From ee9f744a13b61e773ec5e98292b89f467b48868e Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 15 Jun 2023 10:32:32 -0400 Subject: [PATCH 01/51] Update Yuzu presets to handle new config syntax --- emu-configs/defaults/retrodeck/presets/yuzu_presets.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/emu-configs/defaults/retrodeck/presets/yuzu_presets.cfg b/emu-configs/defaults/retrodeck/presets/yuzu_presets.cfg index e6c915fc..bfb46f5e 100644 --- a/emu-configs/defaults/retrodeck/presets/yuzu_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/yuzu_presets.cfg @@ -3,7 +3,7 @@ target_file^$yuzuconf defaults_file^$emuconfigs/yuzu/qt-config.ini change^ask_to_exit^confirmClose^true^UI change^ask_to_exit^confirmClose\default^true^UI -change^nintendo_button_layout^player_0_button_a^pad:0,button:0,port:0,guid:03000000de280000ff11000001000000,engine:sdl^Controls -change^nintendo_button_layout^player_0_button_b^pad:0,button:1,port:0,guid:03000000de280000ff11000001000000,engine:sdl^Controls -change^nintendo_button_layout^player_0_button_x^pad:0,button:2,port:0,guid:03000000de280000ff11000001000000,engine:sdl^Controls -change^nintendo_button_layout^player_0_button_y^pad:0,button:3,port:0,guid:03000000de280000ff11000001000000,engine:sdl^Controls +change^nintendo_button_layout^player_0_button_a^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:0,pad:0"^Controls +change^nintendo_button_layout^player_0_button_b^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:1,pad:0"^Controls +change^nintendo_button_layout^player_0_button_x^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:2,pad:0"^Controls +change^nintendo_button_layout^player_0_button_y^"engine:sdl,guid:03000000de280000ff11000001000000,port:0,button:3,pad:0"^Controls From 803bdaefab4f307638cec6feda43da3c838b70aa Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 15 Jun 2023 16:47:41 +0200 Subject: [PATCH 02/51] RetroDECK cooker-0.7.1b init --- net.retrodeck.retrodeck.appdata.xml | 9 +++++++++ net.retrodeck.retrodeck.yml | 16 ++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 1a2f62b9..f1d81141 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -65,6 +65,15 @@ GPL-3.0 CC0-1.0 + + https://github.com/XargonWan/RetroDECK/releases/tag/0.7.1b + +

Bug fixes:

+
    +
  • PLACEHOLDER
    • +
+ + https://github.com/XargonWan/RetroDECK/releases/tag/0.7.0b diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index f914bb52..ad6bbf91 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -65,18 +65,18 @@ modules: # The version number is hardcoded in /app/retrodeck/version # # UPDATE STEPS FOR MAIN: - # [X] Update the VERSION variable - # [X] Update the appdata.xml with the version number and notes - # [X] change branch into main in version-initialization (first one) - # [X] change branch into main in retrodeck module (last one) - # [X] if header (before modules) was edited, edit it even in flathub.yml + # [ ] Update the VERSION variable + # [ ] Update the appdata.xml with the version number and notes + # [ ] change branch into main in version-initialization (first one) + # [ ] change branch into main in retrodeck module (last one) + # [ ] if header (before modules) was edited, edit it even in flathub.yml # - name: version-initialization buildsystem: simple build-commands: - | - VERSION="0.7.0b" + VERSION=$(git rev-parse --abbrev-ref HEAD) git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ @@ -90,7 +90,7 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: main + branch: cooker-0.7.1b - name: xmlstarlet config-opts: @@ -1182,4 +1182,4 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK.git - branch: main + branch: cooker-0.7.1b From b5577b1bbd8bf0e1619a4d0fc79919241320f904 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 15 Jun 2023 10:50:09 -0400 Subject: [PATCH 03/51] Fix rsync trying to keep perms from RO files --- functions/functions.sh | 2 +- functions/post_update.sh | 8 ++++---- functions/prepare_emulator.sh | 8 ++++---- tools/configurator.sh | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/functions/functions.sh b/functions/functions.sh index 2a7b1928..f137ca2d 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -464,7 +464,7 @@ install_retrodeck_controller_profile() { # BIGGER NOTE: As part of this process, all emulators will need to have their configs hard-reset to match the controller mappings of the profile # USAGE: install_retrodeck_controller_profile if [[ -d "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" && -d "$HOME/.steam/steam/controller_base/templates/" ]]; then - rsync -a "/app/retrodeck/binding-icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" + rsync -rlD "/app/retrodeck/binding-icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" else configurator_generic_dialog "RetroDECK Controller Profile Install" "The target directories for the controller profile do not exist.\n\nThis may happen if you do not have Steam installed or the location is does not have permission to be read." diff --git a/functions/post_update.sh b/functions/post_update.sh index 4eea301b..46dc9e93 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -127,9 +127,9 @@ post_update() { dir_prep "$rdhome/gamelists" "/var/config/emulationstation/.emulationstation/gamelists" dir_prep "$borders_folder" "/var/config/retroarch/overlays/borders" - rsync -a "/app/retrodeck/emu-configs/retroarch/borders/" "/var/config/retroarch/overlays/borders" + rsync -rlD "/app/retrodeck/emu-configs/retroarch/borders/" "/var/config/retroarch/overlays/borders/" - rsync -a --mkpath "$emuconfigs/defaults/retrodeck/presets/remaps/" "/var/config/retroarch/config/remaps/" + rsync -rlD --mkpath "$emuconfigs/defaults/retrodeck/presets/remaps/" "/var/config/retroarch/config/remaps/" if [[ ! -f "$bios_folder/capsimg.so" ]]; then cp -f "/app/retrodeck/extras/Amiga/capsimg.so" "$bios_folder/capsimg.so" @@ -226,10 +226,10 @@ post_update() { # The following commands are run every time. if [[ -d "/var/data/dolphin-emu/Load/DynamicInputTextures" ]]; then # Refresh installed textures if they have been enabled - rsync -a "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/dolphin-emu/Load/DynamicInputTextures/" + rsync -rlD "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/dolphin-emu/Load/DynamicInputTextures/" fi if [[ -d "/var/data/primehack/Load/DynamicInputTextures" ]]; then # Refresh installed textures if they have been enabled - rsync -a "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/primehack/Load/DynamicInputTextures/" + rsync -rlD "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/primehack/Load/DynamicInputTextures/" fi update_splashscreens diff --git a/functions/prepare_emulator.sh b/functions/prepare_emulator.sh index f7d7dad0..1b24b608 100644 --- a/functions/prepare_emulator.sh +++ b/functions/prepare_emulator.sh @@ -72,13 +72,13 @@ prepare_emulator() { mkdir -pv /var/config/retroarch/shaders/ cp -rf /app/share/libretro/shaders /var/config/retroarch/ dir_prep "$rdhome/shaders/retroarch" "/var/config/retroarch/shaders" - rsync -a --mkpath "/app/share/libretro/cores/" "/var/config/retroarch/cores/" + rsync -rlD --mkpath "/app/share/libretro/cores/" "/var/config/retroarch/cores/" cp -fv $emuconfigs/retroarch/retroarch.cfg /var/config/retroarch/ cp -fv $emuconfigs/retroarch/retroarch-core-options.cfg /var/config/retroarch/ - rsync -a --mkpath "$emuconfigs/retroarch/core-overrides/" "/var/config/retroarch/config/" - rsync -a --mkpath "$emuconfigs/defaults/retrodeck/presets/remaps/" "/var/config/retroarch/config/remaps/" + rsync -rlD --mkpath "$emuconfigs/retroarch/core-overrides/" "/var/config/retroarch/config/" + rsync -rlD --mkpath "$emuconfigs/defaults/retrodeck/presets/remaps/" "/var/config/retroarch/config/remaps/" dir_prep "$borders_folder" "/var/config/retroarch/overlays/borders" - rsync -a --mkpath "/app/retrodeck/emu-configs/retroarch/borders/" "/var/config/retroarch/overlays/borders/" + rsync -rlD --mkpath "/app/retrodeck/emu-configs/retroarch/borders/" "/var/config/retroarch/overlays/borders/" set_setting_value "$raconf" "savefile_directory" "$saves_folder" "retroarch" set_setting_value "$raconf" "savestate_directory" "$states_folder" "retroarch" set_setting_value "$raconf" "screenshot_directory" "$screenshots_folder" "retroarch" diff --git a/tools/configurator.sh b/tools/configurator.sh index ee790af0..7285a3b7 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -344,7 +344,7 @@ configurator_dolphin_input_textures_dialog() { set_setting_value $dolphingfxconf "HiresTextures" "True" dolphin ( mkdir "/var/data/dolphin-emu/Load/DynamicInputTextures" - rsync -a "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/dolphin-emu/Load/DynamicInputTextures/" + rsync -rlD "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/dolphin-emu/Load/DynamicInputTextures/" ) | zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ @@ -382,7 +382,7 @@ configurator_primehack_input_textures_dialog() { set_setting_value $primehackgfxconf "HiresTextures" "True" primehack ( mkdir "/var/data/primehack/Load/DynamicInputTextures" - rsync -a "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/primehack/Load/DynamicInputTextures/" + rsync -rlD "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/primehack/Load/DynamicInputTextures/" ) | zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ From 381328286ebc9830de803c5599c610b532da23c1 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 16 Jun 2023 17:23:18 +0200 Subject: [PATCH 04/51] =?UTF-8?q?Replaced=20Flatpak=20portal=20with=20U?= =?UTF-8?q?=C3=A8dateMonitor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index ad6bbf91..250147d3 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -22,7 +22,7 @@ finish-args: - --talk-name=org.freedesktop.ScreenSaver - --talk-name=org.freedesktop.PowerManagement.Inhibit - --talk-name=org.freedesktop.login1.Manager - - --talk-name=org.freedesktop.Flatpak + - --talk-name=org.freedesktop.portal.Flatpak.UpdateMonitor - --filesystem=xdg-run/app/com.discordapp.Discord:create # Dolphin - --allow=bluetooth From cfa2a0382170c5f617144fafab4b6a5828a2cf7f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 20 Jun 2023 09:37:46 +0200 Subject: [PATCH 05/51] Updated Steam controller config --- .../retrodeck/RetroDECK_controller_config.vdf | 157 ++++++++++-------- 1 file changed, 85 insertions(+), 72 deletions(-) diff --git a/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf b/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf index 7bf60e77..19a6fd78 100644 --- a/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf +++ b/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf @@ -1,8 +1,8 @@ "controller_mappings" { "version" "3" - "revision" "1596" - "title" "RetroDECK: Official Layout - v0.7b" + "revision" "1662" + "title" "RetroDECK: Official Layout - v0.7.1b" "description" "The Official RetroDECK Layout" "creator" "" "progenitor" "" @@ -12,7 +12,7 @@ "controller_caps" "23117823" "major_revision" "0" "minor_revision" "0" - "Timestamp" "-1230453184" + "Timestamp" "-915384448" "actions" { "Default" @@ -721,8 +721,8 @@ { "bindings" { - "binding" "key_press LEFT_CONTROL, FULLSCREEN OFF, , " - "binding" "key_press O, FULLSCREEN OFF, , " + "binding" "key_press LEFT_CONTROL, Open Menu, , " + "binding" "key_press M, Open Menu, , " } } } @@ -829,6 +829,40 @@ "description" "" "inputs" { + "dpad_north" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Increase Emulation Speed, , " + "binding" "key_press 1, Increase Emulation Speed, , " + } + } + } + "disabled_activators" + { + } + } + "dpad_south" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press LEFT_CONTROL, Decrease Emulation Speed, , " + "binding" "key_press 2, Decrease Emulation Speed, , " + } + } + } + "disabled_activators" + { + } + } "dpad_east" { "activators" @@ -1558,23 +1592,6 @@ { } } - "touch_menu_button_9" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "key_press LEFT_CONTROL, Fullscreen Off, RD-zoom-fit-best.png, #232323 #AD0000" - "binding" "key_press N, Fullscreen Off, RD-zoom-fit-best.png, #232323 #AD0000" - } - } - } - "disabled_activators" - { - } - } "touch_menu_button_10" { "activators" @@ -2737,23 +2754,6 @@ { } } - "touch_menu_button_5" - { - "activators" - { - "Full_Press" - { - "bindings" - { - "binding" "key_press LEFT_CONTROL, Fullscreen Off, RD-zoom-fit-best.png, #232323 #AD0000" - "binding" "key_press N, Fullscreen Off, RD-zoom-fit-best.png, #232323 #AD0000" - } - } - } - "disabled_activators" - { - } - } "touch_menu_button_6" { "activators" @@ -8038,7 +8038,7 @@ { "bindings" { - "binding" "key_press T, , " + "binding" "xinput_button B, , " } } } @@ -8054,7 +8054,7 @@ { "bindings" { - "binding" "key_press Y, , " + "binding" "xinput_button A, , " } } } @@ -8151,6 +8151,13 @@ "binding" "xinput_button select, , " } } + "Full_Press" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 2 1 1, , " + } + } } "disabled_activators" { @@ -8196,7 +8203,7 @@ { "bindings" { - "binding" "key_press T, , " + "binding" "xinput_button B, , " } } } @@ -8212,7 +8219,7 @@ { "bindings" { - "binding" "key_press Y, , " + "binding" "xinput_button A, , " } } } @@ -8303,12 +8310,18 @@ { "activators" { + "release" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 1 1 1, , " + } + } "Full_Press" { "bindings" { - "binding" "key_press LEFT_CONTROL, OPEN MENU, , " - "binding" "key_press M, OPEN MENU, , " + "binding" "xinput_button SELECT, , " } } } @@ -8480,7 +8493,7 @@ { "bindings" { - "binding" "key_press T, , " + "binding" "xinput_button B, , " } } } @@ -8496,7 +8509,7 @@ { "bindings" { - "binding" "key_press Y, , " + "binding" "xinput_button A, , " } } } @@ -8638,7 +8651,7 @@ { "bindings" { - "binding" "key_press T, , " + "binding" "xinput_button B, , " } } } @@ -8654,7 +8667,7 @@ { "bindings" { - "binding" "key_press Y, , " + "binding" "xinput_button A, , " } } } @@ -8796,7 +8809,7 @@ { "bindings" { - "binding" "key_press T, , " + "binding" "xinput_button B, , " } } } @@ -8812,7 +8825,7 @@ { "bindings" { - "binding" "key_press Y, , " + "binding" "xinput_button A, , " } } } @@ -8954,7 +8967,7 @@ { "bindings" { - "binding" "key_press T, , " + "binding" "xinput_button B, , " } } } @@ -8970,7 +8983,7 @@ { "bindings" { - "binding" "key_press Y, , " + "binding" "xinput_button A, , " } } } @@ -9112,7 +9125,7 @@ { "bindings" { - "binding" "key_press T, , " + "binding" "xinput_button B, , " } } } @@ -9128,7 +9141,7 @@ { "bindings" { - "binding" "key_press Y, , " + "binding" "xinput_button A, , " } } } @@ -9270,7 +9283,7 @@ { "bindings" { - "binding" "key_press T, , " + "binding" "xinput_button B, , " } } } @@ -9286,7 +9299,7 @@ { "bindings" { - "binding" "key_press Y, , " + "binding" "xinput_button A, , " } } } @@ -9428,7 +9441,7 @@ { "bindings" { - "binding" "key_press T, , " + "binding" "xinput_button B, , " } } } @@ -9444,7 +9457,7 @@ { "bindings" { - "binding" "key_press Y, , " + "binding" "xinput_button A, , " } } } @@ -9586,7 +9599,7 @@ { "bindings" { - "binding" "key_press T, , " + "binding" "xinput_button B, , " } } } @@ -9602,7 +9615,7 @@ { "bindings" { - "binding" "key_press Y, , " + "binding" "xinput_button A, , " } } } @@ -9744,7 +9757,7 @@ { "bindings" { - "binding" "key_press T, , " + "binding" "xinput_button B, , " } } } @@ -9760,7 +9773,7 @@ { "bindings" { - "binding" "key_press Y, , " + "binding" "xinput_button A, , " } } } @@ -9902,7 +9915,7 @@ { "bindings" { - "binding" "key_press T, , " + "binding" "xinput_button B, , " } } } @@ -9918,7 +9931,7 @@ { "bindings" { - "binding" "key_press Y, , " + "binding" "xinput_button A, , " } } } @@ -10060,7 +10073,7 @@ { "bindings" { - "binding" "key_press T, , " + "binding" "xinput_button B, , " } } } @@ -10076,7 +10089,7 @@ { "bindings" { - "binding" "key_press Y, , " + "binding" "xinput_button A, , " } } } @@ -10218,7 +10231,7 @@ { "bindings" { - "binding" "key_press T, , " + "binding" "xinput_button B, , " } } } @@ -10234,7 +10247,7 @@ { "bindings" { - "binding" "key_press Y, , " + "binding" "xinput_button A, , " } } } @@ -10376,7 +10389,7 @@ { "bindings" { - "binding" "key_press T, , " + "binding" "xinput_button B, , " } } } @@ -10392,7 +10405,7 @@ { "bindings" { - "binding" "key_press Y, , " + "binding" "xinput_button A, , " } } } @@ -10768,4 +10781,4 @@ "left_trackpad_mode" "0" "right_trackpad_mode" "0" } -} +} \ No newline at end of file From e9270c4d4abdf9aa24f879290fc03b15b83400ed Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 21 Jun 2023 19:20:32 +0200 Subject: [PATCH 06/51] Controller Config: fixed SELECT not working in some menus --- .../retrodeck/RetroDECK_controller_config.vdf | 104 +++++++++++++++++- 1 file changed, 101 insertions(+), 3 deletions(-) diff --git a/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf b/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf index 19a6fd78..e965bdd5 100644 --- a/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf +++ b/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf @@ -1,7 +1,7 @@ "controller_mappings" { "version" "3" - "revision" "1662" + "revision" "1691" "title" "RetroDECK: Official Layout - v0.7.1b" "description" "The Official RetroDECK Layout" "creator" "" @@ -12,7 +12,7 @@ "controller_caps" "23117823" "major_revision" "0" "minor_revision" "0" - "Timestamp" "-915384448" + "Timestamp" "-913215520" "actions" { "Default" @@ -7990,7 +7990,14 @@ { "bindings" { - "binding" "xinput_button select, , " + "binding" "xinput_button SELECT, , " + } + } + "Full_Press" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 2 1 1, , " } } } @@ -8448,6 +8455,13 @@ "binding" "xinput_button select, , " } } + "Full_Press" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 2 1 1, , " + } + } } "disabled_activators" { @@ -8606,6 +8620,13 @@ "binding" "xinput_button select, , " } } + "Full_Press" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 2 1 1, , " + } + } } "disabled_activators" { @@ -8764,6 +8785,13 @@ "binding" "xinput_button select, , " } } + "Full_Press" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 2 1 1, , " + } + } } "disabled_activators" { @@ -8922,6 +8950,13 @@ "binding" "xinput_button select, , " } } + "Full_Press" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 2 1 1, , " + } + } } "disabled_activators" { @@ -9080,6 +9115,13 @@ "binding" "xinput_button select, , " } } + "Full_Press" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 2 1 1, , " + } + } } "disabled_activators" { @@ -9238,6 +9280,13 @@ "binding" "xinput_button select, , " } } + "Full_Press" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 2 1 1, , " + } + } } "disabled_activators" { @@ -9396,6 +9445,13 @@ "binding" "xinput_button select, , " } } + "Full_Press" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 2 1 1, , " + } + } } "disabled_activators" { @@ -9554,6 +9610,13 @@ "binding" "xinput_button select, , " } } + "Full_Press" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 2 1 1, , " + } + } } "disabled_activators" { @@ -9712,6 +9775,13 @@ "binding" "xinput_button select, , " } } + "Full_Press" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 2 1 1, , " + } + } } "disabled_activators" { @@ -9870,6 +9940,13 @@ "binding" "xinput_button select, , " } } + "Full_Press" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 2 1 1, , " + } + } } "disabled_activators" { @@ -10028,6 +10105,13 @@ "binding" "xinput_button select, , " } } + "Full_Press" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 2 1 1, , " + } + } } "disabled_activators" { @@ -10186,6 +10270,13 @@ "binding" "xinput_button select, , " } } + "Full_Press" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 2 1 1, , " + } + } } "disabled_activators" { @@ -10344,6 +10435,13 @@ "binding" "xinput_button select, , " } } + "Full_Press" + { + "bindings" + { + "binding" "controller_action CHANGE_PRESET 2 1 1, , " + } + } } "disabled_activators" { From 6de5afd41029fb92683ef112f0ef465734acd693 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 22 Jun 2023 09:53:17 +0200 Subject: [PATCH 07/51] PPSSPP: fixed L and R buttons --- emu-configs/defaults/ppsspp/controls.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emu-configs/defaults/ppsspp/controls.ini b/emu-configs/defaults/ppsspp/controls.ini index 62e144a4..a5f01e59 100644 --- a/emu-configs/defaults/ppsspp/controls.ini +++ b/emu-configs/defaults/ppsspp/controls.ini @@ -9,8 +9,8 @@ Square = 1-29,10-191 Triangle = 1-47,10-188 Start = 1-62,10-197 Select = 1-66,10-196 -L = 1-45,10-194 -R = 1-51,10-195 +L = 1-45,10-193 +R = 1-51,10-192 An.Up = 1-37,10-4003 An.Down = 1-39,10-4002 An.Left = 1-38,10-4001 From 438d20c5ea8e0c633e324dfd20b7bcd6e09b5727 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 22 Jun 2023 10:26:17 +0200 Subject: [PATCH 08/51] YUZU: updated config --- emu-configs/defaults/yuzu/qt-config.ini | 89 ++++++++++++++++++++++--- 1 file changed, 80 insertions(+), 9 deletions(-) diff --git a/emu-configs/defaults/yuzu/qt-config.ini b/emu-configs/defaults/yuzu/qt-config.ini index efa6bb94..5a18ed8a 100644 --- a/emu-configs/defaults/yuzu/qt-config.ini +++ b/emu-configs/defaults/yuzu/qt-config.ini @@ -63,6 +63,10 @@ enable_accurate_vibrations=false enable_accurate_vibrations\default=true enable_ir_sensor=false enable_ir_sensor\default=true +enable_joycon_driver=true +enable_joycon_driver\default=true +enable_procon_driver=false +enable_procon_driver\default=true enable_raw_input=false enable_raw_input\default=true enable_ring_controller=true @@ -721,6 +725,8 @@ player_9_vibration_enabled=true player_9_vibration_enabled\default=true player_9_vibration_strength=100 player_9_vibration_strength\default=true +random_amiibo_id=false +random_amiibo_id\default=true ring_controller="modifier_scale:0.050000,modifier:toggle$00$1code$00$1engine$0keyboard,right:toggle$00$1code$068$1engine$0keyboard,left:toggle$00$1code$065$1engine$0keyboard,down:toggle$00$1code$00$1engine$0keyboard,up:toggle$00$1code$00$1engine$0keyboard,engine:analog_from_button" ring_controller\default=true tas_enable=false @@ -755,6 +761,8 @@ use_extended_memory_layout=false use_extended_memory_layout\default=true use_multi_core=true use_multi_core\default=true +use_unsafe_extended_memory_layout=false +use_unsafe_extended_memory_layout\default=true [Cpu] cpu_accuracy=0 @@ -775,6 +783,8 @@ cpuopt_fastmem=true cpuopt_fastmem\default=true cpuopt_fastmem_exclusives=true cpuopt_fastmem_exclusives\default=true +cpuopt_ignore_memory_aborts=true +cpuopt_ignore_memory_aborts\default=true cpuopt_misc_ir=true cpuopt_misc_ir\default=true cpuopt_page_tables=true @@ -821,6 +831,8 @@ use_virtual_sd\default=true [Debugging] create_crash_dumps=false create_crash_dumps\default=true +disable_macro_hle=false +disable_macro_hle\default=true disable_macro_jit=false disable_macro_jit\default=true dump_exefs=false @@ -864,7 +876,7 @@ ip\default=true ip_ban_list\size=0 max_player=8 max_player\default=true -nickname= +nickname=RetroDECK nickname\default=true port=24872 port\default=true @@ -885,6 +897,12 @@ anti_aliasing=0 anti_aliasing\default=true aspect_ratio=0 aspect_ratio\default=true +astc_recompression=0 +astc_recompression\default=true +async_astc=false +async_astc\default=true +async_presentation=false +async_presentation\default=true backend=1 backend\default=true bg_blue=0 @@ -897,8 +915,12 @@ debug=false debug\default=true disable_shader_loop_safety_checks=false disable_shader_loop_safety_checks\default=true -fps_cap=1000 -fps_cap\default=true +enable_compute_pipelines=false +enable_compute_pipelines\default=true +force_max_clock=false +force_max_clock\default=true +fsr_sharpening_slider=25 +fsr_sharpening_slider\default=true fullscreen_mode=1 fullscreen_mode\default=true gpu_accuracy=1 @@ -929,15 +951,19 @@ use_fast_gpu_time=true use_fast_gpu_time\default=true use_pessimistic_flushes=false use_pessimistic_flushes\default=true -use_speed_limit=true -use_speed_limit\default=true -use_vsync=true +use_reactive_flushing=true +use_reactive_flushing\default=true +use_video_framerate=false +use_video_framerate\default=true +use_vsync=2 use_vsync\default=true +use_vulkan_driver_pipeline_cache=true +use_vulkan_driver_pipeline_cache\default=true vulkan_device=0 vulkan_device\default=true [Services] -network_interface=None +network_interface=wlan0 network_interface\default=false [System] @@ -947,6 +973,7 @@ custom_rtc=0 custom_rtc\default=true custom_rtc_enabled=false custom_rtc_enabled\default=true +device_name=RetroDECK language_index=1 language_index\default=true region_index=1 @@ -1018,132 +1045,176 @@ Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq=Home+Dpad_Right Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq\default=true Shortcuts\Main%20Window\Audio%20Mute\Unmute\KeySeq=Ctrl+M Shortcuts\Main%20Window\Audio%20Mute\Unmute\KeySeq\default=true +Shortcuts\Main%20Window\Audio%20Mute\Unmute\Repeat=false +Shortcuts\Main%20Window\Audio%20Mute\Unmute\Repeat\default=true Shortcuts\Main%20Window\Audio%20Volume%20Down\Context=2 Shortcuts\Main%20Window\Audio%20Volume%20Down\Context\default=true Shortcuts\Main%20Window\Audio%20Volume%20Down\Controller_KeySeq=Home+Dpad_Down Shortcuts\Main%20Window\Audio%20Volume%20Down\Controller_KeySeq\default=true Shortcuts\Main%20Window\Audio%20Volume%20Down\KeySeq=- Shortcuts\Main%20Window\Audio%20Volume%20Down\KeySeq\default=true +Shortcuts\Main%20Window\Audio%20Volume%20Down\Repeat=true +Shortcuts\Main%20Window\Audio%20Volume%20Down\Repeat\default=true Shortcuts\Main%20Window\Audio%20Volume%20Up\Context=2 Shortcuts\Main%20Window\Audio%20Volume%20Up\Context\default=true Shortcuts\Main%20Window\Audio%20Volume%20Up\Controller_KeySeq=Home+Dpad_Up Shortcuts\Main%20Window\Audio%20Volume%20Up\Controller_KeySeq\default=true Shortcuts\Main%20Window\Audio%20Volume%20Up\KeySeq="=" Shortcuts\Main%20Window\Audio%20Volume%20Up\KeySeq\default=true +Shortcuts\Main%20Window\Audio%20Volume%20Up\Repeat=true +Shortcuts\Main%20Window\Audio%20Volume%20Up\Repeat\default=true Shortcuts\Main%20Window\Capture%20Screenshot\Context=3 Shortcuts\Main%20Window\Capture%20Screenshot\Context\default=true Shortcuts\Main%20Window\Capture%20Screenshot\Controller_KeySeq=Screenshot Shortcuts\Main%20Window\Capture%20Screenshot\Controller_KeySeq\default=true Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq=Ctrl+P Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq\default=true +Shortcuts\Main%20Window\Capture%20Screenshot\Repeat=false +Shortcuts\Main%20Window\Capture%20Screenshot\Repeat\default=true Shortcuts\Main%20Window\Change%20Adapting%20Filter\Context=2 Shortcuts\Main%20Window\Change%20Adapting%20Filter\Context\default=true Shortcuts\Main%20Window\Change%20Adapting%20Filter\Controller_KeySeq=Home+L Shortcuts\Main%20Window\Change%20Adapting%20Filter\Controller_KeySeq\default=true Shortcuts\Main%20Window\Change%20Adapting%20Filter\KeySeq=F8 Shortcuts\Main%20Window\Change%20Adapting%20Filter\KeySeq\default=true +Shortcuts\Main%20Window\Change%20Adapting%20Filter\Repeat=false +Shortcuts\Main%20Window\Change%20Adapting%20Filter\Repeat\default=true Shortcuts\Main%20Window\Change%20Docked%20Mode\Context=2 Shortcuts\Main%20Window\Change%20Docked%20Mode\Context\default=true Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq=Home+X Shortcuts\Main%20Window\Change%20Docked%20Mode\Controller_KeySeq\default=true Shortcuts\Main%20Window\Change%20Docked%20Mode\KeySeq=F10 Shortcuts\Main%20Window\Change%20Docked%20Mode\KeySeq\default=true +Shortcuts\Main%20Window\Change%20Docked%20Mode\Repeat=false +Shortcuts\Main%20Window\Change%20Docked%20Mode\Repeat\default=true Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Context=2 Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Context\default=true Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Controller_KeySeq=Home+R Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Controller_KeySeq\default=true Shortcuts\Main%20Window\Change%20GPU%20Accuracy\KeySeq=F9 Shortcuts\Main%20Window\Change%20GPU%20Accuracy\KeySeq\default=true +Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Repeat=false +Shortcuts\Main%20Window\Change%20GPU%20Accuracy\Repeat\default=true Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context=1 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context\default=true Shortcuts\Main%20Window\Continue\Pause%20Emulation\Controller_KeySeq=Home+Plus Shortcuts\Main%20Window\Continue\Pause%20Emulation\Controller_KeySeq\default=true Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq=F4 Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq\default=true +Shortcuts\Main%20Window\Continue\Pause%20Emulation\Repeat=false +Shortcuts\Main%20Window\Continue\Pause%20Emulation\Repeat\default=true Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1 Shortcuts\Main%20Window\Exit%20Fullscreen\Context\default=true Shortcuts\Main%20Window\Exit%20Fullscreen\Controller_KeySeq= Shortcuts\Main%20Window\Exit%20Fullscreen\Controller_KeySeq\default=true -Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Esc -Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=true +Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq= +Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=false +Shortcuts\Main%20Window\Exit%20Fullscreen\Repeat=false +Shortcuts\Main%20Window\Exit%20Fullscreen\Repeat\default=true Shortcuts\Main%20Window\Exit%20yuzu\Context=1 Shortcuts\Main%20Window\Exit%20yuzu\Context\default=true Shortcuts\Main%20Window\Exit%20yuzu\Controller_KeySeq=Home+Minus Shortcuts\Main%20Window\Exit%20yuzu\Controller_KeySeq\default=true Shortcuts\Main%20Window\Exit%20yuzu\KeySeq=Ctrl+Q Shortcuts\Main%20Window\Exit%20yuzu\KeySeq\default=true +Shortcuts\Main%20Window\Exit%20yuzu\Repeat=false +Shortcuts\Main%20Window\Exit%20yuzu\Repeat\default=true Shortcuts\Main%20Window\Fullscreen\Context=1 Shortcuts\Main%20Window\Fullscreen\Context\default=true Shortcuts\Main%20Window\Fullscreen\Controller_KeySeq=Home+B Shortcuts\Main%20Window\Fullscreen\Controller_KeySeq\default=true Shortcuts\Main%20Window\Fullscreen\KeySeq=F11 Shortcuts\Main%20Window\Fullscreen\KeySeq\default=true +Shortcuts\Main%20Window\Fullscreen\Repeat=false +Shortcuts\Main%20Window\Fullscreen\Repeat\default=true Shortcuts\Main%20Window\Load%20File\Context=3 Shortcuts\Main%20Window\Load%20File\Context\default=true Shortcuts\Main%20Window\Load%20File\Controller_KeySeq= Shortcuts\Main%20Window\Load%20File\Controller_KeySeq\default=true Shortcuts\Main%20Window\Load%20File\KeySeq=Ctrl+O Shortcuts\Main%20Window\Load%20File\KeySeq\default=true +Shortcuts\Main%20Window\Load%20File\Repeat=false +Shortcuts\Main%20Window\Load%20File\Repeat\default=true Shortcuts\Main%20Window\Load\Remove%20Amiibo\Context=3 Shortcuts\Main%20Window\Load\Remove%20Amiibo\Context\default=true Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq=Home+A Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq\default=true Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq=F2 Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq\default=true +Shortcuts\Main%20Window\Load\Remove%20Amiibo\Repeat=false +Shortcuts\Main%20Window\Load\Remove%20Amiibo\Repeat\default=true Shortcuts\Main%20Window\Restart%20Emulation\Context=1 Shortcuts\Main%20Window\Restart%20Emulation\Context\default=true Shortcuts\Main%20Window\Restart%20Emulation\Controller_KeySeq= Shortcuts\Main%20Window\Restart%20Emulation\Controller_KeySeq\default=true Shortcuts\Main%20Window\Restart%20Emulation\KeySeq=F6 Shortcuts\Main%20Window\Restart%20Emulation\KeySeq\default=true +Shortcuts\Main%20Window\Restart%20Emulation\Repeat=false +Shortcuts\Main%20Window\Restart%20Emulation\Repeat\default=true Shortcuts\Main%20Window\Stop%20Emulation\Context=1 Shortcuts\Main%20Window\Stop%20Emulation\Context\default=true Shortcuts\Main%20Window\Stop%20Emulation\Controller_KeySeq= Shortcuts\Main%20Window\Stop%20Emulation\Controller_KeySeq\default=true Shortcuts\Main%20Window\Stop%20Emulation\KeySeq=F5 Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=true +Shortcuts\Main%20Window\Stop%20Emulation\Repeat=false +Shortcuts\Main%20Window\Stop%20Emulation\Repeat\default=true Shortcuts\Main%20Window\TAS%20Record\Context=2 Shortcuts\Main%20Window\TAS%20Record\Context\default=true Shortcuts\Main%20Window\TAS%20Record\Controller_KeySeq= Shortcuts\Main%20Window\TAS%20Record\Controller_KeySeq\default=true Shortcuts\Main%20Window\TAS%20Record\KeySeq=Ctrl+F7 Shortcuts\Main%20Window\TAS%20Record\KeySeq\default=true +Shortcuts\Main%20Window\TAS%20Record\Repeat=false +Shortcuts\Main%20Window\TAS%20Record\Repeat\default=true Shortcuts\Main%20Window\TAS%20Reset\Context=2 Shortcuts\Main%20Window\TAS%20Reset\Context\default=true Shortcuts\Main%20Window\TAS%20Reset\Controller_KeySeq= Shortcuts\Main%20Window\TAS%20Reset\Controller_KeySeq\default=true Shortcuts\Main%20Window\TAS%20Reset\KeySeq=Ctrl+F6 Shortcuts\Main%20Window\TAS%20Reset\KeySeq\default=true +Shortcuts\Main%20Window\TAS%20Reset\Repeat=false +Shortcuts\Main%20Window\TAS%20Reset\Repeat\default=true Shortcuts\Main%20Window\TAS%20Start\Stop\Context=2 Shortcuts\Main%20Window\TAS%20Start\Stop\Context\default=true Shortcuts\Main%20Window\TAS%20Start\Stop\Controller_KeySeq= Shortcuts\Main%20Window\TAS%20Start\Stop\Controller_KeySeq\default=true Shortcuts\Main%20Window\TAS%20Start\Stop\KeySeq=Ctrl+F5 Shortcuts\Main%20Window\TAS%20Start\Stop\KeySeq\default=true +Shortcuts\Main%20Window\TAS%20Start\Stop\Repeat=false +Shortcuts\Main%20Window\TAS%20Start\Stop\Repeat\default=true Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context=1 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context\default=true Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Controller_KeySeq= Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Controller_KeySeq\default=true Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq=Ctrl+F Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq\default=true +Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Repeat=false +Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Repeat\default=true Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Context=2 Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Context\default=true Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Controller_KeySeq=Home+Y Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Controller_KeySeq\default=true Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\KeySeq=Ctrl+U Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\KeySeq\default=true +Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Repeat=false +Shortcuts\Main%20Window\Toggle%20Framerate%20Limit\Repeat\default=true Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Context=2 Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Context\default=true Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Controller_KeySeq= Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Controller_KeySeq\default=true Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\KeySeq=Ctrl+F9 Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\KeySeq\default=true +Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Repeat=false +Shortcuts\Main%20Window\Toggle%20Mouse%20Panning\Repeat\default=true Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context=1 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context\default=true Shortcuts\Main%20Window\Toggle%20Status%20Bar\Controller_KeySeq= Shortcuts\Main%20Window\Toggle%20Status%20Bar\Controller_KeySeq\default=true Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq=Ctrl+S Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq\default=true +Shortcuts\Main%20Window\Toggle%20Status%20Bar\Repeat=false +Shortcuts\Main%20Window\Toggle%20Status%20Bar\Repeat\default=true UIGameList\cache_game_list=true UIGameList\cache_game_list\default=true UIGameList\favorites\size=0 From d7a0d53e2287a44f7f5edc36c1bf8f9aa1e466d6 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 22 Jun 2023 10:33:07 +0200 Subject: [PATCH 09/51] CITRA: updated config --- .../defaults/citra/citra-qt-config.ini | 68 ++++++++++++++----- 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/emu-configs/defaults/citra/citra-qt-config.ini b/emu-configs/defaults/citra/citra-qt-config.ini index 7a42e448..4b9877e3 100644 --- a/emu-configs/defaults/citra/citra-qt-config.ini +++ b/emu-configs/defaults/citra/citra-qt-config.ini @@ -1,10 +1,12 @@ [Audio] +audio_emulation=0 +audio_emulation\default=true enable_audio_stretching=true enable_audio_stretching\default=true -enable_dsp_lle=false -enable_dsp_lle\default=true -enable_dsp_lle_multithread=false -enable_dsp_lle_multithread\default=true +input_device=auto +input_device\default=true +input_type=0 +input_type\default=true mic_input_device=Default mic_input_device\default=true mic_input_type=0 @@ -13,6 +15,8 @@ output_device=auto output_device\default=true output_engine=auto output_engine\default=true +output_type=0 +output_type\default=true volume=@Variant(\0\0\0\x87?\x80\0\0) volume\default=true @@ -178,6 +182,8 @@ LLE\NWM=false LLE\NWM\default=true LLE\PDN=false LLE\PDN\default=true +LLE\PLGLDR=false +LLE\PLGLDR\default=true LLE\PM=false LLE\PM\default=true LLE\PS=false @@ -197,10 +203,14 @@ LLE\SSL\default=true gdbstub_port=24689 gdbstub_port\default=true record_frame_times=false +renderer_debug=false +renderer_debug\default=true use_gdbstub=false use_gdbstub\default=true [Layout] +anaglyph_shader_name=dubois (builtin) +anaglyph_shader_name\default=true custom_bottom_bottom=480 custom_bottom_bottom\default=true custom_bottom_left=40 @@ -211,6 +221,8 @@ custom_bottom_top=240 custom_bottom_top\default=true custom_layout=false custom_layout\default=true +custom_second_layer_opacity=100 +custom_second_layer_opacity\default=true custom_top_bottom=240 custom_top_bottom\default=true custom_top_left=0 @@ -246,18 +258,18 @@ bg_red=0 bg_red\default=true frame_limit=100 frame_limit\default=true -frame_limit_alternate=200 -frame_limit_alternate\default=true +graphics_api=1 +graphics_api\default=true resolution_factor=1 resolution_factor\default=true shaders_accurate_mul=true shaders_accurate_mul\default=true -texture_filter_name=none -texture_filter_name\default=true +texture_filter=0 +texture_filter\default=true +texture_filter_name=Linear (Default) +texture_filter_name\default=false use_disk_shader_cache=true use_disk_shader_cache\default=true -use_frame_limit_alternate=false -use_frame_limit_alternate\default=true use_hw_renderer=true use_hw_renderer\default=true use_hw_shader=true @@ -268,12 +280,16 @@ use_vsync_new=true use_vsync_new\default=true [System] +allow_plugin_loader=true +allow_plugin_loader\default=true init_clock=0 init_clock\default=true init_time=946681277 init_time\default=true is_new_3ds=true is_new_3ds\default=true +plugin_loader=false +plugin_loader\default=true region_value=-1 region_value\default=true @@ -347,6 +363,10 @@ Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context=1 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context\default=true Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq=F4 Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq\default=true +Shortcuts\Main%20Window\Decrease%203D%20Factor\Context=1 +Shortcuts\Main%20Window\Decrease%203D%20Factor\Context\default=false +Shortcuts\Main%20Window\Decrease%203D%20Factor\KeySeq= +Shortcuts\Main%20Window\Decrease%203D%20Factor\KeySeq\default=false Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context=2 Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context\default=true Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq=- @@ -357,12 +377,16 @@ Shortcuts\Main%20Window\Exit%20Citra\KeySeq=Ctrl+Q Shortcuts\Main%20Window\Exit%20Citra\KeySeq\default=true Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1 Shortcuts\Main%20Window\Exit%20Fullscreen\Context\default=true -Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Esc +Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq= Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=true Shortcuts\Main%20Window\Fullscreen\Context=1 Shortcuts\Main%20Window\Fullscreen\Context\default=true Shortcuts\Main%20Window\Fullscreen\KeySeq=F11 Shortcuts\Main%20Window\Fullscreen\KeySeq\default=true +Shortcuts\Main%20Window\Increase%203D%20Factor\Context=1 +Shortcuts\Main%20Window\Increase%203D%20Factor\Context\default=false +Shortcuts\Main%20Window\Increase%203D%20Factor\KeySeq= +Shortcuts\Main%20Window\Increase%203D%20Factor\KeySeq\default=false Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context=2 Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context\default=true Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq=+ @@ -402,19 +426,27 @@ Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=true Shortcuts\Main%20Window\Swap%20Screens\Context=1 Shortcuts\Main%20Window\Swap%20Screens\Context\default=true Shortcuts\Main%20Window\Swap%20Screens\KeySeq=F9 -Shortcuts\Main%20Window\Swap%20Screens\KeySeq\default=true -Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\Context=2 -Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\Context\default=true -Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\KeySeq=Ctrl+Z -Shortcuts\Main%20Window\Toggle%20Alternate%20Speed\KeySeq\default=true +Shortcuts\Main%20Window\Swap%20Screens\KeySeq\default=false +Shortcuts\Main%20Window\Toggle%203D\Context=1 +Shortcuts\Main%20Window\Toggle%203D\Context\default=false +Shortcuts\Main%20Window\Toggle%203D\KeySeq= +Shortcuts\Main%20Window\Toggle%203D\KeySeq\default=false +Shortcuts\Main%20Window\Toggle%20Custom%20Textures\Context=2 +Shortcuts\Main%20Window\Toggle%20Custom%20Textures\Context\default=true +Shortcuts\Main%20Window\Toggle%20Custom%20Textures\KeySeq=Ctrl+Z +Shortcuts\Main%20Window\Toggle%20Custom%20Textures\KeySeq\default=false Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context=1 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context\default=true Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq=Ctrl+F Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq\default=true -Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context=2 +Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context=1 Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context\default=true Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq=Ctrl+A Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq\default=true +Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\Context=1 +Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\Context\default=true +Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq= +Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq\default=false Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context=1 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context\default=true Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq=F10 @@ -468,6 +500,8 @@ theme=default theme\default=true [Utility] +async_custom_loading=true +async_custom_loading\default=true custom_textures=false custom_textures\default=true dump_textures=false From fe50a8afb8cc2c64d9fc881dc55d2cc9bc19a8b0 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 22 Jun 2023 09:12:43 -0400 Subject: [PATCH 10/51] Upgrade controller config at update if installed Change auto-update to notification only until auto update permissions can be fixed --- functions/checks.sh | 48 +++++++++++++++++++++--------------- functions/post_update.sh | 4 +++ rd-submodules/retroarch | 2 +- rd-submodules/shared-modules | 2 +- 4 files changed, 34 insertions(+), 22 deletions(-) diff --git a/functions/checks.sh b/functions/checks.sh index ead3f45d..227be3fd 100644 --- a/functions/checks.sh +++ b/functions/checks.sh @@ -38,26 +38,34 @@ check_for_version_update() { if [[ ! "$update_ignore" == "$online_version" ]]; then if [[ "$update_repo" == "RetroDECK" ]] && [[ $(sed -e 's/[\.a-z]//g' <<< $version) -le $(sed -e 's/[\.a-z]//g' <<< $online_version) ]]; then - choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="Yes" --extra-button="No" --extra-button="Ignore this version" \ - --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ - --title "RetroDECK Update Available" \ - --text="There is a new version of RetroDECK on the stable release channel $online_version. Would you like to update to it?\n\n(depending on your internet speed this could takes several minutes).") - rc=$? # Capture return code, as "Yes" button has no text value - if [[ $rc == "1" ]]; then # If any button other than "Yes" was clicked - if [[ $choice == "Ignore this version" ]]; then - set_setting_value $rd_conf "update_ignore" "$online_version" retrodeck "options" # Store version to ignore for future checks - fi - else # User clicked "Yes" - configurator_generic_dialog "RetroDECK Online Update" "The update process may take several minutes.\n\nAfter the update is complete, RetroDECK will close. When you run it again you will be using the latest version." - ( - flatpak-spawn --host flatpak update --noninteractive -y net.retrodeck.retrodeck - ) | - zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ - --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ - --title "RetroDECK Updater" \ - --text="Upgrade in process please wait (this could takes several minutes)." - configurator_generic_dialog "RetroDECK Online Update" "The update process is now complete!\n\nPlease restart RetroDECK to keep the fun going." - exit 1 + # choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="Yes" --extra-button="No" --extra-button="Ignore this version" \ + # --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + # --title "RetroDECK Update Available" \ + # --text="There is a new version of RetroDECK on the stable release channel $online_version. Would you like to update to it?\n\n(depending on your internet speed this could takes several minutes).") + # rc=$? # Capture return code, as "Yes" button has no text value + # if [[ $rc == "1" ]]; then # If any button other than "Yes" was clicked + # if [[ $choice == "Ignore this version" ]]; then + # set_setting_value $rd_conf "update_ignore" "$online_version" retrodeck "options" # Store version to ignore for future checks + # fi + # else # User clicked "Yes" + # configurator_generic_dialog "RetroDECK Online Update" "The update process may take several minutes.\n\nAfter the update is complete, RetroDECK will close. When you run it again you will be using the latest version." + # ( + # flatpak-spawn --host flatpak update --noninteractive -y net.retrodeck.retrodeck + # ) | + # zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ + # --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + # --title "RetroDECK Updater" \ + # --text="Upgrade in process please wait (this could takes several minutes)." + # configurator_generic_dialog "RetroDECK Online Update" "The update process is now complete!\n\nPlease restart RetroDECK to keep the fun going." + # exit 1 + # fi + choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="OK" --extra-button="Ignore this version" \ + --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + --title "RetroDECK Update Available" \ + --text="There is a new version of RetroDECK on the stable release channel $online_version. Please update through the Discover app!\n\nIf you would like to ignore this version and recieve a notification at the NEXT version,\nclick the \"Ignore this version\" button.") + rc=$? # Capture return code, as "OK" button has no text value + if [[ $rc == "1" ]]; then # If any button other than "OK" was clicked + set_setting_value $rd_conf "update_ignore" "$online_version" retrodeck "options" # Store version to ignore for future checks fi elif [[ "$update_repo" == "RetroDECK-cooker" ]] && [[ ! $version == $online_version ]]; then choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="Yes" --extra-button="No" --extra-button="Ignore this version" \ diff --git a/functions/post_update.sh b/functions/post_update.sh index 46dc9e93..0cfdf25b 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -232,6 +232,10 @@ post_update() { rsync -rlD "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/primehack/Load/DynamicInputTextures/" fi + if [[ -f "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" ]]; then # If RetroDECK controller profile has been previously installed + cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" + fi + update_splashscreens build_retrodeck_current_presets ) | diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch index fbfdda61..0b1cfb79 160000 --- a/rd-submodules/retroarch +++ b/rd-submodules/retroarch @@ -1 +1 @@ -Subproject commit fbfdda61b3da092a71cc53999dd3e7b909f244e2 +Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409 diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules index 50314360..a2441b96 160000 --- a/rd-submodules/shared-modules +++ b/rd-submodules/shared-modules @@ -1 +1 @@ -Subproject commit 50314360ded6fa3b9f0b602513b1164b7a6636ed +Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42 From 8e371345e47aeaea335f9d3fd1317d94c35eb5d3 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 26 Jun 2023 10:35:31 +0200 Subject: [PATCH 11/51] Updated controller config --- .../retrodeck/RetroDECK_controller_config.vdf | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf b/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf index e965bdd5..7a85eaf4 100644 --- a/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf +++ b/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf @@ -1,7 +1,7 @@ "controller_mappings" { "version" "3" - "revision" "1691" + "revision" "1702" "title" "RetroDECK: Official Layout - v0.7.1b" "description" "The Official RetroDECK Layout" "creator" "" @@ -12,7 +12,7 @@ "controller_caps" "23117823" "major_revision" "0" "minor_revision" "0" - "Timestamp" "-913215520" + "Timestamp" "-1030266496" "actions" { "Default" @@ -4151,7 +4151,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 10 1 1, MAME, RD-emblem-favorite.png, " + "binding" "controller_action CHANGE_PRESET 10 1 1, MAME, RD-mame.png, " } } } @@ -4183,7 +4183,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 12 1 1, Gamecube & Wii, RD-tesseract.png, " + "binding" "controller_action CHANGE_PRESET 12 1 1, Gamecube & Wii, RD-dolphin.png, " } } } @@ -4199,7 +4199,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 13 1 1, NDS, RD-preferences-tweaks-shadows.png, " + "binding" "controller_action CHANGE_PRESET 13 1 1, NDS, RD-melonds.png, " } } } @@ -4215,7 +4215,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 15 1 1, 3DS, RD-preferences-system-windows-actions.png, " + "binding" "controller_action CHANGE_PRESET 15 1 1, 3DS, RD-citra.png, " } } } @@ -4231,7 +4231,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 16 1 1, Switch, RD-playonlinux.png, " + "binding" "controller_action CHANGE_PRESET 16 1 1, Switch, RD-ryujinx.png, " } } } @@ -6556,7 +6556,7 @@ { "bindings" { - "binding" "xinput_button DPAD_UP, Konami Deck, RD-octopi.png, #232323 #FFFFFF" + "binding" "xinput_button DPAD_UP, Konami Deck, RD-retrodeck-compact.png, " } } "Full_Press" @@ -6635,8 +6635,8 @@ { "bindings" { - "binding" "key_press 3, Here be dragons!, RD-tools-check-spelling.png, " - "binding" "key_press 2, Here be dragons!, RD-tools-check-spelling.png, " + "binding" "key_press 3, Here be dragons!, RD-vcmi.png, " + "binding" "key_press 2, Here be dragons!, RD-vcmi.png, " } } "Full_Press" @@ -6673,7 +6673,7 @@ { "bindings" { - "binding" "key_press I, You can do it!, RD-preferences-desktop-emoticons.png, " + "binding" "key_press I, You can do it!, RD-gzdoom.png, " } } "Full_Press" From 28e5af58194e7029d1bde25803b4f0cbe6a58df8 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 26 Jun 2023 10:37:52 +0200 Subject: [PATCH 12/51] Updated controller config icons --- .../RD-Arcade-BLUE.png | Bin .../RD-Arcade-GREEN.png | Bin .../RD-Arcade-RED.png | Bin .../RD-Arcade-YELLOW.png | Bin .../RD-Arrow-01.png | Bin .../RD-Arrow-02.png | Bin .../RD-Arrow-03.png | Bin .../RD-Arrow-04.png | Bin .../RD-Arrow-05.png | Bin .../RD-Arrow-06.png | Bin .../RD-Arrow-07.png | Bin .../RD-Arrow-08.png | Bin .../RD-Arrow-09.png | Bin .../RD-Arrow-10.png | Bin .../RD-Arrow-11.png | Bin .../RD-Arrow-12.png | Bin .../RD-Arrow-13.png | Bin .../RD-Arrow-14.png | Bin .../RD-Arrow-15.png | Bin .../RD-Arrow-16.png | Bin .../RD-Arrow-17.png | Bin .../RD-Arrow-18.png | Bin .../RD-Arrow-19.png | Bin .../RD-Arrow-20.png | Bin .../RD-Arrow-21.png | Bin .../RD-Arrow-22.png | Bin .../RD-Arrow-23.png | Bin .../RD-Arrow-24.png | Bin .../RD-Arrow-25.png | Bin .../RD-Arrow-26.png | Bin .../RD-Arrow-27.png | Bin .../RD-Arrow-28.png | Bin .../RD-Arrow-29.png | Bin .../RD-Arrow-30.png | Bin .../RD-Arrow-31.png | Bin .../RD-Arrow-32.png | Bin .../RD-Arrow-33.png | Bin .../RD-Arrow-34.png | Bin .../RD-Arrow-35.png | Bin .../RD-Arrow-36.png | Bin .../RD-Arrow-37.png | Bin res/{binding-icons => binding_icons}/RD-ESC.png | Bin res/{binding-icons => binding_icons}/RD-Enter.png | Bin res/{binding-icons => binding_icons}/RD-F1.png | Bin res/{binding-icons => binding_icons}/RD-F4.png | Bin res/{binding-icons => binding_icons}/RD-Tab.png | Bin .../RD-applets-screenshooter.png | Bin .../RD-application-x-iso.png | Bin .../RD-battery-full-charging.png | Bin .../RD-battery-missing.png | Bin .../RD-camera-photo.png | Bin res/binding_icons/RD-cemu.png | Bin 0 -> 414 bytes res/binding_icons/RD-citra.png | Bin 0 -> 508 bytes .../RD-distributor-logo-netbsd.png | Bin .../RD-document-save.png | Bin res/binding_icons/RD-dolphin.png | Bin 0 -> 363 bytes .../RD-edit-find.png | Bin .../RD-edit-undo-red.png | Bin .../RD-edit-undo.png | Bin .../RD-emblem-documents.png | Bin .../RD-emblem-downloads.png | Bin .../RD-emblem-encrypted-locked.png | Bin .../RD-emblem-encrypted-unlocked.png | Bin .../RD-emblem-favorite.png | Bin .../RD-emblem-generic.png | Bin .../RD-emblem-new.png | Bin .../RD-emblem-synchronizing.png | Bin .../RD-emblem-unlocked.png | Bin .../RD-emblem-unreadable.png | Bin .../RD-folder-applications.png | Bin .../RD-folder-blue-backup.png | Bin .../RD-folder-blue-games.png | Bin .../RD-go-next.png | Bin .../RD-go-previous.png | Bin res/{binding-icons => binding_icons}/RD-godot.png | Bin res/binding_icons/RD-gzdoom.png | Bin 0 -> 486 bytes .../RD-icon_circle_2_180x180.png | Bin .../RD-io.github.antimicrox.antimicrox.png | Bin .../RD-list-add.png | Bin .../RD-list-remove.png | Bin res/binding_icons/RD-mame.png | Bin 0 -> 409 bytes .../RD-media-playback-pause.png | Bin .../RD-media-playback-start.png | Bin res/binding_icons/RD-melonds.png | Bin 0 -> 479 bytes ...RD-notification-network-ethernet-connected.png | Bin .../RD-notification-network-wireless.png | Bin .../RD-octopi.png | Bin .../RD-org.xfce.session.png | Bin res/binding_icons/RD-pcsx2.png | Bin 0 -> 430 bytes .../RD-pcsxr-icon.png | Bin .../RD-playonlinux.png | Bin res/binding_icons/RD-ppsspp.png | Bin 0 -> 505 bytes .../RD-preferences-desktop-accessibility.png | Bin .../RD-preferences-desktop-display.png | Bin .../RD-preferences-desktop-emoticons.png | Bin .../RD-preferences-desktop-icons.png | Bin .../RD-preferences-desktop-keyboard.png | Bin .../RD-preferences-system-search.png | Bin .../RD-preferences-system-windows-actions.png | Bin .../RD-preferences-tweaks-shadows.png | Bin .../RD-process-stop.png | Bin res/{binding-icons => binding_icons}/RD-pvz.png | Bin .../RD-retroarch.png | Bin res/binding_icons/RD-retrodeck-compact.png | Bin 0 -> 491 bytes res/binding_icons/RD-rpcs3.png | Bin 0 -> 405 bytes res/binding_icons/RD-ryujinx.png | Bin 0 -> 439 bytes .../RD-security-low.png | Bin res/{binding-icons => binding_icons}/RD-steam.png | Bin .../RD-supertuxkart.png | Bin .../RD-system-reboot.png | Bin .../RD-system-switch-user.png | Bin .../RD-tesseract.png | Bin .../RD-text-x-generic.png | Bin .../RD-tools-check-spelling.png | Bin .../RD-urbanterror.png | Bin .../RD-user-red-home.png | Bin .../RD-utilities-terminal.png | Bin res/binding_icons/RD-vcmi.png | Bin 0 -> 475 bytes .../RD-video-x-generic.png | Bin .../RD-view-refresh.png | Bin res/binding_icons/RD-xemu.png | Bin 0 -> 482 bytes .../RD-zoom-fit-best.png | Bin .../RD-zoom-in.png | Bin .../RD-zoom-original.png | Bin .../RD-zoom-out.png | Bin 125 files changed, 0 insertions(+), 0 deletions(-) rename res/{binding-icons => binding_icons}/RD-Arcade-BLUE.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arcade-GREEN.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arcade-RED.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arcade-YELLOW.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-01.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-02.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-03.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-04.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-05.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-06.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-07.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-08.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-09.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-10.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-11.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-12.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-13.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-14.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-15.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-16.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-17.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-18.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-19.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-20.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-21.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-22.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-23.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-24.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-25.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-26.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-27.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-28.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-29.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-30.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-31.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-32.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-33.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-34.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-35.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-36.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Arrow-37.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-ESC.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Enter.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-F1.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-F4.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-Tab.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-applets-screenshooter.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-application-x-iso.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-battery-full-charging.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-battery-missing.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-camera-photo.png (100%) mode change 100644 => 100755 create mode 100755 res/binding_icons/RD-cemu.png create mode 100755 res/binding_icons/RD-citra.png rename res/{binding-icons => binding_icons}/RD-distributor-logo-netbsd.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-document-save.png (100%) mode change 100644 => 100755 create mode 100755 res/binding_icons/RD-dolphin.png rename res/{binding-icons => binding_icons}/RD-edit-find.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-edit-undo-red.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-edit-undo.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-emblem-documents.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-emblem-downloads.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-emblem-encrypted-locked.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-emblem-encrypted-unlocked.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-emblem-favorite.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-emblem-generic.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-emblem-new.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-emblem-synchronizing.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-emblem-unlocked.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-emblem-unreadable.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-folder-applications.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-folder-blue-backup.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-folder-blue-games.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-go-next.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-go-previous.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-godot.png (100%) mode change 100644 => 100755 create mode 100755 res/binding_icons/RD-gzdoom.png rename res/{binding-icons => binding_icons}/RD-icon_circle_2_180x180.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-io.github.antimicrox.antimicrox.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-list-add.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-list-remove.png (100%) mode change 100644 => 100755 create mode 100755 res/binding_icons/RD-mame.png rename res/{binding-icons => binding_icons}/RD-media-playback-pause.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-media-playback-start.png (100%) mode change 100644 => 100755 create mode 100755 res/binding_icons/RD-melonds.png rename res/{binding-icons => binding_icons}/RD-notification-network-ethernet-connected.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-notification-network-wireless.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-octopi.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-org.xfce.session.png (100%) mode change 100644 => 100755 create mode 100755 res/binding_icons/RD-pcsx2.png rename res/{binding-icons => binding_icons}/RD-pcsxr-icon.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-playonlinux.png (100%) mode change 100644 => 100755 create mode 100755 res/binding_icons/RD-ppsspp.png rename res/{binding-icons => binding_icons}/RD-preferences-desktop-accessibility.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-preferences-desktop-display.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-preferences-desktop-emoticons.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-preferences-desktop-icons.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-preferences-desktop-keyboard.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-preferences-system-search.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-preferences-system-windows-actions.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-preferences-tweaks-shadows.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-process-stop.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-pvz.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-retroarch.png (100%) mode change 100644 => 100755 create mode 100755 res/binding_icons/RD-retrodeck-compact.png create mode 100755 res/binding_icons/RD-rpcs3.png create mode 100755 res/binding_icons/RD-ryujinx.png rename res/{binding-icons => binding_icons}/RD-security-low.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-steam.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-supertuxkart.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-system-reboot.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-system-switch-user.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-tesseract.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-text-x-generic.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-tools-check-spelling.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-urbanterror.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-user-red-home.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-utilities-terminal.png (100%) mode change 100644 => 100755 create mode 100755 res/binding_icons/RD-vcmi.png rename res/{binding-icons => binding_icons}/RD-video-x-generic.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-view-refresh.png (100%) mode change 100644 => 100755 create mode 100755 res/binding_icons/RD-xemu.png rename res/{binding-icons => binding_icons}/RD-zoom-fit-best.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-zoom-in.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-zoom-original.png (100%) mode change 100644 => 100755 rename res/{binding-icons => binding_icons}/RD-zoom-out.png (100%) mode change 100644 => 100755 diff --git a/res/binding-icons/RD-Arcade-BLUE.png b/res/binding_icons/RD-Arcade-BLUE.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arcade-BLUE.png rename to res/binding_icons/RD-Arcade-BLUE.png diff --git a/res/binding-icons/RD-Arcade-GREEN.png b/res/binding_icons/RD-Arcade-GREEN.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arcade-GREEN.png rename to res/binding_icons/RD-Arcade-GREEN.png diff --git a/res/binding-icons/RD-Arcade-RED.png b/res/binding_icons/RD-Arcade-RED.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arcade-RED.png rename to res/binding_icons/RD-Arcade-RED.png diff --git a/res/binding-icons/RD-Arcade-YELLOW.png b/res/binding_icons/RD-Arcade-YELLOW.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arcade-YELLOW.png rename to res/binding_icons/RD-Arcade-YELLOW.png diff --git a/res/binding-icons/RD-Arrow-01.png b/res/binding_icons/RD-Arrow-01.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-01.png rename to res/binding_icons/RD-Arrow-01.png diff --git a/res/binding-icons/RD-Arrow-02.png b/res/binding_icons/RD-Arrow-02.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-02.png rename to res/binding_icons/RD-Arrow-02.png diff --git a/res/binding-icons/RD-Arrow-03.png b/res/binding_icons/RD-Arrow-03.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-03.png rename to res/binding_icons/RD-Arrow-03.png diff --git a/res/binding-icons/RD-Arrow-04.png b/res/binding_icons/RD-Arrow-04.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-04.png rename to res/binding_icons/RD-Arrow-04.png diff --git a/res/binding-icons/RD-Arrow-05.png b/res/binding_icons/RD-Arrow-05.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-05.png rename to res/binding_icons/RD-Arrow-05.png diff --git a/res/binding-icons/RD-Arrow-06.png b/res/binding_icons/RD-Arrow-06.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-06.png rename to res/binding_icons/RD-Arrow-06.png diff --git a/res/binding-icons/RD-Arrow-07.png b/res/binding_icons/RD-Arrow-07.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-07.png rename to res/binding_icons/RD-Arrow-07.png diff --git a/res/binding-icons/RD-Arrow-08.png b/res/binding_icons/RD-Arrow-08.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-08.png rename to res/binding_icons/RD-Arrow-08.png diff --git a/res/binding-icons/RD-Arrow-09.png b/res/binding_icons/RD-Arrow-09.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-09.png rename to res/binding_icons/RD-Arrow-09.png diff --git a/res/binding-icons/RD-Arrow-10.png b/res/binding_icons/RD-Arrow-10.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-10.png rename to res/binding_icons/RD-Arrow-10.png diff --git a/res/binding-icons/RD-Arrow-11.png b/res/binding_icons/RD-Arrow-11.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-11.png rename to res/binding_icons/RD-Arrow-11.png diff --git a/res/binding-icons/RD-Arrow-12.png b/res/binding_icons/RD-Arrow-12.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-12.png rename to res/binding_icons/RD-Arrow-12.png diff --git a/res/binding-icons/RD-Arrow-13.png b/res/binding_icons/RD-Arrow-13.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-13.png rename to res/binding_icons/RD-Arrow-13.png diff --git a/res/binding-icons/RD-Arrow-14.png b/res/binding_icons/RD-Arrow-14.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-14.png rename to res/binding_icons/RD-Arrow-14.png diff --git a/res/binding-icons/RD-Arrow-15.png b/res/binding_icons/RD-Arrow-15.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-15.png rename to res/binding_icons/RD-Arrow-15.png diff --git a/res/binding-icons/RD-Arrow-16.png b/res/binding_icons/RD-Arrow-16.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-16.png rename to res/binding_icons/RD-Arrow-16.png diff --git a/res/binding-icons/RD-Arrow-17.png b/res/binding_icons/RD-Arrow-17.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-17.png rename to res/binding_icons/RD-Arrow-17.png diff --git a/res/binding-icons/RD-Arrow-18.png b/res/binding_icons/RD-Arrow-18.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-18.png rename to res/binding_icons/RD-Arrow-18.png diff --git a/res/binding-icons/RD-Arrow-19.png b/res/binding_icons/RD-Arrow-19.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-19.png rename to res/binding_icons/RD-Arrow-19.png diff --git a/res/binding-icons/RD-Arrow-20.png b/res/binding_icons/RD-Arrow-20.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-20.png rename to res/binding_icons/RD-Arrow-20.png diff --git a/res/binding-icons/RD-Arrow-21.png b/res/binding_icons/RD-Arrow-21.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-21.png rename to res/binding_icons/RD-Arrow-21.png diff --git a/res/binding-icons/RD-Arrow-22.png b/res/binding_icons/RD-Arrow-22.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-22.png rename to res/binding_icons/RD-Arrow-22.png diff --git a/res/binding-icons/RD-Arrow-23.png b/res/binding_icons/RD-Arrow-23.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-23.png rename to res/binding_icons/RD-Arrow-23.png diff --git a/res/binding-icons/RD-Arrow-24.png b/res/binding_icons/RD-Arrow-24.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-24.png rename to res/binding_icons/RD-Arrow-24.png diff --git a/res/binding-icons/RD-Arrow-25.png b/res/binding_icons/RD-Arrow-25.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-25.png rename to res/binding_icons/RD-Arrow-25.png diff --git a/res/binding-icons/RD-Arrow-26.png b/res/binding_icons/RD-Arrow-26.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-26.png rename to res/binding_icons/RD-Arrow-26.png diff --git a/res/binding-icons/RD-Arrow-27.png b/res/binding_icons/RD-Arrow-27.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-27.png rename to res/binding_icons/RD-Arrow-27.png diff --git a/res/binding-icons/RD-Arrow-28.png b/res/binding_icons/RD-Arrow-28.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-28.png rename to res/binding_icons/RD-Arrow-28.png diff --git a/res/binding-icons/RD-Arrow-29.png b/res/binding_icons/RD-Arrow-29.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-29.png rename to res/binding_icons/RD-Arrow-29.png diff --git a/res/binding-icons/RD-Arrow-30.png b/res/binding_icons/RD-Arrow-30.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-30.png rename to res/binding_icons/RD-Arrow-30.png diff --git a/res/binding-icons/RD-Arrow-31.png b/res/binding_icons/RD-Arrow-31.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-31.png rename to res/binding_icons/RD-Arrow-31.png diff --git a/res/binding-icons/RD-Arrow-32.png b/res/binding_icons/RD-Arrow-32.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-32.png rename to res/binding_icons/RD-Arrow-32.png diff --git a/res/binding-icons/RD-Arrow-33.png b/res/binding_icons/RD-Arrow-33.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-33.png rename to res/binding_icons/RD-Arrow-33.png diff --git a/res/binding-icons/RD-Arrow-34.png b/res/binding_icons/RD-Arrow-34.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-34.png rename to res/binding_icons/RD-Arrow-34.png diff --git a/res/binding-icons/RD-Arrow-35.png b/res/binding_icons/RD-Arrow-35.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-35.png rename to res/binding_icons/RD-Arrow-35.png diff --git a/res/binding-icons/RD-Arrow-36.png b/res/binding_icons/RD-Arrow-36.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-36.png rename to res/binding_icons/RD-Arrow-36.png diff --git a/res/binding-icons/RD-Arrow-37.png b/res/binding_icons/RD-Arrow-37.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Arrow-37.png rename to res/binding_icons/RD-Arrow-37.png diff --git a/res/binding-icons/RD-ESC.png b/res/binding_icons/RD-ESC.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-ESC.png rename to res/binding_icons/RD-ESC.png diff --git a/res/binding-icons/RD-Enter.png b/res/binding_icons/RD-Enter.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Enter.png rename to res/binding_icons/RD-Enter.png diff --git a/res/binding-icons/RD-F1.png b/res/binding_icons/RD-F1.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-F1.png rename to res/binding_icons/RD-F1.png diff --git a/res/binding-icons/RD-F4.png b/res/binding_icons/RD-F4.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-F4.png rename to res/binding_icons/RD-F4.png diff --git a/res/binding-icons/RD-Tab.png b/res/binding_icons/RD-Tab.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-Tab.png rename to res/binding_icons/RD-Tab.png diff --git a/res/binding-icons/RD-applets-screenshooter.png b/res/binding_icons/RD-applets-screenshooter.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-applets-screenshooter.png rename to res/binding_icons/RD-applets-screenshooter.png diff --git a/res/binding-icons/RD-application-x-iso.png b/res/binding_icons/RD-application-x-iso.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-application-x-iso.png rename to res/binding_icons/RD-application-x-iso.png diff --git a/res/binding-icons/RD-battery-full-charging.png b/res/binding_icons/RD-battery-full-charging.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-battery-full-charging.png rename to res/binding_icons/RD-battery-full-charging.png diff --git a/res/binding-icons/RD-battery-missing.png b/res/binding_icons/RD-battery-missing.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-battery-missing.png rename to res/binding_icons/RD-battery-missing.png diff --git a/res/binding-icons/RD-camera-photo.png b/res/binding_icons/RD-camera-photo.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-camera-photo.png rename to res/binding_icons/RD-camera-photo.png diff --git a/res/binding_icons/RD-cemu.png b/res/binding_icons/RD-cemu.png new file mode 100755 index 0000000000000000000000000000000000000000..94763938cfe82e42f4e4c930627d1678ef3ab928 GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU`+LNaSW-r_4ckeUz34|Ltxhq zm75$o!DdR{Ob0a=Ut6M>d#QMt>5=naCzdT(cv|G%eB*6(KI`B4{oPciI<>C$xlP-e z*X1U@3``CT91M&K3{l2U-hI~8{`zytIZhvj?F=jp3<3;H4h&mL`4Z;e|7O|9`9KUR z1Xd4|CyUdd+PL`olJ%z4Tn#c6Kc=h zzhn3R&xRGhTk5YT*6+W(=f#`@TnXGz16Uk_)o#w8VCC*^-+tZh`SN-7xvVg$1_llj z_KaFTgAecXSvRmMFaV7dU|>2R^I-L&^PF{m{!6Z5*aj7JV3@(&GRay!tFZnv+6s}Ele;Y92ja!`2_y%`@7J7el?RI0~6FrrL&A#^FMpv*MCsQfbfO^ zdq?p({kO-TvxG53!_}T)oMrXg+)jN1(+wt|tH35C@I9C#pW*jlo&yWmsX)PoecCa$7WBwrJ$Oal@Kf_<}|AL_YNi;!gAIA6Tw!<*aMmBORjyGzA$nY}78Q zcdX2ep8j+9uNaYu_xFDh{$tL_!N91%z|z35f%%K=^ZUu?fA03Z{Il|F)X{mL`8PhV zDF?|3FfchVa5UIiJ5AJ{Z$h3#j>&(BS$T5tco`uoNA&QI=f-eI(1f*8!en7}SEd7-tV*Oxwly}~<~ zD_Fn=0%Z^I8K|zDtMGJNe0yB;o&UQxFh3B4xrYG@NSI>R-e8^Od`fIONY>NU&t;uc GLK6T}-FGek literal 0 HcmV?d00001 diff --git a/res/binding-icons/RD-edit-find.png b/res/binding_icons/RD-edit-find.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-edit-find.png rename to res/binding_icons/RD-edit-find.png diff --git a/res/binding-icons/RD-edit-undo-red.png b/res/binding_icons/RD-edit-undo-red.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-edit-undo-red.png rename to res/binding_icons/RD-edit-undo-red.png diff --git a/res/binding-icons/RD-edit-undo.png b/res/binding_icons/RD-edit-undo.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-edit-undo.png rename to res/binding_icons/RD-edit-undo.png diff --git a/res/binding-icons/RD-emblem-documents.png b/res/binding_icons/RD-emblem-documents.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-emblem-documents.png rename to res/binding_icons/RD-emblem-documents.png diff --git a/res/binding-icons/RD-emblem-downloads.png b/res/binding_icons/RD-emblem-downloads.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-emblem-downloads.png rename to res/binding_icons/RD-emblem-downloads.png diff --git a/res/binding-icons/RD-emblem-encrypted-locked.png b/res/binding_icons/RD-emblem-encrypted-locked.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-emblem-encrypted-locked.png rename to res/binding_icons/RD-emblem-encrypted-locked.png diff --git a/res/binding-icons/RD-emblem-encrypted-unlocked.png b/res/binding_icons/RD-emblem-encrypted-unlocked.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-emblem-encrypted-unlocked.png rename to res/binding_icons/RD-emblem-encrypted-unlocked.png diff --git a/res/binding-icons/RD-emblem-favorite.png b/res/binding_icons/RD-emblem-favorite.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-emblem-favorite.png rename to res/binding_icons/RD-emblem-favorite.png diff --git a/res/binding-icons/RD-emblem-generic.png b/res/binding_icons/RD-emblem-generic.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-emblem-generic.png rename to res/binding_icons/RD-emblem-generic.png diff --git a/res/binding-icons/RD-emblem-new.png b/res/binding_icons/RD-emblem-new.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-emblem-new.png rename to res/binding_icons/RD-emblem-new.png diff --git a/res/binding-icons/RD-emblem-synchronizing.png b/res/binding_icons/RD-emblem-synchronizing.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-emblem-synchronizing.png rename to res/binding_icons/RD-emblem-synchronizing.png diff --git a/res/binding-icons/RD-emblem-unlocked.png b/res/binding_icons/RD-emblem-unlocked.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-emblem-unlocked.png rename to res/binding_icons/RD-emblem-unlocked.png diff --git a/res/binding-icons/RD-emblem-unreadable.png b/res/binding_icons/RD-emblem-unreadable.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-emblem-unreadable.png rename to res/binding_icons/RD-emblem-unreadable.png diff --git a/res/binding-icons/RD-folder-applications.png b/res/binding_icons/RD-folder-applications.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-folder-applications.png rename to res/binding_icons/RD-folder-applications.png diff --git a/res/binding-icons/RD-folder-blue-backup.png b/res/binding_icons/RD-folder-blue-backup.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-folder-blue-backup.png rename to res/binding_icons/RD-folder-blue-backup.png diff --git a/res/binding-icons/RD-folder-blue-games.png b/res/binding_icons/RD-folder-blue-games.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-folder-blue-games.png rename to res/binding_icons/RD-folder-blue-games.png diff --git a/res/binding-icons/RD-go-next.png b/res/binding_icons/RD-go-next.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-go-next.png rename to res/binding_icons/RD-go-next.png diff --git a/res/binding-icons/RD-go-previous.png b/res/binding_icons/RD-go-previous.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-go-previous.png rename to res/binding_icons/RD-go-previous.png diff --git a/res/binding-icons/RD-godot.png b/res/binding_icons/RD-godot.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-godot.png rename to res/binding_icons/RD-godot.png diff --git a/res/binding_icons/RD-gzdoom.png b/res/binding_icons/RD-gzdoom.png new file mode 100755 index 0000000000000000000000000000000000000000..51fdb0526f1120c4116da328586531493764eacb GIT binary patch literal 486 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU|j3z;uunK>+Rixyo`YY4T;@c zE<0AbuxAA{2)QtN1$6R-JaTj4j=Ae*^s#LI_uBN?C!U?pxp&0P+$(Br|9Zi_JLA5^ zKKr#X`i2=J2Lq!514{!#hHph%$+`8>Tht90ZI}cYm>d{@QWvht9k9I50%k*$9W(iL zAn&o-)i)((j4)LS4EydgyQFR2x%)!Vjzajl#W1REHjCRH~~J9qJ>t;?6cZU64IpvowooVR%Md(|(s=lb{6m-Qzy zRj|P9IUv_iR9Ab>9LYg%7++1S)j#x~O$p>Vu<=vwFuUxZZJ(pPzwxr?t6xWxX72h| zw|^$cn^1#}eq&hsUq9iSOdhfquB^RweERJKB%v)E**okK`~$YXPQ8z;|Nc8hrEe^U f?Vis@GF1Man5|{LzLe|@1|aZs^>bP0l+XkKH2L6C!alct|nf4lk~qmXJyfRyMmDZEL(?cVV)%>@OFTBU1z`)YLAi%(+V9s1!cVpiDEnh!ct*QR|XWl*^ zsEh*x2g7rQyEi`n=e+yb7a`a%oXJ7&;V^m<+B=q+^b4l%ab4H+{ zP_a48H&8T+oM%kB|M~syqdVSxJ^Ad536fGF!9TwlHopJ4@c(V|%%A^e{j2e1=x1O7 zJJEr`g8fA1dH=uv{>9#B`M?1+oy8&UIm5R+M~|yh8~R4T)Z9 z7OX7B_TA69BsOV(VaRwRwC+N}4kkHk`@`FU6}nx&s{hWY+x5RvC)(}Q?Da3FUkqEk z;A`H+z7uKj^H-gC-!FS;6Q=_M2Lq!51B*ju+@kA0&t^T=NZXpLT+JkWKocz9z#zbo z`j!zWcmFiMyW!$zGj1I&dC%#?u$+MfB*)~yFl8(Ii{Jcb;??_#4*Yzb!~`@AD#Me; zKjG82&(UAlKUmJ51+@t(2eB4|Q$O`@HRI0z`uA91E^A=ez+N$D-}~ZrPK4?YHq{L0 zxjR1Yf!oE=p!k+CXwiA@6My$ME!;a%75!U^m^qWQO-#=d@AKYNJ0SY2J(0{Sl z-vd?KGj_-2he-py{r&K^&tGe6SNR~>SN)ygqAlZJuh{3ak&HKAm%Y;5Oe6QY4g(N) My85}Sb4q9e08Ol&GXMYp literal 0 HcmV?d00001 diff --git a/res/binding-icons/RD-notification-network-ethernet-connected.png b/res/binding_icons/RD-notification-network-ethernet-connected.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-notification-network-ethernet-connected.png rename to res/binding_icons/RD-notification-network-ethernet-connected.png diff --git a/res/binding-icons/RD-notification-network-wireless.png b/res/binding_icons/RD-notification-network-wireless.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-notification-network-wireless.png rename to res/binding_icons/RD-notification-network-wireless.png diff --git a/res/binding-icons/RD-octopi.png b/res/binding_icons/RD-octopi.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-octopi.png rename to res/binding_icons/RD-octopi.png diff --git a/res/binding-icons/RD-org.xfce.session.png b/res/binding_icons/RD-org.xfce.session.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-org.xfce.session.png rename to res/binding_icons/RD-org.xfce.session.png diff --git a/res/binding_icons/RD-pcsx2.png b/res/binding_icons/RD-pcsx2.png new file mode 100755 index 0000000000000000000000000000000000000000..7df1c9944d5d5cd29cfad571b92f76382d0bf598 GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU@Y}?aSW-r_4bY-*C7LmhKtKm zz6AKi9dIlt5H9?xuuds2uPN?8v1PQrLP^KQ%wPBPx@uHH{;TNptzWnD#%BX=&Gq-^ z?OwHi{A0S#Myv!32{s&@}umJxA`n=Y9JP@!J%i7w-{8 zH~__@2i(SgZG)am{(8o^2FaE6BH`D!?EG?Dt!2*ni(6-}e}9e@=6)3I4h(;ybpA3= zvkT8h@(IitU@aN}A3rlB?~gxV+lX)=ieUx~{5RE%xvD3=o4^1Bp00i_>zopr0CN$0 Am;e9( literal 0 HcmV?d00001 diff --git a/res/binding-icons/RD-pcsxr-icon.png b/res/binding_icons/RD-pcsxr-icon.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-pcsxr-icon.png rename to res/binding_icons/RD-pcsxr-icon.png diff --git a/res/binding-icons/RD-playonlinux.png b/res/binding_icons/RD-playonlinux.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-playonlinux.png rename to res/binding_icons/RD-playonlinux.png diff --git a/res/binding_icons/RD-ppsspp.png b/res/binding_icons/RD-ppsspp.png new file mode 100755 index 0000000000000000000000000000000000000000..f2bc6cfd3b50f3b98e77fde094c70b287ef7e033 GIT binary patch literal 505 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU_9XI;uunK>+KyyKW0afhKI62 zp`jP86F8?SNS|Y_3$?Z7cTDD-W~~r#B9FH!{)EBI?Kj_V7LC0%KeNo}_o)eY5^a1B zH|>>^_kQ+zw^W2FBL@Sc0s~6}L&WT}m;N`ro_%}W`~N>b=CL|3z+?m%n26zItWBAJ zSp4kG?sfai>KwlO`JcCY|Lp3&zn{N8%hkXDGh~8`h5Cl?GW!&FoacZ3G5lTen{B^; z&-(r6O)<|}hB_vgvIKdB$sg=?mCaYU@M}+_C<7zdjWAglXF=na=ZuSr-){ZPthDvK zY>K^p0_z81xMjZ?>UZ+zul+vfz`f6$Ymof&e?`jv18>ehzdkR#LSlY;ygmE>#i?EU z9u#k6f*I|=@aNVKj$c)lc3bWA4I&v)t%h0AaP?)K+yjGoUF#1b`Ef&EZG&dTfxSMT jZ?o)uE)j*KS?mc@bZ5BemDA3X7=Xaj)z4*}Q$iB}*Fda4 literal 0 HcmV?d00001 diff --git a/res/binding-icons/RD-preferences-desktop-accessibility.png b/res/binding_icons/RD-preferences-desktop-accessibility.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-preferences-desktop-accessibility.png rename to res/binding_icons/RD-preferences-desktop-accessibility.png diff --git a/res/binding-icons/RD-preferences-desktop-display.png b/res/binding_icons/RD-preferences-desktop-display.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-preferences-desktop-display.png rename to res/binding_icons/RD-preferences-desktop-display.png diff --git a/res/binding-icons/RD-preferences-desktop-emoticons.png b/res/binding_icons/RD-preferences-desktop-emoticons.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-preferences-desktop-emoticons.png rename to res/binding_icons/RD-preferences-desktop-emoticons.png diff --git a/res/binding-icons/RD-preferences-desktop-icons.png b/res/binding_icons/RD-preferences-desktop-icons.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-preferences-desktop-icons.png rename to res/binding_icons/RD-preferences-desktop-icons.png diff --git a/res/binding-icons/RD-preferences-desktop-keyboard.png b/res/binding_icons/RD-preferences-desktop-keyboard.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-preferences-desktop-keyboard.png rename to res/binding_icons/RD-preferences-desktop-keyboard.png diff --git a/res/binding-icons/RD-preferences-system-search.png b/res/binding_icons/RD-preferences-system-search.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-preferences-system-search.png rename to res/binding_icons/RD-preferences-system-search.png diff --git a/res/binding-icons/RD-preferences-system-windows-actions.png b/res/binding_icons/RD-preferences-system-windows-actions.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-preferences-system-windows-actions.png rename to res/binding_icons/RD-preferences-system-windows-actions.png diff --git a/res/binding-icons/RD-preferences-tweaks-shadows.png b/res/binding_icons/RD-preferences-tweaks-shadows.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-preferences-tweaks-shadows.png rename to res/binding_icons/RD-preferences-tweaks-shadows.png diff --git a/res/binding-icons/RD-process-stop.png b/res/binding_icons/RD-process-stop.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-process-stop.png rename to res/binding_icons/RD-process-stop.png diff --git a/res/binding-icons/RD-pvz.png b/res/binding_icons/RD-pvz.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-pvz.png rename to res/binding_icons/RD-pvz.png diff --git a/res/binding-icons/RD-retroarch.png b/res/binding_icons/RD-retroarch.png old mode 100644 new mode 100755 similarity index 100% rename from res/binding-icons/RD-retroarch.png rename to res/binding_icons/RD-retroarch.png diff --git a/res/binding_icons/RD-retrodeck-compact.png b/res/binding_icons/RD-retrodeck-compact.png new file mode 100755 index 0000000000000000000000000000000000000000..8ad3624d23f7ad5eab358312aba30f2a0b81a708 GIT binary patch literal 491 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVBF;C;uunK>+S5lUd)anZsn7F zHwh|rw6^Z+p8LRgMZ)6Pq-32dUbk1wo%%>RLUY|No^1i-bg>3z}9dmm4;*k5DzZPjm(x(USxPF;1nApdU8xz5jbo1Nag2OGTq8{@)T z7FCAFzDXubS_(BVZ#(<38+MZ|>w$CyJhMCSeXpGi zkojlTm9t^--lg}a{e7dK|MTnTeU=Bl{<;61M*!s1y59`<%d4HgUN-Cp`D;Vmf$jU} zZ`o_l2b4P#ci`W`>vCBu-yJ{4n0o#1a^Iuo&Ok*Im~-B~vwuCqFusg$L$Vymm^M3x Yw5bKN%r7m;0rD6;UHx3vIVCg!0IrMNy#N3J literal 0 HcmV?d00001 diff --git a/res/binding_icons/RD-rpcs3.png b/res/binding_icons/RD-rpcs3.png new file mode 100755 index 0000000000000000000000000000000000000000..d7580360863046b25c5b9fd2eab8836ddfcc0d2a GIT binary patch literal 405 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV2tr}aSW-r_4dv|-X;T)hQzEJ zo@obk3-oR}r8TVlaO&i&E88a2-H+6Na$dRiSexEOlXcbZrk{;kro6vzb7&i<0|N&G zqXGkqL-wL{kLQ1~yWev9Fsx@_X zOX<;XDm%Zks5OLx)PfCq!}xFIxA%9`?VrzvnhaGBu?B;~x#_?D0oz73xB)Qpq0TCN z$9d+AZ6gldFk8WzBzLM`V1fCkfnfvtf(f_2tIuGFV}$9>@am{dkh*?1dDps1$tF&O sV?Ml=Q#dy7!JX$d!VHWsKR$TCyl}4y%kksW7Bc{Wr>mdKI;Vst0EW(XiU0rr literal 0 HcmV?d00001 diff --git a/res/binding_icons/RD-ryujinx.png b/res/binding_icons/RD-ryujinx.png new file mode 100755 index 0000000000000000000000000000000000000000..1e3a15f68b72f3ac321059d12349b89bb01c2d01 GIT binary patch literal 439 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV65|WaSW-r_4dw2-a`fg4uRIE z#Ci_NTv>C#rsT?*gBoibFI}2@fwA-L_g^L#r|ZhAZT)lOONHLd=kdp#b!DT^Ex+=6 z<@V}Ve|=gPayl?@Ffb}GupG#Ew)XtbCoaV;8GZ?@8(4ut4GaPdOb28RSk}+6Y!p2p z2Ij-mW92j~J9}4L?$3I~Uwnz*{(ldHngP;N-0*+y=ga5g^_MF=3E zzB3|Qn_$nX{+<~mHNRY*A)0{+YV#S!ed^Wn3RcU1+c9i|TQGz9i?Mpgmb!D>nP4u5 zxm1B+J&cLf(F}|iT0i_|xcUCW#+PM5yoU?~94@kK zWZ&&@lw(RxgUeBt5RV*(lN=!%xFzy4kPn@6o78m{0C^Pf%U@@wbb z+jYgxIcxp_mI7|5R+a_^0k|@j13J3d`wzT*CR_FQ@y@JYpM4qN@(uOxn3tTJTAin` z{>9FEVFpG8gdB*&_=A%LWLE5|e>)ql?EH0Q=ie7Q|GoG+6XHa$922sotS#r6fBa`a zGHJp5+J;Mu&hxt5x7YgqpJ5h~PT}O2+$U<|7JRXDcv-rS6X9rsz&|z(&$)aU;1)F0 zePb+|{d;E}lF1L)lV8Uxe6MW0cKxRs1Kb%0=6qvZ^qWO+RjMolK4b4Hq*% z>PehoNtT$$b8vE^M9)DUAC@ZNd|k7rU(Q!Qzw7#B@$6M|OD~7KFp!@wJUdd}TkGe) zx!VhJm;@M@92htl7!78<;fb_*KL5S=`=Z9%FQs;=7clKW$X=6Es5+-VH`!hM?>{TX z7)GED1qPM|h7Ifn&-*u{s-05%wm9e9wd#&*@%x1jh&C`l?Wk^;=3>A8!tdwO7APkC zSbk^Dy_o7IF!usE2l!Xj%O$+N|NQ$un?^K?p8dIX z^%;-NqNj~6r@%y#ib@j-q zd$zKlsCE1@uR*iqT)ez@5fj2qHM`k6?g Date: Mon, 26 Jun 2023 10:46:35 +0200 Subject: [PATCH 13/51] Updated cooker release notes text --- .github/workflows/cooker-selfhosted.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index 677268e5..f10f4b27 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -91,6 +91,8 @@ jobs: body: | # Release Notes (Cooker) This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. + + For the full release note for this build please refer to the channel [#BETA-TESTING](https://discord.gg/qQcrFvaA2C) on our Discord server. Cooker channel is provided for the community to test fixes and explore new functionality. Please DO NOT open issues or ask support on this build. From 5f1defa5d3c2bb8db03650edf0345e85057aeed1 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 26 Jun 2023 10:46:58 +0200 Subject: [PATCH 14/51] Updated cooker release notes text [skip cr] --- .github/workflows/cooker-selfhosted.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index f10f4b27..f4e8838a 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -112,4 +112,4 @@ jobs: with: name: retrodeck-flatpak path: RetroDECK.flatpak - continue-on-error: true + continue-on-error: true \ No newline at end of file From d1f61f77869f1a99f5fc246515d5d9adfda75b1d Mon Sep 17 00:00:00 2001 From: icenine451 Date: Mon, 26 Jun 2023 08:44:52 -0400 Subject: [PATCH 15/51] Make slash / underscore use more consistent --- functions/functions.sh | 2 +- functions/global.sh | 2 +- net.retrodeck.retrodeck.yml | 4 ++-- res/{extra-splashes => extra_splashes}/example-splash.svg | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename res/{extra-splashes => extra_splashes}/example-splash.svg (100%) diff --git a/functions/functions.sh b/functions/functions.sh index f137ca2d..6ea55b5d 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -464,7 +464,7 @@ install_retrodeck_controller_profile() { # BIGGER NOTE: As part of this process, all emulators will need to have their configs hard-reset to match the controller mappings of the profile # USAGE: install_retrodeck_controller_profile if [[ -d "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" && -d "$HOME/.steam/steam/controller_base/templates/" ]]; then - rsync -rlD "/app/retrodeck/binding-icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" + rsync -rlD "/app/retrodeck/binding_icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" else configurator_generic_dialog "RetroDECK Controller Profile Install" "The target directories for the controller profile do not exist.\n\nThis may happen if you do not have Steam installed or the location is does not have permission to be read." diff --git a/functions/global.sh b/functions/global.sh index 38a986b1..58223622 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -25,7 +25,7 @@ zip_compressable_extensions="$emuconfigs/defaults/retrodeck/reference_lists/zip_ easter_egg_checklist="$emuconfigs/defaults/retrodeck/reference_lists/easter_egg_checklist.cfg" # A config file listing days and times when special splash screens should show up input_validation="$emuconfigs/defaults/retrodeck/reference_lists/input_validation.cfg" # A config file listing valid CLI inputs finit_options_list="$emuconfigs/defaults/retrodeck/reference_lists/finit_options_list.cfg" # A config file listing available optional installs during finit -splashscreen_dir="/var/config/emulationstation/.emulationstation/resources/graphics/extra-splashes" # The default location of extra splash screens +splashscreen_dir="/var/config/emulationstation/.emulationstation/resources/graphics/extra_splashes" # The default location of extra splash screens current_splash_file="/var/config/emulationstation/.emulationstation/resources/graphics/splash.svg" # The active splash file that will be shown on boot default_splash_file="/var/config/emulationstation/.emulationstation/resources/graphics/splash-orig.svg" # The default RetroDECK splash screen multi_user_data_folder="$rdhome/multi-user-data" # The default location of multi-user environment profiles diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 250147d3..4d00799d 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1139,9 +1139,9 @@ modules: - mv -f -t ${FLATPAK_DEST}/retrodeck /app/share/emulationstation/resources/graphics - cp -f res/splash.svg ${FLATPAK_DEST}/retrodeck/graphics/splash.svg - cp -f res/splash.svg ${FLATPAK_DEST}/retrodeck/graphics/splash-orig.svg - - cp -rf res/extra-splashes/ ${FLATPAK_DEST}/retrodeck/graphics + - cp -rf res/extra_splashes/ ${FLATPAK_DEST}/retrodeck/graphics - cp -f res/icon.svg /app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg - - mv -f -t ${FLATPAK_DEST}/retrodeck res/binding-icons + - mv -f -t ${FLATPAK_DEST}/retrodeck res/binding_icons # RetroDECK core script - cp retrodeck.sh /app/bin/retrodeck.sh diff --git a/res/extra-splashes/example-splash.svg b/res/extra_splashes/example-splash.svg similarity index 100% rename from res/extra-splashes/example-splash.svg rename to res/extra_splashes/example-splash.svg From 2933f736e9867989467599a09daae08f3bb98139 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Mon, 26 Jun 2023 09:43:31 -0400 Subject: [PATCH 16/51] Test ES-DE patch to change "no roms found" dialog --- .../es-de/es-de-retrodeck-mods.patch | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/rd-submodules/es-de/es-de-retrodeck-mods.patch b/rd-submodules/es-de/es-de-retrodeck-mods.patch index f5f49bbd..b19af5d4 100644 --- a/rd-submodules/es-de/es-de-retrodeck-mods.patch +++ b/rd-submodules/es-de/es-de-retrodeck-mods.patch @@ -48,6 +48,116 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de/es- void openOtherOptions(); + void openRetroDeckConfigurator(); void openQuitMenu(); +diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp +--- emulationstation-de/es-app/src/views/ViewController.cpp 2023-06-26 09:37:59.297437013 -0400 ++++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-06-26 09:38:18.410322017 -0400 +@@ -85,9 +85,7 @@ + { +- mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " +- "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE " +- "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM " +- "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL " +- "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME " +- "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n" +- "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n"; ++ mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. " ++ "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE " ++ "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY " ++ "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n" ++ "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n"; + +@@ -100,90 +98,3 @@ + mNoGamesMessageBox = new GuiMsgBox( +- HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", +- [this] { +- std::string currentROMDirectory; +-#if defined(_WIN64) +- currentROMDirectory = Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); +-#else +- currentROMDirectory = FileData::getROMDirectory(); +-#endif +- if (Settings::getInstance()->getBool("VirtualKeyboard")) { +- mWindow->pushGui(new GuiTextEditKeyboardPopup( +- HelpStyle(), 0.0f, "ENTER ROM DIRECTORY PATH", currentROMDirectory, +- [this](const std::string& newROMDirectory) { +- Settings::getInstance()->setString("ROMDirectory", +- Utils::String::trim(newROMDirectory)); +- Settings::getInstance()->saveFile(); +-#if defined(_WIN64) +- mRomDirectory = +- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); +-#else +- mRomDirectory = FileData::getROMDirectory(); +-#endif +- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); +- mWindow->pushGui(new GuiMsgBox(HelpStyle(), +- "ROM DIRECTORY SETTING SAVED, RESTART\n" +- "THE APPLICATION TO RESCAN THE SYSTEMS", +- "OK", nullptr, "", nullptr, "", nullptr, +- true, true)); +- }, +- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", +- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", +- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)")); +- } +- else { +- mWindow->pushGui(new GuiTextEditPopup( +- HelpStyle(), "ENTER ROM DIRECTORY PATH", currentROMDirectory, +- [this](const std::string& newROMDirectory) { +- Settings::getInstance()->setString("ROMDirectory", +- Utils::String::trim(newROMDirectory)); +- Settings::getInstance()->saveFile(); +-#if defined(_WIN64) +- mRomDirectory = +- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); +-#else +- mRomDirectory = FileData::getROMDirectory(); +-#endif +- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); +- mWindow->pushGui(new GuiMsgBox(HelpStyle(), +- "ROM DIRECTORY SETTING SAVED, RESTART\n" +- "THE APPLICATION TO RESCAN THE SYSTEMS", +- "OK", nullptr, "", nullptr, "", nullptr, +- true)); +- }, +- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", +- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", +- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)")); +- } +- }, +- "CREATE DIRECTORIES", +- [this] { +- mWindow->pushGui(new GuiMsgBox( +- HelpStyle(), +- "THIS WILL CREATE DIRECTORIES FOR ALL THE\n" +- "GAME SYSTEMS DEFINED IN es_systems.xml\n\n" +- "THIS MAY CREATE A LOT OF FOLDERS SO IT'S\n" +- "ADVICED TO REMOVE THE ONES YOU DON'T NEED\n\n" +- "PROCEED?", +- "YES", +- [this] { +- if (!SystemData::createSystemDirectories()) { +- mWindow->pushGui(new GuiMsgBox(HelpStyle(), +- "THE SYSTEM DIRECTORIES WERE SUCCESSFULLY\n" +- "GENERATED, EXIT THE APPLICATION AND PLACE\n" +- "YOUR GAMES IN THE NEWLY CREATED FOLDERS", +- "OK", nullptr, "", nullptr, "", nullptr, +- true)); +- } +- else { +- mWindow->pushGui(new GuiMsgBox(HelpStyle(), +- "ERROR CREATING THE SYSTEM DIRECTORIES,\n" +- "PERMISSION PROBLEMS OR DISK FULL?\n\n" +- "SEE THE LOG FILE FOR MORE DETAILS", +- "OK", nullptr, "", nullptr, "", nullptr, +- true)); +- } +- }, +- "NO", nullptr, "", nullptr, true)); +- }, +- "QUIT", ++ HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", + [] { diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp --- emulationstation-de/es-core/src/Window.cpp 2023-04-12 09:08:12.398268670 -0400 +++ emulationstation-de/es-core/src/Window.cpp 2023-04-14 11:03:48.261309278 -0400 From 9d528c6321d833be2b59605f6e3b8e9ee50da275 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Tue, 27 Jun 2023 10:46:07 -0400 Subject: [PATCH 17/51] Update binding_icons at update if installed --- functions/post_update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/functions/post_update.sh b/functions/post_update.sh index 0cfdf25b..e43bad3b 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -234,6 +234,7 @@ post_update() { if [[ -f "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" ]]; then # If RetroDECK controller profile has been previously installed cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" + rsync -rlD "/app/retrodeck/binding_icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" fi update_splashscreens From 2c9585b992136778c21488b936e61a684c31ebd1 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Tue, 27 Jun 2023 10:53:34 -0400 Subject: [PATCH 18/51] Ensure rsync dest path exists --- functions/functions.sh | 5 ++--- functions/post_update.sh | 8 ++++---- tools/configurator.sh | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/functions/functions.sh b/functions/functions.sh index 6ea55b5d..0dade626 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -464,7 +464,7 @@ install_retrodeck_controller_profile() { # BIGGER NOTE: As part of this process, all emulators will need to have their configs hard-reset to match the controller mappings of the profile # USAGE: install_retrodeck_controller_profile if [[ -d "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" && -d "$HOME/.steam/steam/controller_base/templates/" ]]; then - rsync -rlD "/app/retrodeck/binding_icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" + rsync -rlD --mkpath "/app/retrodeck/binding_icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" else configurator_generic_dialog "RetroDECK Controller Profile Install" "The target directories for the controller profile do not exist.\n\nThis may happen if you do not have Steam installed or the location is does not have permission to be read." @@ -483,8 +483,7 @@ update_splashscreens() { # USAGE: update_splashscreens rm -rf /var/config/emulationstation/.emulationstation/resources/graphics - mkdir -p /var/config/emulationstation/.emulationstation/resources/graphics - cp -rf /app/retrodeck/graphics/* /var/config/emulationstation/.emulationstation/resources/graphics + rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/emulationstation/.emulationstation/resources/graphics/" } deploy_helper_files() { diff --git a/functions/post_update.sh b/functions/post_update.sh index e43bad3b..621fd89b 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -127,7 +127,7 @@ post_update() { dir_prep "$rdhome/gamelists" "/var/config/emulationstation/.emulationstation/gamelists" dir_prep "$borders_folder" "/var/config/retroarch/overlays/borders" - rsync -rlD "/app/retrodeck/emu-configs/retroarch/borders/" "/var/config/retroarch/overlays/borders/" + rsync -rlD --mkpath "/app/retrodeck/emu-configs/retroarch/borders/" "/var/config/retroarch/overlays/borders/" rsync -rlD --mkpath "$emuconfigs/defaults/retrodeck/presets/remaps/" "/var/config/retroarch/config/remaps/" @@ -226,15 +226,15 @@ post_update() { # The following commands are run every time. if [[ -d "/var/data/dolphin-emu/Load/DynamicInputTextures" ]]; then # Refresh installed textures if they have been enabled - rsync -rlD "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/dolphin-emu/Load/DynamicInputTextures/" + rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/dolphin-emu/Load/DynamicInputTextures/" fi if [[ -d "/var/data/primehack/Load/DynamicInputTextures" ]]; then # Refresh installed textures if they have been enabled - rsync -rlD "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/primehack/Load/DynamicInputTextures/" + rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/primehack/Load/DynamicInputTextures/" fi if [[ -f "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" ]]; then # If RetroDECK controller profile has been previously installed cp -f "$emuconfigs/defaults/retrodeck/RetroDECK_controller_config.vdf" "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" - rsync -rlD "/app/retrodeck/binding_icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" + rsync -rlD --mkpath "/app/retrodeck/binding_icons/" "$HOME/.steam/steam/tenfoot/resource/images/library/controller/binding_icons/" fi update_splashscreens diff --git a/tools/configurator.sh b/tools/configurator.sh index 7285a3b7..dc9dd210 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -344,7 +344,7 @@ configurator_dolphin_input_textures_dialog() { set_setting_value $dolphingfxconf "HiresTextures" "True" dolphin ( mkdir "/var/data/dolphin-emu/Load/DynamicInputTextures" - rsync -rlD "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/dolphin-emu/Load/DynamicInputTextures/" + rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/dolphin-emu/Load/DynamicInputTextures/" ) | zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ @@ -382,7 +382,7 @@ configurator_primehack_input_textures_dialog() { set_setting_value $primehackgfxconf "HiresTextures" "True" primehack ( mkdir "/var/data/primehack/Load/DynamicInputTextures" - rsync -rlD "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/primehack/Load/DynamicInputTextures/" + rsync -rlD --mkpath "/app/retrodeck/extras/DynamicInputTextures/" "/var/data/primehack/Load/DynamicInputTextures/" ) | zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ From dbf40496c3472a6afb8334aca4b8e1e7fcb7b892 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 10:22:44 +0200 Subject: [PATCH 19/51] Updated ES-DE to 2.1.0 --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 4d00799d..575859b6 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -303,7 +303,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: 7a1e420c9df3b801a65e9bcdc0ac92e2d708836e + branch: c78e215d13b02132762b9fbf45ec7b861d50601b - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK From 5483a89f70678def2d2b1c56694c2be8b9987089 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 10:26:30 +0200 Subject: [PATCH 20/51] Updated Yuzu --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 575859b6..fb538a7e 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -567,8 +567,8 @@ modules: - ln -s "${FLATPAK_DEST}/yuzu/usr/bin/yuzu" "${FLATPAK_DEST}/bin/yuzu" sources: - type: file - url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1465/yuzu-mainline-20230611-b9fc07fc0.AppImage - sha256: 3a5c90947d0e5ca839921a4b77ec11b71176dcd4fb6f64c81757af1ba0f6f4d3 + url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1495/yuzu-mainline-20230713-523db3ac6.AppImage + sha256: 1eb43101835c37888f427efa94f0c2e9b8ebfd3181f480fa914fd15041dc4c2f # Yuzu - END From 51feed8d9022fe44b1826952a87046dfdd76911a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 10:36:07 +0200 Subject: [PATCH 21/51] Updated Citra --- net.retrodeck.retrodeck.yml | 7 +-- .../citra/unified-source-compat.patch | 56 ------------------- 2 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 rd-submodules/citra/unified-source-compat.patch diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index fb538a7e..86457c70 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -592,7 +592,6 @@ modules: # FFMPEG VIDEO DUMPER was disabled because of this: https://github.com/citra-emu/citra/issues/5949 - '-DUSE_SYSTEM_SDL2=ON' - '-DCMAKE_POLICY_DEFAULT_CMP0069=NEW' - - '-DENABLE_FDK=ON' cleanup: - /share/man - /share/pixmaps @@ -602,8 +601,8 @@ modules: sources: - type: archive url: >- - https://github.com/citra-emu/citra-nightly/releases/download/nightly-1898/citra-unified-source-20230504-70335a7.tar.xz - sha256: b320585bd8c4c075f63d3d9c74b830718e58fcf04d987a5dcead402a72abf753 + https://github.com/citra-emu/citra-nightly/releases/download/nightly-1940/citra-unified-source-20230704-df9cc1b.tar.xz + sha256: d63dc8d57b44eebca6abec9839ce67ba7d614e7a8bb62cecbf3c9b0768a0b713 x-checker-data: type: json url: https://api.github.com/repos/citra-emu/citra-nightly/releases/latest @@ -612,8 +611,6 @@ modules: .assets[] | .browser_download_url | match("https://.+citra-unified-source-.+.xz$") | .string is-main-source: true - - type: patch - path: rd-submodules/citra/unified-source-compat.patch # CITRA - END diff --git a/rd-submodules/citra/unified-source-compat.patch b/rd-submodules/citra/unified-source-compat.patch deleted file mode 100644 index 6a1ca47c..00000000 --- a/rd-submodules/citra/unified-source-compat.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 710f3fcfb..e5f4f4687 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -94,7 +94,11 @@ function(check_submodules_present) - endif() - endforeach() - endfunction() --check_submodules_present() -+ -+if (EXISTS "${PROJECT_SOURCE_DIR}/.git/objects") -+ # only check submodules when source is obtained via Git -+ check_submodules_present() -+endif() - - configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc - ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc -diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake -index a011c6cbf..87e9eef35 100644 ---- a/CMakeModules/GenerateSCMRev.cmake -+++ b/CMakeModules/GenerateSCMRev.cmake -@@ -6,15 +6,27 @@ endfunction() - - list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/externals/cmake-modules") - --# Find the package here with the known path so that the GetGit commands can find it as well --find_package(Git QUIET PATHS "${GIT_EXECUTABLE}") -- - # generate git/build information --include(GetGitRevisionDescription) --get_git_head_revision(GIT_REF_SPEC GIT_REV) --git_describe(GIT_DESC --always --long --dirty) --git_branch_name(GIT_BRANCH) - get_timestamp(BUILD_DATE) -+if (EXISTS "${SRC_DIR}/.git/objects") -+ # Find the package here with the known path so that the GetGit commands can find it as well -+ find_package(Git QUIET PATHS "${GIT_EXECUTABLE}") -+ # only use Git to check revision info when source is obtained via Git -+ include(GetGitRevisionDescription) -+ get_git_head_revision(GIT_REF_SPEC GIT_REV) -+ git_describe(GIT_DESC --always --long --dirty) -+ git_branch_name(GIT_BRANCH) -+elseif(EXISTS "${SRC_DIR}/GIT-COMMIT" AND EXISTS "${SRC_DIR}/GIT-TAG") -+ # unified source archive -+ file(READ "${SRC_DIR}/GIT-COMMIT" GIT_REV_RAW LIMIT 64) -+ string(STRIP "${GIT_REV_RAW}" GIT_REV) -+ string(SUBSTRING "${GIT_REV_RAW}" 0 9 GIT_DESC) -+ set(GIT_BRANCH "HEAD") -+else() -+ # self-packed archive? -+ set(GIT_DESC "UNKNOWN") -+ set(GIT_BRANCH "UNKNOWN") -+endif() - - # Generate cpp with Git revision from template - # Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well \ No newline at end of file From 5410a2e378a0886fa217ce752ad58107c4e3b477 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 10:36:28 +0200 Subject: [PATCH 22/51] Updated PCSX2 --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 86457c70..2e7ed0b3 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -629,8 +629,8 @@ modules: - ln -s "${FLATPAK_DEST}/pcsx2-qt/usr/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt" sources: - type: file - url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.4570/pcsx2-v1.7.4570-linux-AppImage-64bit-Qt.AppImage - sha256: fab77713f37140451d37b237092df479fa61325a97c038fad5a9c687f1e5f2b1 + url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.4729/pcsx2-v1.7.4729-linux-appimage-x64-Qt.AppImage + sha256: 2e0571926ac6253b7ebaea45c36b3ebd19c2923075c3e76c6b4936c0190867e4 # PCSX2 - END From 7f045e96d038f1915e4e70b7522b086f4f5ca761 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 10:38:18 +0200 Subject: [PATCH 23/51] Updated Xemu --- net.retrodeck.retrodeck.yml | 4 ++-- rd-submodules/retroarch | 2 +- rd-submodules/shared-modules | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 2e7ed0b3..8f62806d 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -807,8 +807,8 @@ modules: sources: - type: git url: https://github.com/xemu-project/xemu.git - tag: v0.7.92 - commit: d557a294feb3ecae8ec22adca0909e2d3adcc459 + tag: v0.7.98 + commit: 7bfb7c85378f64f93556c365ea0cc18cb2181dc8 x-checker-data: type: json url: https://api.github.com/repos/xemu-project/xemu/releases/latest diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch index 0b1cfb79..fbfdda61 160000 --- a/rd-submodules/retroarch +++ b/rd-submodules/retroarch @@ -1 +1 @@ -Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409 +Subproject commit fbfdda61b3da092a71cc53999dd3e7b909f244e2 diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules index a2441b96..50314360 160000 --- a/rd-submodules/shared-modules +++ b/rd-submodules/shared-modules @@ -1 +1 @@ -Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42 +Subproject commit 50314360ded6fa3b9f0b602513b1164b7a6636ed From b1d91ab399e3df46217fc7f48c7a34ed4da35803 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 10:57:42 +0200 Subject: [PATCH 24/51] Updated RPCS3 --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 8f62806d..9fcc7f8d 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -860,7 +860,7 @@ modules: # glu issue, check libglu module for more info #- rd-submodules/shared-modules/glu/glu-9.json - - rd-submodules/shared-modules/glew/glew.json + - rd-submodules/shared-modules/glew/glew.json # RPCS3 is not using this anymore, what about the other emu? Can we remove it? - name: rpcs3 buildsystem: cmake-ninja @@ -905,7 +905,7 @@ modules: sources: - type: git url: https://github.com/RPCS3/rpcs3.git - commit: 5d7e75c5d8c7492ae655ea38bb7ead4b868a2f17 + commit: a828c214b5c0b87b81fcd13ff3c1e952c9a5d6dd # RPCS3 - END From 06284eace0f66558629a2e7adc68c51a23990972 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 11:17:19 +0200 Subject: [PATCH 25/51] Updated Cemu --- net.retrodeck.retrodeck.yml | 49 +++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 9fcc7f8d..2c796a5a 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1004,8 +1004,8 @@ modules: - /lib/pkgconfig sources: - type: archive - url: https://libzip.org/download/libzip-1.9.2.tar.xz - sha256: c93e9852b7b2dc931197831438fee5295976ee0ba24f8524a8907be5c2ba5937 + url: https://libzip.org/download/libzip-1.10.0.tar.xz + sha256: cd2a7ac9f1fb5bfa6218272d9929955dc7237515bba6e14b5ad0e1d1e2212b43 x-checker-data: type: anitya project-id: 10649 @@ -1060,9 +1060,9 @@ modules: type: anitya project-id: 11526 url-template: https://github.com/fmtlib/fmt/archive/$version.tar.gz + versions: {<: '10.0'} - name: wxwidgets - buildsystem: cmake-ninja cleanup: - /bin - /include @@ -1070,15 +1070,14 @@ modules: - /lib/wx - /share sources: - - type: git - url: https://github.com/wxWidgets/wxWidgets - tag: v3.2.2.1 - commit: a812fffda3fe686c94e24bff27e8effd96e4de64 + - type: archive + url: https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.2.1/wxWidgets-3.2.2.1.tar.bz2 + sha256: dffcb6be71296fff4b7f8840eb1b510178f57aa2eb236b20da41182009242c02 x-checker-data: type: anitya project-id: 5150 stable-only: true - tag-template: v$version + url-template: https://github.com/wxWidgets/wxWidgets/releases/download/v$version/wxWidgets-$version.tar.bz2 - name: Cemu buildsystem: cmake-ninja @@ -1095,8 +1094,12 @@ modules: x-checker-data: type: git tag-pattern: ^v([\d.]+-\d+)$ - tag: v2.0-39 - commit: eda4cf4b241d56c5c16f6aa4d135b8a269676a76 + tag: v2.0-44 + commit: f1c200a01675714e51548137f2365ab2a1a9977b + - type: shell + commands: + - sed "s/set(EXPERIMENTAL_VERSION.*/set(EXPERIMENTAL_VERSION \"$(git describe + --tag | sed "s/v2.0-//")\" CACHE STRING \"\")/g" -i CMakeLists.txt - type: script commands: - | @@ -1108,7 +1111,33 @@ modules: done Cemu_relwithdebinfo "$@" dest-filename: Cemu-wrapper + - type: script + dest-filename: dev_release_metainfo.py + commands: + - | + import os + import xml.etree.ElementTree as ET + meta_file = os.environ.get('AS_META_FILE') + version = os.environ.get('AS_META_VERSION') + release_type = os.environ.get('AS_META_TYPE') + release_date = os.environ.get('AS_META_DATE') + release_url = os.environ.get('AS_META_URL') + tree = ET.parse(meta_file) + root = tree.getroot() + el_releases = root.find('releases') + for el_release in el_releases: + el_releases.remove(el_release) + el_release = ET.SubElement(el_releases, 'release') + el_url = ET.SubElement(el_release, 'url') + el_url.text = release_url + el_release.attrib['type'] = release_type + el_release.attrib['date'] = release_date + el_release.attrib['version'] = version + ET.indent(tree, space=' ', level=0) + tree.write(meta_file, encoding='utf8') post-install: + - cp -r bin/gameProfiles ${FLATPAK_DEST}/share/Cemu/ + - cp -r bin/resources ${FLATPAK_DEST}/share/Cemu/ - install -Dm644 -t ${FLATPAK_DEST}/share/icons/hicolor/128x128/apps/ dist/linux/info.cemu.Cemu.png - install -D -t ${FLATPAK_DEST}/bin/ bin/Cemu_relwithdebinfo Cemu-wrapper From 8b42d77571bef26c527882ae3ebc5aff7586c215 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 11:53:33 +0200 Subject: [PATCH 26/51] ES-DE: reverted to the previous version due to patches incompatbility --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 2c796a5a..78e004e7 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -303,7 +303,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: c78e215d13b02132762b9fbf45ec7b861d50601b + branch: 7a1e420c9df3b801a65e9bcdc0ac92e2d708836e - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK From babd77ffb9ca394b987cd4cb72eb6a4ad2dd1f48 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 12:57:06 +0200 Subject: [PATCH 27/51] Reverted Citra as it's on QT6 --- net.retrodeck.retrodeck.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 78e004e7..be3cedd2 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -592,6 +592,7 @@ modules: # FFMPEG VIDEO DUMPER was disabled because of this: https://github.com/citra-emu/citra/issues/5949 - '-DUSE_SYSTEM_SDL2=ON' - '-DCMAKE_POLICY_DEFAULT_CMP0069=NEW' + - '-DENABLE_FDK=ON' cleanup: - /share/man - /share/pixmaps @@ -601,8 +602,8 @@ modules: sources: - type: archive url: >- - https://github.com/citra-emu/citra-nightly/releases/download/nightly-1940/citra-unified-source-20230704-df9cc1b.tar.xz - sha256: d63dc8d57b44eebca6abec9839ce67ba7d614e7a8bb62cecbf3c9b0768a0b713 + https://github.com/citra-emu/citra-nightly/releases/download/nightly-1898/citra-unified-source-20230504-70335a7.tar.xz + sha256: b320585bd8c4c075f63d3d9c74b830718e58fcf04d987a5dcead402a72abf753 x-checker-data: type: json url: https://api.github.com/repos/citra-emu/citra-nightly/releases/latest @@ -611,6 +612,9 @@ modules: .assets[] | .browser_download_url | match("https://.+citra-unified-source-.+.xz$") | .string is-main-source: true + - type: patch + path: rd-submodules/citra/unified-source-compat.patch + # CITRA - END From 9c771aeef1604bfc7ba00d874e2f5f4ff2f882b2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 13:00:33 +0200 Subject: [PATCH 28/51] Reverted Citra as it's on QT6 --- .../citra/unified-source-compat.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 rd-submodules/citra/rd-submodules/citra/unified-source-compat.patch diff --git a/rd-submodules/citra/rd-submodules/citra/unified-source-compat.patch b/rd-submodules/citra/rd-submodules/citra/unified-source-compat.patch new file mode 100644 index 00000000..6a1ca47c --- /dev/null +++ b/rd-submodules/citra/rd-submodules/citra/unified-source-compat.patch @@ -0,0 +1,56 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 710f3fcfb..e5f4f4687 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,7 +94,11 @@ function(check_submodules_present) + endif() + endforeach() + endfunction() +-check_submodules_present() ++ ++if (EXISTS "${PROJECT_SOURCE_DIR}/.git/objects") ++ # only check submodules when source is obtained via Git ++ check_submodules_present() ++endif() + + configure_file(${PROJECT_SOURCE_DIR}/dist/compatibility_list/compatibility_list.qrc + ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc +diff --git a/CMakeModules/GenerateSCMRev.cmake b/CMakeModules/GenerateSCMRev.cmake +index a011c6cbf..87e9eef35 100644 +--- a/CMakeModules/GenerateSCMRev.cmake ++++ b/CMakeModules/GenerateSCMRev.cmake +@@ -6,15 +6,27 @@ endfunction() + + list(APPEND CMAKE_MODULE_PATH "${SRC_DIR}/externals/cmake-modules") + +-# Find the package here with the known path so that the GetGit commands can find it as well +-find_package(Git QUIET PATHS "${GIT_EXECUTABLE}") +- + # generate git/build information +-include(GetGitRevisionDescription) +-get_git_head_revision(GIT_REF_SPEC GIT_REV) +-git_describe(GIT_DESC --always --long --dirty) +-git_branch_name(GIT_BRANCH) + get_timestamp(BUILD_DATE) ++if (EXISTS "${SRC_DIR}/.git/objects") ++ # Find the package here with the known path so that the GetGit commands can find it as well ++ find_package(Git QUIET PATHS "${GIT_EXECUTABLE}") ++ # only use Git to check revision info when source is obtained via Git ++ include(GetGitRevisionDescription) ++ get_git_head_revision(GIT_REF_SPEC GIT_REV) ++ git_describe(GIT_DESC --always --long --dirty) ++ git_branch_name(GIT_BRANCH) ++elseif(EXISTS "${SRC_DIR}/GIT-COMMIT" AND EXISTS "${SRC_DIR}/GIT-TAG") ++ # unified source archive ++ file(READ "${SRC_DIR}/GIT-COMMIT" GIT_REV_RAW LIMIT 64) ++ string(STRIP "${GIT_REV_RAW}" GIT_REV) ++ string(SUBSTRING "${GIT_REV_RAW}" 0 9 GIT_DESC) ++ set(GIT_BRANCH "HEAD") ++else() ++ # self-packed archive? ++ set(GIT_DESC "UNKNOWN") ++ set(GIT_BRANCH "UNKNOWN") ++endif() + + # Generate cpp with Git revision from template + # Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well \ No newline at end of file From 6280a13401828217a8b07e6bb6a9e3495e06c61b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 13:19:27 +0200 Subject: [PATCH 29/51] Reverted Citra as it's on QT6 --- .../citra/{rd-submodules/citra => }/unified-source-compat.patch | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rd-submodules/citra/{rd-submodules/citra => }/unified-source-compat.patch (100%) diff --git a/rd-submodules/citra/rd-submodules/citra/unified-source-compat.patch b/rd-submodules/citra/unified-source-compat.patch similarity index 100% rename from rd-submodules/citra/rd-submodules/citra/unified-source-compat.patch rename to rd-submodules/citra/unified-source-compat.patch From 07902e5f4a8ab97ac419d862ecc99cbcde9abdff Mon Sep 17 00:00:00 2001 From: icenine451 Date: Fri, 14 Jul 2023 08:56:38 -0400 Subject: [PATCH 30/51] Add patch file for ES-DE 2.1.0 --- rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch | 0 rd-submodules/retroarch | 2 +- rd-submodules/shared-modules | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch diff --git a/rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch b/rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch new file mode 100644 index 00000000..e69de29b diff --git a/rd-submodules/retroarch b/rd-submodules/retroarch index fbfdda61..0b1cfb79 160000 --- a/rd-submodules/retroarch +++ b/rd-submodules/retroarch @@ -1 +1 @@ -Subproject commit fbfdda61b3da092a71cc53999dd3e7b909f244e2 +Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409 diff --git a/rd-submodules/shared-modules b/rd-submodules/shared-modules index 50314360..a2441b96 160000 --- a/rd-submodules/shared-modules +++ b/rd-submodules/shared-modules @@ -1 +1 @@ -Subproject commit 50314360ded6fa3b9f0b602513b1164b7a6636ed +Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42 From dfd4885e2a04308f53493d99982e0c5562c92c24 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Fri, 14 Jul 2023 08:57:22 -0400 Subject: [PATCH 31/51] ES-DE 2.1.0 patch content --- .../es-de/es-de-2.1-retrodeck-mods.patch | 168 ++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch b/rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch index e69de29b..2a2d01e8 100644 --- a/rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch +++ b/rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch @@ -0,0 +1,168 @@ +diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/es-app/src/guis/GuiMenu.cpp +--- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:44:25.788696841 -0400 ++++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:48:23.574196859 -0400 +@@ -10,2 +10,3 @@ + #include "guis/GuiMenu.h" ++#include "utils/PlatformUtil.h" + +@@ -67,2 +68,4 @@ + ++ addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); }); ++ + if (!Settings::getInstance()->getBool("ForceKiosk") && +@@ -70,3 +73,3 @@ + #if defined(__APPLE__) +- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); ++ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); + #else +@@ -75,3 +78,3 @@ + else +- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); ++ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); + #endif +@@ -1729,2 +1732,15 @@ + ++void GuiMenu::openRetroDeckConfigurator() ++{ ++ // Launch the configurator.sh script ++ std::string command; ++ std::string startDirectory; ++ bool runInBackground; ++ command = "bash /app/tools/configurator.sh"; ++ startDirectory = "/app/tools"; ++ runInBackground = false; ++ int result = Utils::Platform::launchGameUnix(command, startDirectory, runInBackground); ++ // You can add any checks for the script's outcome here. ++} ++ + void GuiMenu::openQuitMenu() +@@ -1758,3 +1774,3 @@ + auto quitText = std::make_shared( +- "QUIT EMULATIONSTATION", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); ++ "QUIT RETRODECK", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); + quitText->setSelectable(true); +diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de/es-app/src/guis/GuiMenu.h +--- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:44:25.788696841 -0400 ++++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:49:05.851991859 -0400 +@@ -46,2 +46,3 @@ + void openOtherOptions(); ++ void openRetroDeckConfigurator(); + void openQuitMenu(); +diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp +--- emulationstation-de/es-app/src/views/ViewController.cpp 2023-07-14 08:44:25.788696841 -0400 ++++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-07-14 08:51:37.107581872 -0400 +@@ -164,9 +164,7 @@ + { +- mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " +- "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE " +- "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM " +- "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL " +- "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME " +- "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n" +- "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n"; ++ mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. " ++ "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE " ++ "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY " ++ "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n" ++ "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n"; + +@@ -179,90 +177,3 @@ + mNoGamesMessageBox = new GuiMsgBox( +- HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", +- [this] { +- std::string currentROMDirectory; +-#if defined(_WIN64) +- currentROMDirectory = Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); +-#else +- currentROMDirectory = FileData::getROMDirectory(); +-#endif +- if (Settings::getInstance()->getBool("VirtualKeyboard")) { +- mWindow->pushGui(new GuiTextEditKeyboardPopup( +- HelpStyle(), 0.0f, "ENTER ROM DIRECTORY PATH", currentROMDirectory, +- [this](const std::string& newROMDirectory) { +- Settings::getInstance()->setString("ROMDirectory", +- Utils::String::trim(newROMDirectory)); +- Settings::getInstance()->saveFile(); +-#if defined(_WIN64) +- mRomDirectory = +- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); +-#else +- mRomDirectory = FileData::getROMDirectory(); +-#endif +- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); +- mWindow->pushGui(new GuiMsgBox(HelpStyle(), +- "ROM DIRECTORY SETTING SAVED, RESTART\n" +- "THE APPLICATION TO RESCAN THE SYSTEMS", +- "OK", nullptr, "", nullptr, "", nullptr, +- true, true)); +- }, +- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", +- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", +- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)")); +- } +- else { +- mWindow->pushGui(new GuiTextEditPopup( +- HelpStyle(), "ENTER ROM DIRECTORY PATH", currentROMDirectory, +- [this](const std::string& newROMDirectory) { +- Settings::getInstance()->setString("ROMDirectory", +- Utils::String::trim(newROMDirectory)); +- Settings::getInstance()->saveFile(); +-#if defined(_WIN64) +- mRomDirectory = +- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); +-#else +- mRomDirectory = FileData::getROMDirectory(); +-#endif +- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); +- mWindow->pushGui(new GuiMsgBox(HelpStyle(), +- "ROM DIRECTORY SETTING SAVED, RESTART\n" +- "THE APPLICATION TO RESCAN THE SYSTEMS", +- "OK", nullptr, "", nullptr, "", nullptr, +- true)); +- }, +- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", +- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", +- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)")); +- } +- }, +- "CREATE DIRECTORIES", +- [this] { +- mWindow->pushGui(new GuiMsgBox( +- HelpStyle(), +- "THIS WILL CREATE DIRECTORIES FOR ALL THE\n" +- "GAME SYSTEMS DEFINED IN es_systems.xml\n\n" +- "THIS MAY CREATE A LOT OF FOLDERS SO IT'S\n" +- "ADVICED TO REMOVE THE ONES YOU DON'T NEED\n\n" +- "PROCEED?", +- "YES", +- [this] { +- if (!SystemData::createSystemDirectories()) { +- mWindow->pushGui(new GuiMsgBox(HelpStyle(), +- "THE SYSTEM DIRECTORIES WERE SUCCESSFULLY\n" +- "GENERATED, EXIT THE APPLICATION AND PLACE\n" +- "YOUR GAMES IN THE NEWLY CREATED FOLDERS", +- "OK", nullptr, "", nullptr, "", nullptr, +- true)); +- } +- else { +- mWindow->pushGui(new GuiMsgBox(HelpStyle(), +- "ERROR CREATING THE SYSTEM DIRECTORIES,\n" +- "PERMISSION PROBLEMS OR DISK FULL?\n\n" +- "SEE THE LOG FILE FOR MORE DETAILS", +- "OK", nullptr, "", nullptr, "", nullptr, +- true)); +- } +- }, +- "NO", nullptr, "", nullptr, true)); +- }, +- "QUIT", ++ HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", + [] { +diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp +--- emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:44:25.805371841 -0400 ++++ emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:52:32.335181878 -0400 +@@ -165,3 +165,3 @@ + progressBarRect.barPosY = mSplashTextPositions.y + (progressBarRect.barHeight * 2.0f); +- progressBarRect.color = 0x777777FF; ++ progressBarRect.color = 0xC858E6FF; + mProgressBarRectangles.emplace_back(progressBarRect); From a177735b431243ff172872955e6a621cd3b7a40e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 16:28:25 +0200 Subject: [PATCH 32/51] Updated ES-DE to 2.1.0 + patch --- net.retrodeck.retrodeck.yml | 2 +- .../es-de/es-de-retrodeck-mods.patch | 158 +++++++++++++++--- 2 files changed, 135 insertions(+), 25 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index be3cedd2..8eff91fc 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -303,7 +303,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: 7a1e420c9df3b801a65e9bcdc0ac92e2d708836e + branch: c78e215d13b02132762b9fbf45ec7b861d50601b - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK diff --git a/rd-submodules/es-de/es-de-retrodeck-mods.patch b/rd-submodules/es-de/es-de-retrodeck-mods.patch index f5f49bbd..16be14ea 100644 --- a/rd-submodules/es-de/es-de-retrodeck-mods.patch +++ b/rd-submodules/es-de/es-de-retrodeck-mods.patch @@ -1,26 +1,26 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/es-app/src/guis/GuiMenu.cpp ---- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-04-12 09:08:12.394935336 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-04-12 16:25:04.618753274 -0400 +--- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:44:25.788696841 -0400 ++++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:48:23.574196859 -0400 @@ -10,2 +10,3 @@ #include "guis/GuiMenu.h" +#include "utils/PlatformUtil.h" -@@ -66,2 +67,4 @@ +@@ -67,2 +68,4 @@ -+ addEntry("RETRODECK CONFIGURATOR", 0x777777FF, false, [this] { openRetroDeckConfigurator(); }); ++ addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); }); + if (!Settings::getInstance()->getBool("ForceKiosk") && -@@ -69,3 +72,3 @@ +@@ -70,3 +73,3 @@ #if defined(__APPLE__) -- addEntry("QUIT EMULATIONSTATION", 0x777777FF, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); }); +- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); ++ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); #else -@@ -74,3 +77,3 @@ +@@ -75,3 +78,3 @@ else -- addEntry("QUIT EMULATIONSTATION", 0x777777FF, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); }); +- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); ++ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); #endif -@@ -1704,2 +1707,15 @@ +@@ -1729,2 +1732,15 @@ +void GuiMenu::openRetroDeckConfigurator() +{ @@ -36,23 +36,133 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/e +} + void GuiMenu::openQuitMenu() -@@ -1732,3 +1748,3 @@ - }); -- auto quitText = std::make_shared("QUIT EMULATIONSTATION", -+ auto quitText = std::make_shared("QUIT RETRODECK", - Font::get(FONT_SIZE_MEDIUM), 0x777777FF); +@@ -1758,3 +1774,3 @@ + auto quitText = std::make_shared( +- "QUIT EMULATIONSTATION", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); ++ "QUIT RETRODECK", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); + quitText->setSelectable(true); diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de/es-app/src/guis/GuiMenu.h ---- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-04-12 09:08:12.394935336 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-04-12 09:33:25.023871033 -0400 +--- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:44:25.788696841 -0400 ++++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:49:05.851991859 -0400 @@ -46,2 +46,3 @@ void openOtherOptions(); + void openRetroDeckConfigurator(); void openQuitMenu(); +diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp +--- emulationstation-de/es-app/src/views/ViewController.cpp 2023-07-14 08:44:25.788696841 -0400 ++++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-07-14 08:51:37.107581872 -0400 +@@ -164,9 +164,7 @@ + { +- mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " +- "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE " +- "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM " +- "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL " +- "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME " +- "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n" +- "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n"; ++ mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. " ++ "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE " ++ "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY " ++ "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n" ++ "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n"; + +@@ -179,90 +177,3 @@ + mNoGamesMessageBox = new GuiMsgBox( +- HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", +- [this] { +- std::string currentROMDirectory; +-#if defined(_WIN64) +- currentROMDirectory = Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); +-#else +- currentROMDirectory = FileData::getROMDirectory(); +-#endif +- if (Settings::getInstance()->getBool("VirtualKeyboard")) { +- mWindow->pushGui(new GuiTextEditKeyboardPopup( +- HelpStyle(), 0.0f, "ENTER ROM DIRECTORY PATH", currentROMDirectory, +- [this](const std::string& newROMDirectory) { +- Settings::getInstance()->setString("ROMDirectory", +- Utils::String::trim(newROMDirectory)); +- Settings::getInstance()->saveFile(); +-#if defined(_WIN64) +- mRomDirectory = +- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); +-#else +- mRomDirectory = FileData::getROMDirectory(); +-#endif +- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); +- mWindow->pushGui(new GuiMsgBox(HelpStyle(), +- "ROM DIRECTORY SETTING SAVED, RESTART\n" +- "THE APPLICATION TO RESCAN THE SYSTEMS", +- "OK", nullptr, "", nullptr, "", nullptr, +- true, true)); +- }, +- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", +- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", +- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)")); +- } +- else { +- mWindow->pushGui(new GuiTextEditPopup( +- HelpStyle(), "ENTER ROM DIRECTORY PATH", currentROMDirectory, +- [this](const std::string& newROMDirectory) { +- Settings::getInstance()->setString("ROMDirectory", +- Utils::String::trim(newROMDirectory)); +- Settings::getInstance()->saveFile(); +-#if defined(_WIN64) +- mRomDirectory = +- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); +-#else +- mRomDirectory = FileData::getROMDirectory(); +-#endif +- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); +- mWindow->pushGui(new GuiMsgBox(HelpStyle(), +- "ROM DIRECTORY SETTING SAVED, RESTART\n" +- "THE APPLICATION TO RESCAN THE SYSTEMS", +- "OK", nullptr, "", nullptr, "", nullptr, +- true)); +- }, +- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", +- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", +- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)")); +- } +- }, +- "CREATE DIRECTORIES", +- [this] { +- mWindow->pushGui(new GuiMsgBox( +- HelpStyle(), +- "THIS WILL CREATE DIRECTORIES FOR ALL THE\n" +- "GAME SYSTEMS DEFINED IN es_systems.xml\n\n" +- "THIS MAY CREATE A LOT OF FOLDERS SO IT'S\n" +- "ADVICED TO REMOVE THE ONES YOU DON'T NEED\n\n" +- "PROCEED?", +- "YES", +- [this] { +- if (!SystemData::createSystemDirectories()) { +- mWindow->pushGui(new GuiMsgBox(HelpStyle(), +- "THE SYSTEM DIRECTORIES WERE SUCCESSFULLY\n" +- "GENERATED, EXIT THE APPLICATION AND PLACE\n" +- "YOUR GAMES IN THE NEWLY CREATED FOLDERS", +- "OK", nullptr, "", nullptr, "", nullptr, +- true)); +- } +- else { +- mWindow->pushGui(new GuiMsgBox(HelpStyle(), +- "ERROR CREATING THE SYSTEM DIRECTORIES,\n" +- "PERMISSION PROBLEMS OR DISK FULL?\n\n" +- "SEE THE LOG FILE FOR MORE DETAILS", +- "OK", nullptr, "", nullptr, "", nullptr, +- true)); +- } +- }, +- "NO", nullptr, "", nullptr, true)); +- }, +- "QUIT", ++ HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", + [] { diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp ---- emulationstation-de/es-core/src/Window.cpp 2023-04-12 09:08:12.398268670 -0400 -+++ emulationstation-de/es-core/src/Window.cpp 2023-04-14 11:03:48.261309278 -0400 -@@ -179,3 +179,3 @@ - progressBarRect.barPosY += borderThickness; -- progressBarRect.color = 0x79010FFF; +--- emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:44:25.805371841 -0400 ++++ emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:52:32.335181878 -0400 +@@ -165,3 +165,3 @@ + progressBarRect.barPosY = mSplashTextPositions.y + (progressBarRect.barHeight * 2.0f); +- progressBarRect.color = 0x777777FF; + progressBarRect.color = 0xC858E6FF; - mProgressBarRectangles.emplace_back(progressBarRect); + mProgressBarRectangles.emplace_back(progressBarRect); \ No newline at end of file From d8f55bc5e9455be5c12a46f84003e37c84cf040d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 16:57:46 +0200 Subject: [PATCH 33/51] Added libpoppler for ES-DE --- net.retrodeck.retrodeck.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 8eff91fc..49ccdb1e 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -290,6 +290,21 @@ modules: url: https://github.com/libgit2/libgit2.git tag: v1.6.3 + - name: libpoppler-glib + buildsystem: cmake-ninja + config-opts: + - '-DENABLE_BOOST=OFF' + sources: + - type: archive + url: >- + https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-22.11.0/poppler-poppler-22.11.0.tar.bz2 + sha256: b8f618d5c62030034d5c8da4d3f6a740260b7620b9a31021679ce1914d327f81 + cleanup: + - /lib/pkgconfig + - /include + - '*.a' + - '*.la' + # When updating this module remember to check those: # https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/unix/es_find_rules.xml # But we don't include them 1:1 as RetroDECK got some specific configs in some cases From 2a65d1ecf8454a7d6f3a56b9be35ab3f669df943 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 14 Jul 2023 16:58:46 +0200 Subject: [PATCH 34/51] Added libpoppler for ES-DE --- net.retrodeck.retrodeck.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 49ccdb1e..b07f6566 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -293,11 +293,10 @@ modules: - name: libpoppler-glib buildsystem: cmake-ninja config-opts: - - '-DENABLE_BOOST=OFF' + - -DENABLE_BOOST=OFF sources: - type: archive - url: >- - https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-22.11.0/poppler-poppler-22.11.0.tar.bz2 + url: https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-22.11.0/poppler-poppler-22.11.0.tar.bz2 sha256: b8f618d5c62030034d5c8da4d3f6a740260b7620b9a31021679ce1914d327f81 cleanup: - /lib/pkgconfig From 26cc18d6887af89878afd58eba9b9ba4525828a3 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Sat, 15 Jul 2023 09:39:18 +0200 Subject: [PATCH 35/51] [TEST] Removing ES-DE custom patches --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index b07f6566..2480c1a1 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -323,8 +323,8 @@ modules: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK v'$(cat ${FLATPAK_DEST}/retrodeck/version)', ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#g' es-app/src/guis/GuiMenu.cpp - - type: patch - path: rd-submodules/es-de/es-de-retrodeck-mods.patch + #- type: patch + # path: rd-submodules/es-de/es-de-retrodeck-mods.patch # ES-DE - END From 576a74b93cc0816c6d94519b81d7433c90db4dac Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 17 Jul 2023 09:10:59 +0200 Subject: [PATCH 36/51] ES-DE reverted to 2.0 --- net.retrodeck.retrodeck.yml | 31 ++-- .../es-de/es-de-retrodeck-mods.patch | 156 +++--------------- 2 files changed, 39 insertions(+), 148 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index b07f6566..4bb4f892 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -289,20 +289,21 @@ modules: - type: git url: https://github.com/libgit2/libgit2.git tag: v1.6.3 - - - name: libpoppler-glib - buildsystem: cmake-ninja - config-opts: - - -DENABLE_BOOST=OFF - sources: - - type: archive - url: https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-22.11.0/poppler-poppler-22.11.0.tar.bz2 - sha256: b8f618d5c62030034d5c8da4d3f6a740260b7620b9a31021679ce1914d327f81 - cleanup: - - /lib/pkgconfig - - /include - - '*.a' - - '*.la' + + # Needed from ES-DE 2.1.0+ + # - name: libpoppler-glib + # buildsystem: cmake-ninja + # config-opts: + # - -DENABLE_BOOST=OFF + # sources: + # - type: archive + # url: https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-22.11.0/poppler-poppler-22.11.0.tar.bz2 + # sha256: b8f618d5c62030034d5c8da4d3f6a740260b7620b9a31021679ce1914d327f81 + # cleanup: + # - /lib/pkgconfig + # - /include + # - '*.a' + # - '*.la' # When updating this module remember to check those: # https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/unix/es_find_rules.xml @@ -317,7 +318,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: c78e215d13b02132762b9fbf45ec7b861d50601b + branch: 7a1e420c9df3b801a65e9bcdc0ac92e2d708836e - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK diff --git a/rd-submodules/es-de/es-de-retrodeck-mods.patch b/rd-submodules/es-de/es-de-retrodeck-mods.patch index 16be14ea..8c820077 100644 --- a/rd-submodules/es-de/es-de-retrodeck-mods.patch +++ b/rd-submodules/es-de/es-de-retrodeck-mods.patch @@ -1,26 +1,26 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/es-app/src/guis/GuiMenu.cpp ---- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:44:25.788696841 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:48:23.574196859 -0400 +--- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-04-12 09:08:12.394935336 -0400 ++++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-04-12 16:25:04.618753274 -0400 @@ -10,2 +10,3 @@ #include "guis/GuiMenu.h" +#include "utils/PlatformUtil.h" -@@ -67,2 +68,4 @@ +@@ -66,2 +67,4 @@ -+ addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); }); ++ addEntry("RETRODECK CONFIGURATOR", 0x777777FF, false, [this] { openRetroDeckConfigurator(); }); + if (!Settings::getInstance()->getBool("ForceKiosk") && -@@ -70,3 +73,3 @@ +@@ -69,3 +72,3 @@ #if defined(__APPLE__) -- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); +- addEntry("QUIT EMULATIONSTATION", 0x777777FF, false, [this] { openQuitMenu(); }); ++ addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); }); #else -@@ -75,3 +78,3 @@ +@@ -74,3 +77,3 @@ else -- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); +- addEntry("QUIT EMULATIONSTATION", 0x777777FF, false, [this] { openQuitMenu(); }); ++ addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); }); #endif -@@ -1729,2 +1732,15 @@ +@@ -1704,2 +1707,15 @@ +void GuiMenu::openRetroDeckConfigurator() +{ @@ -36,133 +36,23 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/e +} + void GuiMenu::openQuitMenu() -@@ -1758,3 +1774,3 @@ - auto quitText = std::make_shared( -- "QUIT EMULATIONSTATION", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); -+ "QUIT RETRODECK", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); - quitText->setSelectable(true); +@@ -1732,3 +1748,3 @@ + }); +- auto quitText = std::make_shared("QUIT EMULATIONSTATION", ++ auto quitText = std::make_shared("QUIT RETRODECK", + Font::get(FONT_SIZE_MEDIUM), 0x777777FF); diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de/es-app/src/guis/GuiMenu.h ---- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:44:25.788696841 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:49:05.851991859 -0400 +--- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-04-12 09:08:12.394935336 -0400 ++++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-04-12 09:33:25.023871033 -0400 @@ -46,2 +46,3 @@ void openOtherOptions(); + void openRetroDeckConfigurator(); void openQuitMenu(); -diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp ---- emulationstation-de/es-app/src/views/ViewController.cpp 2023-07-14 08:44:25.788696841 -0400 -+++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-07-14 08:51:37.107581872 -0400 -@@ -164,9 +164,7 @@ - { -- mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " -- "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE " -- "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM " -- "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL " -- "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME " -- "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n" -- "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n"; -+ mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. " -+ "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE " -+ "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY " -+ "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n" -+ "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n"; - -@@ -179,90 +177,3 @@ - mNoGamesMessageBox = new GuiMsgBox( -- HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", -- [this] { -- std::string currentROMDirectory; --#if defined(_WIN64) -- currentROMDirectory = Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); --#else -- currentROMDirectory = FileData::getROMDirectory(); --#endif -- if (Settings::getInstance()->getBool("VirtualKeyboard")) { -- mWindow->pushGui(new GuiTextEditKeyboardPopup( -- HelpStyle(), 0.0f, "ENTER ROM DIRECTORY PATH", currentROMDirectory, -- [this](const std::string& newROMDirectory) { -- Settings::getInstance()->setString("ROMDirectory", -- Utils::String::trim(newROMDirectory)); -- Settings::getInstance()->saveFile(); --#if defined(_WIN64) -- mRomDirectory = -- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); --#else -- mRomDirectory = FileData::getROMDirectory(); --#endif -- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "ROM DIRECTORY SETTING SAVED, RESTART\n" -- "THE APPLICATION TO RESCAN THE SYSTEMS", -- "OK", nullptr, "", nullptr, "", nullptr, -- true, true)); -- }, -- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", -- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", -- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)")); -- } -- else { -- mWindow->pushGui(new GuiTextEditPopup( -- HelpStyle(), "ENTER ROM DIRECTORY PATH", currentROMDirectory, -- [this](const std::string& newROMDirectory) { -- Settings::getInstance()->setString("ROMDirectory", -- Utils::String::trim(newROMDirectory)); -- Settings::getInstance()->saveFile(); --#if defined(_WIN64) -- mRomDirectory = -- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); --#else -- mRomDirectory = FileData::getROMDirectory(); --#endif -- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "ROM DIRECTORY SETTING SAVED, RESTART\n" -- "THE APPLICATION TO RESCAN THE SYSTEMS", -- "OK", nullptr, "", nullptr, "", nullptr, -- true)); -- }, -- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", -- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", -- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)")); -- } -- }, -- "CREATE DIRECTORIES", -- [this] { -- mWindow->pushGui(new GuiMsgBox( -- HelpStyle(), -- "THIS WILL CREATE DIRECTORIES FOR ALL THE\n" -- "GAME SYSTEMS DEFINED IN es_systems.xml\n\n" -- "THIS MAY CREATE A LOT OF FOLDERS SO IT'S\n" -- "ADVICED TO REMOVE THE ONES YOU DON'T NEED\n\n" -- "PROCEED?", -- "YES", -- [this] { -- if (!SystemData::createSystemDirectories()) { -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "THE SYSTEM DIRECTORIES WERE SUCCESSFULLY\n" -- "GENERATED, EXIT THE APPLICATION AND PLACE\n" -- "YOUR GAMES IN THE NEWLY CREATED FOLDERS", -- "OK", nullptr, "", nullptr, "", nullptr, -- true)); -- } -- else { -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "ERROR CREATING THE SYSTEM DIRECTORIES,\n" -- "PERMISSION PROBLEMS OR DISK FULL?\n\n" -- "SEE THE LOG FILE FOR MORE DETAILS", -- "OK", nullptr, "", nullptr, "", nullptr, -- true)); -- } -- }, -- "NO", nullptr, "", nullptr, true)); -- }, -- "QUIT", -+ HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", - [] { diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp ---- emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:44:25.805371841 -0400 -+++ emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:52:32.335181878 -0400 -@@ -165,3 +165,3 @@ - progressBarRect.barPosY = mSplashTextPositions.y + (progressBarRect.barHeight * 2.0f); -- progressBarRect.color = 0x777777FF; +--- emulationstation-de/es-core/src/Window.cpp 2023-04-12 09:08:12.398268670 -0400 ++++ emulationstation-de/es-core/src/Window.cpp 2023-04-14 11:03:48.261309278 -0400 +@@ -179,3 +179,3 @@ + progressBarRect.barPosY += borderThickness; +- progressBarRect.color = 0x79010FFF; + progressBarRect.color = 0xC858E6FF; mProgressBarRectangles.emplace_back(progressBarRect); \ No newline at end of file From 5ee17af9a6b3c46bec45684ca1dc1461701bdf4b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 17 Jul 2023 09:23:47 +0200 Subject: [PATCH 37/51] PPSSPP: fixed L/R --- emu-configs/ppssppsdl/controls.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emu-configs/ppssppsdl/controls.ini b/emu-configs/ppssppsdl/controls.ini index 70d0d001..721182e1 100644 --- a/emu-configs/ppssppsdl/controls.ini +++ b/emu-configs/ppssppsdl/controls.ini @@ -9,8 +9,8 @@ Square = 1-29,10-191 Triangle = 1-47,10-188 Start = 1-62,10-197 Select = 1-66,10-196 -L = 1-45,10-194 -R = 1-51,10-195 +L = 1-45,10-193 +R = 1-51,10-192 An.Up = 1-37,10-4003 An.Down = 1-39,10-4002 An.Left = 1-38,10-4001 From 6e5071a9697bc55ba385245d0e47139bc94cd8f7 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 17 Jul 2023 09:25:40 +0200 Subject: [PATCH 38/51] ES-DE reverted to 2.0 --- net.retrodeck.retrodeck.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 59543eb1..10c28533 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -289,7 +289,7 @@ modules: - type: git url: https://github.com/libgit2/libgit2.git tag: v1.6.3 - + # Needed from ES-DE 2.1.0+ # - name: libpoppler-glib # buildsystem: cmake-ninja @@ -324,8 +324,8 @@ modules: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK v'$(cat ${FLATPAK_DEST}/retrodeck/version)', ES-DE v" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#g' es-app/src/guis/GuiMenu.cpp - #- type: patch - # path: rd-submodules/es-de/es-de-retrodeck-mods.patch + - type: patch + path: rd-submodules/es-de/es-de-retrodeck-mods.patch # ES-DE - END From 8128651b3776bd684efb4456c83cccec393ba4a4 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Mon, 17 Jul 2023 10:07:28 -0400 Subject: [PATCH 39/51] Another attempt at ES-DE 2.1.1 --- net.retrodeck.retrodeck.yml | 28 +-- .../es-de/es-de-2.1-retrodeck-mods.patch | 168 ------------------ .../es-de/es-de-retrodeck-mods.patch | 69 +++---- 3 files changed, 51 insertions(+), 214 deletions(-) delete mode 100644 rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 10c28533..9d00ba11 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -291,19 +291,19 @@ modules: tag: v1.6.3 # Needed from ES-DE 2.1.0+ - # - name: libpoppler-glib - # buildsystem: cmake-ninja - # config-opts: - # - -DENABLE_BOOST=OFF - # sources: - # - type: archive - # url: https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-22.11.0/poppler-poppler-22.11.0.tar.bz2 - # sha256: b8f618d5c62030034d5c8da4d3f6a740260b7620b9a31021679ce1914d327f81 - # cleanup: - # - /lib/pkgconfig - # - /include - # - '*.a' - # - '*.la' + - name: libpoppler-glib + buildsystem: cmake-ninja + config-opts: + - -DENABLE_BOOST=OFF + sources: + - type: archive + url: https://gitlab.freedesktop.org/poppler/poppler/-/archive/poppler-22.11.0/poppler-poppler-22.11.0.tar.bz2 + sha256: b8f618d5c62030034d5c8da4d3f6a740260b7620b9a31021679ce1914d327f81 + cleanup: + - /lib/pkgconfig + - /include + - '*.a' + - '*.la' # When updating this module remember to check those: # https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/unix/es_find_rules.xml @@ -318,7 +318,7 @@ modules: sources: - type: git url: https://gitlab.com/es-de/emulationstation-de - branch: 7a1e420c9df3b801a65e9bcdc0ac92e2d708836e + branch: c78e215d13b02132762b9fbf45ec7b861d50601b - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK diff --git a/rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch b/rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch deleted file mode 100644 index 2a2d01e8..00000000 --- a/rd-submodules/es-de/es-de-2.1-retrodeck-mods.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/es-app/src/guis/GuiMenu.cpp ---- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:44:25.788696841 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:48:23.574196859 -0400 -@@ -10,2 +10,3 @@ - #include "guis/GuiMenu.h" -+#include "utils/PlatformUtil.h" - -@@ -67,2 +68,4 @@ - -+ addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); }); -+ - if (!Settings::getInstance()->getBool("ForceKiosk") && -@@ -70,3 +73,3 @@ - #if defined(__APPLE__) -- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); - #else -@@ -75,3 +78,3 @@ - else -- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); - #endif -@@ -1729,2 +1732,15 @@ - -+void GuiMenu::openRetroDeckConfigurator() -+{ -+ // Launch the configurator.sh script -+ std::string command; -+ std::string startDirectory; -+ bool runInBackground; -+ command = "bash /app/tools/configurator.sh"; -+ startDirectory = "/app/tools"; -+ runInBackground = false; -+ int result = Utils::Platform::launchGameUnix(command, startDirectory, runInBackground); -+ // You can add any checks for the script's outcome here. -+} -+ - void GuiMenu::openQuitMenu() -@@ -1758,3 +1774,3 @@ - auto quitText = std::make_shared( -- "QUIT EMULATIONSTATION", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); -+ "QUIT RETRODECK", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); - quitText->setSelectable(true); -diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de/es-app/src/guis/GuiMenu.h ---- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:44:25.788696841 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:49:05.851991859 -0400 -@@ -46,2 +46,3 @@ - void openOtherOptions(); -+ void openRetroDeckConfigurator(); - void openQuitMenu(); -diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp ---- emulationstation-de/es-app/src/views/ViewController.cpp 2023-07-14 08:44:25.788696841 -0400 -+++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-07-14 08:51:37.107581872 -0400 -@@ -164,9 +164,7 @@ - { -- mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " -- "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE " -- "ITS PATH USING THE BUTTON BELOW. OPTIONALLY THE ROM " -- "DIRECTORY STRUCTURE CAN BE GENERATED WHICH WILL " -- "CREATE A TEXT FILE FOR EACH SYSTEM PROVIDING SOME " -- "INFORMATION SUCH AS THE SUPPORTED FILE EXTENSIONS.\n" -- "THIS IS THE CURRENTLY CONFIGURED ROM DIRECTORY:\n"; -+ mNoGamesErrorMessage = "RETRODECK COULD NOT FIND ANY ROM FILES. " -+ "PLEASE PLACE YOUR ROM FILES INTO THE APPROPRIATE " -+ "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY " -+ "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n" -+ "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n"; - -@@ -179,90 +177,3 @@ - mNoGamesMessageBox = new GuiMsgBox( -- HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", -- [this] { -- std::string currentROMDirectory; --#if defined(_WIN64) -- currentROMDirectory = Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); --#else -- currentROMDirectory = FileData::getROMDirectory(); --#endif -- if (Settings::getInstance()->getBool("VirtualKeyboard")) { -- mWindow->pushGui(new GuiTextEditKeyboardPopup( -- HelpStyle(), 0.0f, "ENTER ROM DIRECTORY PATH", currentROMDirectory, -- [this](const std::string& newROMDirectory) { -- Settings::getInstance()->setString("ROMDirectory", -- Utils::String::trim(newROMDirectory)); -- Settings::getInstance()->saveFile(); --#if defined(_WIN64) -- mRomDirectory = -- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); --#else -- mRomDirectory = FileData::getROMDirectory(); --#endif -- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "ROM DIRECTORY SETTING SAVED, RESTART\n" -- "THE APPLICATION TO RESCAN THE SYSTEMS", -- "OK", nullptr, "", nullptr, "", nullptr, -- true, true)); -- }, -- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", -- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", -- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)")); -- } -- else { -- mWindow->pushGui(new GuiTextEditPopup( -- HelpStyle(), "ENTER ROM DIRECTORY PATH", currentROMDirectory, -- [this](const std::string& newROMDirectory) { -- Settings::getInstance()->setString("ROMDirectory", -- Utils::String::trim(newROMDirectory)); -- Settings::getInstance()->saveFile(); --#if defined(_WIN64) -- mRomDirectory = -- Utils::String::replace(FileData::getROMDirectory(), "/", "\\"); --#else -- mRomDirectory = FileData::getROMDirectory(); --#endif -- mNoGamesMessageBox->changeText(mNoGamesErrorMessage + mRomDirectory); -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "ROM DIRECTORY SETTING SAVED, RESTART\n" -- "THE APPLICATION TO RESCAN THE SYSTEMS", -- "OK", nullptr, "", nullptr, "", nullptr, -- true)); -- }, -- false, "SAVE", "SAVE CHANGES?", "Currently configured path:", -- currentROMDirectory, "LOAD CURRENTLY CONFIGURED PATH", -- "CLEAR (LEAVE BLANK TO RESET TO DEFAULT PATH)")); -- } -- }, -- "CREATE DIRECTORIES", -- [this] { -- mWindow->pushGui(new GuiMsgBox( -- HelpStyle(), -- "THIS WILL CREATE DIRECTORIES FOR ALL THE\n" -- "GAME SYSTEMS DEFINED IN es_systems.xml\n\n" -- "THIS MAY CREATE A LOT OF FOLDERS SO IT'S\n" -- "ADVICED TO REMOVE THE ONES YOU DON'T NEED\n\n" -- "PROCEED?", -- "YES", -- [this] { -- if (!SystemData::createSystemDirectories()) { -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "THE SYSTEM DIRECTORIES WERE SUCCESSFULLY\n" -- "GENERATED, EXIT THE APPLICATION AND PLACE\n" -- "YOUR GAMES IN THE NEWLY CREATED FOLDERS", -- "OK", nullptr, "", nullptr, "", nullptr, -- true)); -- } -- else { -- mWindow->pushGui(new GuiMsgBox(HelpStyle(), -- "ERROR CREATING THE SYSTEM DIRECTORIES,\n" -- "PERMISSION PROBLEMS OR DISK FULL?\n\n" -- "SEE THE LOG FILE FOR MORE DETAILS", -- "OK", nullptr, "", nullptr, "", nullptr, -- true)); -- } -- }, -- "NO", nullptr, "", nullptr, true)); -- }, -- "QUIT", -+ HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", - [] { -diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp ---- emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:44:25.805371841 -0400 -+++ emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:52:32.335181878 -0400 -@@ -165,3 +165,3 @@ - progressBarRect.barPosY = mSplashTextPositions.y + (progressBarRect.barHeight * 2.0f); -- progressBarRect.color = 0x777777FF; -+ progressBarRect.color = 0xC858E6FF; - mProgressBarRectangles.emplace_back(progressBarRect); diff --git a/rd-submodules/es-de/es-de-retrodeck-mods.patch b/rd-submodules/es-de/es-de-retrodeck-mods.patch index 8b3f5db4..fd17ccf9 100644 --- a/rd-submodules/es-de/es-de-retrodeck-mods.patch +++ b/rd-submodules/es-de/es-de-retrodeck-mods.patch @@ -1,27 +1,27 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/es-app/src/guis/GuiMenu.cpp ---- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-04-12 09:08:12.394935336 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-04-12 16:25:04.618753274 -0400 +--- emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:44:25.788696841 -0400 ++++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-07-14 08:48:23.574196859 -0400 @@ -10,2 +10,3 @@ #include "guis/GuiMenu.h" +#include "utils/PlatformUtil.h" - -@@ -66,2 +67,4 @@ - -+ addEntry("RETRODECK CONFIGURATOR", 0x777777FF, false, [this] { openRetroDeckConfigurator(); }); + +@@ -67,2 +68,4 @@ + ++ addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); }); + if (!Settings::getInstance()->getBool("ForceKiosk") && -@@ -69,3 +72,3 @@ +@@ -70,3 +73,3 @@ #if defined(__APPLE__) -- addEntry("QUIT EMULATIONSTATION", 0x777777FF, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); }); +- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); ++ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); #else -@@ -74,3 +77,3 @@ +@@ -75,3 +78,3 @@ else -- addEntry("QUIT EMULATIONSTATION", 0x777777FF, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); }); +- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); ++ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); #endif -@@ -1704,2 +1707,15 @@ - +@@ -1729,2 +1732,15 @@ + +void GuiMenu::openRetroDeckConfigurator() +{ + // Launch the configurator.sh script @@ -36,22 +36,22 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de/e +} + void GuiMenu::openQuitMenu() -@@ -1732,3 +1748,3 @@ - }); -- auto quitText = std::make_shared("QUIT EMULATIONSTATION", -+ auto quitText = std::make_shared("QUIT RETRODECK", - Font::get(FONT_SIZE_MEDIUM), 0x777777FF); +@@ -1758,3 +1774,3 @@ + auto quitText = std::make_shared( +- "QUIT EMULATIONSTATION", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); ++ "QUIT RETRODECK", Font::get(FONT_SIZE_MEDIUM), mMenuColorPrimary); + quitText->setSelectable(true); diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.h emulationstation-de/es-app/src/guis/GuiMenu.h ---- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-04-12 09:08:12.394935336 -0400 -+++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-04-12 09:33:25.023871033 -0400 +--- emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:44:25.788696841 -0400 ++++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-07-14 08:49:05.851991859 -0400 @@ -46,2 +46,3 @@ void openOtherOptions(); + void openRetroDeckConfigurator(); void openQuitMenu(); diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstation-de/es-app/src/views/ViewController.cpp ---- emulationstation-de/es-app/src/views/ViewController.cpp 2023-06-26 09:37:59.297437013 -0400 -+++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-06-26 09:38:18.410322017 -0400 -@@ -85,9 +85,7 @@ +--- emulationstation-de/es-app/src/views/ViewController.cpp 2023-07-14 08:44:25.788696841 -0400 ++++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-07-17 09:58:26.862373622 -0400 +@@ -164,9 +164,7 @@ { - mNoGamesErrorMessage = "NO GAME FILES WERE FOUND. EITHER PLACE YOUR GAMES IN " - "THE CURRENTLY CONFIGURED ROM DIRECTORY OR CHANGE " @@ -65,8 +65,8 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat + "SYSTEM SUBFOLDER IN THE CONFIGURED ROM DIRECTORY " + "AND RUN RETRODECK AGAIN TO SCAN YOUR LIBRARY.\n" + "THE CURRENTLY CONFIGURED ROM DIRECTORY IS:\n"; - -@@ -100,90 +98,3 @@ + +@@ -179,90 +177,3 @@ mNoGamesMessageBox = new GuiMsgBox( - HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "CHANGE ROM DIRECTORY", - [this] { @@ -158,11 +158,16 @@ diff -au1r emulationstation-de/es-app/src/views/ViewController.cpp emulationstat - "QUIT", + HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", [] { +@@ -272,3 +183,3 @@ + }, +- true, false, ++ "", nullptr, "", nullptr, true, false, + (mRenderer->getIsVerticalOrientation() ? diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp ---- emulationstation-de/es-core/src/Window.cpp 2023-04-12 09:08:12.398268670 -0400 -+++ emulationstation-de/es-core/src/Window.cpp 2023-04-14 11:03:48.261309278 -0400 -@@ -179,3 +179,3 @@ - progressBarRect.barPosY += borderThickness; -- progressBarRect.color = 0x79010FFF; +--- emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:44:25.805371841 -0400 ++++ emulationstation-de/es-core/src/Window.cpp 2023-07-14 08:52:32.335181878 -0400 +@@ -165,3 +165,3 @@ + progressBarRect.barPosY = mSplashTextPositions.y + (progressBarRect.barHeight * 2.0f); +- progressBarRect.color = 0x777777FF; + progressBarRect.color = 0xC858E6FF; - mProgressBarRectangles.emplace_back(progressBarRect); \ No newline at end of file + mProgressBarRectangles.emplace_back(progressBarRect); From 81fc7d1c1b355f3b23544db1a4a99d6bdb3e6c2d Mon Sep 17 00:00:00 2001 From: icenine451 Date: Mon, 24 Jul 2023 15:30:37 -0400 Subject: [PATCH 40/51] Rebind L/R in PPSSPP on update. --- functions/post_update.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/functions/post_update.sh b/functions/post_update.sh index 621fd89b..c65bd9f2 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -222,6 +222,12 @@ post_update() { prepare_emulator "reset" "all" fi fi + if [[ $prev_version -le "071" ]]; then + # In version 0.7.1b, the following changes were made that required config file updates/reset or other changes to the filesystem: + # - Force update PPSSPP standalone keybinds for L/R. + set_setting_value "$ppssppcontrolsconf" "L" "1-45,10-193" "ppsspp" "ControlMapping" + set_setting_value "$ppssppcontrolsconf" "R" "1-51,10-192" "ppsspp" "ControlMapping" + fi # The following commands are run every time. From a4398bc05ecc813b91704dcaa41de987275d12ba Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 14 Aug 2023 11:11:11 +0200 Subject: [PATCH 41/51] Removed notification when swapping controller preset --- .../retrodeck/RetroDECK_controller_config.vdf | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf b/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf index 7a85eaf4..75df14b9 100644 --- a/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf +++ b/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf @@ -7997,7 +7997,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -8077,7 +8077,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } "settings" { @@ -8097,7 +8097,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } } } @@ -8162,7 +8162,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -8242,7 +8242,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } "settings" { @@ -8262,7 +8262,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } } } @@ -8459,7 +8459,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -8539,7 +8539,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } "settings" { @@ -8559,7 +8559,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } } } @@ -8624,7 +8624,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -8704,7 +8704,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } "settings" { @@ -8724,7 +8724,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } } } @@ -8789,7 +8789,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -8869,7 +8869,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } "settings" { @@ -8889,7 +8889,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } } } @@ -8954,7 +8954,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -9034,7 +9034,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } "settings" { @@ -9054,7 +9054,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } } } @@ -9119,7 +9119,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -9199,7 +9199,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } "settings" { @@ -9219,7 +9219,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } } } @@ -9284,7 +9284,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -9364,7 +9364,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } "settings" { @@ -9384,7 +9384,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } } } @@ -9449,7 +9449,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -9529,7 +9529,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } "settings" { @@ -9549,7 +9549,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } } } @@ -9614,7 +9614,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -9694,7 +9694,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } "settings" { @@ -9714,7 +9714,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } } } @@ -9779,7 +9779,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -9859,7 +9859,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } "settings" { @@ -9879,7 +9879,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } } } @@ -9944,7 +9944,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -10024,7 +10024,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } "settings" { @@ -10044,7 +10044,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } } } @@ -10109,7 +10109,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -10189,7 +10189,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } "settings" { @@ -10209,7 +10209,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } } } @@ -10274,7 +10274,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -10354,7 +10354,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } "settings" { @@ -10374,7 +10374,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } } } @@ -10439,7 +10439,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, , " } } } @@ -10519,7 +10519,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } "settings" { @@ -10539,7 +10539,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 2 1 1, Hotkey, , " + "binding" "controller_action CHANGE_PRESET 2 0 1, Hotkey, , " } } } From fa37c0dbcee024a2f2b542106b40a950c451be6f Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 14 Aug 2023 11:13:45 +0200 Subject: [PATCH 42/51] YUZU: updated to mainline-0-1522 --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 9d00ba11..8cbc799c 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -582,7 +582,7 @@ modules: - ln -s "${FLATPAK_DEST}/yuzu/usr/bin/yuzu" "${FLATPAK_DEST}/bin/yuzu" sources: - type: file - url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1495/yuzu-mainline-20230713-523db3ac6.AppImage + url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1522/yuzu-mainline-20230813-3ea669b08.AppImage sha256: 1eb43101835c37888f427efa94f0c2e9b8ebfd3181f480fa914fd15041dc4c2f # Yuzu - END From 5d30410cdca17ff5724c9f8ded798dfdaeb1e99c Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 14 Aug 2023 11:18:00 +0200 Subject: [PATCH 43/51] PCSX2: updated to v1.7.4916 --- net.retrodeck.retrodeck.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 8cbc799c..b15ad68e 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -648,15 +648,15 @@ modules: - ln -s "${FLATPAK_DEST}/pcsx2-qt/usr/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt" sources: - type: file - url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.4729/pcsx2-v1.7.4729-linux-appimage-x64-Qt.AppImage - sha256: 2e0571926ac6253b7ebaea45c36b3ebd19c2923075c3e76c6b4936c0190867e4 + url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.4916/pcsx2-v1.7.4916-linux-appimage-x64-Qt.AppImage + sha256: 870a9d198d5f05a1ecf3e98110fe24beacf72eb45077ee31d1200c36930b3d9c # PCSX2 - END # Dolphin - START + # DO NOT UPDATE! WENT ON QT6 # https://github.com/flathub/org.DolphinEmu.dolphin-emu # WHEN UPADTING: remember to update rd-submodules/dolphin contents - # NOTE: this is the last QT5 build, do not update until we don't fully switch to QT6! # needed for the emulate bluetooth adapter feature to work - name: bluez From 19e8b3582b658d892d8ff94c7f1ae32c0f805f5c Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 14 Aug 2023 11:22:03 +0200 Subject: [PATCH 44/51] RPCS3: updated --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index b15ad68e..3f1ce450 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -924,7 +924,7 @@ modules: sources: - type: git url: https://github.com/RPCS3/rpcs3.git - commit: a828c214b5c0b87b81fcd13ff3c1e952c9a5d6dd + commit: 0e23b89352b52c703a94a79c4ee22722870a1f5e # RPCS3 - END From 73ac7a49f21bea3333de6a634f6524afd7dbdcf7 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 14 Aug 2023 11:24:59 +0200 Subject: [PATCH 45/51] GLSSLANG: updated to 12.3.1 for Cemu --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 3f1ce450..71f117ed 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -219,8 +219,8 @@ modules: - /lib/cmake sources: - type: archive - url: https://github.com/KhronosGroup/glslang/archive/12.1.0.tar.gz - sha256: 1515e840881d1128fb6d831308433f731808f818f2103881162f3ffd47b15cd5 + url: https://github.com/KhronosGroup/glslang/archive/12.3.1.tar.gz + sha256: a57836a583b3044087ac51bb0d5d2d803ff84591d55f89087fc29ace42a8b9a8 x-checker-data: type: anitya stable-only: true From 91cf39a8b44ebefb3144e2a930fcd9e5b3c65647 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 14 Aug 2023 11:34:00 +0200 Subject: [PATCH 46/51] CMEU: updated to 2.0-46 --- net.retrodeck.retrodeck.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 71f117ed..56772e85 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1113,8 +1113,8 @@ modules: x-checker-data: type: git tag-pattern: ^v([\d.]+-\d+)$ - tag: v2.0-44 - commit: f1c200a01675714e51548137f2365ab2a1a9977b + tag: v2.0-46 + commit: a17111e6b0e4802044c90f4bedd66478de689070 - type: shell commands: - sed "s/set(EXPERIMENTAL_VERSION.*/set(EXPERIMENTAL_VERSION \"$(git describe From 5da7c61e3d0783229295388de7220f0fb0a21832 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 14 Aug 2023 11:35:30 +0200 Subject: [PATCH 47/51] Added XDG config RO permission to fix some issue in dark themes (from CEMU) --- net.retrodeck.retrodeck.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 56772e85..23ea1ea8 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -24,6 +24,7 @@ finish-args: - --talk-name=org.freedesktop.login1.Manager - --talk-name=org.freedesktop.portal.Flatpak.UpdateMonitor - --filesystem=xdg-run/app/com.discordapp.Discord:create + - --filesystem=xdg-config/gtk-3.0:ro # Dolphin - --allow=bluetooth # PPSSPP From 44d83fb464410bb043b96975248b4b9a9f9cfeaa Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 14 Aug 2023 11:50:07 +0200 Subject: [PATCH 48/51] YUZU: fixed sha --- net.retrodeck.retrodeck.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 23ea1ea8..934d6ecf 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -584,7 +584,7 @@ modules: sources: - type: file url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1522/yuzu-mainline-20230813-3ea669b08.AppImage - sha256: 1eb43101835c37888f427efa94f0c2e9b8ebfd3181f480fa914fd15041dc4c2f + sha256: d1c5217f96c7ce66b6ebc8db835daad801de7e8ca7df1c35ae62920aa55c04da # Yuzu - END From a73da3bfefffa43ed7b7922433ea5507c4b6dea4 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 14 Aug 2023 13:42:31 +0200 Subject: [PATCH 49/51] RPCS3: reverted as it moved to QT6 --- net.retrodeck.retrodeck.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 934d6ecf..d7f79d87 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -876,6 +876,7 @@ modules: # MELONDS - END # RPCS3 - START + # DO NOT UPDATE! WENT ON QT6 # https://github.com/flathub/net.rpcs3.RPCS3 # glu issue, check libglu module for more info @@ -925,7 +926,7 @@ modules: sources: - type: git url: https://github.com/RPCS3/rpcs3.git - commit: 0e23b89352b52c703a94a79c4ee22722870a1f5e + commit: a828c214b5c0b87b81fcd13ff3c1e952c9a5d6dd # RPCS3 - END From 2fcb114eed9461ce47f9aefb7ba1cc0b3293eb25 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 14 Aug 2023 22:20:12 +0200 Subject: [PATCH 50/51] Updated controller template --- .../retrodeck/RetroDECK_controller_config.vdf | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf b/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf index 75df14b9..8de2683f 100644 --- a/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf +++ b/emu-configs/defaults/retrodeck/RetroDECK_controller_config.vdf @@ -1,7 +1,7 @@ "controller_mappings" { "version" "3" - "revision" "1702" + "revision" "1706" "title" "RetroDECK: Official Layout - v0.7.1b" "description" "The Official RetroDECK Layout" "creator" "" @@ -12,7 +12,7 @@ "controller_caps" "23117823" "major_revision" "0" "minor_revision" "0" - "Timestamp" "-1030266496" + "Timestamp" "-918096944" "actions" { "Default" @@ -1107,7 +1107,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 14 1 1, RetroDECK, RD-icon_circle_2_180x180.png, " + "binding" "controller_action CHANGE_PRESET 14 0 1, RetroDECK, RD-icon_circle_2_180x180.png, " } } } @@ -1123,7 +1123,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 3 1 1, Quick, RD-org.xfce.session.png, #232323 #FFFFFF" + "binding" "controller_action CHANGE_PRESET 3 0 1, Quick, RD-org.xfce.session.png, " } } } @@ -1139,7 +1139,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 4 1 1, State, RD-folder-blue-games.png, " + "binding" "controller_action CHANGE_PRESET 4 0 1, State, RD-folder-blue-games.png, " } } } @@ -1155,7 +1155,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 5 1 1, Speed & Frames, RD-supertuxkart.png, " + "binding" "controller_action CHANGE_PRESET 5 0 1, Speed & Frames, RD-supertuxkart.png, " } } } @@ -1171,7 +1171,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 6 1 1, Display & Graphics, RD-preferences-desktop-display.png, " + "binding" "controller_action CHANGE_PRESET 6 0 1, Display & Graphics, RD-preferences-desktop-display.png, " } } } @@ -1187,7 +1187,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 7 1 1, General, RD-io.github.antimicrox.antimicrox.png, " + "binding" "controller_action CHANGE_PRESET 7 0 1, General, RD-io.github.antimicrox.antimicrox.png, " } } } @@ -1203,7 +1203,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 9 1 1, Specific, RD-folder-applications.png, " + "binding" "controller_action CHANGE_PRESET 9 0 1, Specific, RD-folder-applications.png, " } } } @@ -1219,7 +1219,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 8 1 1, Steam Deck, RD-steam.png, " + "binding" "controller_action CHANGE_PRESET 8 0 1, Steam Deck, RD-steam.png, " } } } @@ -1448,7 +1448,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, #232323 #FFFFFF" + "binding" "controller_action CHANGE_PRESET 1 0 1, Back, RD-edit-undo-red.png, #232323 #FFFFFF" } } } @@ -1731,7 +1731,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, " + "binding" "controller_action CHANGE_PRESET 1 0 1, Back, RD-edit-undo-red.png, " } } } @@ -2196,7 +2196,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, " + "binding" "controller_action CHANGE_PRESET 1 0 1, Back, RD-edit-undo-red.png, " } } } @@ -2678,7 +2678,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, " + "binding" "controller_action CHANGE_PRESET 1 0 1, Back, RD-edit-undo-red.png, " } } } @@ -3143,7 +3143,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, " + "binding" "controller_action CHANGE_PRESET 1 0 1, Back, RD-edit-undo-red.png, " } } } @@ -3659,7 +3659,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, " + "binding" "controller_action CHANGE_PRESET 1 0 1, Back, RD-edit-undo-red.png, " } } } @@ -4135,7 +4135,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, " + "binding" "controller_action CHANGE_PRESET 1 0 1, Back, RD-edit-undo-red.png, " } } } @@ -4151,7 +4151,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 10 1 1, MAME, RD-mame.png, " + "binding" "controller_action CHANGE_PRESET 10 0 1, MAME, RD-mame.png, " } } } @@ -4167,7 +4167,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 11 1 1, RetroArch, RD-retroarch.png, " + "binding" "controller_action CHANGE_PRESET 11 0 1, RetroArch, RD-retroarch.png, " } } } @@ -4183,7 +4183,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 12 1 1, Gamecube & Wii, RD-dolphin.png, " + "binding" "controller_action CHANGE_PRESET 12 0 1, Gamecube & Wii, RD-dolphin.png, " } } } @@ -4199,7 +4199,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 13 1 1, NDS, RD-melonds.png, " + "binding" "controller_action CHANGE_PRESET 13 0 1, NDS, RD-melonds.png, " } } } @@ -4215,7 +4215,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 15 1 1, 3DS, RD-citra.png, " + "binding" "controller_action CHANGE_PRESET 15 0 1, 3DS, RD-citra.png, " } } } @@ -4231,7 +4231,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 16 1 1, Switch, RD-ryujinx.png, " + "binding" "controller_action CHANGE_PRESET 16 0 1, Switch, RD-ryujinx.png, " } } } @@ -4594,7 +4594,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo-red.png, " + "binding" "controller_action CHANGE_PRESET 9 0 1, Back, RD-edit-undo-red.png, " } } } @@ -5002,7 +5002,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo-red.png, " + "binding" "controller_action CHANGE_PRESET 9 0 1, Back, RD-edit-undo-red.png, " } } } @@ -5524,7 +5524,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo-red.png, " + "binding" "controller_action CHANGE_PRESET 9 0 1, Back, RD-edit-undo-red.png, " } } } @@ -5989,7 +5989,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo-red.png, " + "binding" "controller_action CHANGE_PRESET 9 0 1, Back, RD-edit-undo-red.png, " } } } @@ -6540,7 +6540,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, " + "binding" "controller_action CHANGE_PRESET 1 0 1, Back, RD-edit-undo-red.png, " } } } @@ -7064,7 +7064,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo-red.png, " + "binding" "controller_action CHANGE_PRESET 9 0 1, Back, RD-edit-undo-red.png, " } } } @@ -7461,7 +7461,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo-red.png, " + "binding" "controller_action CHANGE_PRESET 9 0 1, Back, RD-edit-undo-red.png, " } } } @@ -8321,7 +8321,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 1 1, , " + "binding" "controller_action CHANGE_PRESET 1 0 1, , " } } "Full_Press" @@ -8378,7 +8378,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 1 1, , " + "binding" "controller_action CHANGE_PRESET 1 0 1, , " } } } @@ -8394,7 +8394,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 1 1 1, , " + "binding" "controller_action CHANGE_PRESET 1 0 1, , " } } } @@ -10879,4 +10879,4 @@ "left_trackpad_mode" "0" "right_trackpad_mode" "0" } -} \ No newline at end of file +} From f22092722742b59df698bfc75046c61fe2761a52 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Thu, 17 Aug 2023 13:38:18 -0400 Subject: [PATCH 51/51] Corrections to backup function --- functions/functions.sh | 1 + functions/global.sh | 12 +++++++----- tools/configurator.sh | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/functions/functions.sh b/functions/functions.sh index 0dade626..7bcc6499 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -261,6 +261,7 @@ update_rpcs3_firmware() { } backup_retrodeck_userdata() { + mkdir -p "$backups_folder" zip -rq9 "$backups_folder/$(date +"%0m%0d")_retrodeck_userdata.zip" "$saves_folder" "$states_folder" "$bios_folder" "$media_folder" "$themes_folder" "$logs_folder" "$screenshots_folder" "$mods_folder" "$texture_packs_folder" "$borders_folder" > $logs_folder/$(date +"%0m%0d")_backup_log.log } diff --git a/functions/global.sh b/functions/global.sh index 58223622..93dbb93c 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -28,18 +28,16 @@ finit_options_list="$emuconfigs/defaults/retrodeck/reference_lists/finit_options splashscreen_dir="/var/config/emulationstation/.emulationstation/resources/graphics/extra_splashes" # The default location of extra splash screens current_splash_file="/var/config/emulationstation/.emulationstation/resources/graphics/splash.svg" # The active splash file that will be shown on boot default_splash_file="/var/config/emulationstation/.emulationstation/resources/graphics/splash-orig.svg" # The default RetroDECK splash screen -multi_user_data_folder="$rdhome/multi-user-data" # The default location of multi-user environment profiles multi_user_emulator_config_dirs="$emuconfigs/defaults/retrodeck/reference_lists/multi_user_emulator_config_dirs.cfg" # A list of emulator config folders that can be safely linked/unlinked entirely in multi-user mode -backups_folder="$rdhome/backups" # A standard location for backup file storage rd_es_themes="/app/share/emulationstation/themes" # The directory where themes packaged with RetroDECK are stored lockfile="/var/config/retrodeck/.lock" # where the lockfile is located default_sd="/run/media/mmcblk0p1" # Steam Deck SD default path hard_version="$(cat '/app/retrodeck/version')" # hardcoded version (in the readonly filesystem) rd_repo="https://github.com/XargonWan/RetroDECK" # The URL of the main RetroDECK GitHub repo es_themes_list="https://gitlab.com/es-de/themes/themes-list/-/raw/master/themes.json" # The URL of the ES-DE 2.0 themes list -remote_network_target_1="https://flathub.org" # The URL of a common internet target for testing network access -remote_network_target_2="$rd_repo" # The URL of a common internet target for testing network access -remote_network_target_3="https://one.one.one.one" # The URL of a common internet target for testing network access +remote_network_target_1="https://flathub.org" # The URL of a common internet target for testing network access +remote_network_target_2="$rd_repo" # The URL of a common internet target for testing network access +remote_network_target_3="https://one.one.one.one" # The URL of a common internet target for testing network access helper_files_folder="$emuconfigs/defaults/retrodeck/helper_files" # The parent folder of RetroDECK documentation files for deployment helper_files_list="$emuconfigs/defaults/retrodeck/reference_lists/helper_files_list.cfg" # The list of files to be deployed and where they go rd_appdata="/app/share/appdata/net.retrodeck.retrodeck.appdata.xml" # The shipped appdata XML file for this version @@ -174,4 +172,8 @@ else prepare_emulator "all" "postmove" conf_write fi + + # Static variables dependent on $rd_conf values, need to be set after reading $rd_conf + backups_folder="$rdhome/backups" # A standard location for backup file storage + multi_user_data_folder="$rdhome/multi-user-data" # The default location of multi-user environment profiles fi diff --git a/tools/configurator.sh b/tools/configurator.sh index dc9dd210..175a7174 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -879,7 +879,7 @@ configurator_retrodeck_troubleshooting_dialog() { --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Configurator Utility - Backup in Progress" \ --text="Backing up RetroDECK userdata, please wait..." - if [[ -f $backups_folder/$(date +"%0m%0d")_retrodeck_userdata.zip ]]; then + if [[ -f "$backups_folder/$(date +"%0m%0d")_retrodeck_userdata.zip" ]]; then configurator_generic_dialog "RetroDECK Configurator - Backup: RetroDECK Userdata" "The backup process is now complete." else configurator_generic_dialog "RetroDECK Configurator - Backup: RetroDECK Userdata" "The backup process could not be completed,\nplease check the logs folder for more information."