From f1657ba737631fef402c899b3c6d62532db196a1 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 16 Jan 2024 14:08:12 +0100 Subject: [PATCH 01/81] RYUJINX: re-added --- net.retrodeck.retrodeck.yml | 17 +++++++++++++++++ old/removed-modules.yml | 19 +------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 62c2b843..1cd5586f 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1334,6 +1334,23 @@ modules: # MAME - End + # Ryujinx Appimage - START + # https://ryujinx.org/download + + - name: Ryujinx + buildsystem: simple + build-commands: + - | + tar -zxvf ryujinx-1.1.685-linux_x64.tar.gz + mv -v publish ${FLATPAK_DEST}/ryujinx + ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx + sources: + - type: file + url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1111/ryujinx-1.1.1111-linux_x64.tar.gz + sha256: 612dd28c38e5f8657da0f1b3f54385ffbb304053bca7c9d8de027242b0c9f946 + + # Ryujinx Appimage - END + # External manifests end - name: retrodeck diff --git a/old/removed-modules.yml b/old/removed-modules.yml index 43d5cab3..04274441 100644 --- a/old/removed-modules.yml +++ b/old/removed-modules.yml @@ -112,24 +112,7 @@ # Duckstation-DontUpdate - END - # Ryujinx Appimage - START - # https://ryujinx.org/download - - # - name: Ryujinx - # buildsystem: simple - # build-commands: - # - | - # tar -zxvf ryujinx-1.1.685-linux_x64.tar.gz - # mv -v publish ${FLATPAK_DEST}/ryujinx - # ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx - # sources: - # - type: file - # url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.685/ryujinx-1.1.685-linux_x64.tar.gz - # sha256: bc4d7076106d7aa59c3a3ea22b83c553e5fa1a897815831adcf18cc13d729e15 - - # Ryujinx Appimage - END - - # Ryujinx - START + # Ryujinx - START # https://github.com/flathub/org.ryujinx.Ryujinx - name: Ryujinx From 56edb70232f0411dd0bf3274a32bef56f3c41970 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 17 Jan 2024 08:27:05 +0100 Subject: [PATCH 02/81] RYUJINX: fixed wrong tar command --- 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 1cd5586f..6dfd2de5 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1341,7 +1341,7 @@ modules: buildsystem: simple build-commands: - | - tar -zxvf ryujinx-1.1.685-linux_x64.tar.gz + tar -zxvf ryujinx-*-linux_x64.tar.gz mv -v publish ${FLATPAK_DEST}/ryujinx ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx sources: From b46fd7d26f13272a90535cd6cd198a3727feaa5b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 30 Jan 2024 14:52:22 +0100 Subject: [PATCH 03/81] RYUJINX: updated --- 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 125b31ba..34e15200 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1316,13 +1316,13 @@ modules: buildsystem: simple build-commands: - | - tar -zxvf ryujinx-*-linux_x64.tar.gz + tar -zxvf *.tar.gz mv -v publish ${FLATPAK_DEST}/ryujinx ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx sources: - type: file - url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1111/ryujinx-1.1.1111-linux_x64.tar.gz - sha256: 612dd28c38e5f8657da0f1b3f54385ffbb304053bca7c9d8de027242b0c9f946 + url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1151/ryujinx-1.1.1151-linux_x64.tar.gz + sha256: 34ac1d2fae46dc63cf7bdd0dfd9c819e6a4efec9aba35ee4d0f98fce63e49faa # Ryujinx Appimage - END From d00ab922feb26e2c2c71599b2189e048fa383232 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 5 Feb 2024 09:35:56 +0100 Subject: [PATCH 04/81] RYUJINX: updated to 1.1.1159 --- 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 34e15200..27b52a61 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1321,8 +1321,8 @@ modules: ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx sources: - type: file - url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1151/ryujinx-1.1.1151-linux_x64.tar.gz - sha256: 34ac1d2fae46dc63cf7bdd0dfd9c819e6a4efec9aba35ee4d0f98fce63e49faa + url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1159/ryujinx-1.1.1159-linux_x64.tar.gz + sha256: 5f2354ae6b1c982f4f2ea4734c1320ce32dca2badb8c1f6e4216353f54faaa94 # Ryujinx Appimage - END From 3af92ed71a323b3a1bfaeeacfc918ee9e0a60058 Mon Sep 17 00:00:00 2001 From: icenine451 Date: Tue, 6 Feb 2024 10:18:58 -0500 Subject: [PATCH 05/81] Add z64, ngc and pce compression targets --- .../defaults/retrodeck/reference_lists/compression_targets.cfg | 1 + .../retrodeck/reference_lists/zip_compressable_extensions.cfg | 3 +++ 2 files changed, 4 insertions(+) diff --git a/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg b/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg index d1d7d923..4ae00365 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/compression_targets.cfg @@ -40,3 +40,4 @@ sega32xjp sega32xna snes snesna +tg16 diff --git a/emu-configs/defaults/retrodeck/reference_lists/zip_compressable_extensions.cfg b/emu-configs/defaults/retrodeck/reference_lists/zip_compressable_extensions.cfg index 585e7584..72966ab7 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/zip_compressable_extensions.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/zip_compressable_extensions.cfg @@ -40,7 +40,9 @@ .msa .nds .nes +.ngc .o +.pce .prg .rom .sfc @@ -58,3 +60,4 @@ .unif .xex .xfd +.z64 From c9f62cddb3e61c89b0f3ef619f606b300f3f74e5 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 13 Feb 2024 11:10:10 +0100 Subject: [PATCH 06/81] RYUJINX: 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 27b52a61..d799f3a3 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1321,7 +1321,7 @@ modules: ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx sources: - type: file - url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1159/ryujinx-1.1.1159-linux_x64.tar.gz + url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1192/ryujinx-1.1.1192-linux_x64.tar.gz sha256: 5f2354ae6b1c982f4f2ea4734c1320ce32dca2badb8c1f6e4216353f54faaa94 # Ryujinx Appimage - END From 55c359987499b733e84042aeb147ebead4359e7a Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 13 Feb 2024 12:18:48 +0100 Subject: [PATCH 07/81] RYUJINX: 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 d799f3a3..0062f4a5 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1322,7 +1322,7 @@ modules: sources: - type: file url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1192/ryujinx-1.1.1192-linux_x64.tar.gz - sha256: 5f2354ae6b1c982f4f2ea4734c1320ce32dca2badb8c1f6e4216353f54faaa94 + sha256: 41716233f5745a7df1e411af6bac9d828f0b6b6feb63b5ef87445b81b01dee54 # Ryujinx Appimage - END From 46b9922a98728006ceb46b547cb03e3cd517e7a2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 14 Feb 2024 00:05:03 +0100 Subject: [PATCH 08/81] Triggering build From db3aab771fc25f67b824e7545dde797245636c49 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 14 Feb 2024 09:30:26 +0100 Subject: [PATCH 09/81] RYUJINX: added reset to cli and Configurator --- retrodeck.sh | 4 ++-- tools/configurator.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/retrodeck.sh b/retrodeck.sh index edb0241a..e95920cc 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -57,9 +57,9 @@ https://retrodeck.net ;; --reset-component*) echo "You are about to reset one or more RetroDECK components or emulators." - echo "Available options are: es-de, retroarch, cemu, citra, dolphin, duckstation, melonds, pcsx3, pico8, ppsspp, primehack, rpcs3, xemu, yuzu, vita3k, mame, gzdoom, boilr, all" + echo "Available options are: es-de, retroarch, cemu, citra, dolphin, duckstation, melonds, pcsx3, pico8, ppsspp, primehack, rpcs3, ryujinx, xemu, yuzu, vita3k, mame, gzdoom, boilr, all" read -p "Please enter the component you would like to reset: " component - if [[ "$component" =~ ^(es-de | retroarch | cemu | citra | dolphin | duckstation | melonds | pcsx3 | pico8 | ppsspp | primehack | rpcs3 | xemu | yuzu | vita3k | mame | gzdoom | boilr | all)$ ]]; then + if [[ "$component" =~ ^(es-de | retroarch | cemu | citra | dolphin | duckstation | melonds | pcsx3 | pico8 | ppsspp | primehack | rpcs3 | ryujinx | xemu | yuzu | vita3k | mame | gzdoom | boilr | all)$ ]]; then read -p "You are about to reset $component to default settings. Enter 'y' to continue, 'n' to stop: " response if [[ $response == [yY] ]]; then prepare_component "reset" "$component" "cli" diff --git a/tools/configurator.sh b/tools/configurator.sh index 196befb2..fa86cc08 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -1009,6 +1009,7 @@ configurator_reset_dialog() { "PPSSPP" "Reset the PSP emulator PPSSPP to default settings" \ "Primehack" "Reset the Metroid Prime emulator Primehack to default settings" \ "RPCS3" "Reset the PS3 emulator RPCS3 to default settings" \ + "Ryujinx" "Reset the Switch emulator Ryujinx to default settings" \ "Vita3k" "Reset the PS Vita emulator Vita3k to default settings" \ "XEMU" "Reset the XBOX emulator XEMU to default settings" \ "Yuzu" "Reset the Switch emulator Yuzu to default settings" ) From 29da4eef21c530ca50ca6e18c5d61b109aec4d89 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 14 Feb 2024 10:47:39 +0100 Subject: [PATCH 10/81] RYUJINX: fixed config file substitutions --- functions/prepare_component.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 510f2985..e8cac45c 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -549,14 +549,14 @@ prepare_component() { rm -rf "$multi_user_data_folder/$SteamAppUser/config/Ryujinx" mkdir -p "$multi_user_data_folder/$SteamAppUser/config/Ryujinx/system" cp -fv $emuconfigs/ryujinx/* "$multi_user_data_folder/$SteamAppUser/config/Ryujinx" - sed -i 's#/home/deck/retrodeck#'$rdhome'#g' "$multi_user_data_folder/$SteamAppUser/config/Ryujinx/Config.json" + sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "$multi_user_data_folder/$SteamAppUser/config/Ryujinx/Config.json" dir_prep "$multi_user_data_folder/$SteamAppUser/config/Ryujinx" "/var/config/Ryujinx" else # removing config directory to wipe legacy files rm -rf /var/config/Ryujinx mkdir -p /var/config/Ryujinx/system cp -fv $emuconfigs/ryujinx/* /var/config/Ryujinx - sed -i 's#/home/deck/retrodeck#'$rdhome'#g' "$ryujinxconf" + sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "$ryujinxconf" fi fi if [[ "$action" == "reset" ]] || [[ "$action" == "postmove" ]]; then # Run commands that apply to both resets and moves From d1d0a938e3f13394ae35559fd2ecf8c64d5bc7e2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 14 Feb 2024 10:47:55 +0100 Subject: [PATCH 11/81] RYUJINX: updated config file to version 49 --- emu-configs/ryujinx/Config.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/emu-configs/ryujinx/Config.json b/emu-configs/ryujinx/Config.json index e58b6ead..3c977be0 100644 --- a/emu-configs/ryujinx/Config.json +++ b/emu-configs/ryujinx/Config.json @@ -1,5 +1,5 @@ { - "version": 48, + "version": 49, "enable_file_log": true, "backend_threading": "Auto", "res_scale": 1, @@ -136,7 +136,7 @@ "enable_rumble": true }, "left_joycon": { - "button_minus": "Minus", + "button_minus": "Back", "button_l": "LeftShoulder", "button_zl": "LeftTrigger", "button_sl": "Unbound", @@ -147,7 +147,7 @@ "dpad_right": "DpadRight" }, "right_joycon": { - "button_plus": "Plus", + "button_plus": "Start", "button_r": "RightShoulder", "button_zr": "RightTrigger", "button_sl": "Unbound", @@ -166,6 +166,7 @@ ], "graphics_backend": "Vulkan", "preferred_gpu": "0x1002_0x163F", + "multiplayer_mode": 0, "multiplayer_lan_interface_id": "0", "use_hypervisor": true } From 4469e984c78f1c83aeeb84d97c44753166293c69 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 15 Feb 2024 09:34:27 +0100 Subject: [PATCH 12/81] RYUJINX: added a function to check for keys --- functions/functions.sh | 37 +++++++++++++++++++++++++++++++++++++ retrodeck.sh | 3 +++ 2 files changed, 40 insertions(+) diff --git a/functions/functions.sh b/functions/functions.sh index 98768855..5f66cbb5 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -559,6 +559,43 @@ easter_eggs() { cp -f "$new_splash_file" "$current_splash_file" # Deploy assigned splash screen } +manage_ryujinx_keys() { + # This function checks if Switch keys are existing and symlinks them inside the Ryujinx system folder + # If the symlinks are broken it recreates them + + echo "Checking Ryujinx Switch keys." #TODO logging + ryujinx_system="/var/config/Ryujinx/system" # Set the path to the Ryujinx system folder + # Check if the keys folder exists + if [ -d "$bios_folder/switch/keys" ]; then + # Check if there are files in the keys folder + if [ -n "$(find "$bios_folder/switch/keys" -maxdepth 1 -type f)" ]; then + # Iterate over each file in the keys folder + for file in "$bios_folder/switch/keys"/*; do + filename=$(basename "$file") + symlink="$ryujinx_system/$filename" + + # Check if the symlink exists and is valid + if [ -L "$symlink" ] && [ "$(readlink -f "$symlink")" = "$file" ]; then + echo "Found \"$symlink\" and it's a valid symlink." #TODO logging + continue # Skip if the symlink is already valid + fi + + # Remove broken symlink or non-symlink file + echo "Found \"$symlink\" but it's not a valid symlink. Repeiring it" #TODO logging + [ -e "$symlink" ] && rm "$symlink" + + # Create symlink + ln -s "$file" "$symlink" + echo "Created symlink: \"$symlink\"" + done + else + echo "No files found in $bios_folder/switch/keys. Continuing" #TODO logging + fi + else + echo "Directory $bios_folder/switch/keys does not exist. Maybe Ryujinx was never run. Continuing" #TODO logging + fi +} + quit_retrodeck() { pkill -f retrodeck pkill -f emulationstation diff --git a/retrodeck.sh b/retrodeck.sh index 97934a43..bc18205a 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -182,6 +182,9 @@ if [[ -f "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_conf fi # REMOVE BEFORE NEXT VERSION RELEASE +# Linking switch keys for Ryujinx +manage_ryujinx_keys + # Normal Startup start_retrodeck From cf5bd4019b51933c4162971df6f1edf86a0d161d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 15 Feb 2024 09:40:04 +0100 Subject: [PATCH 13/81] RYUJINX: updated config --- emu-configs/ryujinx/Config.json | 212 +++++++++++++++++++++++++++++--- 1 file changed, 197 insertions(+), 15 deletions(-) diff --git a/emu-configs/ryujinx/Config.json b/emu-configs/ryujinx/Config.json index 3c977be0..630011ad 100644 --- a/emu-configs/ryujinx/Config.json +++ b/emu-configs/ryujinx/Config.json @@ -12,7 +12,7 @@ "graphics_shaders_dump_path": "", "logging_enable_debug": false, "logging_enable_stub": false, - "logging_enable_info": true, + "logging_enable_info": false, "logging_enable_warn": true, "logging_enable_error": true, "logging_enable_trace": false, @@ -91,13 +91,13 @@ "enable_keyboard": false, "enable_mouse": false, "hotkeys": { - "toggle_vsync": "F1", - "screenshot": "F8", - "show_ui": "F4", - "pause": "F5", - "toggle_mute": "F2", - "res_scale_up": "Unbound", - "res_scale_down": "Unbound", + "toggle_vsync": "Unknown", + "screenshot": "Unknown", + "show_ui": "F1", + "pause": "F4", + "toggle_mute": "Unknown", + "res_scale_up": "F7", + "res_scale_down": "F8", "volume_up": "Unbound", "volume_down": "Unbound" }, @@ -121,14 +121,78 @@ }, "deadzone_left": 0, "deadzone_right": 0, - "range_left": 1, + "range_left": 1.2, "range_right": 1, - "trigger_threshold": 0.5, + "trigger_threshold": 0, + "motion": { + "slot": 0, + "alt_slot": 0, + "mirror_input": false, + "dsu_server_host": "127.0.0.1", + "dsu_server_port": 26760, + "motion_backend": "CemuHook", + "sensitivity": 100, + "gyro_deadzone": 1, + "enable_motion": true + }, + "rumble": { + "strong_rumble": 2.1, + "weak_rumble": 1, + "enable_rumble": true + }, + "left_joycon": { + "button_minus": "Back", + "button_l": "LeftShoulder", + "button_zl": "LeftTrigger", + "button_sl": "Unbound", + "button_sr": "Unbound", + "dpad_up": "DpadUp", + "dpad_down": "DpadDown", + "dpad_left": "DpadLeft", + "dpad_right": "DpadRight" + }, + "right_joycon": { + "button_plus": "Start", + "button_r": "RightShoulder", + "button_zr": "RightTrigger", + "button_sl": "Unbound", + "button_sr": "Unbound", + "button_x": "Y", + "button_b": "A", + "button_y": "X", + "button_a": "B" + }, + "version": 1, + "backend": "GamepadSDL2", + "id": "0-f6790003-28de-0000-ff11-000001000000", + "controller_type": "ProController", + "player_index": "Player1" + }, + { + "left_joycon_stick": { + "joystick": "Left", + "invert_stick_x": false, + "invert_stick_y": false, + "rotate90_cw": false, + "stick_button": "LeftStick" + }, + "right_joycon_stick": { + "joystick": "Right", + "invert_stick_x": false, + "invert_stick_y": false, + "rotate90_cw": false, + "stick_button": "RightStick" + }, + "deadzone_left": 0, + "deadzone_right": 0, + "range_left": 1.2, + "range_right": 1, + "trigger_threshold": 0, "motion": { "motion_backend": "GamepadDriver", "sensitivity": 100, "gyro_deadzone": 1, - "enable_motion": true + "enable_motion": false }, "rumble": { "strong_rumble": 1, @@ -159,9 +223,127 @@ }, "version": 1, "backend": "GamepadSDL2", - "id": "0-f6790003-28de-0000-ff11-000001000000", - "controller_type": "Handheld", - "player_index": "Handheld" + "id": "1-00000003-28de-0000-ff11-000001000000", + "controller_type": "ProController", + "player_index": "Player2" + }, + { + "left_joycon_stick": { + "joystick": "Left", + "invert_stick_x": false, + "invert_stick_y": false, + "rotate90_cw": false, + "stick_button": "LeftStick" + }, + "right_joycon_stick": { + "joystick": "Right", + "invert_stick_x": false, + "invert_stick_y": false, + "rotate90_cw": false, + "stick_button": "RightStick" + }, + "deadzone_left": 0, + "deadzone_right": 0, + "range_left": 1.2, + "range_right": 1, + "trigger_threshold": 0, + "motion": { + "motion_backend": "GamepadDriver", + "sensitivity": 100, + "gyro_deadzone": 1, + "enable_motion": false + }, + "rumble": { + "strong_rumble": 1, + "weak_rumble": 1, + "enable_rumble": true + }, + "left_joycon": { + "button_minus": "Back", + "button_l": "LeftShoulder", + "button_zl": "LeftTrigger", + "button_sl": "Unbound", + "button_sr": "Unbound", + "dpad_up": "DpadUp", + "dpad_down": "DpadDown", + "dpad_left": "DpadLeft", + "dpad_right": "DpadRight" + }, + "right_joycon": { + "button_plus": "Start", + "button_r": "RightShoulder", + "button_zr": "RightTrigger", + "button_sl": "Unbound", + "button_sr": "Unbound", + "button_x": "Y", + "button_b": "A", + "button_y": "X", + "button_a": "B" + }, + "version": 1, + "backend": "GamepadSDL2", + "id": "2-00000003-28de-0000-ff11-000001000000", + "controller_type": "ProController", + "player_index": "Player3" + }, + { + "left_joycon_stick": { + "joystick": "Left", + "invert_stick_x": false, + "invert_stick_y": false, + "rotate90_cw": false, + "stick_button": "LeftStick" + }, + "right_joycon_stick": { + "joystick": "Right", + "invert_stick_x": false, + "invert_stick_y": false, + "rotate90_cw": false, + "stick_button": "RightStick" + }, + "deadzone_left": 0, + "deadzone_right": 0, + "range_left": 1.2, + "range_right": 1, + "trigger_threshold": 0, + "motion": { + "motion_backend": "GamepadDriver", + "sensitivity": 100, + "gyro_deadzone": 1, + "enable_motion": false + }, + "rumble": { + "strong_rumble": 1, + "weak_rumble": 1, + "enable_rumble": true + }, + "left_joycon": { + "button_minus": "Back", + "button_l": "LeftShoulder", + "button_zl": "LeftTrigger", + "button_sl": "Unbound", + "button_sr": "Unbound", + "dpad_up": "DpadUp", + "dpad_down": "DpadDown", + "dpad_left": "DpadLeft", + "dpad_right": "DpadRight" + }, + "right_joycon": { + "button_plus": "Start", + "button_r": "RightShoulder", + "button_zr": "RightTrigger", + "button_sl": "Unbound", + "button_sr": "Unbound", + "button_x": "Y", + "button_b": "A", + "button_y": "X", + "button_a": "B" + }, + "version": 1, + "backend": "GamepadSDL2", + "id": "3-00000003-28de-0000-ff11-000001000000", + "controller_type": "ProController", + "player_index": "Player4" } ], "graphics_backend": "Vulkan", @@ -169,4 +351,4 @@ "multiplayer_mode": 0, "multiplayer_lan_interface_id": "0", "use_hypervisor": true -} +} \ No newline at end of file From ee664d7ac13fb31b3d5071c1eb168253168102fe Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 15 Feb 2024 13:59:21 +0100 Subject: [PATCH 14/81] RYUJINX: binary was symlinked instead of wrapper, fixed --- 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 50ff205c..406c4454 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1319,7 +1319,7 @@ modules: - | tar -zxvf *.tar.gz mv -v publish ${FLATPAK_DEST}/ryujinx - ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx + ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx.sh ${FLATPAK_DEST}/bin/Ryujinx sources: - type: file url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1192/ryujinx-1.1.1192-linux_x64.tar.gz From 483c7e4421f041cfe53217a3097a895b3f8e8dae Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 15 Feb 2024 14:00:30 +0100 Subject: [PATCH 15/81] RYUJINX: binary was symlinked instead of wrapper, fixed -fix --- 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 406c4454..824ca769 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -1319,7 +1319,7 @@ modules: - | tar -zxvf *.tar.gz mv -v publish ${FLATPAK_DEST}/ryujinx - ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx.sh ${FLATPAK_DEST}/bin/Ryujinx + ln -sv ${FLATPAK_DEST}/ryujinx/Ryujinx ${FLATPAK_DEST}/bin/Ryujinx.sh sources: - type: file url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1192/ryujinx-1.1.1192-linux_x64.tar.gz From 345acb94b1a4c25e0b99c500e725691076bb0925 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 15 Feb 2024 14:45:55 +0100 Subject: [PATCH 16/81] RYUJINX: removing keys folder symlinking --- functions/prepare_component.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index e8cac45c..4ea009c0 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -559,9 +559,9 @@ prepare_component() { sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "$ryujinxconf" fi fi - if [[ "$action" == "reset" ]] || [[ "$action" == "postmove" ]]; then # Run commands that apply to both resets and moves - dir_prep "$bios_folder/switch/keys" "/var/config/Ryujinx/system" - fi + # if [[ "$action" == "reset" ]] || [[ "$action" == "postmove" ]]; then # Run commands that apply to both resets and moves + # dir_prep "$bios_folder/switch/keys" "/var/config/Ryujinx/system" + # fi if [[ "$action" == "postmove" ]]; then # Run only post-move commands sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "$ryujinxconf" # This is an unfortunate one-off because set_setting_value does not currently support JSON fi From 4c7c30f46796c8c4d707fb6c2c32a3e88f408b35 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 15 Feb 2024 14:48:51 +0100 Subject: [PATCH 17/81] RYUJINX: removing keys folder symlinking --- functions/prepare_component.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 4ea009c0..42905a09 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -547,14 +547,14 @@ prepare_component() { echo "------------------------" if [[ $multi_user_mode == "true" ]]; then rm -rf "$multi_user_data_folder/$SteamAppUser/config/Ryujinx" - mkdir -p "$multi_user_data_folder/$SteamAppUser/config/Ryujinx/system" + #mkdir -p "$multi_user_data_folder/$SteamAppUser/config/Ryujinx/system" cp -fv $emuconfigs/ryujinx/* "$multi_user_data_folder/$SteamAppUser/config/Ryujinx" sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "$multi_user_data_folder/$SteamAppUser/config/Ryujinx/Config.json" dir_prep "$multi_user_data_folder/$SteamAppUser/config/Ryujinx" "/var/config/Ryujinx" else # removing config directory to wipe legacy files rm -rf /var/config/Ryujinx - mkdir -p /var/config/Ryujinx/system + #mkdir -p /var/config/Ryujinx/system cp -fv $emuconfigs/ryujinx/* /var/config/Ryujinx sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "$ryujinxconf" fi From c0ffc1ae52e51c04acafbb5bb053950c90496793 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 15 Feb 2024 15:46:50 +0100 Subject: [PATCH 18/81] Triggering build From a19c932f1efb834b75d47a43270f3ac0aef515fa Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 19 Feb 2024 15:23:59 +0100 Subject: [PATCH 19/81] APPDATA: fixed wrong help link [skip ci] --- net.retrodeck.retrodeck.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 6268d6ba..0f530fdd 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -8,7 +8,7 @@ RetroDECK Team https://retrodeck.net https://github.com/XargonWan/RetroDECK/issues - http://discord.gg/Dz3szYsP8g + https://retrodeck.readthedocs.io https://github.com/XargonWan/RetroDECK/wiki/FAQs---Frequently-asked-questions https://www.patreon.com/RetroDECK From cb8b3de7d8603b1642a4d541d91859f236ad4302 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 19 Feb 2024 16:21:43 +0100 Subject: [PATCH 20/81] ES-DE: .emulationstation folder is now renamed in ES-DE --- functions/050_save_migration.sh | 6 +++--- functions/functions.sh | 10 +++++----- functions/global.sh | 8 ++++---- functions/post_update.sh | 15 +++++++++++---- functions/prepare_component.sh | 8 ++++---- tools/configurator.sh | 2 +- 6 files changed, 28 insertions(+), 21 deletions(-) diff --git a/functions/050_save_migration.sh b/functions/050_save_migration.sh index 0f53c65c..41213705 100644 --- a/functions/050_save_migration.sh +++ b/functions/050_save_migration.sh @@ -28,12 +28,12 @@ save_migration() { fi # Doing the dir prep as we don't know from which version we came - dir_prep "$media_folder" "/var/config/emulationstation/.emulationstation/downloaded_media" - dir_prep "$themes_folder" "/var/config/emulationstation/.emulationstation/themes" + dir_prep "$media_folder" "/var/config/emulationstation/ES-DE/downloaded_media" + dir_prep "$themes_folder" "/var/config/emulationstation/ES-DE/themes" mkdir -pv $rdhome/logs #this was added later, maybe safe to remove in a few versions # Resetting es_settings, now we need it but in the future I should think a better solution, maybe with sed - cp -fv /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml + cp -fv /app/retrodeck/es_settings.xml /var/config/emulationstation/ES-DE/es_settings.xml # 0.4 -> 0.5 # Perform save and state migration if needed diff --git a/functions/functions.sh b/functions/functions.sh index 70627152..a03d1e35 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -486,9 +486,9 @@ install_retrodeck_starterpack() { ## DOOM section ## cp /app/retrodeck/extras/doom1.wad "$roms_folder/doom/doom1.wad" # No -f in case the user already has it - mkdir -p "/var/config/emulationstation/.emulationstation/gamelists/doom" - if [[ ! -f "/var/config/emulationstation/.emulationstation/gamelists/doom/gamelist.xml" ]]; then # Don't overwrite an existing gamelist - cp "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/emulationstation/.emulationstation/gamelists/doom/gamelist.xml" + mkdir -p "/var/config/emulationstation/ES-DE/gamelists/doom" + if [[ ! -f "/var/config/emulationstation/ES-DE/gamelists/doom/gamelist.xml" ]]; then # Don't overwrite an existing gamelist + cp "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/emulationstation/ES-DE/gamelists/doom/gamelist.xml" fi mkdir -p "$media_folder/doom" unzip -oq "/app/retrodeck/rd_prepacks/doom/doom.zip" -d "$media_folder/doom/" @@ -519,8 +519,8 @@ update_splashscreens() { # This script will purge any existing ES graphics and reload them from RO space into somewhere ES will look for it # USAGE: update_splashscreens - rm -rf /var/config/emulationstation/.emulationstation/resources/graphics - rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/emulationstation/.emulationstation/resources/graphics/" + rm -rf /var/config/emulationstation/ES-DE/resources/graphics + rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/emulationstation/ES-DE/resources/graphics/" } deploy_helper_files() { diff --git a/functions/global.sh b/functions/global.sh index 5c61ecd3..b71b1b3e 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -25,9 +25,9 @@ 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 -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 +splashscreen_dir="/var/config/emulationstation/ES-DE/resources/graphics/extra_splashes" # The default location of extra splash screens +current_splash_file="/var/config/emulationstation/ES-DE/resources/graphics/splash.svg" # The active splash file that will be shown on boot +default_splash_file="/var/config/emulationstation/ES-DE/resources/graphics/splash-orig.svg" # The default RetroDECK splash screen 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 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 @@ -58,7 +58,7 @@ yuzuconf="/var/config/yuzu/qt-config.ini" # ES-DE config files -es_settings="/var/config/emulationstation/.emulationstation/es_settings.xml" +es_settings="/var/config/emulationstation/ES-DE/es_settings.xml" # RetroArch config files diff --git a/functions/post_update.sh b/functions/post_update.sh index 8f118b76..ec9acee5 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -124,7 +124,7 @@ post_update() { dir_prep "$texture_packs_folder/RetroArch-Mupen64Plus/hires_texture" "/var/config/retroarch/system/Mupen64plus/hires_texture" dir_prep "$texture_packs_folder/Duckstation" "/var/config/duckstation/textures" - dir_prep "$rdhome/gamelists" "/var/config/emulationstation/.emulationstation/gamelists" + dir_prep "$rdhome/gamelists" "/var/config/emulationstation/ES-DE/gamelists" dir_prep "$borders_folder" "/var/config/retroarch/overlays/borders" rsync -rlD --mkpath "/app/retrodeck/emu-configs/retroarch/borders/" "/var/config/retroarch/overlays/borders/" @@ -172,7 +172,7 @@ post_update() { dir_prep "$states_folder/psx/duckstation" "/var/config/duckstation/savestates" rm -rf /var/config/retrodeck/tools - rm -rf /var/config/emulationstation/.emulationstation/gamelists/tools/ + rm -rf /var/config/emulationstation/ES-DE/gamelists/tools/ mv "$saves_folder/gc/dolphin/EUR" "$saves_folder/gc/dolphin/EU" mv "$saves_folder/gc/dolphin/USA" "$saves_folder/gc/dolphin/US" @@ -195,8 +195,8 @@ post_update() { sed -i '$ a ' "$es_settings" # Add new default line to existing file set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings" unlink "/var/config/emulationstation/ROMs" - unlink "/var/config/emulationstation/.emulationstation/downloaded_media" - unlink "/var/config/emulationstation/.emulationstation/themes" + unlink "/var/config/emulationstation/ES-DE/downloaded_media" + unlink "/var/config/emulationstation/ES-DE/themes" set_setting_value "$raconf" "savestate_auto_load" "false" "retroarch" set_setting_value "$raconf" "savestate_auto_save" "false" "retroarch" @@ -241,8 +241,15 @@ post_update() { # - Install RetroDECK controller profile in desired location TODO # - Change section name in retrodeck.cfg for ABXY button swap preset sed -i 's^nintendo_button_layout^abxy_button_swap^' "$rd_conf" # This is a one-off sed statement as there are no functions for replacing section names + mv -f /var/config/emulationstation/.emulationstation /var/config/emulationstation/ES-DE # in 3.0 .emulationstation was moved into ES-DE + ln -s /var/config/emulationstation/ES-DE /var/config/emulationstation/.emulationstation # symlinking it to mantain the compatibility # TODO: remove this symlink n 0.9.0b fi + # if [[ $prev_version -le "090" ]]; then + # # Placeholder for version 0.9.0b + # rm /var/config/emulationstation/.emulationstation # remving the old symlink to .emulationstation as it might be not needed anymore + # fi + # The following commands are run every time. if [[ -d "/var/data/dolphin-emu/Load/DynamicInputTextures" ]]; then # Refresh installed textures if they have been enabled diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 0a32e9f6..206fc3dc 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -40,12 +40,12 @@ prepare_component() { if [[ "$component" =~ ^(es-de|ES-DE|all)$ ]]; then # For use after ESDE-related folders are moved or a reset if [[ "$action" == "reset" ]]; then rm -rf /var/config/emulationstation/ - mkdir -p /var/config/emulationstation/.emulationstation/ - cp -f /app/retrodeck/es_settings.xml /var/config/emulationstation/.emulationstation/es_settings.xml + mkdir -p /var/config/emulationstation/ES-DE/ + cp -f /app/retrodeck/es_settings.xml /var/config/emulationstation/ES-DE/es_settings.xml set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings" set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings" set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings" - dir_prep "$rdhome/gamelists" "/var/config/emulationstation/.emulationstation/gamelists" + dir_prep "$rdhome/gamelists" "/var/config/emulationstation/ES-DE/gamelists" emulationstation --home /var/config/emulationstation --create-system-dirs update_splashscreens fi @@ -53,7 +53,7 @@ prepare_component() { set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings" set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings" set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings" - dir_prep "$rdhome/gamelists" "/var/config/emulationstation/.emulationstation/gamelists" + dir_prep "$rdhome/gamelists" "/var/config/emulationstation/ES-DE/gamelists" fi fi diff --git a/tools/configurator.sh b/tools/configurator.sh index 6c48b740..d474a279 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -1349,7 +1349,7 @@ configurator_usb_import_dialog() { if [[ ! -z "$choice" ]]; then emulationstation --home "$choice" --create-system-dirs - rm -rf "$choice/.emulationstation" # Cleanup unnecessary folder + rm -rf "$choice/ES-DE" # Cleanup unnecessary folder fi else configurator_generic_dialog "RetroDeck Configurator - USB Import" "There were no USB devices found." From 870121b42b7f5753026f431859698e01f0b63939 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 19 Feb 2024 16:22:05 +0100 Subject: [PATCH 21/81] ES-DE: updated xml files --- es-configs/es_find_rules.xml | 82 ++++++++--- es-configs/es_settings.xml | 2 +- es-configs/es_systems.xml | 265 +++++++++++++++++++++++------------ 3 files changed, 238 insertions(+), 111 deletions(-) diff --git a/es-configs/es_find_rules.xml b/es-configs/es_find_rules.xml index a7b5f073..112a4a40 100644 --- a/es-configs/es_find_rules.xml +++ b/es-configs/es_find_rules.xml @@ -1,5 +1,5 @@ - + @@ -42,10 +42,6 @@ /usr/lib64/libretro /usr/lib/libretro - - /usr/local/lib/libretro - - /usr/pkg/lib/libretro @@ -69,6 +65,18 @@ ~/bin/advancemame/advmame + + + + amiberry + + + ~/Applications/amiberry/amiberry + ~/.local/share/applications/amiberry/amiberry + ~/.local/bin/amiberry/amiberry + ~/bin/amiberry/amiberry + + @@ -318,24 +326,35 @@ org.flycast.Flycast - ~/Applications/flycast*.AppImage - ~/.local/share/applications/flycast*.AppImage - ~/.local/bin/flycast*.AppImage - ~/bin/flycast*.AppImage + ~/Applications/flycast-x86*.AppImage + ~/.local/share/applications/flycast-x86*.AppImage + ~/.local/bin/flycast-x86*.AppImage + ~/bin/flycast-x86*.AppImage /var/lib/flatpak/exports/bin/org.flycast.Flycast ~/.local/share/flatpak/exports/bin/org.flycast.Flycast + + + + flycast-dojo + + + ~/Applications/flycast-dojo*.AppImage + ~/.local/share/applications/flycast-dojo*.AppImage + ~/.local/bin/flycast-dojo*.AppImage + ~/bin/flycast-dojo*.AppImage + + - fs-uae - fsuae.fs-uae - net.fsuae.FS-UAE + fs-uae-launcher + fsuae.launcher - /var/lib/flatpak/exports/bin/net.fsuae.FS-UAE - ~/.local/share/flatpak/exports/bin/net.fsuae.FS-UAE + /var/lib/flatpak/exports/bin/net.fsuae.FS-UAE|flatpak run --command=fs-uae-launcher net.fsuae.FS-UAE + ~/.local/share/flatpak/exports/bin/net.fsuae.FS-UAE|flatpak run --command=fs-uae-launcher net.fsuae.FS-UAE @@ -649,6 +668,8 @@ ~/.local/share/applications/punes/punes ~/.local/bin/punes/punes ~/bin/punes/punes + /var/lib/flatpak/exports/bin/io.github.punesemu.puNES + ~/.local/share/flatpak/exports/bin/io.github.punesemu.puNES @@ -721,16 +742,22 @@ - Ryujinx.sh + Ryujinx.sh + Ryujinx + Ryujinx.Ava org.ryujinx.Ryujinx /var/lib/flatpak/exports/bin/org.ryujinx.Ryujinx ~/.local/share/flatpak/exports/bin/org.ryujinx.Ryujinx - ~/Applications/publish/Ryujinx.sh - ~/.local/share/applications/publish/Ryujinx.sh - ~/.local/bin/publish/Ryujinx.sh - ~/bin/publish/Ryujinx.sh + ~/Applications/publish/Ryujinx + ~/.local/share/applications/publish/Ryujinx + ~/.local/bin/publish/Ryujinx + ~/bin/publish/Ryujinx + ~/Applications/publish/Ryujinx.Ava + ~/.local/share/applications/publish/Ryujinx.Ava + ~/.local/bin/publish/Ryujinx.Ava + ~/bin/publish/Ryujinx.Ava @@ -868,6 +895,19 @@ ~/.local/share/applications/Supermodel/supermodel ~/.local/bin/Supermodel/supermodel ~/bin/Supermodel/supermodel + /var/lib/flatpak/exports/bin/com.supermodel3.Supermodel + ~/.local/share/flatpak/exports/bin/com.supermodel3.Supermodel + + + + + + tic80 + com.tic80.TIC_80 + + + /var/lib/flatpak/exports/bin/com.tic80.TIC_80 + ~/.local/share/flatpak/exports/bin/com.tic80.TIC_80 @@ -950,6 +990,10 @@ Vita3K + ~/Applications/Vita3K*.AppImage + ~/.local/share/applications/Vita3K*.AppImage + ~/.local/bin/Vita3K*.AppImage + ~/bin/Vita3K*.AppImage ~/Applications/Vita3K/Vita3K ~/.local/share/applications/Vita3K/Vita3K ~/.local/bin/Vita3K/Vita3K diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index a88a2ba8..cad78b67 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -145,7 +145,7 @@ - + diff --git a/es-configs/es_systems.xml b/es-configs/es_systems.xml index 832d37a9..9baca300 100644 --- a/es-configs/es_systems.xml +++ b/es-configs/es_systems.xml @@ -1,5 +1,5 @@ - + 3do @@ -30,8 +30,8 @@ Adventure Game Studio Game Engine %ROMPATH%/ags .desktop .sh - %STARTDIR%=%GAMEDIR% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% - ags + %STARTDIR%=%GAMEDIR% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + pcwindows ags --> @@ -39,9 +39,11 @@ amiga Commodore Amiga %ROMPATH%/amiga - .adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .rp9 .RP9 .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .uae .UAE .7z .7Z .zip .ZIP + .adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .rp9 .RP9 .uae .UAE .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% + %EMULATOR_FS-UAE% %ROM% + %STARTDIR%=%EMUDIR% %EMULATOR_AMIBERRY% --autoload %ROM% amiga amiga @@ -49,9 +51,11 @@ amiga1200 Commodore Amiga 1200 %ROMPATH%/amiga1200 - .adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .rp9 .RP9 .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .uae .UAE .7z .7Z .zip .ZIP + .adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .rp9 .RP9 .uae .UAE .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% + %EMULATOR_FS-UAE% %ROM% + %STARTDIR%=%EMUDIR% %EMULATOR_AMIBERRY% --autoload %ROM% amiga amiga1200 @@ -59,9 +63,11 @@ amiga600 Commodore Amiga 600 %ROMPATH%/amiga600 - .adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .rp9 .RP9 .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .uae .UAE .7z .7Z .zip .ZIP + .adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .rp9 .RP9 .uae .UAE .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% + %EMULATOR_FS-UAE% %ROM% + %STARTDIR%=%EMUDIR% %EMULATOR_AMIBERRY% --autoload %ROM% amiga amiga600 @@ -69,9 +75,11 @@ amigacd32 Commodore Amiga CD32 %ROMPATH%/amigacd32 - .adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .rp9 .RP9 .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .uae .UAE .7z .7Z .zip .ZIP + .adf .ADF .adz .ADZ .ccd .CCD .chd .CHD .cue .CUE .dms .DMS .fdi .FDI .hdf .HDF .hdz .HDZ .ipf .IPF .iso .ISO .lha .LHA .m3u .M3U .mds .MDS .nrg .NRG .rp9 .RP9 .uae .UAE .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% + %EMULATOR_FS-UAE% --config:amiga-model=CD32 %ROM% + %STARTDIR%=%EMUDIR% %EMULATOR_AMIBERRY% --model CD32 --autoload %ROM% amigacd32 amigacd32 @@ -104,6 +112,7 @@ .do .DO .dsk .DSK .nib .NIB .po .PO + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "apple2e -rompath \"%GAMEDIRRAW%;%ROMPATH%/apple2\" -flop1 \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/apple2 apple2e -flop1 %ROM% apple2 apple2 @@ -114,7 +123,7 @@ Apple IIGS %ROMPATH%/apple2gs .2mg .2MG .7z .7z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "apple2gs -rompath %GAMEDIR%\;%ROMPATH%/apple2gs -flop3 \"%ROMRAW%\"" + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "apple2gs -rompath \"%GAMEDIRRAW%;%ROMPATH%/apple2gs\" -flop3 \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/apple2gs apple2gs -flop3 %ROM% apple2gs apple2gs @@ -135,9 +144,9 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% %EMULATOR_FLYCAST% %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% - %STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -force-feedback %INJECT%=%BASENAME%.commands %ROM% - %STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -fullscreen -force-feedback %INJECT%=%BASENAME%.commands %ROM% + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% arcade arcade @@ -148,7 +157,7 @@ Emerson Arcadia 2001 %ROMPATH%/arcadia .bin .BIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "arcadia -rompath %GAMEDIR%\;%ROMPATH%/arcadia -cart \"%ROMRAW%\"" + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "arcadia -rompath \"%GAMEDIRRAW%;%ROMPATH%/arcadia\" -cart \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/arcadia arcadia -cart %ROM% arcadia arcadia @@ -181,7 +190,7 @@ Bally Astrocade %ROMPATH%/astrocde .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "astrocde -rompath \"%GAMEDIRRAW%;%ROMPATH%/astrocde\" -cart \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/astrocde astrocde -cart %BASENAME% astrocde astrocade @@ -216,6 +225,7 @@ %ROMPATH%/atari7800 .a78 .A78 .bin .BIN .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prosystem_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "a7800 -rompath \"%GAMEDIRRAW%;%ROMPATH%/atari7800\" -cart \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/atari7800 a7800 -cart %ROM% atari7800 atari7800 @@ -289,9 +299,10 @@ atomiswave Sammy Corporation Atomiswave %ROMPATH%/atomiswave - .bin .BIN .cdi .CDI .cue .CUE .dat .DAT .elf .ELF .gdi .GDI .iso .ISO .lst .LST .m3u .M3U .7z .7Z .zip .ZIP + .bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% + arcade atomiswave @@ -320,15 +331,6 @@ c64 c64 - - cavestory - Cave Story (NXEngine) - %ROMPATH%/cavestory - .exe .EXE .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nxengine_libretro.so %ROM% - cavestory - cavestory - cdimono1 Philips CD-i @@ -347,6 +349,8 @@ .ccd .CCD .chd .CHD .cue .CUE .iso .ISO .m3u .M3U .mds .MDS .nrg .NRG .rp9 .RP9 .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/puae2021_libretro.so %ROM% + + cdtv cdtv @@ -365,6 +369,8 @@ %ROMPATH%/channelf .bin .BIN .chf .CHF .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freechaf_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "channelf -rompath \"%GAMEDIRRAW%;%ROMPATH%/channelf\" -cart \"%ROMRAW%\"" + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/channelf channelf -cart %ROM% channelf channelf @@ -401,6 +407,7 @@ %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/consolearcade %BASENAME% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% @@ -498,11 +505,12 @@ daphne Daphne Arcade LaserDisc Emulator %ROMPATH%/daphne - .daphne .singe .7z .7Z .zip .ZIP + .daphne .dirksimple .ogv .OGV .singe .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/daphne %BASENAME% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dirksimple_libretro.so %ROM% daphne, arcade daphne @@ -511,7 +519,7 @@ doom Doom %ROMPATH%/doom - .doom .DOOM .desktop .iwad .IWAD .pk4 .PK4 .pk3 .PK3 .pwad .PWAD .sh .wad .WAD .ipk3 .IPK3 + .doom .DOOM .desktop .ipk3 .IPK3 .iwad .IWAD .pk3 .PK3 .pk4 .PK4 .pwad .PWAD .sh .wad .WAD gzdoom.sh %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/prboom_libretro.so %ROM% @@ -550,9 +558,10 @@ dreamcast Sega Dreamcast %ROMPATH%/dreamcast - .chd .CHD .cdi .CDI .iso .ISO .elf .ELF .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP + .cdi .CDI .chd .CHD .cue .CUE .dat .DAT .elf .ELF .gdi .GDI .iso .ISO .lst .LST .m3u .M3U .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% + dreamcast dreamcast @@ -609,6 +618,8 @@ + + famicom famicom @@ -683,9 +694,10 @@ fmtowns Fujitsu FM Towns %ROMPATH%/fmtowns - .cue .CUE .iso .ISO .7z .7Z .zip .ZIP + .cdr .CDR .chd .CHD .cue .CUE .gdi .GDI .iso .ISO + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "fmtownshr -rompath \"%GAMEDIRRAW%;%ROMPATH%/fmtowns\" -cdrom \"%ROMRAW%\"" + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fmtowns fmtowns %BASENAME% - %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/fmtowns fmtowns %BASENAME% fmtowns fmtowns @@ -707,7 +719,7 @@ Bit Corporation Gamate %ROMPATH%/gamate .bin .BIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gamate -rompath %GAMEDIR%\;%ROMPATH%/gamate -cart \"%ROMRAW%\"" + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gamate -rompath \"%GAMEDIRRAW%;%ROMPATH%/gamate\" -cart \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gamate gamate -cart %ROM% gamate gamate @@ -718,6 +730,7 @@ Nintendo Game and Watch %ROMPATH%/gameandwatch .mgw .MGW .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gameandwatch %BASENAME% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gw_libretro.so %ROM% @@ -730,7 +743,7 @@ Tiger Electronics Game.com %ROMPATH%/gamecom .tgc .TGC .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gamecom -rompath %GAMEDIR%\;%ROMPATH%/gamecom -cartridge1 \"%ROMRAW%\"" + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gamecom -rompath \"%GAMEDIRRAW%;%ROMPATH%/gamecom\" -cartridge1 \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gamecom gamecom -cartridge1 %ROM% gamecom gamecom @@ -747,6 +760,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/smsplus_libretro.so %ROM% + gamegear gamegear @@ -762,6 +776,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/DoubleCherryGB_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% @@ -769,6 +784,9 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vbam_libretro.so %ROM% + + + gb gb @@ -783,6 +801,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vba_next_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gpsp_libretro.so %ROM% + gba @@ -799,6 +818,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearboy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tgbdual_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/DoubleCherryGB_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bsnes_libretro.so %ROM% @@ -806,6 +826,9 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vbam_libretro.so %ROM% + + + gbc gbc @@ -842,7 +865,7 @@ Hartung Game Master %ROMPATH%/gmaster .bin .BIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gmaster -rompath %GAMEDIR%\;%ROMPATH%/gmaster -cart \"%ROMRAW%\"" + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "gmaster -rompath \"%GAMEDIRRAW%;%ROMPATH%/gmaster\" -cart \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/gmaster gmaster -cart %ROM% gmaster gmaster @@ -863,8 +886,10 @@ intellivision Mattel Electronics Intellivision %ROMPATH%/intellivision - .int .INT .bin .BIN .rom .ROM .7z .7Z .zip .ZIP + .bin .BIN .int .INT .rom .ROM .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/freeintv_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "intv -rompath \"%GAMEDIRRAW%;%ROMPATH%/intellivision\" -cart \"%ROMRAW%\"" + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/intellivision intv -cart %ROM% intellivision intellivision @@ -877,22 +902,11 @@ android j2me - laserdisc LaserDisc Games %ROMPATH%/laserdisc - .daphne .singe .7z .7Z .zip .ZIP + .daphne .dirksimple .ogv .OGV .singe .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% @@ -905,6 +919,7 @@ LCD Handheld Games %ROMPATH%/lcdgames .mgw .MGW .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so %ROM% %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/lcdgames %BASENAME% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gw_libretro.so %ROM% @@ -946,9 +961,9 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/fbalpha2012_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% - %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% arcade mame @@ -975,6 +990,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% + mastersystem mastersystem @@ -1024,6 +1040,8 @@ %ROMPATH%/megaduck .bin .BIN .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameduck_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "megaduck -rompath \"%GAMEDIRRAW%;%ROMPATH%/megaduck\" -cart \"%ROMRAW%\"" + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/megaduck megaduck -cart %ROM% megaduck megaduck @@ -1056,7 +1074,6 @@ %ROMPATH%/model3 .7z .7Z .zip .ZIP %STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -force-feedback %INJECT%=%BASENAME%.commands %ROM% - %STARTDIR%=%GAMEDIR% %EMULATOR_SUPERMODEL% -log-output=%GAMEDIR%/Config/Supermodel.log -fullscreen -force-feedback %INJECT%=%BASENAME%.commands %ROM% arcade model3 @@ -1074,7 +1091,7 @@ moto Thomson MO/TO Series %ROMPATH%/moto - .fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP + .fd .FD .k7 .K7 .m5 .M5 .m7 .M7 .rom .ROM .sap .SAP .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM% moto moto @@ -1146,6 +1163,7 @@ %ROMPATH%/multivision .bin .BIN .gg .GG .rom .ROM .sg .SG .sms .SMS .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% + sg-1000 multivision @@ -1182,6 +1200,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/parallel_n64_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mupen64plus_next_libretro.so %ROM% + n64 n64dd @@ -1189,9 +1208,10 @@ naomi Sega NAOMI %ROMPATH%/naomi - .cdi .CDI .iso .ISO .elf .ELF .bin .BIN .cue .CUE .gdi .GDI .lst .LST .dat .DAT .m3u .M3U .7z .7Z .zip .ZIP + .bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% + arcade naomi @@ -1202,6 +1222,7 @@ .bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% + arcade naomi2 @@ -1212,6 +1233,7 @@ .bin .BIN .dat .DAT .elf .ELF .lst .LST .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/flycast_libretro.so %ROM% + arcade naomigd @@ -1224,6 +1246,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/desmume2015_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/melonds_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/melondsds_libretro.so %ROM% %EMULATOR_MELONDS% %ROM% nds @@ -1268,7 +1291,7 @@ nes Nintendo Entertainment System %ROMPATH%/nes - .fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP + .3dsen .3DSEN .fds .FDS .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM% @@ -1300,7 +1323,7 @@ ngp SNK Neo Geo Pocket %ROMPATH%/ngp - .ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP + .ngc .NGC .ngp .NGP .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_ngp_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/race_libretro.so %ROM% @@ -1312,7 +1335,7 @@ ngpc SNK Neo Geo Pocket Color %ROMPATH%/ngpc - .ngp .NGP .ngc .NGC .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP + .ngc .NGC .ngp .NGP .ngpc .NGPC .npc .NPC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_ngp_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/race_libretro.so %ROM% @@ -1322,10 +1345,12 @@ odyssey2 - Magnavox Odyssey2 + Magnavox Odyssey 2 %ROMPATH%/odyssey2 .bin .BIN .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "odyssey2 -rompath \"%GAMEDIRRAW%;%ROMPATH%/odyssey2\" -cart \"%ROMRAW%\"" + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/odyssey2 odyssey2 -cart %ROM% odyssey2 odyssey2 @@ -1355,7 +1380,7 @@ palm Palm OS %ROMPATH%/palm - .prc .PRC .pqa .PQA .img .IMG .7z .7Z .zip .ZIP + .img .IMG .pqa .PQA .prc .PRC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mu_libretro.so %ROM% palm palm @@ -1374,7 +1399,7 @@ pc98 NEC PC-9800 Series %ROMPATH%/pc98 - .2hd .2HD .88d .88D .98d .98D .d88 .D88 .d98 .D98 .cmd .CMD .dup .DUP .fdd .FDD .fdi .FDI .hdd .HDD .hdi .HDI .hdm .HDM .hdn .HDN .m3u .M3U .nhd .NHD .tfd .TFD .thd .THD . xdf .XDF .7z .7Z .zip .ZIP + .2hd .2HD .88d .88D .98d .98D .d88 .D88 .d98 .D98 .cmd .CMD .dup .DUP .fdd .FDD .fdi .FDI .hdd .HDD .hdi .HDI .hdm .HDM .hdn .HDN .m3u .M3U .nhd .NHD .tfd .TFD .thd .THD .xdf .XDF .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/np2kai_libretro.so %ROM% %STARTDIR%=%GAMEDIR% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nekop2_libretro.so %ROM% pc98 @@ -1388,6 +1413,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + pcengine pcengine @@ -1400,6 +1426,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + pcenginecd pcenginecd @@ -1421,6 +1448,7 @@ .p8 .P8 .png .PNG %EMULATOR_PICO-8% -desktop_path ~/retrodeck/screenshots -root_path %GAMEDIR% -run %ROM% %EMULATOR_PICO-8% -desktop_path ~/retrodeck/screenshots -root_path %GAMEDIR% -splore + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/retro8_libretro.so %ROM% pico8 pico8 @@ -1447,9 +1475,13 @@ ports Ports %ROMPATH%/ports - .AppImage .desktop .sh + .AppImage .desktop .exe .EXE .game .GAME .phd .PHD .psx .PSX .sh %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% %EMULATOR_OS-SHELL% -c "%ROM%" + + + + pc, pcwindows ports @@ -1457,7 +1489,7 @@ ps2 Sony PlayStation 2 %ROMPATH%/ps2 - .arcadedef .bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG + .arcadedef .bin .BIN .chd .CHD .ciso .CISO .cso .CSO .dump .DUMP .elf .ELF .gz .GZ .m3u .M3U .mdf .MDF .img .IMG .iso .ISO .isz .ISZ .ngr .NRG .zso .ZSO %EMULATOR_PCSX2% -batch %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx2_libretro.so %ROM% @@ -1491,7 +1523,7 @@ psp Sony PlayStation Portable %ROMPATH%/psp - .elf .ELF .iso .ISO .cso .CSO .prx .PRX .pbp .PBP .7z .7Z .zip .ZIP + .chd .CHD .cso .CSO .elf .ELF .iso .ISO .pbp .PBP .prx .PRX .7z .7Z .zip .ZIP %EMULATOR_PPSSPP% %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/ppsspp_libretro.so %ROM% psp @@ -1519,6 +1551,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/pcsx_rearmed_libretro.so %ROM% %EMULATOR_DUCKSTATION% -batch %ROM% + psx psx @@ -1528,6 +1561,7 @@ Casio PV-1000 %ROMPATH%/pv1000 .bin .BIN .7z .7Z .zip .ZIP + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "pv1000 -rompath \"%GAMEDIRRAW%;%ROMPATH%/pv1000\" -cart \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/pv1000 pv1000 -cart %ROM% pv1000 pv1000 @@ -1553,7 +1587,7 @@ samcoupe MGT SAM Coupé %ROMPATH%/samcoupe - .dsk .DSK .mgt .MGT .sbt .SBT .sad .SAD .7z .7Z .zip .ZIP + .dsk .DSK .mgt .MGT .sad .SAD .sbt .SBT .7z .7Z .zip .ZIP %EMULATOR_SIMCOUPE% %ROM% samcoupe samcoupe @@ -1581,7 +1615,7 @@ saturn Sega Saturn %ROMPATH%/saturn - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .iso .ISO .mds .MDS .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .iso .ISO .m3u .M3U .mds .MDS .toc .TOC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_saturn_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/yabasanshiro_libretro.so %ROM% @@ -1594,7 +1628,7 @@ saturnjp Sega Saturn %ROMPATH%/saturnjp - .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .iso .ISO .mds .MDS .toc .TOC .m3u .M3U .7z .7Z .zip .ZIP + .bin .BIN .ccd .CCD .chd .CHD .cue .CUE .iso .ISO .m3u .M3U .mds .MDS .toc .TOC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_saturn_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/kronos_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/yabasanshiro_libretro.so %ROM% @@ -1619,7 +1653,7 @@ Epoch Super Cassette Vision %ROMPATH%/scv .0 .bin .BIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "scv -rompath %GAMEDIR%\;%ROMPATH%/scv -cart \"%ROMRAW%\"" + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "scv -rompath \"%GAMEDIRRAW%;%ROMPATH%/scv\" -cart \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/scv scv -cart %ROM% scv scv @@ -1629,7 +1663,7 @@ sega32x Sega Mega Drive 32X %ROMPATH%/sega32x - .bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP + .32x .32X .68k .68K .bin .BIN .cue .CUE .gen .GEN .iso .ISO .md .MD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% sega32x @@ -1639,7 +1673,7 @@ sega32xjp Sega Super 32X %ROMPATH%/sega32xjp - .bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP + .32x .32X .68k .68K .bin .BIN .cue .CUE .gen .GEN .iso .ISO .md .MD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% sega32x @@ -1649,7 +1683,7 @@ sega32xna Sega Genesis 32X %ROMPATH%/sega32xna - .bin .BIN .gen .GEN .smd .SMD .md .MD .32x .32X .cue .CUE .iso .ISO .sms .SMS .68k .68K .7z .7Z .zip .ZIP + .32x .32X .68k .68K .bin .BIN .cue .CUE .gen .GEN .iso .ISO .md .MD .smd .SMD .sms .SMS .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/picodrive_libretro.so %ROM% sega32x @@ -1681,6 +1715,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% + snes @@ -1695,6 +1730,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_wide_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/gearsystem_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% + sg-1000 sg-1000 @@ -1705,9 +1741,11 @@ %ROMPATH%/sgb .gb .GB .gbc .GBC .sgb .SGB .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% + + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/sameboy_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mgba_libretro.so %ROM% - gb + sgb sgb @@ -1724,6 +1762,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% + snes @@ -1743,6 +1782,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supafaust_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mesen-s_libretro.so %ROM% + snes @@ -1763,20 +1803,11 @@ spectravideo Spectravideo %ROMPATH%/spectravideo - .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + .cas .CAS .col .COL .dsk .DSK .m3u .M3U .mx1 .MX1 .mx2 .MX2 .ri .RI .rom .ROM .sc .SC .sg .SG .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/bluemsx_libretro.so %ROM% spectravideo spectravideo - - stratagus - Stratagus Game Engine - %ROMPATH%/stratagus - .7z .7Z .zip .ZIP - PLACEHOLDER %ROM% - stratagus - stratagus - stv Sega Titan Video Game System @@ -1809,9 +1840,11 @@ supergrafx NEC SuperGrafx %ROMPATH%/supergrafx - .pce .PCE .sgx .SGX .cue .CUE .ccd .CCD .chd .CHD .7z .7Z .zip .ZIP + .ccd .CCD .chd .CHD .cue .CUE .pce .PCE .sgx .SGX .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_supergrafx_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% + + supergrafx supergrafx @@ -1822,6 +1855,8 @@ %ROMPATH%/supervision .bin .BIN .sv .SV .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/potator_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "svision -rompath \"%GAMEDIRRAW%;%ROMPATH%/supervision\" -cart \"%ROMRAW%\"" + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/supervision svision -cart %ROM% supervision supervision @@ -1831,7 +1866,7 @@ Funtech Super A'Can %ROMPATH%/supracan .bin .BIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "supracan -rompath %GAMEDIR%\;%ROMPATH%/supracan -cart \"%ROMRAW%\"" + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "supracan -rompath \"%GAMEDIRRAW%;%ROMPATH%/supracan\" -cart \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/supracan supracan -cart %ROM% supracan supracan @@ -1879,6 +1914,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + pcengine tg16 @@ -1891,6 +1927,7 @@ %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_libretro.so %ROM% %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_pce_fast_libretro.so %ROM% + pcenginecd tg-cd @@ -1908,10 +1945,11 @@ tic80 - TIC-80 Game Engine + TIC-80 Fantasy Computer %ROMPATH%/tic80 .tic .TIC %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/tic80_libretro.so %ROM% + tic80 tic80 @@ -1919,7 +1957,7 @@ to8 Thomson TO8 %ROMPATH%/to8 - .fd .FD .sap .SAP .k7 .K7 .m7 .M7 .m5 .M5 .rom .ROM .7z .7Z .zip .ZIP + .fd .FD .k7 .K7 .m5 .M5 .m7 .M7 .rom .ROM .sap .SAP .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/theodore_libretro.so %ROM% moto to8 @@ -1969,10 +2007,12 @@ vectrex - Smith Engineering Vectrex + GCE Vectrex %ROMPATH%/vectrex - .bin .BIN .vec .VEC .gam .GAM .vc .VC .7z .7Z .zip .ZIP + .bin .BIN .gam .GAM .vc .VC .vec .VEC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/vecx_libretro.so %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "vectrex -rompath \"%GAMEDIRRAW%;%ROMPATH%/vectrex\" -cart \"%ROMRAW%\"" + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/vectrex vectrex -cart %ROM% vectrex vectrex @@ -1992,14 +2032,16 @@ %ROMPATH%/videopac .bin .BIN .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/o2em_libretro.so %ROM% - videopac + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "videopac -rompath \"%GAMEDIRRAW%;%ROMPATH%/videopac\" -cart \"%ROMRAW%\"" + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/videopac videopac -cart %ROM% + odyssey2 videopac virtualboy Nintendo Virtual Boy %ROMPATH%/virtualboy - .vb .VB .vboy .VBOY .bin .BIN .7z .7Z .zip .ZIP + .bin .BIN .vb .VB .vboy .VBOY .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_vb_libretro.so %ROM% virtualboy @@ -2011,7 +2053,7 @@ Visual Pinball %ROMPATH%/vpinball .vpt .VPT .vpx .VPX - %EMULATOR_VISUAL-PINBALL% -Minimized -Play %ROM% + %EMULATOR_VISUAL-PINBALL% -play %ROM% vpinball vpinball @@ -2022,7 +2064,7 @@ VTech V.Smile %ROMPATH%/vsmile .bin .BIN .7z .7Z .zip .ZIP - %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "vsmile -rompath %GAMEDIR%\;%ROMPATH%/vsmile -cart \"%ROMRAW%\"" + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mame_libretro.so "vsmile -rompath \"%GAMEDIRRAW%;%ROMPATH%/vsmile\" -cart \"%ROMRAW%\"" %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/vsmile vsmile -cart %ROM% vsmile vsmile @@ -2057,14 +2099,55 @@ wiiu wiiu + + windows + Microsoft Windows + %ROMPATH%/windows + .AppImage .desktop .sh + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + %RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + %EMULATOR_OS-SHELL% -c "%ROM%" + %RUNINBACKGROUND% %EMULATOR_OS-SHELL% -c "%ROM%" + pcwindows + windows + + + windows3x + Microsoft Windows 3.x + %ROMPATH%/windows3x + .AppImage .bat .BAT .desktop .dosz .DOSZ .sh .7z .7Z .zip .ZIP + %STARTDIR%=%GAMEDIR% %EMULATOR_DOSBOX-X% -defaultdir %GAMEDIR% %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM% + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + %RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + %EMULATOR_OS-SHELL% -c "%ROM%" + %RUNINBACKGROUND% %EMULATOR_OS-SHELL% -c "%ROM%" + windows3x + windows3x + + + windows9x + Microsoft Windows 9x + %ROMPATH%/windows9x + .AppImage .bat .BAT .desktop .dosz .DOSZ .sh .7z .7Z .zip .ZIP + %STARTDIR%=%GAMEDIR% %EMULATOR_DOSBOX-X% -defaultdir %GAMEDIR% %ROM% + %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/dosbox_pure_libretro.so %ROM% + %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + %RUNINBACKGROUND% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% + %EMULATOR_OS-SHELL% -c "%ROM%" + %RUNINBACKGROUND% %EMULATOR_OS-SHELL% -c "%ROM%" + pcwindows + windows9x + wonderswan Bandai WonderSwan %ROMPATH%/wonderswan - .ws .WS .pc2 .PC2 .7z .7Z .zip .ZIP + .pc2 .PC2 .ws .WS .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.so %ROM% + wonderswan wonderswan @@ -2072,7 +2155,7 @@ wonderswancolor Bandai WonderSwan Color %ROMPATH%/wonderswancolor - .ws .WS .wsc .WSC .pc2 .PC2 .7z .7Z .zip .ZIP + .pc2 .PC2 .ws .WS .wsc .WSC .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/mednafen_wswan_libretro.so %ROM% @@ -2083,7 +2166,7 @@ x1 Sharp X1 %ROMPATH%/x1 - .dx1 .DX1 .2d .2D .2hd .2HD .tfd .TFD .d88 .D88 .88d .88D .hdm .HDM .xdf .XDF .dup .DUP .tap .TAP .cmd .CMD .7z .7Z .zip .ZIP + .2d .2D .2hd .2HD .88d .88D .cmd .CMD .d88 .D88 .dup .DUP .dx1 .DX1 .hdm .HDM .tap .TAP .tfd .TFD .xdf .XDF .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/x1_libretro.so %ROM% x1 x1 @@ -2092,9 +2175,9 @@ x68000 Sharp X68000 %ROMPATH%/x68000 - .dim .DIM .img .IMG .d88 .D88 .88d .88D .hdm .HDM .dup .DUP .2hd .2HD .xdf .XDF .hdf .HDF .cmd .CMD .m3u .M3U .7z .7Z .zip .ZIP + .2hd .2HD .88d .88D .cmd .CMD .d88 .D88 .dim .DIM .dup .DUP .hdf .HDF .hdm .HDM .img .IMG .m3u .M3U .xdf .XDF .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/px68k_libretro.so %ROM% - %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/x68000 x68000 -flop1 %ROM% + %STARTDIR%=~/.mame %EMULATOR_MAME% -rompath %GAMEDIR%\;%ROMPATH%/x68000 x68000 -flop1 %ROM% x68000 x68000 @@ -2112,7 +2195,7 @@ xbox360 Microsoft Xbox 360 %ROMPATH%/xbox360 - . .desktop .iso .ISO .sh .xex .XEX + . .desktop .iso .ISO .sh .xex .XEX .zar .ZAR %STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_XENIA-WINDOWS% %ROM% %STARTDIR%=%EMUDIR% %PRECOMMAND_PROTON% %EMULATOR_XENIA-WINDOWS% %ROM% %ENABLESHORTCUTS% %EMULATOR_OS-SHELL% %ROM% @@ -2135,7 +2218,7 @@ zx81 Sinclair ZX81 %ROMPATH%/zx81 - .tzx .TZX .p .P .7z .7Z .zip .ZIP + .p .P .tzx .TZX .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/81_libretro.so %ROM% zx81 zx81 From 534084b59cd37c119c5568c196d64a2169a66fe2 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Mon, 19 Feb 2024 16:24:48 +0100 Subject: [PATCH 22/81] ES-DE: changed branch in manifest --- 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 5d895820..5e5aba2e 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -419,7 +419,7 @@ modules: sources: - type: git url: https://github.com/XargonWan/RetroDECK-ES-DE - branch: cebbeff3b5f834fd9adaeb1f5dc9e0da6b106599 + branch: update/3.0 - type: shell commands: - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK From f3ffd6e782ef2fc10cf5f5dab41f8e333cc54d7d Mon Sep 17 00:00:00 2001 From: Lazorne Date: Mon, 19 Feb 2024 18:56:13 +0100 Subject: [PATCH 23/81] Added ScummVM Radial Icons --- res/binding_icons/rd-pc-call.png | Bin 0 -> 440 bytes res/binding_icons/rd-pc-close.png | Bin 0 -> 4298 bytes res/binding_icons/rd-pc-fight.png | Bin 0 -> 278 bytes res/binding_icons/rd-pc-give.png | Bin 0 -> 377 bytes res/binding_icons/rd-pc-look.png | Bin 0 -> 2439 bytes res/binding_icons/rd-pc-move.png | Bin 0 -> 277 bytes res/binding_icons/rd-pc-open.png | Bin 0 -> 4660 bytes res/binding_icons/rd-pc-pickup.png | Bin 0 -> 340 bytes res/binding_icons/rd-pc-pull.png | Bin 0 -> 447 bytes res/binding_icons/rd-pc-push.png | Bin 0 -> 341 bytes res/binding_icons/rd-pc-read.png | Bin 0 -> 747 bytes res/binding_icons/rd-pc-talk.png | Bin 0 -> 591 bytes res/binding_icons/rd-pc-use.png | Bin 0 -> 1526 bytes 13 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 res/binding_icons/rd-pc-call.png create mode 100644 res/binding_icons/rd-pc-close.png create mode 100644 res/binding_icons/rd-pc-fight.png create mode 100644 res/binding_icons/rd-pc-give.png create mode 100644 res/binding_icons/rd-pc-look.png create mode 100644 res/binding_icons/rd-pc-move.png create mode 100644 res/binding_icons/rd-pc-open.png create mode 100644 res/binding_icons/rd-pc-pickup.png create mode 100644 res/binding_icons/rd-pc-pull.png create mode 100644 res/binding_icons/rd-pc-push.png create mode 100644 res/binding_icons/rd-pc-read.png create mode 100644 res/binding_icons/rd-pc-talk.png create mode 100644 res/binding_icons/rd-pc-use.png diff --git a/res/binding_icons/rd-pc-call.png b/res/binding_icons/rd-pc-call.png new file mode 100644 index 0000000000000000000000000000000000000000..66e1069727291b35d4152c2a0ed65d08f9d037a8 GIT binary patch literal 440 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 literal 0 HcmV?d00001 diff --git a/res/binding_icons/rd-pc-fight.png b/res/binding_icons/rd-pc-fight.png new file mode 100644 index 0000000000000000000000000000000000000000..4b5e5c787ed75498f2962241740b63bc31f8a961 GIT binary patch literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJi=HlyArY-_ry24!If%HhSD#;? zCf6XrcYtxp<_$}}NKBb>`&MLdVM}}gL;nFmj;X9CZ!j3HaOBaM^=G=z?$1WiZLIC^_A0C@|6Oh?P!P(=myzj;pF6PO2e~{;OOv3GECQ3TvIGl2>^`<=eA~GZyce zx?+{_*r>0m2Pes?td+?c&R z4E`+oPxGQXmpr^GjGplRvB%B9pKIGEnUX&v|Uw6?|$T{Qu3wQ-C9aEtVa?QBl;@RssJ<N_5o7(n0tg=?UV~ZOO^|mVMFSG9*?ATP4*kJ%M4Tx062|}Ro!pfR1`mnZ(O7nKcKOW4i$^9Ra0BJ8yc;~21%2p=|UR0&DbiW z$#rfTQ`a`O(`{9s_5yDV_yd5l2Of}kLK+Oj_Ok5(v`JGz71bo9J#^YYXp{DWs&KBa zQ@dTpxRI}aIp=pi@6k0t$5)!;m`NF6-tt{FpOKHBn3g+MAqmexC-gw4rh87hTrL7G z#)U`L!(So6-Zux@>;H3gR;i~0B%VTSS3P|m@o9jRsXML@Al^p#@G0Lx-0?i(9WEw_ zSYddU<1E8793KxjQ|c&UmW!mTC>k>?{om1c9S zUx<6_jj_!T&^M{wWM#>IBbOSf*xP<^F{$j$aOQ5Y{cT zROCL1M7^NKKL z&(yA}mSw#iM0^;IB{ZO5!wl{^Sg-*ysE~&Yz8!E;Qv(A`lu*=Clo*MpVGd>OdF6n^ zam1Jntk;<}MrqIC5$=Q>n{*R}?8oOIDUw5En2dl--Xw34!z7E+5pr-OgyQ-soSab)C%saskMla`aQLVzg0+MZf20tJU&K{hZoBrUc+U4e9&3o zw|KmGEe4#xz17wBu{f`SS_4i66?j31EjY7n{zGfhONK~c+td!TS#B}JoR}5UAd7p& z5phTyXSkK0xCeD3xaYP^o&J~#Xp9xFb0C;HHml5fA<%h1eR|qw7wxF+oNL9T1Aits?sKNIwvGaN)^WO$I^cUV)HzL_| z1K?{9p!>B*)`xfEv!4N6IG{J&h49W#Bz^(#YWw%`e_a{8n{G9m5AeR~_yl0%<7V@p z2RaaL}F_}z}93X_? znP>aZe0mKavD3n*Vdm^D*#ASKC@vCcwOUbDR(5q@V4#rt9Lz6`JdAR5u*IdNrD8ZE z4hDlFNv27H`}4Pm+Mw2sNtQBBuB1X!~%TZihjFOTPT)yJR)@|;a zXJGZKDr9ExsI9FknOE#YKLxcIDCAvLdIL4yY98AjlPBgQdXoP1$P^WDZ@Yv z1|2cev7|7b9REa1&g@Jf@4p;x9WOyNz6r0z!4DMVu!YB=CJF8`XTxYT(mU`=javMidIAcp-jt5nFLpx^I7&*-hDIZ{Jt-Bzs^IY}F|*`e zBpZUVNeTF^)z_Vrq((wQBKrIL;qiFT+uMtQK_4D|WI1G<6yb0f9UUE_Kz18g6*5xk zD9B;$k_9IvV9!2V%kZ!d4u@Ubna}5k-EOA`l1E$HMfzhQi1~d!ANrmB7#bRa-|xqx z^HMY0>)x~9QjdwNI2lg`R3P-2}%fwV-xoG#Ea5r$d;XccaeSP%rL)oRSh zypDr4r*Ynap;!crxdk2{In~fcH0z#6(b3=Cw7eX?e0=~*3LH?n&){U^Ao5atFlp?l z`=bwm5D#^nfDB13*6)$`T(G*ksDK^OikPqyp4gf|PPB5g$z*_6sOV2;E4&`Bn3uhC z23Db*X=d!-Xu^g~zc{xa^Vn#>Hxyq)D`3JC>u|~3v&=q~PT7g=wON>+GaY)p9&R_Q zibU*$$?9Hw_=*PboWuSTpAY5pXxCkPo{O8lp0k+5wc37?xw!YvPx zuh+lvlwIoLg3awx&+%sOWsfh+ z-pltCQI~ym?x+ON1zL(F6c17qQ84SHV8lOD3{w0z?Qb})6Om+hMb-cS002ovPDHLk FV1f}VvpE0& literal 0 HcmV?d00001 diff --git a/res/binding_icons/rd-pc-move.png b/res/binding_icons/rd-pc-move.png new file mode 100644 index 0000000000000000000000000000000000000000..8a9635b9066233ba06f4dc9c4ace7a4a7c7f2bbb GIT binary patch literal 277 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 literal 0 HcmV?d00001 diff --git a/res/binding_icons/rd-pc-push.png b/res/binding_icons/rd-pc-push.png new file mode 100644 index 0000000000000000000000000000000000000000..1eec6137e45216c4537df788f21fce2d94fdda77 GIT binary patch literal 341 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFba6OIEF;DzMXbZutkB#b-(rP z_L4gll&K54ZFio;l|4FZ$HE3Ek^}jF>NrpE!^qNz_*p*rxnAd zs?JTSVL_6CrVSQ}clccn*r+>8din2IbD-{Oq3MxHGxy$_v9Da6p`qA2C%QqBVb3n} zJZ1~_FSZv-qn+CrD)=2f&JGJ@@aXlN{fDQav!T!@-s|Pu+w;O#>T9%%-Y}m(#m+0Q zNc+@WCOhlz(@qvM=p5Jn_P^rmwNt+uX87{HtzJ-=XE-_0!#?7DZRe3VOBREP_wsZT e<7U2QulQEETsK)>1sFsOp00i_>zoprkl6rTG=-l4 literal 0 HcmV?d00001 diff --git a/res/binding_icons/rd-pc-read.png b/res/binding_icons/rd-pc-read.png new file mode 100644 index 0000000000000000000000000000000000000000..d9880d85db87467c0051e080b1295951d23b097b GIT binary patch literal 747 zcmVifM@(?^qzSCT^rX^3fMi|T>=37FvIMl zSIhU}F^KA}hr3JoVFmz5bdKw*G2boWWy{7yui<-q|8gOpZDk?RIc#O2?+k%36A{X( zH@iu|&byf*(K&9HYs?obA@y!%004I~0Dw}IBu{jXZM=ay8Q{m=Z`jJh?Q(sx0I|ZfW1TUkQfcZS%;8xiC49%cx1iucYNY~zgxYI2}92l~zs?qnbiOw~w!^TVt} z{&x0CTp*@ugl)WmA7)5&UQ2vb0Euj60RRG>mZB&5feU-WK&KLftt{Bef{qXJ@3;Uu zz=#r^A4E!Wf;mv4l zvm7w9msYxy0s79cmYi#*YJ|QsEV+1=16&yBREYdA!#3WC10*pW2y`kAFfTeeV8ZMH zbij1Vd^R26GxMSetz}3Ds+%y$7&-8_3d}NWLu(mUyC54;RctkBtCiH01C7Ioi;IQ( z9M}u{=|vJY3zU+S$<5M3mmj&GvnDKIEFh3sP_2kG)#1kulEtAY9!GHI>qO2k-SICe}yZ&o{YOE zA!j_WMxav>;oTP`1zA*GCSlGOtKI%@n26{kzz;Ja1BwVgd|K9$HNhmFFIKf{>NeS3 zUyY%h9y~8<-Jk`nf6E)I!1E#iMHK&lo^dt4PzO0b;Oyv6!m&+T?R&;!;19*-tD z>N^2<^yqpYKr%5N)%ITQeR$qa;D#Ii7`Zck6JPUA6XO^FUY=`Gqxa9i=x$vCu{Ej# z09vFd94zQoc&Dp4Nkn1q0NTw0 zC&HXFkm}y&Azad&Q4tW}dONt@4((j|JT#q!F+Cq#_I~-Yrt(j#*Wxx}jDXGU;9H z6`49444)dD6shJ8u|75<-B4%|2x$Zt;3R;3U$EzX%2ro;BLYbhA&t=Qlwgf*;k?(Y z129iQ<7s%BfFX^9Ilu4dx*0C|T?p6ME&(88J2u^hFCichxzb(#7(aGt_u_du dyTAYd002ovPDHLkV1fVu002ovPDHLkV1iNA`eFb8 literal 0 HcmV?d00001 diff --git a/res/binding_icons/rd-pc-use.png b/res/binding_icons/rd-pc-use.png new file mode 100644 index 0000000000000000000000000000000000000000..3234426bbaa680ceb55c22f1bddf0334921e3472 GIT binary patch literal 1526 zcmVY%D>wlzdLv5}FHY;#jo z&~;sL+u%;%Xf&FWKsrHHRfRA>(KAUbX1cB`Sru5!LZJ|u5W(=-jA&zCI)MXvN;R-gm|0aR6` zwzgJ0y0->^;ZZ^Vz$~8}8eP)AtD^{j{()Hl+ecZFfUQ7dV>Q)6nu>aH!A_0eUz+o zQT()+H3gTLRE|@!&P7@2!XHNW{pplgvk54j6-UIbhZpIrIFhq?2qB2YVkyAo<>iju zF4&}UJg2hryC?lZqI6aqq3TYHJbzE(7zYm?OpzKO5{b}UpA0q|-0Ssn%{WR~X&&!w z4YFSPBd5N3OnZAf{r&xf z!(q;~_HpC(-xR4XO4hmPe)M??$(j$pm3>Wa8Jh)sg^78VSo}QLRR4C3c#K+5e=ZSZ>dU#{~LiB!rBSHIDukz>9LoyC* z&@CIT6Q4RP=f1iAvMfwxtIpCtTAxvhZTv+E*!D}0MNLi3qEg!CEKKRan+Copfn`0_ cUdF@tA6o6cfZVCWCjbBd07*qoM6N<$f--x}n*aa+ literal 0 HcmV?d00001 From 8541752e2ece326e610cde9532227634aa8a311b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 20 Feb 2024 08:50:54 +0100 Subject: [PATCH 24/81] ES-DE: fixed systems path from unix to linux --- net.retrodeck.retrodeck.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 5e5aba2e..d95c2908 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -407,7 +407,7 @@ modules: - '*.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 + # https://gitlab.com/es-de/emulationstation-de/-/blob/[VERSION]/resources/systems/linux/es_find_rules.xml # But we don't include them 1:1 as RetroDECK got some specific configs in some cases - name: ES-DE buildsystem: cmake-ninja @@ -1302,10 +1302,10 @@ modules: - mkdir -p ${FLATPAK_DEST}/retrodeck # Prep the ES-DE and RetroArch config files - I will have to SED/XMLSTARLET them soon - - rm -rf /app/share/emulationstation/resources/systems/unix/es_find_rules.xml - - cp es-configs/es_find_rules.xml /app/share/emulationstation/resources/systems/unix/ - - rm -rf /app/share/emulationstation/resources/systems/unix/es_systems.xml - - cp es-configs/es_systems.xml /app/share/emulationstation/resources/systems/unix/ + - rm -rf /app/share/emulationstation/resources/systems/linux/es_find_rules.xml + - cp es-configs/es_find_rules.xml /app/share/emulationstation/resources/systems/linux/ + - rm -rf /app/share/emulationstation/resources/systems/linux/es_systems.xml + - cp es-configs/es_systems.xml /app/share/emulationstation/resources/systems/linux/ # These must be put in home folder, managed by retrodeck.sh - cp es-configs/es_settings.xml ${FLATPAK_DEST}/retrodeck/es_settings.xml - mv -f -t ${FLATPAK_DEST}/retrodeck es-configs/rd_prepacks From 831b4aeb97304903874b96989ff7bda29c8d49a0 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 20 Feb 2024 09:13:45 +0100 Subject: [PATCH 25/81] BRANCH_SELECTOR: added a new branch selector --- functions/branch_selection.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100755 functions/branch_selection.sh diff --git a/functions/branch_selection.sh b/functions/branch_selection.sh new file mode 100755 index 00000000..375fe74e --- /dev/null +++ b/functions/branch_selection.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +# Fetch branches from GitHub API +branches=$(curl -s https://api.github.com/repos/XargonWan/RetroDECK/branches | grep '"name":' | awk -F '"' '{print $4}') + +# Create an array to store branch names +branch_array=() + +# Loop through each branch and add it to the array +while IFS= read -r branch; do + branch_array+=("$branch") +done <<< "$branches" + +# Display branches in a Zenity list dialog +selected_branch=$(zenity --list --title="Select Branch" --column="Branch" "${branch_array[@]}") + +# Output selected branch +echo "Selected branch: $selected_branch" \ No newline at end of file From ceb462379daea6bd62278ac846e615bdde51454e Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 20 Feb 2024 09:14:35 +0100 Subject: [PATCH 26/81] BRANCH_SELECTOR: added logger placeholders --- functions/branch_selection.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/functions/branch_selection.sh b/functions/branch_selection.sh index 375fe74e..c245405d 100755 --- a/functions/branch_selection.sh +++ b/functions/branch_selection.sh @@ -2,6 +2,7 @@ # Fetch branches from GitHub API branches=$(curl -s https://api.github.com/repos/XargonWan/RetroDECK/branches | grep '"name":' | awk -F '"' '{print $4}') +# TODO logger # Create an array to store branch names branch_array=() @@ -13,6 +14,7 @@ done <<< "$branches" # Display branches in a Zenity list dialog selected_branch=$(zenity --list --title="Select Branch" --column="Branch" "${branch_array[@]}") +# TODO: logger # Output selected branch -echo "Selected branch: $selected_branch" \ No newline at end of file +echo "Selected branch: $selected_branch" # TODO: logger \ No newline at end of file From 998818d57ce19d0da5e4989bf260b1741861286c Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 20 Feb 2024 09:42:18 +0100 Subject: [PATCH 27/81] BRANCH_SELECTOR: improved script --- functions/branch_selection.sh | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/functions/branch_selection.sh b/functions/branch_selection.sh index c245405d..d56534a0 100755 --- a/functions/branch_selection.sh +++ b/functions/branch_selection.sh @@ -1,8 +1,8 @@ #!/bin/bash -# Fetch branches from GitHub API -branches=$(curl -s https://api.github.com/repos/XargonWan/RetroDECK/branches | grep '"name":' | awk -F '"' '{print $4}') -# TODO logger +# Fetch branches from GitHub API excluding "main" +branches=$(curl -s https://api.github.com/repos/XargonWan/RetroDECK/branches | grep '"name":' | awk -F '"' '$4 != "main" {print $4}') +# TODO: logging - Fetching branches from GitHub API # Create an array to store branch names branch_array=() @@ -11,10 +11,20 @@ branch_array=() while IFS= read -r branch; do branch_array+=("$branch") done <<< "$branches" +# TODO: logging - Creating array of branch names # Display branches in a Zenity list dialog -selected_branch=$(zenity --list --title="Select Branch" --column="Branch" "${branch_array[@]}") -# TODO: logger +selected_branch=$(zenity --list --title="Select Branch" --column="Branch" --width=1280 --height=800 "${branch_array[@]}") +# TODO: logging - Displaying branches in Zenity list dialog -# Output selected branch -echo "Selected branch: $selected_branch" # TODO: logger \ No newline at end of file +# Display warning message +if [ $selected_branch ]; then + zenity --question --text="Are you sure you want to move to \"$selected_branch\" branch?" + # Output selected branch + echo "Selected branch: $selected_branch" # TODO: logging - Outputting selected branch + zenity --info --text="The data will be now downloaded, please stand by." + # Do stuff here +else + zenity --warning --text="No branch selected, exiting." + # TODO: logging +fi From 310324da57014534f39bdcb02a188138ee5dba8b Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 20 Feb 2024 09:43:21 +0100 Subject: [PATCH 28/81] BRANCH_SELECTOR: moved in functions --- functions/branch_selection.sh | 30 ------------------------------ functions/functions.sh | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 30 deletions(-) delete mode 100755 functions/branch_selection.sh diff --git a/functions/branch_selection.sh b/functions/branch_selection.sh deleted file mode 100755 index d56534a0..00000000 --- a/functions/branch_selection.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# Fetch branches from GitHub API excluding "main" -branches=$(curl -s https://api.github.com/repos/XargonWan/RetroDECK/branches | grep '"name":' | awk -F '"' '$4 != "main" {print $4}') -# TODO: logging - Fetching branches from GitHub API - -# Create an array to store branch names -branch_array=() - -# Loop through each branch and add it to the array -while IFS= read -r branch; do - branch_array+=("$branch") -done <<< "$branches" -# TODO: logging - Creating array of branch names - -# Display branches in a Zenity list dialog -selected_branch=$(zenity --list --title="Select Branch" --column="Branch" --width=1280 --height=800 "${branch_array[@]}") -# TODO: logging - Displaying branches in Zenity list dialog - -# Display warning message -if [ $selected_branch ]; then - zenity --question --text="Are you sure you want to move to \"$selected_branch\" branch?" - # Output selected branch - echo "Selected branch: $selected_branch" # TODO: logging - Outputting selected branch - zenity --info --text="The data will be now downloaded, please stand by." - # Do stuff here -else - zenity --warning --text="No branch selected, exiting." - # TODO: logging -fi diff --git a/functions/functions.sh b/functions/functions.sh index a03d1e35..16f27d3f 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -562,6 +562,37 @@ easter_eggs() { cp -f "$new_splash_file" "$current_splash_file" # Deploy assigned splash screen } +branch_selector() { + # Fetch branches from GitHub API excluding "main" + branches=$(curl -s https://api.github.com/repos/XargonWan/RetroDECK/branches | grep '"name":' | awk -F '"' '$4 != "main" {print $4}') + # TODO: logging - Fetching branches from GitHub API + + # Create an array to store branch names + branch_array=() + + # Loop through each branch and add it to the array + while IFS= read -r branch; do + branch_array+=("$branch") + done <<< "$branches" + # TODO: logging - Creating array of branch names + + # Display branches in a Zenity list dialog + selected_branch=$(zenity --list --title="Select Branch" --column="Branch" --width=1280 --height=800 "${branch_array[@]}") + # TODO: logging - Displaying branches in Zenity list dialog + + # Display warning message + if [ $selected_branch ]; then + zenity --question --text="Are you sure you want to move to \"$selected_branch\" branch?" + # Output selected branch + echo "Selected branch: $selected_branch" # TODO: logging - Outputting selected branch + zenity --info --text="The data will be now downloaded, please stand by." + # Do stuff here + else + zenity --warning --text="No branch selected, exiting." + # TODO: logging + fi +} + quit_retrodeck() { pkill -f retrodeck pkill -f emulationstation From 44154a55a6a1d0912470f711d25bca1aedca7bcc Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 20 Feb 2024 11:57:26 +0100 Subject: [PATCH 29/81] BRANCH_SELECTOR: enhanced scripting, put placeholders --- functions/checks.sh | 1 + functions/functions.sh | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/functions/checks.sh b/functions/checks.sh index bb93b322..7b76d82f 100644 --- a/functions/checks.sh +++ b/functions/checks.sh @@ -59,6 +59,7 @@ check_for_version_update() { # configurator_generic_dialog "RetroDECK Online Update" "The update process is now complete!\n\nPlease restart RetroDECK to keep the fun going." # exit 1 # fi + # TODO: add the logic to check and update the branch from the configuration file 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" \ diff --git a/functions/functions.sh b/functions/functions.sh index 16f27d3f..f5ae5368 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -562,6 +562,7 @@ easter_eggs() { cp -f "$new_splash_file" "$current_splash_file" # Deploy assigned splash screen } +# TODO: this function is not yet used branch_selector() { # Fetch branches from GitHub API excluding "main" branches=$(curl -s https://api.github.com/repos/XargonWan/RetroDECK/branches | grep '"name":' | awk -F '"' '$4 != "main" {print $4}') @@ -577,18 +578,43 @@ branch_selector() { # TODO: logging - Creating array of branch names # Display branches in a Zenity list dialog - selected_branch=$(zenity --list --title="Select Branch" --column="Branch" --width=1280 --height=800 "${branch_array[@]}") + selected_branch=$( + zenity --list \ + --icon-name=net.retrodeck.retrodeck \ + --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + --title "RetroDECK Configurator Cooker Branch - Select Branch" \ + --column="Branch" --width=1280 --height=800 "${branch_array[@]}" + ) # TODO: logging - Displaying branches in Zenity list dialog # Display warning message if [ $selected_branch ]; then - zenity --question --text="Are you sure you want to move to \"$selected_branch\" branch?" + zenity --question --icon-name=net.retrodeck.retrodeck --no-wrap \ + --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ + --title "RetroDECK Configurator Cooker Branch - Switch Branch" \ + --text="Are you sure you want to move to \"$selected_branch\" branch?" # Output selected branch echo "Selected branch: $selected_branch" # TODO: logging - Outputting selected branch - zenity --info --text="The data will be now downloaded, please stand by." - # Do stuff here + # TODO: write the branch into the config file + # TODO: check what is the last release for $selected_branch + # TODO: form a proper url: $flatpak_file_url + 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." + ( + local desired_flatpak_file=$(curl --silent $flatpak_file_url | grep '"browser_download_url":' | sed -E 's/.*"([^"]+)".*/\1/') + mkdir -p "$rdhome/RetroDECK_Updates" + wget -P "$rdhome/RetroDECK_Updates" $desired_flatpak_file + flatpak-spawn --host flatpak remove --noninteractive -y net.retrodeck.retrodeck # Remove current version before installing new one, to avoid duplicates + flatpak-spawn --host flatpak install --user --bundle --noninteractive -y "$rdhome/RetroDECK_Updates/RetroDECK-cooker.flatpak" + rm -rf "$rdhome/RetroDECK_Updates" # Cleanup old bundles to save space + ) | + 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="RetroDECK is updating to the latest \"$selected_branch\" version, please wait." + configurator_generic_dialog "RetroDECK Online Update" "The update process is now complete!\n\nPlease restart RetroDECK to keep the fun going." + exit 1 else - zenity --warning --text="No branch selected, exiting." + configurator_generic_dialog "No branch selected, exiting." # TODO: logging fi } From ec326284e447973681cc9bfceff5094df6f17451 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 20 Feb 2024 13:10:20 +0100 Subject: [PATCH 30/81] BRANCH_SELECTOR: added branch variable in the config --- emu-configs/defaults/retrodeck/retrodeck.cfg | 1 + functions/functions.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/emu-configs/defaults/retrodeck/retrodeck.cfg b/emu-configs/defaults/retrodeck/retrodeck.cfg index da64517f..5cf0a8f2 100644 --- a/emu-configs/defaults/retrodeck/retrodeck.cfg +++ b/emu-configs/defaults/retrodeck/retrodeck.cfg @@ -21,6 +21,7 @@ desktop_mode_warning=true low_space_warning=true update_check=false update_repo=RetroDECK +branch= update_ignore= cloud_saves=false multi_user_mode=false diff --git a/functions/functions.sh b/functions/functions.sh index f5ae5368..622c3f0c 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -595,7 +595,7 @@ branch_selector() { --text="Are you sure you want to move to \"$selected_branch\" branch?" # Output selected branch echo "Selected branch: $selected_branch" # TODO: logging - Outputting selected branch - # TODO: write the branch into the config file + set_setting_value "$rd_conf" "branch" "$selected_branch" "retrodeck" "options" # TODO: check what is the last release for $selected_branch # TODO: form a proper url: $flatpak_file_url 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." From 6e79e7c88de21be90bc3a4534e9634e9becb9753 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 20 Feb 2024 13:22:06 +0100 Subject: [PATCH 31/81] BRANCH_SELECTOR: added a line to check the latest release for a given branch --- functions/functions.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/functions/functions.sh b/functions/functions.sh index 622c3f0c..074c3cf5 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -596,7 +596,10 @@ branch_selector() { # Output selected branch echo "Selected branch: $selected_branch" # TODO: logging - Outputting selected branch set_setting_value "$rd_conf" "branch" "$selected_branch" "retrodeck" "options" - # TODO: check what is the last release for $selected_branch + branch="feat/sftp" + # Get the latest release for the specified branch + latest_release=$(curl -s "https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases" | jq ".[] | select(.target_commitish == \"$branch_name\") | .tag_name" | head -n 1) + # TODO: this will fail because the builds coming from the PRs are not published yet, we should fix them # TODO: form a proper url: $flatpak_file_url 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." ( From 587a646a72b401e85f7feee79f9195b148b82ae7 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 20 Feb 2024 14:15:52 +0100 Subject: [PATCH 32/81] MAME: updated configs --- emu-configs/mame/mame.ini | 42 +++++++++++++++++++-------------------- emu-configs/mame/ui.ini | 42 +++++++++++++++++++-------------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/emu-configs/mame/mame.ini b/emu-configs/mame/mame.ini index 99812b94..f47c2062 100644 --- a/emu-configs/mame/mame.ini +++ b/emu-configs/mame/mame.ini @@ -7,31 +7,31 @@ writeconfig 0 # # CORE SEARCH PATH OPTIONS # -homepath /var/config/mame -rompath RETRODECKROMSDIR -hashpath /app/share/mame/hash -samplepath /app/share/mame/samples -artpath RETRODECKHOMEDIR/downloaded_media/arcade/screenshots/ -ctrlrpath /app/share/mame/ctrlr -inipath /var/config/mame -fontpath /app/bin/ -cheatpath /app/share/mame/cheat -crosshairpath /app/share/mame/crosshair -pluginspath /app/share/mame/plugins -languagepath /app/share/mame/language -swpath /app/share/mame/software +homepath /var/data/mame/plugin-data +rompath RETRODECKROMSDIR/mame/;RETRODECKROMSDIR/arcade/;RETRODECKROMSDIR/bbcmicro/ +hashpath /var/data/mame/hash +samplepath /var/data/mame/assets/samples +artpath /var/data/mame/assets/artwork +ctrlrpath /var/config/ctrlr +inipath /var/config/mame/ini +fontpath /var/data/mame/assets/fonts +cheatpath /var/data/mame/cheat +crosshairpath /var/data/mame/assets/crosshair +pluginspath /var/data/mame/plugins +languagepath /var/data/mame/assets/language +swpath /var/data/mame/assets/software # # CORE OUTPUT DIRECTORY OPTIONS # cfg_directory /var/config/mame/cfg -nvram_directory /var/config/mame/nvram +nvram_directory RETRODECKSAVESDIR/mame-sa/nvram input_directory /var/config/mame/inp -state_directory RETRODECKSAVESDIR/mame-sa/states -snapshot_directory RETRODECKHOMEDIR/screenshots -diff_directory /var/config/mame/diff -comment_directory /var/config/mame/comments -share_directory /var/config/mame/share +state_directory RETRODECKSTATESDIR/mame-sa +snapshot_directory RETRODECKHOMEDIR/screenshots/mame-sa +diff_directory RETRODECKSAVESDIR/mame-sa/diff +comment_directory /var/data/mame/assets/comments +share_directory /var/data/mame/assets/share # # CORE STATE/PLAYBACK OPTIONS @@ -234,7 +234,7 @@ output auto keyboardprovider auto mouseprovider auto lightgunprovider auto -joystickprovider auto +joystickprovider sdljoy # # OSD DEBUGGING OPTIONS @@ -353,7 +353,7 @@ networkprovider auto # # BGFX POST-PROCESSING OPTIONS # -bgfx_path bgfx +bgfx_path /app/share/mame/bgfx bgfx_backend auto bgfx_debug 0 bgfx_screen_chains diff --git a/emu-configs/mame/ui.ini b/emu-configs/mame/ui.ini index 5955d68a..d616b1a4 100644 --- a/emu-configs/mame/ui.ini +++ b/emu-configs/mame/ui.ini @@ -1,26 +1,26 @@ # # UI SEARCH PATH OPTIONS # -historypath history;dats;. -categorypath folders -cabinets_directory cabinets;cabdevs -cpanels_directory cpanel -pcbs_directory pcb -flyers_directory flyers -titles_directory titles -ends_directory ends -marquees_directory marquees;RETRODECKHOMEDIR/downloaded_media/arcade/marquees -artwork_preview_directory "artwork preview;artpreview" -bosses_directory bosses -logos_directory logo -scores_directory scores -versus_directory versus -gameover_directory gameover -howto_directory howto -select_directory select -icons_directory icons -covers_directory covers;RETRODECKHOMEDIR/downloaded_media/arcade/covers -ui_path ui +historypath /var/data/mame/dats +categorypath /var/data/mame/folders +cabinets_directory /var/data/mame/assets/cabinets +cpanels_directory /var/data/mame/assets/cpanel +pcbs_directory /var/data/mame/assets/pcb +flyers_directory /var/data/mame/assets/flyers +titles_directory /var/data/mame/assets/titles +ends_directory /var/data/mame/assets/ends +marquees_directory /var/data/mame/assets/marquees +artwork_preview_directory /var/data/mame/assets/artwork-preview +bosses_directory /var/data/mame/assets/bosses +logos_directory /var/data/mame/assets/logo +scores_directory /var/data/mame/assets/scores +versus_directory /var/data/mame/assets/versus +gameover_directory /var/data/mame/assets/gameover +howto_directory /var/data/mame/assets/howto +select_directory /var/data/mame/assets/select +icons_directory /var/data/mame/assets/icons +covers_directory /var/data/mame/assets/covers +ui_path /var/data/mame/assets/ui # # UI MISC OPTIONS @@ -62,7 +62,7 @@ remember_last 0 last_used_filter Available system_right_panel image software_right_panel image -system_right_image cover +system_right_image snap software_right_image snap enlarge_snaps 1 forced4x3 1 From 62154e8c153bb2d04616134688d7fdf842459c63 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 20 Feb 2024 14:22:10 +0100 Subject: [PATCH 33/81] MAME: updated prepare_component --- functions/prepare_component.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 206fc3dc..74cfc55a 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -716,7 +716,7 @@ prepare_component() { sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "/var/config/mame/*.ini" sed -i 's#RETRODECKHOMESDIR#'$rdhome'#g' "/var/config/mame/*.ini" sed -i 's#RETRODECKSAVESDIR#'$rdhome'#g' "/var/config/mame/*.ini" - + sed -i 's#RETRODECKSTATESDIR#'$rdhome'#g' "/var/config/mame/*.ini" fi if [[ "$component" =~ ^(gzdoom|GZDOOM|all)$ ]]; then From d755f7ca30dd4fe778ee2f09496abee1ee7bb3f9 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 20 Feb 2024 20:29:57 +0100 Subject: [PATCH 34/81] GENERAL: fixed /**" pathing with /"** --- functions/prepare_component.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 74cfc55a..5a095536 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -712,7 +712,7 @@ prepare_component() { mkdir -p $saves_folder/mame-sa mkdir -p "/var/config/mame" dir_prep "$saves_folder/mame-sa/hiscore" "/var/config/mame/hiscore" - cp -fvr "$emuconfigs/mame/**" "/var/config/mame" + cp -fvr "$emuconfigs/mame/"** "/var/config/mame" sed -i 's#RETRODECKROMSDIR#'$roms_folder'#g' "/var/config/mame/*.ini" sed -i 's#RETRODECKHOMESDIR#'$rdhome'#g' "/var/config/mame/*.ini" sed -i 's#RETRODECKSAVESDIR#'$rdhome'#g' "/var/config/mame/*.ini" From 8fec21f9ad5c7421c408a232f333255d1a969526 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Tue, 20 Feb 2024 21:18:29 +0100 Subject: [PATCH 35/81] ES-DE: updating paths to es-de folder --- functions/global.sh | 2 +- net.retrodeck.retrodeck.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/functions/global.sh b/functions/global.sh index b71b1b3e..60f7a966 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -29,7 +29,7 @@ splashscreen_dir="/var/config/emulationstation/ES-DE/resources/graphics/extra_sp current_splash_file="/var/config/emulationstation/ES-DE/resources/graphics/splash.svg" # The active splash file that will be shown on boot default_splash_file="/var/config/emulationstation/ES-DE/resources/graphics/splash-orig.svg" # The default RetroDECK splash screen 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 -rd_es_themes="/app/share/emulationstation/themes" # The directory where themes packaged with RetroDECK are stored +rd_es_themes="/app/share/es-de/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) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index d95c2908..c330496a 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -433,8 +433,8 @@ modules: - name: art-book-next-es-de buildsystem: simple build-commands: - - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-es-de/ - - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-es-de/ + - mkdir -p ${FLATPAK_DEST}/share/es-de/themes/art-book-next-es-de/ + - mv -f * ${FLATPAK_DEST}/share/es-de/themes/art-book-next-es-de/ sources: - type: git url: https://github.com/anthonycaccese/art-book-next-es-de.git @@ -1302,16 +1302,16 @@ modules: - mkdir -p ${FLATPAK_DEST}/retrodeck # Prep the ES-DE and RetroArch config files - I will have to SED/XMLSTARLET them soon - - rm -rf /app/share/emulationstation/resources/systems/linux/es_find_rules.xml - - cp es-configs/es_find_rules.xml /app/share/emulationstation/resources/systems/linux/ - - rm -rf /app/share/emulationstation/resources/systems/linux/es_systems.xml - - cp es-configs/es_systems.xml /app/share/emulationstation/resources/systems/linux/ + - rm -rf /app/share/es-de/resources/systems/linux/es_find_rules.xml + - cp es-configs/es_find_rules.xml /app/share/es-de/resources/systems/linux/ + - rm -rf /app/share/es-de/resources/systems/linux/es_systems.xml + - cp es-configs/es_systems.xml /app/share/es-de/resources/systems/linux/ # These must be put in home folder, managed by retrodeck.sh - cp es-configs/es_settings.xml ${FLATPAK_DEST}/retrodeck/es_settings.xml - mv -f -t ${FLATPAK_DEST}/retrodeck es-configs/rd_prepacks # Logo, res, move graphics directory away from default location so splash can be changed after build - - mv -f -t ${FLATPAK_DEST}/retrodeck /app/share/emulationstation/resources/graphics + - mv -f -t ${FLATPAK_DEST}/retrodeck /app/share/es-de/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 From eb126928910e67d201ac138b38eed436180475e3 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 21 Feb 2024 10:00:52 +0100 Subject: [PATCH 36/81] ES-DE: changing more paths --- es-configs/es_settings.xml | 2 +- functions/050_save_migration.sh | 6 +- functions/functions.sh | 14 +-- functions/global.sh | 8 +- functions/post_update.sh | 6 +- functions/prepare_component.sh | 12 +-- net.retrodeck.retrodeck.yml | 4 - rd-submodules/es-de/GuiMenu.cpp.patch | 38 ------- rd-submodules/es-de/GuiMenu.h.patch | 10 -- .../es-de/GuiThemeDownloader.cpp.patch | 10 -- rd-submodules/es-de/ViewController.cpp.patch | 101 ------------------ rd-submodules/es-de/Window.cpp.patch | 9 -- rd-submodules/es-de/patch_helper.sh | 31 ------ tools/configurator.sh | 2 +- 14 files changed, 26 insertions(+), 227 deletions(-) delete mode 100644 rd-submodules/es-de/GuiMenu.cpp.patch delete mode 100644 rd-submodules/es-de/GuiMenu.h.patch delete mode 100644 rd-submodules/es-de/GuiThemeDownloader.cpp.patch delete mode 100644 rd-submodules/es-de/ViewController.cpp.patch delete mode 100644 rd-submodules/es-de/Window.cpp.patch delete mode 100755 rd-submodules/es-de/patch_helper.sh diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index cad78b67..117f1800 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -145,7 +145,7 @@ - + diff --git a/functions/050_save_migration.sh b/functions/050_save_migration.sh index 41213705..786686fc 100644 --- a/functions/050_save_migration.sh +++ b/functions/050_save_migration.sh @@ -28,12 +28,12 @@ save_migration() { fi # Doing the dir prep as we don't know from which version we came - dir_prep "$media_folder" "/var/config/emulationstation/ES-DE/downloaded_media" - dir_prep "$themes_folder" "/var/config/emulationstation/ES-DE/themes" + dir_prep "$media_folder" "/var/config/es-de/ES-DE/downloaded_media" + dir_prep "$themes_folder" "/var/config/es-de/ES-DE/themes" mkdir -pv $rdhome/logs #this was added later, maybe safe to remove in a few versions # Resetting es_settings, now we need it but in the future I should think a better solution, maybe with sed - cp -fv /app/retrodeck/es_settings.xml /var/config/emulationstation/ES-DE/es_settings.xml + cp -fv /app/retrodeck/es_settings.xml /var/config/es-de/ES-DE/es_settings.xml # 0.4 -> 0.5 # Perform save and state migration if needed diff --git a/functions/functions.sh b/functions/functions.sh index a03d1e35..b5bf389d 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -486,9 +486,9 @@ install_retrodeck_starterpack() { ## DOOM section ## cp /app/retrodeck/extras/doom1.wad "$roms_folder/doom/doom1.wad" # No -f in case the user already has it - mkdir -p "/var/config/emulationstation/ES-DE/gamelists/doom" - if [[ ! -f "/var/config/emulationstation/ES-DE/gamelists/doom/gamelist.xml" ]]; then # Don't overwrite an existing gamelist - cp "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/emulationstation/ES-DE/gamelists/doom/gamelist.xml" + mkdir -p "/var/config/es-de/ES-DE/gamelists/doom" + if [[ ! -f "/var/config/es-de/ES-DE/gamelists/doom/gamelist.xml" ]]; then # Don't overwrite an existing gamelist + cp "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/es-de/ES-DE/gamelists/doom/gamelist.xml" fi mkdir -p "$media_folder/doom" unzip -oq "/app/retrodeck/rd_prepacks/doom/doom.zip" -d "$media_folder/doom/" @@ -519,8 +519,8 @@ update_splashscreens() { # This script will purge any existing ES graphics and reload them from RO space into somewhere ES will look for it # USAGE: update_splashscreens - rm -rf /var/config/emulationstation/ES-DE/resources/graphics - rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/emulationstation/ES-DE/resources/graphics/" + rm -rf /var/config/es-de/ES-DE/resources/graphics + rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/es-de/ES-DE/resources/graphics/" } deploy_helper_files() { @@ -564,12 +564,12 @@ easter_eggs() { quit_retrodeck() { pkill -f retrodeck - pkill -f emulationstation + pkill -f es-de } start_retrodeck() { easter_eggs # Check if today has a surprise splashscreen and load it if so # normal startup echo "Starting RetroDECK v$version" - emulationstation --home /var/config/emulationstation + es-de --home /var/config/es-de } diff --git a/functions/global.sh b/functions/global.sh index 60f7a966..9a6ba230 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -25,9 +25,9 @@ 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/ES-DE/resources/graphics/extra_splashes" # The default location of extra splash screens -current_splash_file="/var/config/emulationstation/ES-DE/resources/graphics/splash.svg" # The active splash file that will be shown on boot -default_splash_file="/var/config/emulationstation/ES-DE/resources/graphics/splash-orig.svg" # The default RetroDECK splash screen +splashscreen_dir="/var/config/es-de/ES-DE/resources/graphics/extra_splashes" # The default location of extra splash screens +current_splash_file="/var/config/es-de/ES-DE/resources/graphics/splash.svg" # The active splash file that will be shown on boot +default_splash_file="/var/config/es-de/ES-DE/resources/graphics/splash-orig.svg" # The default RetroDECK splash screen 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 rd_es_themes="/app/share/es-de/themes" # The directory where themes packaged with RetroDECK are stored lockfile="/var/config/retrodeck/.lock" # where the lockfile is located @@ -58,7 +58,7 @@ yuzuconf="/var/config/yuzu/qt-config.ini" # ES-DE config files -es_settings="/var/config/emulationstation/ES-DE/es_settings.xml" +es_settings="/var/config/es-de/ES-DE/es_settings.xml" # RetroArch config files diff --git a/functions/post_update.sh b/functions/post_update.sh index ec9acee5..2355807c 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -241,8 +241,10 @@ post_update() { # - Install RetroDECK controller profile in desired location TODO # - Change section name in retrodeck.cfg for ABXY button swap preset sed -i 's^nintendo_button_layout^abxy_button_swap^' "$rd_conf" # This is a one-off sed statement as there are no functions for replacing section names - mv -f /var/config/emulationstation/.emulationstation /var/config/emulationstation/ES-DE # in 3.0 .emulationstation was moved into ES-DE - ln -s /var/config/emulationstation/ES-DE /var/config/emulationstation/.emulationstation # symlinking it to mantain the compatibility # TODO: remove this symlink n 0.9.0b + # in 3.0 .emulationstation was moved into ES-DE + mv -f /var/config/es-de/ /var/config/es-de/ES-DE + mv -f /var/config/es-de/.emulationstation /var/config/es-de/ES-DE + ln -s /var/config/es-de/ES-DE /var/config/es-de/.emulationstation # symlinking it to mantain the compatibility # TODO: remove this symlink n 0.9.0b fi # if [[ $prev_version -le "090" ]]; then diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 206fc3dc..e09258d2 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -39,21 +39,21 @@ prepare_component() { if [[ "$component" =~ ^(es-de|ES-DE|all)$ ]]; then # For use after ESDE-related folders are moved or a reset if [[ "$action" == "reset" ]]; then - rm -rf /var/config/emulationstation/ - mkdir -p /var/config/emulationstation/ES-DE/ - cp -f /app/retrodeck/es_settings.xml /var/config/emulationstation/ES-DE/es_settings.xml + rm -rf /var/config/es-de/ + mkdir -p /var/config/es-de/ES-DE/ + cp -f /app/retrodeck/es_settings.xml /var/config/es-de/ES-DE/es_settings.xml set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings" set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings" set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings" - dir_prep "$rdhome/gamelists" "/var/config/emulationstation/ES-DE/gamelists" - emulationstation --home /var/config/emulationstation --create-system-dirs + dir_prep "$rdhome/gamelists" "/var/config/es-de/ES-DE/gamelists" + es-de --home /var/config/es-de --create-system-dirs update_splashscreens fi if [[ "$action" == "postmove" ]]; then set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings" set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings" set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings" - dir_prep "$rdhome/gamelists" "/var/config/emulationstation/ES-DE/gamelists" + dir_prep "$rdhome/gamelists" "/var/config/es-de/ES-DE/gamelists" fi fi diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index c330496a..ae428e37 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -421,10 +421,6 @@ modules: url: https://github.com/XargonWan/RetroDECK-ES-DE branch: update/3.0 - type: shell - commands: - - 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 # ES-DE - END diff --git a/rd-submodules/es-de/GuiMenu.cpp.patch b/rd-submodules/es-de/GuiMenu.cpp.patch deleted file mode 100644 index b0c035ea..00000000 --- a/rd-submodules/es-de/GuiMenu.cpp.patch +++ /dev/null @@ -1,38 +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-08-23 13:12:15.617292576 +0200 -+++ emulationstation-de/es-app/src/guis/GuiMenu.cpp 2023-08-23 13:44:10.736412006 +0200 -@@ -67,2 +67,4 @@ - -+ addEntry("RETRODECK CONFIGURATOR", mMenuColorPrimary, false, [this] { openRetroDeckConfigurator(); }); -+ - if (!Settings::getInstance()->getBool("ForceKiosk") && -@@ -70,3 +72,3 @@ - #if defined(__APPLE__) -- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); - #else -@@ -75,3 +77,3 @@ - else -- addEntry("QUIT EMULATIONSTATION", mMenuColorPrimary, false, [this] { openQuitMenu(); }); -+ addEntry("QUIT RETRODECK", mMenuColorPrimary, false, [this] { openQuitMenu(); }); - #endif -@@ -1758,3 +1760,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); -@@ -1910 +1912,14 @@ - } -+ -+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. -+} diff --git a/rd-submodules/es-de/GuiMenu.h.patch b/rd-submodules/es-de/GuiMenu.h.patch deleted file mode 100644 index 13a6b687..00000000 --- a/rd-submodules/es-de/GuiMenu.h.patch +++ /dev/null @@ -1,10 +0,0 @@ -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-08-23 13:12:15.617292576 +0200 -+++ emulationstation-de/es-app/src/guis/GuiMenu.h 2023-08-23 13:50:20.978700234 +0200 -@@ -46,2 +46,3 @@ - void openOtherOptions(); -+ void openRetroDeckConfigurator(); - void openQuitMenu(); -@@ -54 +55,2 @@ - #endif // ES_APP_GUIS_GUI_MENU_H -+ diff --git a/rd-submodules/es-de/GuiThemeDownloader.cpp.patch b/rd-submodules/es-de/GuiThemeDownloader.cpp.patch deleted file mode 100644 index 8dd35293..00000000 --- a/rd-submodules/es-de/GuiThemeDownloader.cpp.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -au1r emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp ---- emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp 2023-11-03 16:25:01.115126901 +0100 -+++ emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp 2023-11-03 16:26:18.882607724 +0100 -@@ -602,4 +602,4 @@ - getHelpStyle(), -- "IT SEEMS AS IF YOU'RE NOT RUNNING THE LATEST ES-DE RELEASE, PLEASE UPGRADE BEFORE " -- "PROCEEDING AS THESE THEMES MAY NOT BE COMPATIBLE WITH YOUR VERSION", -+ "ES-DE THEME ENGINE WAS UPDATED UPSTREAM. THESE THEMES MAY NOT BE COMPATIBLE WITH THE CURRENT RETRODECK VERSION." -+ "CHECK IF A NEW RETRODECK UPDATE IS AVAILABLE, ELSE PLEASE WAIT FOR IT OR PROCEED AT YOUR OWN RISK.", - "OK", [] { return; }, "", nullptr, "", nullptr, nullptr, true)); diff --git a/rd-submodules/es-de/ViewController.cpp.patch b/rd-submodules/es-de/ViewController.cpp.patch deleted file mode 100644 index 8d677c37..00000000 --- a/rd-submodules/es-de/ViewController.cpp.patch +++ /dev/null @@ -1,101 +0,0 @@ -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-11-04 15:09:24.332178777 -0400 -+++ emulationstation-de/es-app/src/views/ViewController.cpp 2023-11-04 15:13:59.015780009 -0400 -@@ -195,91 +195,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, currentROMDirectory](const std::string& newROMDirectory) { -- if (currentROMDirectory != 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, -- 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, -- 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", -- "PROCEED", -- [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, -- 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, -- nullptr, true)); -- } -- }, -- "CANCEL", nullptr, "", nullptr, nullptr, false)); -- }, -- "QUIT", -+ HelpStyle(), mNoGamesErrorMessage + mRomDirectory, "QUIT", - [] { -@@ -289,3 +201,3 @@ - }, -- nullptr, true, false, -+ "", nullptr, "", nullptr, nullptr, true, true, - (mRenderer->getIsVerticalOrientation() ? diff --git a/rd-submodules/es-de/Window.cpp.patch b/rd-submodules/es-de/Window.cpp.patch deleted file mode 100644 index c099d83b..00000000 --- a/rd-submodules/es-de/Window.cpp.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -au1r emulationstation-de/es-core/src/Window.cpp emulationstation-de/es-core/src/Window.cpp ---- emulationstation-de/es-core/src/Window.cpp 2023-08-29 14:14:17.208301836 +0200 -+++ emulationstation-de/es-core/src/Window.cpp 2023-08-29 14:12:37.307334069 +0200 - -@@ -181,3 +181,3 @@ - progressBarRect.barPosY += borderThickness; -- progressBarRect.color = 0x79010FFF; -+ progressBarRect.color = 0xC858E6FF; - mProgressBarRectangles.emplace_back(progressBarRect); diff --git a/rd-submodules/es-de/patch_helper.sh b/rd-submodules/es-de/patch_helper.sh deleted file mode 100755 index 27923b97..00000000 --- a/rd-submodules/es-de/patch_helper.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -mkdir /tmp - -branch="00a226062fff37209d98e0ab048ac89af50ecacc" -git clone "https://gitlab.com/es-de/emulationstation-de.git" /tmp/emulationstation-de - -pushd . -cd /tmp/emulationstation-de -git checkout $branch -popd - -mkdir patches-tmp - -cp /tmp/emulationstation-de/es-app/src/guis/GuiMenu.cpp ./patches-tmp -cp /tmp/emulationstation-de/es-app/src/guis/GuiMenu.h ./patches-tmp -cp /tmp/emulationstation-de/es-app/src/views/ViewController.cpp ./patches-tmp -cp /tmp/emulationstation-de/es-core/src/Window.cpp ./patches-tmp -cp /tmp/emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp ./patches-tmp - -read -p "Please edit the files in \"patches-tmp\" and press enter to continue." - -diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.cpp ./patches-tmp/GuiMenu.cpp > GuiMenu.cpp.patch -diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiMenu.h ./patches-tmp/GuiMenu.h > GuiMenu.h.patch -diff -au1r /tmp/emulationstation-de/es-app/src/views/ViewController.cpp ./patches-tmp/ViewController.cpp > ViewController.cpp.patch -diff -au1r /tmp/emulationstation-de/es-core/src/Window.cpp ./patches-tmp/Window.cpp > Window.cpp.patch -diff -au1r /tmp/emulationstation-de/es-app/src/guis/GuiThemeDownloader.cpp ./patches-tmp/GuiThemeDownloader.cpp > GuiThemeDownloader.cpp.patch - -rm -rf patches-tmp - -echo "Done, now please remeber to edit the headers of the patch files with the correct paths." \ No newline at end of file diff --git a/tools/configurator.sh b/tools/configurator.sh index d474a279..437e99fc 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -1348,7 +1348,7 @@ configurator_usb_import_dialog() { "${external_devices[@]}") if [[ ! -z "$choice" ]]; then - emulationstation --home "$choice" --create-system-dirs + es-de --home "$choice" --create-system-dirs rm -rf "$choice/ES-DE" # Cleanup unnecessary folder fi else From 1efe0aa0d9d504da4d56d238d28ee65bf51faf08 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 21 Feb 2024 10:50:28 +0100 Subject: [PATCH 37/81] WORKFLOW: added calculation for generating a vaild tag for automated PR builds [skip ci] --- .../workflows/cooker-selfhosted-persistent.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cooker-selfhosted-persistent.yml b/.github/workflows/cooker-selfhosted-persistent.yml index dced323f..b2403330 100644 --- a/.github/workflows/cooker-selfhosted-persistent.yml +++ b/.github/workflows/cooker-selfhosted-persistent.yml @@ -113,16 +113,27 @@ jobs: # if it's a feature branch it will not marked as "latest" cooker version - name: "Set makeLatest (cooker only)" run: | - if [[ "$BRANCH_NAME" == 'feat/'* ]]; then + if [[ "$BRANCH_NAME" == 'feat/'* || "$BRANCH_NAME" == 'ref/'* ]]; then echo "MAKE_LATEST=false" >> $GITHUB_ENV else echo "MAKE_LATEST=true" >> $GITHUB_ENV fi + # if the branch is coming from a PR the tag should be manually built + - name: "Generate version tag" + run: | + if [[ "$BRANCH_NAME" == 'ref/'* ]]; then + pr_number=$(echo ${{env.BRANCH_NAME}} | awk -F'/' '{print $3}') + original_branch=$(git ls-remote --heads origin "refs/pull/$pr_number/head" | cut -d'/' -f3) + echo "TAG=PR-$pr_number-$original_branch-${{ env.buildid }}" >> $GITHUB_ENV + else + echo "TAG=${{env.BRANCH_NAME}}-${{ env.buildid }}" >> $GITHUB_ENV + fi + - name: Publish the flatpak in a new cooker release uses: ncipollo/release-action@v1 with: - tag: "${{env.BRANCH_NAME}}-${{ env.buildid }}" + tag: "${{env.TAG}}" body: | # Release Notes (Cooker) This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. From f8a86faa4be45efddaa1cb79025d9142faa02a0d Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 21 Feb 2024 14:26:23 +0100 Subject: [PATCH 38/81] ES-DE: changing more paths, again --- es-configs/es_settings.xml | 2 +- functions/050_save_migration.sh | 6 +++--- functions/functions.sh | 12 ++++++------ functions/global.sh | 8 ++++---- functions/prepare_component.sh | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/es-configs/es_settings.xml b/es-configs/es_settings.xml index 117f1800..8ec2ff62 100644 --- a/es-configs/es_settings.xml +++ b/es-configs/es_settings.xml @@ -145,7 +145,7 @@ - + diff --git a/functions/050_save_migration.sh b/functions/050_save_migration.sh index 786686fc..55f3d679 100644 --- a/functions/050_save_migration.sh +++ b/functions/050_save_migration.sh @@ -28,12 +28,12 @@ save_migration() { fi # Doing the dir prep as we don't know from which version we came - dir_prep "$media_folder" "/var/config/es-de/ES-DE/downloaded_media" - dir_prep "$themes_folder" "/var/config/es-de/ES-DE/themes" + dir_prep "$media_folder" "/var/config/ES-DE/downloaded_media" + dir_prep "$themes_folder" "/var/config/ES-DE/themes" mkdir -pv $rdhome/logs #this was added later, maybe safe to remove in a few versions # Resetting es_settings, now we need it but in the future I should think a better solution, maybe with sed - cp -fv /app/retrodeck/es_settings.xml /var/config/es-de/ES-DE/es_settings.xml + cp -fv /app/retrodeck/es_settings.xml /var/config/ES-DE/es_settings.xml # 0.4 -> 0.5 # Perform save and state migration if needed diff --git a/functions/functions.sh b/functions/functions.sh index 6ac742f3..c69d69ed 100644 --- a/functions/functions.sh +++ b/functions/functions.sh @@ -486,9 +486,9 @@ install_retrodeck_starterpack() { ## DOOM section ## cp /app/retrodeck/extras/doom1.wad "$roms_folder/doom/doom1.wad" # No -f in case the user already has it - mkdir -p "/var/config/es-de/ES-DE/gamelists/doom" - if [[ ! -f "/var/config/es-de/ES-DE/gamelists/doom/gamelist.xml" ]]; then # Don't overwrite an existing gamelist - cp "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/es-de/ES-DE/gamelists/doom/gamelist.xml" + mkdir -p "/var/config/ES-DE/gamelists/doom" + if [[ ! -f "/var/config/ES-DE/gamelists/doom/gamelist.xml" ]]; then # Don't overwrite an existing gamelist + cp "/app/retrodeck/rd_prepacks/doom/gamelist.xml" "/var/config/ES-DE/gamelists/doom/gamelist.xml" fi mkdir -p "$media_folder/doom" unzip -oq "/app/retrodeck/rd_prepacks/doom/doom.zip" -d "$media_folder/doom/" @@ -519,8 +519,8 @@ update_splashscreens() { # This script will purge any existing ES graphics and reload them from RO space into somewhere ES will look for it # USAGE: update_splashscreens - rm -rf /var/config/es-de/ES-DE/resources/graphics - rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/es-de/ES-DE/resources/graphics/" + rm -rf /var/config/ES-DE/resources/graphics + rsync -rlD --mkpath "/app/retrodeck/graphics/" "/var/config/ES-DE/resources/graphics/" } deploy_helper_files() { @@ -631,5 +631,5 @@ start_retrodeck() { easter_eggs # Check if today has a surprise splashscreen and load it if so # normal startup echo "Starting RetroDECK v$version" - es-de --home /var/config/es-de + es-de --home /var/config/ES-DE } diff --git a/functions/global.sh b/functions/global.sh index 9a6ba230..ef5b760f 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -25,9 +25,9 @@ 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/es-de/ES-DE/resources/graphics/extra_splashes" # The default location of extra splash screens -current_splash_file="/var/config/es-de/ES-DE/resources/graphics/splash.svg" # The active splash file that will be shown on boot -default_splash_file="/var/config/es-de/ES-DE/resources/graphics/splash-orig.svg" # The default RetroDECK splash screen +splashscreen_dir="/var/config/ES-DE/resources/graphics/extra_splashes" # The default location of extra splash screens +current_splash_file="/var/config/ES-DE/resources/graphics/splash.svg" # The active splash file that will be shown on boot +default_splash_file="/var/config/ES-DE/resources/graphics/splash-orig.svg" # The default RetroDECK splash screen 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 rd_es_themes="/app/share/es-de/themes" # The directory where themes packaged with RetroDECK are stored lockfile="/var/config/retrodeck/.lock" # where the lockfile is located @@ -58,7 +58,7 @@ yuzuconf="/var/config/yuzu/qt-config.ini" # ES-DE config files -es_settings="/var/config/es-de/ES-DE/es_settings.xml" +es_settings="/var/config/ES-DE/es_settings.xml" # RetroArch config files diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index 95b1d0ac..1b293919 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -40,12 +40,12 @@ prepare_component() { if [[ "$component" =~ ^(es-de|ES-DE|all)$ ]]; then # For use after ESDE-related folders are moved or a reset if [[ "$action" == "reset" ]]; then rm -rf /var/config/es-de/ - mkdir -p /var/config/es-de/ES-DE/ - cp -f /app/retrodeck/es_settings.xml /var/config/es-de/ES-DE/es_settings.xml + mkdir -p /var/config/ES-DE/ + cp -f /app/retrodeck/es_settings.xml /var/config/ES-DE/es_settings.xml set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings" set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings" set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings" - dir_prep "$rdhome/gamelists" "/var/config/es-de/ES-DE/gamelists" + dir_prep "$rdhome/gamelists" "/var/config/ES-DE/gamelists" es-de --home /var/config/es-de --create-system-dirs update_splashscreens fi @@ -53,7 +53,7 @@ prepare_component() { set_setting_value "$es_settings" "ROMDirectory" "$roms_folder" "es_settings" set_setting_value "$es_settings" "MediaDirectory" "$media_folder" "es_settings" set_setting_value "$es_settings" "UserThemeDirectory" "$themes_folder" "es_settings" - dir_prep "$rdhome/gamelists" "/var/config/es-de/ES-DE/gamelists" + dir_prep "$rdhome/gamelists" "/var/config/ES-DE/gamelists" fi fi From 42df8149e1878b481a63cf874beed1770da72218 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 21 Feb 2024 14:26:37 +0100 Subject: [PATCH 39/81] ES-DE: post update scripts cleanup --- functions/post_update.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/functions/post_update.sh b/functions/post_update.sh index 2355807c..5a3dec56 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -242,9 +242,7 @@ post_update() { # - Change section name in retrodeck.cfg for ABXY button swap preset sed -i 's^nintendo_button_layout^abxy_button_swap^' "$rd_conf" # This is a one-off sed statement as there are no functions for replacing section names # in 3.0 .emulationstation was moved into ES-DE - mv -f /var/config/es-de/ /var/config/es-de/ES-DE - mv -f /var/config/es-de/.emulationstation /var/config/es-de/ES-DE - ln -s /var/config/es-de/ES-DE /var/config/es-de/.emulationstation # symlinking it to mantain the compatibility # TODO: remove this symlink n 0.9.0b + mv -f /var/config/emulationstation /var/config/ES-DE fi # if [[ $prev_version -le "090" ]]; then From dbd3e5e9c0ffa90840deeedf13d6561a8ab48444 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 21 Feb 2024 14:48:37 +0100 Subject: [PATCH 40/81] SPLASH: added golden week / kodomo no hi [skip ci] --- .../reference_lists/easter_egg_checklist.cfg | 1 + res/extra_splashes/rd-kodomo-golden.svg | 1457 +++++++++++++++++ 2 files changed, 1458 insertions(+) create mode 100644 res/extra_splashes/rd-kodomo-golden.svg diff --git a/emu-configs/defaults/retrodeck/reference_lists/easter_egg_checklist.cfg b/emu-configs/defaults/retrodeck/reference_lists/easter_egg_checklist.cfg index 22198f01..140620f4 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/easter_egg_checklist.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/easter_egg_checklist.cfg @@ -2,3 +2,4 @@ 0209^0212^0000^2359^rd-lunar-dragon-splash.svg 0214^0214^0001^2359^rd-valentines-splash.svg 0317^0317^0000^2359^rd-stpatricks-splash.svg +0429^0505^0000^2359^rd-kodomo-golden.svg diff --git a/res/extra_splashes/rd-kodomo-golden.svg b/res/extra_splashes/rd-kodomo-golden.svg new file mode 100644 index 00000000..d79d5600 --- /dev/null +++ b/res/extra_splashes/rd-kodomo-golden.svg @@ -0,0 +1,1457 @@ + + From c25bf2ed37fb510801625dd8c8d1dc76bd67b7ac Mon Sep 17 00:00:00 2001 From: XargonWan Date: Wed, 21 Feb 2024 15:53:09 +0100 Subject: [PATCH 41/81] SPLASH: updated added golden week / kodomo no hi [skip ci] --- res/extra_splashes/rd-kodomo-golden.svg | 73 ++++++++++++++++++++----- 1 file changed, 59 insertions(+), 14 deletions(-) diff --git a/res/extra_splashes/rd-kodomo-golden.svg b/res/extra_splashes/rd-kodomo-golden.svg index d79d5600..e447ee1d 100644 --- a/res/extra_splashes/rd-kodomo-golden.svg +++ b/res/extra_splashes/rd-kodomo-golden.svg @@ -20,29 +20,62 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:zoom="0.82289552" - inkscape:cx="834.8569" - inkscape:cy="411.35234" - inkscape:window-width="2400" - inkscape:window-height="1039" + inkscape:cx="716.37284" + inkscape:cy="410.74473" + inkscape:window-width="2191" + inkscape:window-height="952" inkscape:window-x="26" inkscape:window-y="23" inkscape:window-maximized="0" inkscape:current-layer="svg29" />