Commit graph

65 commits

Author SHA1 Message Date
Rodrigo
24582eeb74 Revert "== > ="
This reverts commit 28e8adc03d.
2023-11-30 22:39:36 +01:00
Rodrigo
28e8adc03d == > = 2023-11-30 22:29:33 +01:00
Rodrigo
544bbec8a1 Merge branch 'dev' into early 2023-11-23 14:41:31 +01:00
Rodrigo
150597011f feeds fix 2023-11-23 14:41:22 +01:00
Rodrigo
7516136242 Merge branch 'early-early' into early
# Conflicts:
#	configs/steam-input/emudeck_controller_generic.vdf
#	configs/steam-input/emudeck_controller_ps4.vdf
#	configs/steam-input/emudeck_controller_ps5.vdf
#	configs/steam-input/emudeck_controller_steamdeck.vdf
#	configs/steam-input/emudeck_controller_switch_pro.vdf
#	configs/steam-input/emudeck_controller_xbox360.vdf
#	configs/steam-input/emudeck_controller_xboxone.vdf
#	functions/EmuScripts/emuDeckCitra.sh
#	functions/EmuScripts/emuDeckRPCS3.sh
#	functions/ToolScripts/emuDeckCopyGames.sh
#	functions/ToolScripts/emuDeckMigration.sh
#	tools/launchers/rpcs3.sh
2023-11-20 00:58:24 +01:00
Rodrigo
b379f9a879 new SRM reorg 2023-11-04 00:32:30 +01:00
Rodrigo
7ab5d07eeb Revert "Merge branch 'dev' into early"
This reverts commit 4088a7b841, reversing
changes made to 2bc2dfe9c6.
2023-11-03 17:31:21 +01:00
Rodrigo
9395fce8a9 Update from Early Early + RPCS3 + Citra PR 2023-11-02 19:43:11 +01:00
Rodrigo
ebfbb5548c logss 2023-10-23 13:40:29 +02:00
Dragoon Dorise
1f89ab30f4
Merge from early - CloudSync 2.0, Pegasus, Darwin support (#886)
* add json for apotris.

this PR adds the needed json for accessing Apotris.

* fix pcsx2 cloud

* decky functions + Customization moved inside every emulator _init

* Decky_setClourd

* arSnes var

* last touch

* test

* Darwin wip

* darwin wip

* old EmuAI

* SRM

* RA + SRM + ESDE

* Moving more if darwin to override.sh

* Moving more if darwin to override.sh

* installToolAI + darwin ifs cleanups, more overrides :)

* fi fix

* fixed SRM parsers with ,,

* fix rm dmg

* RA flatpak first

* darwin install

* darwin fixes

* darwinnnn

* jsonjson

* darwin srm

* fix launchers

* SRM env vars moved to a function + override to darwin

* ares out for now

* fix flycast broking everything

* dont check if.cef-enable-remote-debugging

* better zenity

* fix watcher

* zenity fix

* cloudSync provider detection

* fixed paths fix

* darwin fixed paths

* fixed paths fix

* enable cloudsync

* no appinit

* last minute fixes

* weird fixes

* hash fix?

* this needs a proper cleanup...

* fixed?

* back to linkToSaveFolder for now

* better duplicate detection

* parser disabled

* cloudSync final touches

* darwin installation

* improvements

* customSRM

* Revert "customSRM"

This reverts commit 2787d2282c.

* first batch

* second batch

* SGBC + Jaguar parsers

* Pegasus settings and functions

* proper order

* Path fixed

* install on setup

* SRM parser

* icon

* early beta

* chimeraOS improvements

# Conflicts:
#	setup.sh

* cosmetic

* helpers: Fix FlatPak installed check (#875)

* chimeraOS retroarch

* clear console

* Steam installation

* fix shellcheck

* path fixes

* fix SRM

* =

* Steam-ROM-Manager

* srm new path fix

* SRM_IsInstalled

* cloudsync wtf

* SRM_IsInstalled

* Steam ROM Manager proper name

* ROM

* srm stuff

* SRM_migration

* icon

* fix savedownload

* launchers

* srm icon

* ROM

* ummm

* fixes installToolAI

* ESDE Migration

* RetroArch_setConfigOverride  fix

* fix RA

* fix PCSX2QT

* back to flatpaks

* EmuDecky no internet message

* noInternet EmuDecky

* pegasus theme installer

* pegasus launchers

* Pegasus install Darwin

* Pegasus install Darwin

* Init pegasus

* ESDE Theme

* =

* >

* override getEmuInstallStatus

---------

Co-authored-by: Glazed_Belmont <48196637+GlaZedBelmont@users.noreply.github.com>
2023-10-10 22:20:54 +02:00
Dragoon Dorise
97cdef9a20
Feature/cloudsavesync (#876)
cloudSync and EmuDecky functions
2023-09-28 23:25:30 +02:00
Rodrigo
2d4bdd6ff5 appimage fix 2023-05-24 19:09:37 +02:00
Rodrigo
a64a7ee89d fix true 2023-05-24 18:07:23 +02:00
Rodrigo
a0a7a50bbd Merge branch 'main' into dev 2023-05-24 17:59:09 +02:00
Rodrigo
c5edd697be appImageInit 2023-05-24 17:56:29 +02:00