diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index 6da64968..fde7a737 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -108,7 +108,7 @@ jobs: tag: ${{ env.REL_VER }} name: "RetroDECK v${{ env.REL_VER }}" bodyFile: "body.md" - artifacts: "RetroDECK.flatpak,RetroDECK-Artifact.tar.gz" + artifacts: "RetroDECK.flatpak,RetroDECK.flatpak.sha,RetroDECK-Artifact.tar.gz" allowUpdates: true makeLatest: true token: ${{ secrets.TRIGGER_BUILD_TOKEN }} @@ -164,3 +164,11 @@ jobs: -F "attachment=@RetroDECK-Artifact.tar.gz" \ "http://$GITEA_HOST/api/v1/repos/$ORGANIZATION/$REPO/releases/$release_id/assets?name=RetroDECK-Artifact.tar.gz" + - name: Upload RetroDECK.flatpak.sha to Gitea Release + run: | + curl -X POST \ + -H "Authorization: token ${GITEA_TOKEN}" \ + -F "file=@RetroDECK.flatpak.sha" \ + "https://repo.retrodeck.net/RetroDECK/RetroDECK/releases/${{ env.REL_VER }}/assets?name=RetroDECK.flatpak.sha" + env: + GITEA_TOKEN: ${{ secrets.GITEA_TRIGGER_BUILD_TOKEN }} diff --git a/old/removed-workflows/remove-artifacts.yml b/.github/workflows/remove-artifacts.yml similarity index 100% rename from old/removed-workflows/remove-artifacts.yml rename to .github/workflows/remove-artifacts.yml diff --git a/README.md b/README.md index 6a4f59d3..d260662c 100644 --- a/README.md +++ b/README.md @@ -46,15 +46,15 @@ For more information read up here: RetroDECK is a [EmulationStation Desktop Edition](https://es-de.org) (ES-DE) powered Linux [Flatpak application](https://flathub.org/apps/net.retrodeck.retrodeck) that thanks to its `RetroDECK Framework` it builds-in and manage a variety of emulators and other software that allows you to play your favorite retro (and even not-so-retro) games in one complete package. ### So what does that mean? -It means that RetroDECK provides all the emulators, systems and a frontend. RetroDECK configures them for you and put them into one application you can download from Flathub. +It means that RetroDECK provides all the emulators, systems and a frontend. RetroDECK configures them for you and puts them into one application you can download from Flathub. By being one application RetroDECK can put all important files in one location for all the emulators, instead of having them spread out over your entire system and even add features on top to orchestrate them seamlessly. ### The RetroDECK Framework -As previously mentioned, RetroDECK also adds the `RetroDECK Framework` on top of the emulators and ES-DE interface that allows deeper integrations between emulators and easier exposure to a variety of features that you otherwise need to set per emulator basis to create a uniformity between them. +As previously mentioned, RetroDECK also adds the `RetroDECK Framework` on top of the emulators and ES-DE interface which allows deeper integrations between emulators and easier exposure to a variety of features that you otherwise need to set on a per emulator basis to create a uniformity between them. -The `RetroDECK Configurator` is a `Utility` that some parts of exposes the `RetroDECK Framework` to the RetroDECK users. +The `RetroDECK Configurator` is a `Utility` that exposes some parts of the `RetroDECK Framework` to the RetroDECK users. **What can the RetroDECK Framework and by extent the RetroDECK Configurator do?** @@ -67,7 +67,7 @@ It can help with: - Auto installing some free BIOSes - Install prebuilt Steam Input profiles for devices like the Steam Deck and external controllers - Easier management of `mods`, `roms`, `texture_packs`, `scraped media`, `screenshots`, `saves / states` `gamelists` and more -- Give access to global presets that can be acitivated to configure things over many emulators in one go like: `RetroAchievements` +- Give access to global presets that can be activated to configure things over many emulators in one go like: `RetroAchievements` `Borders` `Widescreen Mode` `Swaping A/B X/Y for Nintendo Games` For our long term vision you can check out the following wiki page: @@ -110,7 +110,7 @@ Read up here on how to help out, there is something for everyone: Please check out the [Wiki](https://github.com/XargonWan/RetroDECK/wiki) for even more information. ## The FAQ -The RetroDECK [FAQ](https://github.com/XargonWan/RetroDECK/wiki/FAQs%3A-Frequently-asked-questions) on the wiki has a vast variety of questions and awnsers. +The RetroDECK [FAQ](https://github.com/XargonWan/RetroDECK/wiki/FAQs%3A-Frequently-asked-questions) on the wiki has a vast variety of questions and answers. # How to get support? Use the supports channels on [Discord](https://discord.gg/WDc5C9YWMx). diff --git a/automation_tools/flatpak_build_bundle.sh b/automation_tools/flatpak_build_bundle.sh index 3568ebb7..8e79186f 100755 --- a/automation_tools/flatpak_build_bundle.sh +++ b/automation_tools/flatpak_build_bundle.sh @@ -4,6 +4,8 @@ if [ "${GITHUB_REF##*/}" = "main" ]; then flatpak build-bundle "${GITHUB_WORKSPACE}/.local" "$GITHUB_WORKSPACE/RetroDECK.flatpak" net.retrodeck.retrodeck + sha256sum RetroDECK.flatpak > RetroDECK.flatpak.sha else flatpak build-bundle "${GITHUB_WORKSPACE}/.local" "$GITHUB_WORKSPACE/RetroDECK-cooker.flatpak" net.retrodeck.retrodeck + sha256sum RetroDECK-cooker.flatpak > RetroDECK-cooker.flatpak.sha fi \ No newline at end of file diff --git a/automation_tools/install_dependencies.sh b/automation_tools/install_dependencies.sh index 91503927..3daa4edb 100755 --- a/automation_tools/install_dependencies.sh +++ b/automation_tools/install_dependencies.sh @@ -1,6 +1,31 @@ #!/bin/bash -# This scritp is installing the required dependencies to correctly run the pipeline and buold the flatpak +# This script is installing the required dependencies to correctly run the pipeline and build the flatpak + +unset pkg_mgr + +# rpm-ostree must be checked before dnf because a dnf (wrapper) command also works on rpm-ostree distros (not what we want) +for potential_pkg_mgr in apt pacman rpm-ostree dnf; do + command -v "$potential_pkg_mgr" &> /dev/null && pkg_mgr="$potential_pkg_mgr" && break +done + +case "$pkg_mgr" in + apt) + sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet bzip2 curl jq + ;; + pacman) + sudo pacman -S --noconfirm flatpak flatpak-builder p7zip xmlstarlet bzip2 + ;; + rpm-ostree) + echo "When using a distro with rpm-ostree, you shouldn't build directly on the host. Try using a distrobox." + exit 1 + ;; + dnf) + sudo dnf install -y flatpak flatpak-builder p7zip p7zip-plugins xmlstarlet bzip2 curl + ;; + *) + echo "Package manager $pkg_mgr not supported. Please open an issue." + ;; +esac -sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet bzip2 curl jq flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo \ No newline at end of file +flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo diff --git a/developer_toolbox/build_retrodeck_locally.sh b/developer_toolbox/build_retrodeck_locally.sh index 9682e3bd..85b9e90e 100755 --- a/developer_toolbox/build_retrodeck_locally.sh +++ b/developer_toolbox/build_retrodeck_locally.sh @@ -2,9 +2,6 @@ # WARNING: run this script from the project root folder, not from here!! -# TODO: FEDORA -# sudo dnf install -y flatpak flatpak-builder p7zip p7zip-plugins xmlstarlet bzip2 curl - git submodule update --init --recursive export GITHUB_WORKSPACE="." diff --git a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_steamdeck_neptune_full.vdf b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_steamdeck_neptune_full.vdf index e6d2124b..01b802f7 100644 --- a/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_steamdeck_neptune_full.vdf +++ b/emu-configs/defaults/retrodeck/controller_configs/RetroDECK_controller_steamdeck_neptune_full.vdf @@ -1,9 +1,9 @@ "controller_mappings" { "version" "3" - "revision" "1863" - "title" "RetroDECK: Steam Deck - Neptune v.1b FULL" - "description" "RetroDECK: Steam Deck - Neptune v.1b FULL" + "revision" "1864" + "title" "RetroDECK: Steam Deck - Neptune v.1.1b FULL" + "description" "RetroDECK: Steam Deck - Neptune v.1.1b FULL" "creator" "" "progenitor" "" "url" "" @@ -4380,7 +4380,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 15 0 0, 3DS, RD-citra.png, " + "binding" "controller_action CHANGE_PRESET 14 0 0, 3DS, RD-citra.png, " } } } @@ -4396,7 +4396,7 @@ { "bindings" { - "binding" "controller_action CHANGE_PRESET 16 0 0, Switch, RD-ryujinx.png, " + "binding" "controller_action CHANGE_PRESET 15 0 0, Switch, RD-ryujinx.png, " } } } @@ -7301,8 +7301,8 @@ { "bindings" { - "binding" "key_press LEFT_ALT, Set GPU Accuracy, RD-emblem-new.png, " - "binding" "key_press G, Set GPU Accuracy, RD-emblem-new.png, " + "binding" "key_press LEFT_ALT, Yuzu - Set GPU Accuracy, RD-emblem-new.png, " + "binding" "key_press G, Yuzu - Set GPU Accuracy, RD-emblem-new.png, " } } } @@ -7318,8 +7318,8 @@ { "bindings" { - "binding" "key_press LEFT_ALT, Load/Remove Amiibo, RD-preferences-desktop-accessibility.png, " - "binding" "key_press M, Load/Remove Amiibo, RD-preferences-desktop-accessibility.png, " + "binding" "key_press LEFT_ALT, Yuzu - Load / Remove Amiibo, RD-preferences-desktop-accessibility.png, " + "binding" "key_press M, Yuzu - Load / Remove Amiibo, RD-preferences-desktop-accessibility.png, " } } } @@ -7335,8 +7335,24 @@ { "bindings" { - "binding" "key_press LEFT_ALT, Docked / Undocked Mode, RD-emblem-unlocked.png, " - "binding" "key_press D, Docked / Undocked Mode, RD-emblem-unlocked.png, " + "binding" "key_press LEFT_ALT, Yuzu - Docked / Undocked Mode, RD-emblem-unlocked.png, " + "binding" "key_press D, Yuzu - Docked / Undocked Mode, RD-emblem-unlocked.png, " + } + } + } + "disabled_activators" + { + } + } + "touch_menu_button_4" + { + "activators" + { + "Full_Press" + { + "bindings" + { + "binding" "key_press F4, Ryujinx - F4 Open Menu, RD-F4.png, " } } } diff --git a/emu-configs/defaults/retrodeck/helper_files/Install-firmware-through-Ryujinx.txt b/emu-configs/defaults/retrodeck/helper_files/Install-firmware-through-Ryujinx.txt new file mode 100644 index 00000000..7d196eee --- /dev/null +++ b/emu-configs/defaults/retrodeck/helper_files/Install-firmware-through-Ryujinx.txt @@ -0,0 +1,10 @@ +Do not drop the firmware files here, install them via Ryujinx: + +RetroDECK Configurator -> Open Emulator -> Ryujinx -> Tools -> Install Firmware - Select the firmware zipped file + +Check the wiki for more information. + +Related wiki article can be found here: +https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/ryujinx/ryujinx-guide/ + +The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-Duckstation-textures.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Duckstation-textures.txt index 4deee10f..75153575 100644 --- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-Duckstation-textures.txt +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Duckstation-textures.txt @@ -23,6 +23,6 @@ Texture folder directly - Move textures into the right ~/retrodeck/texture_packs/duckstation/ folder. Related wiki article can be found here: -https://github.com/XargonWan/RetroDECK/wiki/Duckstation%3A-Texture-Packs +https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/duckstation/duckstation-texture-pack/ The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mesen-textures.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mesen-textures.txt index 33e9d9c8..961ff4a7 100644 --- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mesen-textures.txt +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mesen-textures.txt @@ -27,6 +27,6 @@ You want apply a texture pack to a game called ScaryCastle USA.nes and you have NOTE: On the Steam Deck go into GameMode first, then launch RetroDECK. Related wiki article can be found here: -https://github.com/XargonWan/RetroDECK/wiki/RetroArch-Mesen%3A-Texture-Packs +https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/retroarch/retroarch-mesen-texture-pack/ The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mupen64Plus-textures.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mupen64Plus-textures.txt index 6cfe0670..825751aa 100644 --- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mupen64Plus-textures.txt +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mupen64Plus-textures.txt @@ -25,6 +25,6 @@ For compressed textures stored in .hts files, place them in the 'texture_packs/R For uncompressed textures stored in loose folders or files, place them in the 'texture_packs/RetroArch-Mupen64Plus/hires_texture/' folder. Related wiki article can be found here: -https://github.com/XargonWan/RetroDECK/wiki/RetroArch-Mupen64Plus-Next%3A-Texture-Packs +https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/retroarch/retroarch-mupen64plus-texture-pack/ The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-PCSX2-textures.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-PCSX2-textures.txt index 807513b7..ed75e899 100644 --- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-PCSX2-textures.txt +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-PCSX2-textures.txt @@ -21,6 +21,6 @@ For direct texture folder: 3. Move textures into the correct '~/retrodeck/texture_packs/PCSX2/' folder. Related wiki article can be found here: -https://github.com/XargonWan/RetroDECK/wiki/PCSX2%3A-Texture-Packs +https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/pcsx2/pcsx2-texture-pack/ The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-PPSSPP-textures.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-PPSSPP-textures.txt index 6fabb0e4..44a6da45 100644 --- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-PPSSPP-textures.txt +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-PPSSPP-textures.txt @@ -21,6 +21,6 @@ For adding textures: 3. Paste the textures into the correct '~/retrodeck/texture_packs/ppsspp/' folder. Related wiki article can be found here: -https://github.com/XargonWan/RetroDECK/wiki/PPSSPP%3A-Texture-Packs +https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/ppsspp/ppsspp-texture-pack/ The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt index 33a50c8c..a9b96bc5 100644 --- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt @@ -14,6 +14,6 @@ Notes: - GAME_ID is different for every game. Related wiki article can be found here: -https://github.com/XargonWan/RetroDECK/wiki/Dolphin-and-Primehack%3A-Mods +https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/dolphin-primehack/dolphin-primehack-mod/ The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt index 1bcbbc05..8d3650e9 100644 --- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt @@ -14,6 +14,6 @@ Notes: - GAME_ID is different for every game. Related wiki article can be found here: -https://github.com/XargonWan/RetroDECK/wiki/Dolphin-and-Primehack%3A-Mods +https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/dolphin-primehack/dolphin-primehack-mod/ The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-psvita-games.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-psvita-games.txt index febbde78..e51a66b5 100644 --- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-psvita-games.txt +++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-psvita-games.txt @@ -17,6 +17,6 @@ For example the game `WipEout 2048 (EU)` has an ID that is `PCSF00007`. So simply add `PCSF00007` to the `WipEout 2048 (EU).psvita` file and the setup for this game is complete. Related wiki article can be found here: --- +https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/vita3k/vita3k-guide/ The RetroDECK Team \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/presets/gba_presets.cfg b/emu-configs/defaults/retrodeck/presets/gba_presets.cfg index 170c0e17..7f4d649e 100644 --- a/emu-configs/defaults/retrodeck/presets/gba_presets.cfg +++ b/emu-configs/defaults/retrodeck/presets/gba_presets.cfg @@ -4,9 +4,9 @@ change^borders^custom_viewport_height^640^^/var/config/retroarch/config/mGBA/gba change^borders^custom_viewport_width^960^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg change^borders^custom_viewport_x^160^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg change^borders^custom_viewport_y^0^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg -change^borders^input_overlay_enable^true^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg change^borders^input_overlay^/var/config/retroarch/overlays/borders/pegasus/gba.cfg^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg change^borders^input_overlay_aspect_adjust_landscape^0.110000^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg +change^borders^input_overlay_enable^true^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg change^borders^input_overlay_scale_landscape^1.2150000^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg change^borders^input_overlay_y_offset_landscape^0.020000^^/var/config/retroarch/config/mGBA/gba.cfg^$emuconfigs/retroarch/retroarch.cfg enable^abxy_button_swap^/var/config/retroarch/config/remaps/mGBA/gba.rmp diff --git a/emu-configs/defaults/retrodeck/reference_lists/bios_checklist.cfg b/emu-configs/defaults/retrodeck/reference_lists/bios_checklist.cfg index c46346b7..a775d8bc 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/bios_checklist.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/bios_checklist.cfg @@ -1,14 +1,27 @@ -neogeo.zip^^Unknown^Arcade (FinalBurn Neo)^Neo Geo BIOS (Required for this system) -neocdz.zip^^Unknown^Arcade (FinalBurn Neo)^Neo Geo CDZ BIOS (Required for this system) -decocass.zip^^Unknown^Arcade (FinalBurn Neo)^DECO Cassette System BIOS (Required for this system) -isgsm.zip^^Unknown^Arcade (FinalBurn Neo)^ISG Selection Master Type 2006 System BIOS (Required for this system) -midssio.zip^^Unknown^Arcade (FinalBurn Neo)^Midway SSIO Sound Board Internal ROM (Required for this system) -nmk004.zip^^Unknown^Arcade (FinalBurn Neo)^NMK004 Internal ROM (Required for this system) -pgm.zip^^Unknown^Arcade (FinalBurn Neo)^PGM System BIOS (Required for this system) -skns.zip^^Unknown^Arcade (FinalBurn Neo)^Super Kaneko Nova System BIOS (Required for this system) -ym2608.zip^^Unknown^Arcade (FinalBurn Neo)^YM2608 Internal ROM (Required for this system) -cchip.zip^^Unknown^Arcade (FinalBurn Neo)^C-Chip Internal ROM (Required for this system) -bubsys.zip^^Unknown^Arcade (FinalBurn Neo)^Bubble System BIOS (Required for this system) +panafz1.bin^^f47264dd47fe30f73ab3c010015c155b^3DO^Panasonic FZ-1 +panafz10.bin^^51f2f43ae2f3508a14d9f56597e2d3ce^3DO^Panasonic FZ-10 +panafz10-norsa.bin^^1477bda80dc33731a65468c1f5bcbee9^3DO^Panasonic FZ-10 [RSA Patch] +panafz10e-anvil.bin^^a48e6746bd7edec0f40cff078f0bb19f^3DO^Panasonic FZ-10-E [Anvil] +panafz10e-anvil-norsa.bin^^cf11bbb5a16d7af9875cca9de9a15e09^3DO^Panasonic FZ-10-E [Anvil RSA Patch] +panafz1j.bin^^a496cfdded3da562759be3561317b605^3DO^Panasonic FZ-1J +panafz1j-norsa.bin^^f6c71de7470d16abe4f71b1444883dc8^3DO^Panasonic FZ-1J [RSA Patch] +goldstar.bin^^8639fd5e549bd6238cfee79e3e749114^3DO^Goldstar GDO-101M +sanyotry.bin^^35fa1a1ebaaeea286dc5cd15487c13ea^3DO^Sanyo IMP-21J TRY +3do_arcade_saot.bin^^8970fc987ab89a7f64da9f8a8c4333ff^3DO^Shootout At Old Tucson +panafz1-kanji.bin^^b8dc97f778a6245c58e064b0312e8281^3DO^Panasonic FZ-1 Kanji ROM (Font ROM: required for some Japanese games. Optional otherwise.) +panafz10ja-anvil-kanji.bin^^428577250f43edc902ea239c50d2240d^3DO^Panasonic FZ-10JA Kanji ROM (Font ROM: required for some Japanese games. Optional otherwise.) +panafz1j-kanji.bin^^c23fb5d5e6bb1c240d02cf968972be37^3DO^Panasonic FZ-1J Kanji ROM (Font ROM: required for some Japanese games. Optional otherwise.) +neogeo.zip^^00dad01abdbf8ea9e79ad2fe11bdb182^Arcade (FinalBurn Neo)^Neo Geo BIOS (Required for this system) +neocdz.zip^^c733b4b7bd30fa849874d96c591c8639^Arcade (FinalBurn Neo)^Neo Geo CDZ BIOS (Required for this system) +decocass.zip^^b7e1189b341bf6a8e270017c096d21b0^Arcade (FinalBurn Neo)^DECO Cassette System BIOS (Required for this system) +isgsm.zip^^4a56d56e2219c5e2b006b66a4263c01c^Arcade (FinalBurn Neo)^ISG Selection Master Type 2006 System BIOS (Required for this system) +midssio.zip^^5904b0de768d1d506e766aa7e18994c1^Arcade (FinalBurn Neo)^Midway SSIO Sound Board Internal ROM (Required for this system) +nmk004.zip^^bfacf1a68792d5348f93cf724d2f1dda^Arcade (FinalBurn Neo)^NMK004 Internal ROM (Required for this system) +pgm.zip^^87cc944eef4c671aa2629a8ba48a08e0^Arcade (FinalBurn Neo)^PGM System BIOS (Required for this system) +skns.zip^^3f956c4e7008804cb47cbde49bd5b908^Arcade (FinalBurn Neo)^Super Kaneko Nova System BIOS (Required for this system) +ym2608.zip^^79ae0d2bb1901b7e606b6dc339b79a97^Arcade (FinalBurn Neo)^YM2608 Internal ROM (Required for this system) +cchip.zip^^df6f8a3d83c028a5cb9f2f2be60773f3^Arcade (FinalBurn Neo)^C-Chip Internal ROM (Required for this system) +bubsys.zip^^f81298afd68a1a24a49a1a2d9f087964^Arcade (FinalBurn Neo)^Bubble System BIOS (Required for this system) namcoc69.zip^^Unknown^Arcade (FinalBurn Neo)^Namco C69 BIOS (Required for this system) namcoc70.zip^^Unknown^Arcade (FinalBurn Neo)^Namco C70 BIOS (Required for this system) namcoc75.zip^^Unknown^Arcade (FinalBurn Neo)^Namco C75 BIOS (Required for this system) @@ -48,9 +61,9 @@ Complex.bin^^Unknown^Microsoft XBOX^Used by XEMU emulator Complex_4627v1.03.bin^^Unknown^Microsoft XBOX^Used by XEMU emulator Complex_4627.bin^^Unknown^Microsoft XBOX^Used by XEMU emulator syscard3.pce^^38179df8f4ac870017db21ebcbf53114^NEC PC Engine / CD^Super CD-ROM2 System V3.xx (Required) -syscard2.pce^^Unknown^NEC PC Engine / CD^CD-ROM System V2.xx -syscard1.pce^^Unknown^NEC PC Engine / CD^CD-ROM System V1.xx -gexpress.pce^^Unknown^NEC PC Engine / CD^Game Express CD Card +syscard2.pce^^3cdd6614a918616bfc41c862e889dd79^NEC PC Engine / CD^CD-ROM System V2.xx +syscard1.pce^^2b7ccb3d86baa18f6402c176f3065082^NEC PC Engine / CD^CD-ROM System V1.xx +gexpress.pce^^6d2cb14fc3e1f65ceb135633d1694122^NEC PC Engine / CD^Game Express CD Card font.bmp^np2kai/^7da1e5b7c482d4108d22a5b09631d967^NEC PC-98 (Neko Project II Kai)^Needed to display text (Required) FONT.ROM^np2kai/^2af6179d7de4893ea0b705c00e9a98d6^NEC PC-98 (Neko Project II Kai)^Alt font file (Required if normal font file is missing) bios.rom^np2kai/^e246140dec5124c5e404869a84caefce^NEC PC-98 (Neko Project II Kai)^BIOS file (Required) @@ -58,12 +71,12 @@ itf.rom^np2kai/^e9fc3890963b12cf15d0a2eea5815b72^NEC PC-98 (Neko Project II Kai) sound.rom^np2kai/^caf90f22197aed6f14c471c21e64658d^NEC PC-98 (Neko Project II Kai)^BIOS file (Required) bios9821.rom^np2kai/^Unknown^NEC PC-98 (Neko Project II Kai)^Optional BIOS file d8000.rom^np2kai/^Unknown^NEC PC-98 (Neko Project II Kai)^Optional BIOS file -2608_BD.WAV^np2kai/^Unknown^NEC PC-98 (Neko Project II Kai)^YM2608 RYTHM sample -2608_SD.WAV^np2kai/^Unknown^NEC PC-98 (Neko Project II Kai)^YM2608 RYTHM sample -2608_TOP.WAV^np2kai/^Unknown^NEC PC-98 (Neko Project II Kai)^YM2608 RYTHM sample -2608_HH.WAV^np2kai/^Unknown^NEC PC-98 (Neko Project II Kai)^YM2608 RYTHM sample -2608_TOM.WAV^np2kai/^Unknown^NEC PC-98 (Neko Project II Kai)^YM2608 RYTHM sample -2608_RIM.WAV^np2kai/^Unknown^NEC PC-98 (Neko Project II Kai)^YM2608 RYTHM sample +2608_BD.WAV^np2kai/^d94546e70f17fd899be8df3544ab6cbb^NEC PC-98 (Neko Project II Kai)^YM2608 RYTHM sample +2608_SD.WAV^np2kai/^d71004351c8bbfdad53b18222c061d49^NEC PC-98 (Neko Project II Kai)^YM2608 RYTHM sample +2608_TOP.WAV^np2kai/^593cff6597ab9380d822b8f824fd2c28^NEC PC-98 (Neko Project II Kai)^YM2608 RYTHM sample +2608_HH.WAV^np2kai/^08c54a0c1f774a5538a848a6665a34b4^NEC PC-98 (Neko Project II Kai)^YM2608 RYTHM sample +2608_TOM.WAV^np2kai/^96a4ead13f364734f79b0c58af2f0e1f^NEC PC-98 (Neko Project II Kai)^YM2608 RYTHM sample +2608_RIM.WAV^np2kai/^465ea0768b27da404aec45dfc501404b^NEC PC-98 (Neko Project II Kai)^YM2608 RYTHM sample n88.rom^^4f984e04a99d56c4cfe36115415d6eb8^NEC PC-8000 / PC-8800 series (QUASI88)^BIOS File (Required) n88n.rom^^2ff07b8769367321128e03924af668a0^NEC PC-8000 / PC-8800 series (QUASI88)^Required for PC-8000 series emulation. (N BASIC mode) disk.rom^^793f86784e5608352a5d7f03f03e0858^NEC PC-8000 / PC-8800 series (QUASI88)^Required for loading disk images @@ -72,6 +85,19 @@ n88_0.rom^^d675a2ca186c6efcd6277b835de4c7e5^NEC PC-8000 / PC-8800 series (QUASI8 n88_1.rom^^e844534dfe5744b381444dbe61ef1b66^NEC PC-8000 / PC-8800 series (QUASI88)^Optional BIOS file n88_2.rom^^6548fa45061274dee1ea8ae1e9e93910^NEC PC-8000 / PC-8800 series (QUASI88)^Optional BIOS file n88_3.rom^^fc4b76a402ba501e6ba6de4b3e8b4273^NEC PC-8000 / PC-8800 series (QUASI88)^Optional BIOS file +neocd_f.rom^^8834880c33164ccbe6476b559f3e37de^Neo Geo CD^Front Loader BIOS (At least 1 required) +neocd_sf.rom^^043d76d5f0ef836500700c34faef774d^Neo Geo CD^Front Loader BIOS (SMKDAN 0.7b DEC 2010) (At least 1 required) +neocd_t.rom^^de3cf45d227ad44645b22aa83b49f450^Neo Geo CD^Top Loader BIOS (At least 1 required) +neocd_st.rom^^f6325a33c6d63ea4b9162a3fa8c32727^Neo Geo CD^Top Loader BIOS (SMKDAN 0.7b DEC 2010) (At least 1 required) +neocd_z.rom^^11526d58d4c524daef7d5d677dc6b004^Neo Geo CD^CDZ BIOS (At least 1 required) +neocd_sz.rom^^971ee8a36fb72da57aed01758f0a37f5^Neo Geo CD^CDZ BIOS (SMKDAN 0.7b DEC 2010) (At least 1 required) +front-sp1.bin^^5c2366f25ff92d71788468ca492ebeca^Neo Geo CD^Front Loader BIOS (MAME) (At least 1 required) +top-sp1.bin^^122aee210324c72e8a11116e6ef9c0d0^Neo Geo CD^Top Loader BIOS (MAME) (At least 1 required) +neocd.bin^^f39572af7584cb5b3f70ae8cc848aba2^Neo Geo CD^CDZ BIOS (MAME) (At least 1 required) +uni-bioscd.rom^^08ca8b2dba6662e8024f9e789711c6fc^Neo Geo CD^Universe BIOS CD 3.3 +gb_bios.bin^^32fbbd84168d3482956eb3c5051637f5^Game Boy^Optional BIOS file (used to display the Nintendo logo at boot) +gbc_bios.bin^^dbfce9db9deaa2567f6a84fde55f9680^Game Boy Color^Optional BIOS file (used to display the Nintendo logo at boot) +gba_bios.bin^^a860e8c0b6d573d191e4ec7db1b1e4f6^Game Boy Advance^Optional BIOS file (used to display the Nintendo logo at boot) aes_keys.txt^citra/sysdata/^Unknown^Nintendo 3DS^Decryption keys used by Citra emulator bios7.bin^^df692a80a5b1bc90728bc3dfc76cd948^Nintendo DS^Used by MelonDS emulator (Required, see Wiki) bios9.bin^^a392174eb3e572fed6447e956bde4b25^Nintendo DS^Used by MelonDS emulator (Required, see Wiki) @@ -103,9 +129,9 @@ mpr-18811-mx.ic1^^255113ba943c92a54facd25a10fd780c^Sega Saturn^The King of Fight mpr-19367-mx.ic1^^1cd19988d1d72a3e7caa0b73234c96b4^Sega Saturn^Ultraman: Hikari no Kyojin Densetsu ROM Cartridge (Required for this game) iplrom.dat^keropi/^7fd4caabac1d9169e289f0f7bbf71d8e^Sharp X68000^X68000 BIOS (Required) cgrom.dat^keropi/^cb0a5cfcf7247a7eab74bb2716260269^Sharp X68000^Font file (Required) -iplrom30.dat^keropi/^Unknown^Sharp X68000^X68000 BIOS 2 -iplromco.dat^keropi/^Unknown^Sharp X68000^X68000 BIOS 3 -iplromxv.dat^keropi/^Unknown^Sharp X68000^X68000 BIOS 4 +iplrom30.dat^keropi/^f373003710ab4322642f527f567e020a^Sharp X68000^X68000 BIOS 2 +iplromco.dat^keropi/^cc78d4f4900f622bd6de1aed7f52592f^Sharp X68000^X68000 BIOS 3 +iplromxv.dat^keropi/^0617321daa182c3f3d6f41fd02fb3275^Sharp X68000^X68000 BIOS 4 psxonpsp660.bin^^c53ca5908936d412331790f4426c6c33^Sony PSX^PS1 BIOS (At least 1 required) scph5500.bin^^8dd7d5296a650fac7319bce665a6a53c^Sony PSX^PS1 JP BIOS (At least 1 required) scph5501.bin^^490f666e1afb15b7362b406ed1cea246^Sony PSX^PS1 US BIOS (At least 1 required) @@ -119,11 +145,11 @@ ps1_rom.bin^^81bbe60ba7a3d1cea1d48c14cbcc647b^Sony PSX^PS1 BIOS (At least 1 requ ps2-0200a-20040614.bin^^d333558cc14561c1fdc334c75d5f37b7^Sony PS2^PS2 US BIOS (At least 1 required) ps2-0200e-20040614.bin^^dc752f160044f2ed5fc1f4964db2a095^Sony PS2^PS2 EU BIOS (At least 1 required) ps2-0200j-20040614.bin^^0eee5d1c779aa50e94edd168b4ebf42e^Sony PS2^PS2 JP BIOS (At least 1 required) -128p-0.rom^fuse/^Unknown^ZX Spectrum^Pentagon 128K/512K/1024 ROM (Required) -128p-1.rom^fuse/^Unknown^ZX Spectrum^Pentagon 128K/512K/1024 ROM (Required) -trdos.rom^fuse/^Unknown^ZX Spectrum^Pentagon 128K/512K/1024 ROM (Required) -gluck.rom^fuse/^Unknown^ZX Spectrum^Pentagon 512K/1024 ROM (Required) -256s-0.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required) -256s-1.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required) -256s-2.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required) -256s-3.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required) +128p-0.rom^fuse/^a249565f03b98d004ee7f019570069cd^ZX Spectrum^Pentagon 128K/512K/1024 ROM (Required) +128p-1.rom^fuse/^6e09e5d3c4aef166601669feaaadc01c^ZX Spectrum^Pentagon 128K/512K/1024 ROM (Required) +trdos.rom^fuse/^0da70a5d2a0e733398e005b96b7e4ba6^ZX Spectrum^Pentagon 128K/512K/1024 ROM (Required) +gluck.rom^fuse/^d5869034604dbfd2c1d54170e874fd0a^ZX Spectrum^Pentagon 512K/1024 ROM (Required) +256s-0.rom^fuse/^b9fda5b6a747ff037365b0e2d8c4379a^ZX Spectrum^Scorpion 256K ROM (Required) +256s-1.rom^fuse/^643861ad34831b255bf2eb64e8b6ecb8^ZX Spectrum^Scorpion 256K ROM (Required) +256s-2.rom^fuse/^d8ad507b1c915a9acfe0d73957082926^ZX Spectrum^Scorpion 256K ROM (Required) +256s-3.rom^fuse/^ce0723f9bc02f4948c15d3b3230ae831^ZX Spectrum^Scorpion 256K ROM (Required) \ No newline at end of file diff --git a/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg b/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg index ffb832cd..10630974 100644 --- a/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg +++ b/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg @@ -17,3 +17,4 @@ how-to-install-Duckstation-textures.txt^$texture_packs_folder/Duckstation # emulators how-to-install-psvita-games.txt^$roms_folder/psvita +Install-firmware-through-Ryujinx.txt^$bios_folder/switch/firmware diff --git a/emu-configs/defaults/retrodeck/retrodeck.cfg b/emu-configs/defaults/retrodeck/retrodeck.cfg index 4056cc07..88a33896 100644 --- a/emu-configs/defaults/retrodeck/retrodeck.cfg +++ b/emu-configs/defaults/retrodeck/retrodeck.cfg @@ -6,8 +6,8 @@ roms_folder=/home/deck/retrodeck/roms saves_folder=/home/deck/retrodeck/saves states_folder=/home/deck/retrodeck/states bios_folder=/home/deck/retrodeck/bios -media_folder=/home/deck/retrodeck/downloaded_media -themes_folder=/home/deck/retrodeck/themes +media_folder=/home/deck/retrodeck/ES-DE/downloaded_media +themes_folder=/home/deck/retrodeck/ES-DE/themes logs_folder=/home/deck/retrodeck/logs screenshots_folder=/home/deck/retrodeck/screenshots mods_folder=/home/deck/retrodeck/mods @@ -82,3 +82,4 @@ duckstation=false pcsx2=false primehack=false citra=false +rpcs3=false diff --git a/emu-configs/mame/cheat0264.zip b/emu-configs/mame/cheat0264.zip new file mode 100644 index 00000000..6f3f1a5d Binary files /dev/null and b/emu-configs/mame/cheat0264.zip differ diff --git a/emu-configs/mame/default.cfg b/emu-configs/mame/default.cfg index bc995adc..8b2ca5a8 100644 --- a/emu-configs/mame/default.cfg +++ b/emu-configs/mame/default.cfg @@ -1,16 +1,11 @@ - + - - - JOYCODE_1_HAT1UP - - - JOYCODE_1_BUTTON8 + JOYCODE_1_BUTTON8 OR KEYCODE_1 @@ -20,52 +15,72 @@ - JOYCODE_2_BUTTON12 + JOYCODE_2_BUTTON8 OR KEYCODE_2 - JOYCODE_2_BUTTON11 + KEYCODE_6 OR JOYCODE_2_BUTTON7 + + + + + JOYCODE_3_BUTTON8 OR KEYCODE_3 + + + + + KEYCODE_7 OR JOYCODE_3_BUTTON7 + + + + + JOYCODE_4_BUTTON8 OR KEYCODE_4 + + + + + KEYCODE_8 OR JOYCODE_4_BUTTON7 - KEYCODE_1 OR JOYCODE_1_BUTTON12 + JOYCODE_1_BUTTON8 OR KEYCODE_S KEYCODE_1 - KEYCODE_2 OR JOYCODE_2_BUTTON12 + JOYCODE_2_BUTTON8 OR KEYCODE_S KEYCODE_2 - KEYCODE_3 OR JOYCODE_3_BUTTON12 + JOYCODE_3_BUTTON8 OR KEYCODE_S KEYCODE_3 - KEYCODE_4 OR JOYCODE_4_BUTTON12 + JOYCODE_4_BUTTON8 OR KEYCODE_S KEYCODE_4 - KEYCODE_LSHIFT KEYCODE_1 OR JOYCODE_1_BUTTON11 + JOYCODE_1_BUTTON7 OR KEYCODE_LSHIFT KEYCODE_1 - KEYCODE_LSHIFT KEYCODE_2 OR JOYCODE_2_BUTTON11 + JOYCODE_2_BUTTON7 OR KEYCODE_LSHIFT KEYCODE_2 - KEYCODE_LSHIFT KEYCODE_3 OR JOYCODE_3_BUTTON11 + JOYCODE_3_BUTTON7 OR KEYCODE_LSHIFT KEYCODE_3 - KEYCODE_LSHIFT KEYCODE_4 OR JOYCODE_4_BUTTON11 + JOYCODE_4_BUTTON7 OR KEYCODE_LSHIFT KEYCODE_4 @@ -113,31 +128,6 @@ KEYCODE_LALT KEYCODE_T KEYCODE_4 - - - KEYCODE_LALT KEYCODE_S KEYCODE_0 - - - - - KEYCODE_LALT KEYCODE_T KEYCODE_0 - - - - - NONE - - - - - NONE - - - - - NONE - - KEYCODE_LCONTROL KEYCODE_M @@ -148,19 +138,14 @@ KEYCODE_LCONTROL KEYCODE_Q - - - KEYCODE_DEL - - - KEYCODE_PGUP OR JOYCODE_1_ZAXIS_POS_SWITCH + JOYCODE_1_RYAXIS_NEG_SWITCH OR KEYCODE_PGUP - KEYCODE_PGDN OR JOYCODE_1_RZAXIS_POS_SWITCH + JOYCODE_1_RYAXIS_POS_SWITCH OR KEYCODE_PGDN @@ -188,11 +173,6 @@ NONE - - - KEYCODE_LCONTROL KEYCODE_P - - NONE @@ -200,7 +180,7 @@ - KEYCODE_LCONTROL KEYCODE_MINUS + KEYCODE_LCONTROL KEYCODE_MINUSPAD @@ -255,7 +235,7 @@ - KEYCODE_LCONTROL KEYCODE_PLUS + KEYCODE_LCONTROL KEYCODE_PLUSPAD @@ -275,7 +255,7 @@ - NONE + KEYCODE_LCONTROL KEYCODE_V @@ -283,84 +263,14 @@ KEYCODE_LCONTROL KEYCODE_C - - - NONE - - - - - NONE - - - - - NONE - - - - - NONE - - - - - NONE - - - - - NONE - - - - - NONE - - - - - NONE - - - - - NONE - - - - - NONE - - - KEYCODE_TAB OR JOYCODE_1_RZAXIS_POS_SWITCH + JOYCODE_1_RXAXIS_POS_SWITCH - KEYCODE_LSHIFT KEYCODE_TAB OR JOYCODE_1_ZAXIS_POS_SWITCH - - - - - NONE - - - - - JOYCODE_1_BUTTON4 - - - - - NONE - - - - - NONE + JOYCODE_1_RXAXIS_NEG_SWITCH OR KEYCODE_TAB @@ -368,11 +278,6 @@ KEYCODE_LCONTROL KEYCODE_ENTER - - - NONE - - KEYCODE_LCONTROL KEYCODE_Y @@ -383,11 +288,6 @@ KEYCODE_LCONTROL KEYCODE_U - - - NONE - - diff --git a/emu-configs/retroarch/ScummVM.zip b/emu-configs/retroarch/ScummVM.zip new file mode 100644 index 00000000..33e351e3 Binary files /dev/null and b/emu-configs/retroarch/ScummVM.zip differ diff --git a/emu-configs/retroarch/retroarch-core-options.cfg b/emu-configs/retroarch/retroarch-core-options.cfg index 06420de7..be802a61 100644 --- a/emu-configs/retroarch/retroarch-core-options.cfg +++ b/emu-configs/retroarch/retroarch-core-options.cfg @@ -59,17 +59,19 @@ cap32_scr_intensity = "8" cap32_scr_tube = "color" cap32_statusbar = "onloading" citra_analog_function = "C-Stick and Touchscreen Pointer" +citra_cpu_scale = "100% (Default)" citra_custom_textures = "disabled" citra_deadzone = "15" citra_dump_textures = "disabled" -citra_is_new_3ds = "Old 3DS" +citra_is_new_3ds = "New 3DS" citra_language = "English" citra_layout_option = "Default Top-Bottom Screen" citra_mouse_touchscreen = "enabled" citra_region_value = "Auto" citra_render_touchscreen = "disabled" -citra_resolution_factor = "4x" +citra_resolution_factor = "2x" citra_swap_screen = "Top" +citra_swap_screen_mode = "Toggle" citra_texture_filter = "none" citra_touch_touchscreen = "enabled" citra_use_acc_geo_shaders = "enabled" @@ -419,6 +421,7 @@ mgba_sgb_borders = "ON" mgba_skip_bios = "OFF" mgba_solar_sensor_level = "0" mgba_use_bios = "ON" +mesen_fdsautoinsertdisk = "enabled" mupen64plus-169screensize = "960x540" mupen64plus-43screensize = "640x480" mupen64plus-alt-map = "False" diff --git a/emu-configs/retroarch/retroarch.cfg b/emu-configs/retroarch/retroarch.cfg index 156d2499..dc533f2e 100644 --- a/emu-configs/retroarch/retroarch.cfg +++ b/emu-configs/retroarch/retroarch.cfg @@ -3,10 +3,14 @@ accessibility_narrator_speech_speed = "5" ai_service_enable = "false" ai_service_mode = "1" ai_service_pause = "false" +ai_service_poll_delay = "0" ai_service_source_lang = "0" ai_service_target_lang = "0" +ai_service_text_padding = "5" +ai_service_text_position = "0" ai_service_url = "http://localhost:4404/" all_users_control_menu = "true" +app_icon = "default" apply_cheats_after_load = "false" apply_cheats_after_toggle = "false" aspect_ratio_index = "22" @@ -23,6 +27,7 @@ audio_enable_menu_notice = "false" audio_enable_menu_ok = "false" audio_enable_menu_scroll = "false" audio_fastforward_mute = "false" +audio_fastforward_speedup = "false" audio_filter_dir = "/app/lib/retroarch/filters/audio" audio_latency = "64" audio_max_timing_skew = "0.050000" @@ -43,8 +48,8 @@ auto_shaders_enable = "true" autosave_interval = "10" block_sram_overwrite = "false" bluetooth_driver = "null" -builtin_imageviewer_enable = "true" -builtin_mediaplayer_enable = "true" +builtin_imageviewer_enable = "false" +builtin_mediaplayer_enable = "false" bundle_assets_dst_path = "" bundle_assets_dst_path_subdir = "" bundle_assets_extract_enable = "false" @@ -77,9 +82,17 @@ cheevos_unlock_sound_enable = "true" cheevos_username = "" cheevos_verbose_enable = "true" cheevos_visibility_account = "true" +cheevos_visibility_lboard_cancel = "true" +cheevos_visibility_lboard_start = "true" +cheevos_visibility_lboard_submit = "true" +cheevos_visibility_lboard_trackers = "true" cheevos_visibility_mastery = "true" +cheevos_visibility_progress_tracker = "true" cheevos_visibility_summary = "1" cheevos_visibility_unlock = "true" +cloud_sync_destructive = "false" +cloud_sync_driver = "" +cloud_sync_enable = "false" config_save_on_exit = "true" content_database_path = "/app/share/libretro/database/rdb" content_favorites_directory = "default" @@ -159,10 +172,12 @@ gamemode_enable = "false" gamma_correction = "0" global_core_options = "true" history_list_enable = "true" +initial_disk_change_enable = "true" input_ai_service = "i" input_ai_service_axis = "nul" input_ai_service_btn = "nul" input_ai_service_mbtn = "nul" +input_allow_turbo_dpad = "false" input_analog_deadzone = "0.000000" input_analog_sensitivity = "1.000000" input_audio_mute = "nul" @@ -264,6 +279,7 @@ input_hold_slowmotion_axis = "nul" input_hold_slowmotion_btn = "nul" input_hold_slowmotion_mbtn = "nul" input_hotkey_block_delay = "5" +input_hotkey_device_merge = "false" input_joypad_driver = "sdl2" input_keyboard_layout = "" input_load_state = "a" @@ -301,6 +317,9 @@ input_netplay_player_chat_axis = "nul" input_netplay_player_chat_btn = "nul" input_netplay_player_chat_mbtn = "nul" input_nowinkey_enable = "false" +input_osk_overlay = "" +input_osk_overlay_auto_scale = "false" +input_osk_overlay_opacity = "0.700000" input_osk_toggle = "f12" input_osk_toggle_axis = "nul" input_osk_toggle_btn = "nul" @@ -317,11 +336,25 @@ input_overlay_enable = "true" input_overlay_enable_autopreferred = "true" input_overlay_hide_in_menu = "false" input_overlay_hide_when_gamepad_connected = "false" +input_overlay_lightgun_allow_offscreen = "true" +input_overlay_lightgun_four_touch_input = "0" +input_overlay_lightgun_port = "-1" +input_overlay_lightgun_three_touch_input = "0" +input_overlay_lightgun_trigger_delay = "1" +input_overlay_lightgun_trigger_on_touch = "true" +input_overlay_lightgun_two_touch_input = "0" +input_overlay_mouse_dtap_msec = "200" +input_overlay_mouse_dtap_to_drag = "false" +input_overlay_mouse_hold_msec = "200" +input_overlay_mouse_hold_to_drag = "true" +input_overlay_mouse_speed = "1.000000" +input_overlay_mouse_swipe_threshold = "1.000000" input_overlay_next = "nul" input_overlay_next_axis = "nul" input_overlay_next_btn = "nul" input_overlay_next_mbtn = "nul" input_overlay_opacity = "0.700000" +input_overlay_pointer_enable = "false" input_overlay_scale_landscape = "1.000000" input_overlay_scale_portrait = "1.000000" input_overlay_show_inputs = "2" @@ -2912,6 +2945,14 @@ menu_xmb_thumbnail_scale_factor = "100" menu_xmb_title_margin = "5" menu_xmb_title_margin_horizontal_offset = "0" menu_xmb_vertical_fade_factor = "100" +microphone_block_frames = "0" +microphone_device = "" +microphone_driver = "alsathread" +microphone_enable = "true" +microphone_latency = "64" +microphone_rate = "48000" +microphone_resampler = "sinc" +microphone_resampler_quality = "3" midi_driver = "alsa" midi_input = "OFF" midi_output = "OFF" @@ -2985,16 +3026,19 @@ network_remote_enable_user_p9 = "false" notification_show_autoconfig = "true" notification_show_cheats_applied = "true" notification_show_config_override_load = "true" +notification_show_disk_control = "true" notification_show_fast_forward = "true" notification_show_netplay_extra = "false" notification_show_patch_applied = "true" notification_show_refresh_rate = "true" notification_show_remap_load = "true" +notification_show_save_state = "true" notification_show_screenshot = "true" notification_show_screenshot_duration = "0" notification_show_screenshot_flash = "0" notification_show_set_initial_disk = "true" notification_show_when_menu_is_alive = "false" +osk_overlay_directory = "/var/config/retroarch/overlays/keyboards" overlay_directory = "/var/config/retroarch/overlays/borders" ozone_collapse_sidebar = "false" ozone_menu_color_theme = "1" @@ -3018,6 +3062,7 @@ playlist_show_sublabels = "true" playlist_sort_alphabetical = "true" playlist_sublabel_last_played_style = "0" playlist_sublabel_runtime_type = "0" +playlist_use_filename = "false" playlist_use_old_format = "false" preemptive_frames_enable = "false" preemptive_frames_hide_warnings = "false" @@ -3097,6 +3142,7 @@ savestate_file_compression = "true" savestate_max_keep = "0" savestate_thumbnail_enable = "false" savestates_in_content_dir = "false" +scan_serial_and_crc = "false" scan_without_core_match = "false" screen_brightness = "100" screen_orientation = "0" @@ -3141,6 +3187,7 @@ suspend_screensaver_enable = "true" sustained_performance_mode = "false" system_directory = "/var/config/retroarch/system" systemfiles_in_content_dir = "false" +test_input_file_joypad = "" threaded_data_runloop_enable = "true" thumbnails_directory = "/var/config/retroarch/thumbnails" twitch_stream_key = "" @@ -3155,7 +3202,9 @@ video_adaptive_vsync = "false" video_allow_rotate = "true" video_aspect_ratio = "1.333300" video_aspect_ratio_auto = "false" +video_autoswitch_pal_threshold = "54.500000" video_autoswitch_refresh_rate = "0" +video_bfi_dark_frames = "1" video_black_frame_insertion = "0" video_context_driver = "" video_crop_overscan = "true" @@ -3171,6 +3220,7 @@ video_force_aspect = "true" video_force_srgb_disable = "false" video_frame_delay = "0" video_frame_delay_auto = "false" +video_frame_rest = "false" video_fullscreen = "true" video_fullscreen_x = "0" video_fullscreen_y = "0" @@ -3209,11 +3259,13 @@ video_rotation = "0" video_scale = "3" video_scale_integer = "false" video_scale_integer_overscale = "false" +video_scan_subframes = "false" video_shader_delay = "0" video_shader_dir = "/var/config/retroarch/shaders" video_shader_enable = "true" video_shader_preset_save_reference_enable = "true" video_shader_remember_last_dir = "false" +video_shader_subframes = "1" video_shader_watch_files = "false" video_shared_context = "false" video_smooth = "false" @@ -3239,6 +3291,9 @@ video_windowed_position_x = "0" video_windowed_position_y = "0" vrr_runloop_enable = "false" vulkan_gpu_index = "0" +webdav_password = "" +webdav_url = "" +webdav_username = "" wifi_driver = "null" wifi_enabled = "true" xmb_alpha_factor = "75" diff --git a/emu-configs/rpcs3/GuiConfigs/CurrentSettings.ini b/emu-configs/rpcs3/GuiConfigs/CurrentSettings.ini index b4dba439..0ef87f08 100644 --- a/emu-configs/rpcs3/GuiConfigs/CurrentSettings.ini +++ b/emu-configs/rpcs3/GuiConfigs/CurrentSettings.ini @@ -47,4 +47,5 @@ main_window_stop=Ctrl+Q main_window_toggle_fullscreen=Ctrl+Return [main_window] -infoBoxEnabledWelcome=false \ No newline at end of file +confirmationBoxExitGame=false +infoBoxEnabledWelcome=false diff --git a/functions/checks.sh b/functions/checks.sh index e5dc89af..2bd9af51 100644 --- a/functions/checks.sh +++ b/functions/checks.sh @@ -76,8 +76,8 @@ check_for_version_update() { log i "Showing new version found dialog" choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="OK" --extra-button="Ignore this version" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ - --title "RetroDECK Update Available" \ - --text="There is a new version of RetroDECK on the stable release channel $online_version. Please update through the Discover app!\n\nIf you would like to ignore this version and recieve a notification at the NEXT version,\nclick the \"Ignore this version\" button.") + --title "RetroDECK - New Update Available" \ + --text="There is a new version of RetroDECK available: $online_version.\nYou can easily update from the app store you have installed, examples: KDE Discover or Gnome Software.\n\nIf you would like to ignore this notification, click the \"Ignore this version\" button.") rc=$? # Capture return code, as "OK" button has no text value if [[ $rc == "1" ]]; then # If any button other than "OK" was clicked log i "Selected: \"OK\"" @@ -87,8 +87,8 @@ check_for_version_update() { log i "Showing update request dialog as \"$online_version\" was found and is greater then \"$version\"" choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="Yes" --extra-button="No" --extra-button="Ignore this version" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ - --title "RetroDECK Update Available" \ - --text="There is a more recent build of the RetroDECK cooker branch.\nYou are running version $hard_version, the latest is $online_version.\n\nWould you like to update to it?\nIf you would like to skip reminders about this version, click \"Ignore this version\".\nYou will be reminded again at the next version update.\n\nIf you would like to disable these update notifications entirely, disable Online Update Checks in the Configurator.") + --title "RetroDECK - New Cooker Version Available" \ + --text="There is a more recent version of RetroDECK cooker.\nYou are running version $hard_version. The latest is $online_version.\n\nWould you like to update?\nIf you would like to ignore this notification, click the \"Ignore this version\" button.\n\nIf you would like to disable these notifications entirely: disable Online Update Checks in the Configurator.") rc=$? # Capture return code, as "Yes" button has no text value if [[ $rc == "1" ]]; then # If any button other than "Yes" was clicked if [[ $choice == "Ignore this version" ]]; then @@ -99,22 +99,46 @@ check_for_version_update() { log i "Selected: \"Yes\"" configurator_generic_dialog "RetroDECK Online Update" "The update process may take several minutes.\n\nAfter the update is complete, RetroDECK will close. When you run it again you will be using the latest version." ( - local latest_cooker_download=$(curl --silent https://api.github.com/repos/XargonWan/$update_repo/releases/latest | grep '"browser_download_url":' | sed -E 's/.*"([^"]+)".*/\1/') + local latest_cooker_download=$(curl --silent https://api.github.com/repos/XargonWan/RetroDECK-cooker/releases/latest | grep '"browser_download_url":.*flatpak' | grep -v '\.sha' | sed -E 's/.*"([^"]+)".*/\1/') local temp_folder="$rdhome/RetroDECK_Updates" create_dir $temp_folder log i "Downloading version \"$online_version\" in \"$temp_folder/RetroDECK-cooker.flatpak\" from url: \"$latest_cooker_download\"" + # Downloading the flatpak file wget -P "$temp_folder" "$latest_cooker_download" - log d "Uninstalling old RetroDECK flatpak" - flatpak-spawn --host flatpak remove --noninteractive -y net.retrodeck.retrodeck # Remove current version before installing new one, to avoid duplicates - log d "Installing new flatpak file from: \"$temp_folder/RetroDECK-cooker.flatpak\"" + # And its sha + wget -P "$temp_folder" "$latest_cooker_download.sha" + + # Get the expected SHA checksum from the SHA file + local expected_sha=$(cat "$temp_folder/$(basename "$latest_cooker_download").sha" | awk '{print $1}') + + # Check if the file exists if [ -f "$temp_folder/RetroDECK-cooker.flatpak" ]; then - log d "Flatpak file \"$temp_folder/RetroDECK-cooker.flatpak\" found, proceeding." - flatpak-spawn --host flatpak install --user --bundle --noninteractive -y "$temp_folder/RetroDECK-cooker.flatpak" + # Calculate the actual SHA checksum of the file + actual_sha=$(sha256sum "$temp_folder/RetroDECK-cooker.flatpak" | awk '{print $1}') + + # Log the found and expected SHA checksums + log d "Found SHA: $actual_sha" + log d "Expected SHA: $expected_sha" + + # Check if the SHA checksum matches + if [ "$actual_sha" = "$expected_sha" ]; then + log d "Flatpak file \"$temp_folder/RetroDECK-cooker.flatpak\" found and SHA checksum matches, proceeding." + log d "Uninstalling old RetroDECK flatpak" + # Remove current version before installing new one, to avoid duplicates + flatpak-spawn --host flatpak remove --noninteractive -y net.retrodeck.retrodeck && log d "Uninstallation successful" + log d "Installing new flatpak file from: \"$temp_folder/RetroDECK-cooker.flatpak\"" + flatpak-spawn --host flatpak install --user --bundle --noninteractive -y "$temp_folder/RetroDECK-cooker.flatpak" && log d "Installation successful" + else + log e "Flatpak file \"$temp_folder/RetroDECK-cooker.flatpak\" found but SHA checksum does not match. Quitting." + configurator_generic_dialog "RetroDECK Online Update" "There was an error during the update: flatpak file found but SHA checksum does not match. Please check the log file." + exit 1 + fi else - log e "Flatpak file \"$temp_folder/RetroDECK-cooker.flatpak\" NOT FOUND. Quitting" - configurator_generic_dialog "RetroDECK Online Update" "There was an error during the update: flatpak file not found please check the log file." - exit 1 + log e "Flatpak file \"$temp_folder/RetroDECK-cooker.flatpak\" NOT FOUND. Quitting." + configurator_generic_dialog "RetroDECK Online Update" "There was an error during the update: flatpak file not found. Please check the log file." + exit 1 fi + rm -rf "$temp_folder" # Cleanup old bundles to save space ) | zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \ diff --git a/functions/cloud_sync.sh b/functions/cloud_sync.sh new file mode 100644 index 00000000..05a7907c --- /dev/null +++ b/functions/cloud_sync.sh @@ -0,0 +1,2 @@ +#!/bin/bash + diff --git a/functions/dialogs.sh b/functions/dialogs.sh index c0789042..3772c7e9 100644 --- a/functions/dialogs.sh +++ b/functions/dialogs.sh @@ -2,6 +2,10 @@ source /app/libexec/functions.sh +# Dialog colors +purple="#a864fc" +blue="#6fbfff" + debug_dialog() { # This function is for displaying commands run by the Configurator without actually running them # USAGE: debug_dialog "command" @@ -175,8 +179,7 @@ changelog_dialog() { else local version_changelog=$(xml sel -t -m "//release[@version='$1']/description" -v . -n $rd_appdata | tr -s '\n' | sed 's/^\s*//') - echo -e "In RetroDECK version $1, the following changes were made:\n$version_changelog" > "/var/config/retrodeck/changelog-partial.txt" - "$version_changelog" >> "/var/config/retrodeck/changelog-partial.txt" + echo -e "In RetroDECK version $1, the following changes were made:\n$version_changelog" > "/var/config/retrodeck/changelog-partial.txt" 2>/dev/null zenity --icon-name=net.retrodeck.retrodeck --text-info --width=1200 --height=720 \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ diff --git a/functions/framework.sh b/functions/framework.sh index 86ae0fbd..92f3b32e 100644 --- a/functions/framework.sh +++ b/functions/framework.sh @@ -39,11 +39,21 @@ set_setting_value() { fi ;; - "rpcs3" | "vita3k" ) # This does not currently work for settings with a $ in them - if [[ -z $current_section_name ]]; then - sed -i 's^\^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' "$1" - else - sed -i '\^\['"$current_section_name"'\]^,\^\^'"$setting_name_to_change"'.*^s^\^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' "$1" + "rpcs3" | "vita3k" ) + # This does not currently work for settings with a $ in them + + if [[ "$1" =~ (.ini)$ ]]; then # If this is a RPCS3 .ini file + if [[ -z $current_section_name ]]; then + sed -i 's^\^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' "$1" + else + sed -i '\^\['"$current_section_name"'\]^,\^\^'"$setting_name_to_change"'=^s^\^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' "$1" + fi + elif [[ "$1" =~ (.yml)$ ]]; then # If this is an YML-based file + if [[ -z $current_section_name ]]; then + sed -i 's^\^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' "$1" + else + sed -i '\^\['"$current_section_name"'\]^,\^\^'"$setting_name_to_change"'.*^s^\^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' "$1" + fi fi ;; @@ -55,7 +65,9 @@ set_setting_value() { fi ;; - "mame" ) # In this option, $current_section_name is the in the .cfg file. + "mame" ) + # In this option, $current_section_name is the in the .cfg file. + local mame_current_value=$(get_setting_value "$1" "$setting_name_to_change" "$4" "$current_section_name") if [[ "$1" =~ (.ini)$ ]]; then # If this is a MAME .ini file sed -i '\^\^'"$setting_name_to_change"'\s^s^'"$mame_current_value"'^'"$setting_value_to_change"'^' "$1" @@ -84,7 +96,11 @@ get_setting_name() { ;; "rpcs3" | "vita3k" ) - echo "$current_setting_line" | grep -o -P "^\s*?.*?(?=\s?:\s?)" | sed -e 's/^[ \t]*//;s^\\ ^ ^g' + if [[ "$1" =~ (.ini)$ ]]; then # If this is a RPCS3 .ini file + echo "$current_setting_line" | grep -o -P "^\s*?.*?(?=\s?=\s?)" | sed -e 's/^[ \t]*//;s^\\ ^ ^g;s^\\$^^' + elif [[ "$1" =~ (.yml)$ ]]; then # If this is an YML-based file + echo "$current_setting_line" | grep -o -P "^\s*?.*?(?=\s?:\s?)" | sed -e 's/^[ \t]*//;s^\\ ^ ^g' + fi ;; "mame" ) # This only works for mame .ini files, not the .cfg XML files diff --git a/functions/global.sh b/functions/global.sh index f37658e1..704d7f9f 100644 --- a/functions/global.sh +++ b/functions/global.sh @@ -138,7 +138,6 @@ fi # If there is no config file I initalize the file with the the default values if [[ ! -f "$rd_conf" ]]; then - create_dir /var/config/retrodeck/logs log w "RetroDECK config file not found in $rd_conf" log i "Initializing" # if we are here means that the we are in a new installation, so the version is valorized with the hardcoded one @@ -168,7 +167,7 @@ if [[ ! -f "$rd_conf" ]]; then set_setting_value $rd_conf "version" "$version" retrodeck # Set current version for new installs set_setting_value $rd_conf "sdcard" "$default_sd" retrodeck "paths" # Set SD card location if default path has changed - if grep -qF "cooker" <<< $hard_version; then # If newly-installed version is a "cooker" build + if grep -qF "cooker" <<< "$hard_version" || grep -qF "PR-" <<< "$hard_version"; then # If newly-installed version is a "cooker" or PR build set_setting_value $rd_conf "update_repo" "RetroDECK-cooker" retrodeck "options" set_setting_value $rd_conf "update_check" "true" retrodeck "options" set_setting_value $rd_conf "developer_options" "true" retrodeck "options" diff --git a/functions/post_update.sh b/functions/post_update.sh index b3030442..3dcc012b 100644 --- a/functions/post_update.sh +++ b/functions/post_update.sh @@ -300,6 +300,45 @@ post_update() { fi + if [[ $(check_version_is_older_than "0.8.1b") == "true" ]]; then + log i "In version 0.8.1b, the following changes were made that required config file updates/reset or other changes to the filesystem:" + log i "- ES-DE files were moved inside the retrodeck folder, migrating to the new structure" + log i "- Give the user the option to reset Ryujinx, which was not properly initialized in 0.8.0b" + + log d "ES-DE files were moved inside the retrodeck folder, migrating to the new structure" + dir_prep "$rdhome/ES-DE/collections" "/var/config/ES-DE/collections" + dir_prep "$rdhome/ES-DE/gamelists" "/var/config/ES-DE/gamelists" + log i "Moving ES-DE collections, downloaded_media, gamelist, and themes from \"$rdhome\" to \"$rdhome/ES-DE\"" + set_setting_value "$es_settings" "MediaDirectory" "$rdhome/ES-DE/downloaded_media" "es_settings" + set_setting_value "$es_settings" "UserThemeDirectory" "$rdhome/ES-DE/themes" "es_settings" + mv -f "$rdhome/themes" "$rdhome/ES-DE/themes" && log d "Move of \"$rdhome/themes\" completed" + mv -f "$rdhome/downloaded_media" "$rdhome/ES-DE/downloaded_media" && log d "Move of \"$rdhome/downloaded_media\" completed" + mv -f "$rdhome/gamelists/"* "$rdhome/ES-DE/gamelists" && log d "Move of \"$rdhome/gamelists/\" completed" + rm -rf "$rdhome/gamelists" + + log i "MAME-SA, migrating samples to the new exposed folder: from \"/var/data/mame/assets/samples\" to \"$bios_folder/mame-sa/samples\"" + create_dir "$bios_folder/mame-sa/samples" + mv -f "/var/data/mame/assets/samples/"* "$bios_folder/mame-sa/samples" + set_setting_value "$mameconf" "samplepath" "$bios_folder/mame-sa/samples" "mame" + + log i "Installing the missing ScummVM assets and renaming \"$mods_folder/RetroArch/ScummVM/themes\" into \"theme\"" + mv -f "$mods_folder/RetroArch/ScummVM/themes" "$mods_folder/RetroArch/ScummVM/theme" + unzip -o "$emuconfigs/retroarch/ScummVM.zip" 'scummvm/extra/*' -d /tmp + unzip -o "$emuconfigs/retroarch/ScummVM.zip" 'scummvm/theme/*' -d /tmp + mv -f /tmp/scummvm/extra "$mods_folder/RetroArch/ScummVM" + mv -f /tmp/scummvm/theme "$mods_folder/RetroArch/ScummVM" + rm -rf /tmp/extra /tmp/theme + + log i "Placing cheats in \"/var/data/mame/cheat\"" + unzip -j -o "$emuconfigs/mame/cheat0264.zip" 'cheat.7z' -d "/var/data/mame/cheat" + + log d "Verifying with user if they want to reset Ryujinx" + if [[ "$(configurator_generic_question_dialog "RetroDECK 0.8.1b Ryujinx Reset" "In RetroDECK 0.8.0b the Ryujinx emulator was not properly initialized for upgrading users.\nThis would cause Ryujinx to not work properly.\n\nWould you like to reset Ryujinx to default RetroDECK settings now?\n\nIf you have made your own changes to the Ryujinx config, you can decline this reset.")" == "true" ]]; then + log d "User agreed to Ryujinx reset" + prepare_component "reset" "ryujinx" + fi + fi + # if [[ $(check_version_is_older_than "0.9.0b") == "true" ]]; 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 @@ -335,8 +374,9 @@ post_update() { ) | 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 Finishing Upgrade" \ - --text="RetroDECK is finishing the upgrade process, please wait." + --title "RetroDECK - Upgrade Process" \ + --width=400 --height=200 \ + --text="RetroDECK is finishing up the upgrading process, please be patient.\n\nNOTICE - If the process is taking too long:\n\nSome windows might be running in the background that could require your attention: pop-ups from emulators or the upgrade itself that needs user input to continue.\n\n" version=$hard_version conf_write diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh index a47e5fd2..adad0d90 100644 --- a/functions/prepare_component.sh +++ b/functions/prepare_component.sh @@ -10,7 +10,7 @@ prepare_component() { # USAGE: prepare_component "$action" "$component" "$call_source(optional)" action="$1" - component="$2" + component=$(echo "$2" | tr '[:upper:]' '[:lower:]') call_source="$3" log d "Preparing component: \"$component\", action: \"$action\"" @@ -48,7 +48,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(es-de|ES-DE|all)$ ]]; then # For use after ESDE-related folders are moved or a reset + if [[ "$component" =~ ^(es-de|all)$ ]]; then # For use after ESDE-related folders are moved or a reset log i "--------------------------------" log i "Prepearing ES-DE" log i "--------------------------------" @@ -60,7 +60,8 @@ 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/gamelists" + dir_prep "$rdhome/ES-DE/gamelists" "/var/config/ES-DE/gamelists" + dir_prep "$rdhome/ES-DE/collections" "/var/config/ES-DE/collections" dir_prep "$rd_logs_folder/ES-DE" "$es_source_logs" log d "Generating roms system folders" #es-de --home /var/config/ES-DE --create-system-dirs @@ -75,7 +76,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(retroarch|RetroArch|all)$ ]]; then + if [[ "$component" =~ ^(retroarch|all)$ ]]; then log i "--------------------------------" log i "Prepearing RetroArch" log i "--------------------------------" @@ -87,7 +88,7 @@ prepare_component() { else # Single-user actions create_dir -d /var/config/retroarch dir_prep "$bios_folder" "/var/config/retroarch/system" - dir_prep "$logs_folder/retroarch" "/var/config/retroarch/logs" + dir_prep "$rdhome/logs/retroarch" "/var/config/retroarch/logs" create_dir /var/config/retroarch/shaders/ cp -rf /app/share/libretro/shaders /var/config/retroarch/ dir_prep "$rdhome/shaders/retroarch" "/var/config/retroarch/shaders" @@ -103,17 +104,6 @@ prepare_component() { set_setting_value "$raconf" "screenshot_directory" "$screenshots_folder" "retroarch" set_setting_value "$raconf" "log_dir" "$logs_folder" "retroarch" set_setting_value "$raconf" "rgui_browser_directory" "$roms_folder" "retroarch" - - # Specific Settings for ScummVM core - cp -fv "$emuconfigs/retroarch/scummvm.ini" "$ra_scummvm_conf" - create_dir "$mods_folder/RetroArch/ScummVM/icons" - create_dir "$mods_folder/RetroArch/ScummVM/extra" - create_dir "$mods_folder/RetroArch/ScummVM/themes" - set_setting_value "$ra_scummvm_conf" "iconspath" "$mods_folder/RetroArch/ScummVM/icons" "libretro_scummvm" "scummvm" - set_setting_value "$ra_scummvm_conf" "extrapath" "$mods_folder/RetroArch/ScummVM/extra" "libretro_scummvm" "scummvm" - set_setting_value "$ra_scummvm_conf" "themepath" "$mods_folder/RetroArch/ScummVM/themes" "libretro_scummvm" "scummvm" - set_setting_value "$ra_scummvm_conf" "savepath" "$saves_folder/scummvm" "libretro_scummvm" "scummvm" - set_setting_value "$ra_scummvm_conf" "browser_lastpath" "$roms_folder/scummvm" "libretro_scummvm" "scummvm" fi # Shared actions @@ -160,6 +150,24 @@ prepare_component() { log i "-----------------------------------------------------------" log i "Copying \"/app/retrodeck/extras/Amiga/capsimg.so\" in \"$bios_folder/capsimg.so\"" cp -f "/app/retrodeck/extras/Amiga/capsimg.so" "$bios_folder/capsimg.so" + + # ScummVM + log i "-----------------------------------------------------------" + log i "Prepearing ScummVM LIBRETRO" + log i "-----------------------------------------------------------" + cp -fv "$emuconfigs/retroarch/scummvm.ini" "$ra_scummvm_conf" + create_dir "$mods_folder/RetroArch/ScummVM/icons" + log i "Installing ScummVM assets" + unzip -o "$emuconfigs/retroarch/ScummVM.zip" 'scummvm/extra/*' -d /tmp + unzip -o "$emuconfigs/retroarch/ScummVM.zip" 'scummvm/theme/*' -d /tmp + mv -f /tmp/scummvm/extra "$mods_folder/RetroArch/ScummVM" + mv -f /tmp/scummvm/theme "$mods_folder/RetroArch/ScummVM" + rm -rf /tmp/extra /tmp/theme + set_setting_value "$ra_scummvm_conf" "iconspath" "$mods_folder/RetroArch/ScummVM/icons" "libretro_scummvm" "scummvm" + set_setting_value "$ra_scummvm_conf" "extrapath" "$mods_folder/RetroArch/ScummVM/extra" "libretro_scummvm" "scummvm" + set_setting_value "$ra_scummvm_conf" "themepath" "$mods_folder/RetroArch/ScummVM/theme" "libretro_scummvm" "scummvm" + set_setting_value "$ra_scummvm_conf" "savepath" "$saves_folder/scummvm" "libretro_scummvm" "scummvm" + set_setting_value "$ra_scummvm_conf" "browser_lastpath" "$roms_folder/scummvm" "libretro_scummvm" "scummvm" dir_prep "$texture_packs_folder/RetroArch-Mesen" "/var/config/retroarch/system/HdPacks" dir_prep "$texture_packs_folder/RetroArch-Mupen64Plus/cache" "/var/config/retroarch/system/Mupen64plus/cache" @@ -202,7 +210,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(citra|citra-emu|Citra|all)$ ]]; then + if [[ "$component" =~ ^(citra|citra-emu|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "------------------------" log i "Prepearing CITRA" @@ -247,7 +255,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(cemu|Cemu|all)$ ]]; then + if [[ "$component" =~ ^(cemu|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "----------------------" log i "Prepearing CEMU" @@ -274,7 +282,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(dolphin|dolphin-emu|Dolphin|all)$ ]]; then + if [[ "$component" =~ ^(dolphin|dolphin-emu|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "----------------------" log i "Prepearing DOLPHIN" @@ -327,7 +335,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(duckstation|Duckstation|all)$ ]]; then + if [[ "$component" =~ ^(duckstation|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "------------------------" log i "Prepearing DUCKSTATION" @@ -372,7 +380,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(melonds|melonDS|MelonDS|all)$ ]]; then + if [[ "$component" =~ ^(melonds|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "----------------------" log i "Prepearing MELONDS" @@ -410,7 +418,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(pcsx2|PCSX2|all)$ ]]; then + if [[ "$component" =~ ^(pcsx2|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "----------------------" log i "Prepearing PCSX2" @@ -464,7 +472,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(ppsspp|PPSSPP|all)$ ]]; then + if [[ "$component" =~ ^(ppsspp|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "------------------------" log i "Prepearing PPSSPPSDL" @@ -492,7 +500,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(primehack|Primehack|all)$ ]]; then + if [[ "$component" =~ ^(primehack|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "----------------------" log i "Prepearing Primehack" @@ -535,7 +543,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(rpcs3|RPCS3|all)$ ]]; then + if [[ "$component" =~ ^(rpcs3|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "------------------------" log i "Prepearing RPCS3" @@ -571,7 +579,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(ryujinx|Ryujinx|all)$ ]]; then + if [[ "$component" =~ ^(ryujinx|all)$ ]]; then # NOTE: for techincal reasons the system folder of Ryujinx IS NOT a sumlink of the bios/switch/keys as not only the keys are located there # When RetroDECK starts there is a "manage_ryujinx_keys" function that symlinks the keys only in Rryujinx/system. if [[ "$action" == "reset" ]]; then # Run reset-only commands @@ -615,7 +623,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(yuzu|Yuzu|all)$ ]]; then + if [[ "$component" =~ ^(yuzu|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "----------------------" log i "Prepearing YUZU" @@ -668,7 +676,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(xemu|XEMU|all)$ ]]; then + if [[ "$component" =~ ^(xemu|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "------------------------" log i "Prepearing XEMU" @@ -712,7 +720,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(vita3k|Vita3K|all)$ ]]; then + if [[ "$component" =~ ^(vita3k|all)$ ]]; then if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "----------------------" log i "Prepearing Vita3K" @@ -736,7 +744,7 @@ prepare_component() { fi fi - if [[ "$component" =~ ^(mame|MAME|all)$ ]]; then + if [[ "$component" =~ ^(mame|all)$ ]]; then # TODO: do a proper script # This is just a placeholder script to test the emulator's flow log i "----------------------" @@ -757,7 +765,7 @@ prepare_component() { create_dir "/var/data/mame/plugin-data" create_dir "/var/data/mame/hash" - create_dir "/var/data/mame/assets/samples" + create_dir "$bios_folder/mame-sa/samples" create_dir "/var/data/mame/assets/artwork" create_dir "/var/data/mame/assets/fonts" create_dir "/var/data/mame/cheat" @@ -798,10 +806,14 @@ prepare_component() { set_setting_value "$mameconf" "state_directory" "$states_folder/mame-sa" "mame" set_setting_value "$mameconf" "snapshot_directory" "$screenshots_folder/mame-sa" "mame" set_setting_value "$mameconf" "diff_directory" "$saves_folder/mame-sa/diff" "mame" + set_setting_value "$mameconf" "samplepath" "$bios_folder/mame-sa/samples" "mame" + + log i "Placing cheats in \"/var/data/mame/cheat\"" + unzip -j -o "$emuconfigs/mame/cheat0264.zip" 'cheat.7z' -d "/var/data/mame/cheat" fi - if [[ "$component" =~ ^(gzdoom|GZDOOM|all)$ ]]; then + if [[ "$component" =~ ^(gzdoom|all)$ ]]; then # TODO: do a proper script # This is just a placeholder script to test the emulator's flow log i "----------------------" @@ -821,7 +833,7 @@ prepare_component() { sed -i 's#RETRODECKSAVESDIR#'$saves_folder'#g' "/var/config/gzdoom/gzdoom.ini" # This is an unfortunate one-off because set_setting_value does not currently support JSON fi - if [[ "$component" =~ ^(boilr|BOILR|all)$ ]]; then + if [[ "$component" =~ ^(boilr|all)$ ]]; then log i "----------------------" log i "Prepearing BOILR" log i "----------------------" @@ -830,7 +842,7 @@ prepare_component() { cp -fvr "/app/libexec/steam-sync/config.toml" "/var/config/boilr" fi - if [[ ! "$component" =~ ^(retrodeck|es-de|ES-DE|retroarch|RetroArch|citra|citra-emu|Citra|cemu|Cemu|dolphin|dolphin-emu|Dolphin|duckstation|Duckstation|melonds|melonDS|MelonDS|pcsx2|PCSX2|pico8|pico-8|ppsspp|PPSSPP|primehack|Primehack|rpcs3|RPCS3|ryujinx|Ryujinx|yuzu|Yuzu|xemu|XEMU|vita3k|Vita3K|mame|MAME|gzdoom|GZDOOM|boilr|BOILR|)$ ]]; then + if [[ ! "$component" =~ ^(retrodeck|es-de|retroarch|citra|citra-emu|cemu|dolphin|dolphin-emu|duckstation|melonds|melonDS|pcsx2|pico8|pico-8|ppsspp|primehack|rpcs3|ryujinx|yuzu|xemu|vita3k|mame|gzdoom|boilr|)$ ]]; then log e "Supplied component $component not found, not resetting" fi diff --git a/functions/presets.sh b/functions/presets.sh index c5d8af4a..19fcbcec 100644 --- a/functions/presets.sh +++ b/functions/presets.sh @@ -128,7 +128,7 @@ build_preset_config() { create_dir "$(realpath "$(dirname "$read_target_file")")" echo "$read_setting_name = \""$new_setting_value"\"" > "$read_target_file" else - if [[ -z $(grep "$read_setting_name" "$read_target_file") ]]; then + if [[ -z $(grep -o -P "^$read_setting_name\b" "$read_target_file") ]]; then add_setting "$read_target_file" "$read_setting_name" "$new_setting_value" "$read_config_format" "$section" else set_setting_value "$read_target_file" "$read_setting_name" "$new_setting_value" "$read_config_format" "$section" diff --git a/incconfigs/todo.readme b/incconfigs/todo.readme deleted file mode 100644 index f4e9974a..00000000 --- a/incconfigs/todo.readme +++ /dev/null @@ -1,34 +0,0 @@ -Vita3K - -Fix the bindings and make sure everything works - -MAME - -Double check all the inputs and hotkeys for Player 1 to 4 - -GZDoom - -Fix the config. -Feel if the bindings are right when everything is done and all works as excpected. - -Primehack - -See what bindings works best - -Dolphin - -Look into Rotational controls while holding two buttons + right joystick. - -RetroArch - -User complained about Touchscreen -Make sure the config is SDL - -ALL - -Test all inputs after everything is done - - -Question: - -Does the X/Y A/B switcher needs to be updated? diff --git a/incconfigs/whatis.readme b/incconfigs/whatis.readme deleted file mode 100644 index e69de29b..00000000 diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml index 40ce91dc..395edded 100644 --- a/net.retrodeck.retrodeck.appdata.xml +++ b/net.retrodeck.retrodeck.appdata.xml @@ -60,9 +60,46 @@

Discord: https://discord.gg/WDc5C9YWMx (If you want to help out with the project join the "i-want-to-help" channel)

+ + #94a6fb + #404b98 + GPL-3.0 CC0-1.0 + + https://github.com/XargonWan/RetroDECK/releases/tag/0.8.1b + +

Changes:

+
    +
  • All emulators updated
    • +
  • PREPARE_COMPONENT: now the choice is passed lowercased so the script don't have to check for the possible casings, this should fix the issue where GZDoom couldn't be reset as it was expecting both GZDOOM or gzdoom.
    • +
  • ES-DE: downloaded_media, gamelist, and themes are now moved to the new retrodeck/ES-DE (previously was retrodeck)
    • +
  • ES-DE: custom collections are now located in retrodeck/ES-DE/collections, this prevents to be destroyed by a reset
    • +
  • LOGGER: version notes are no more outputed in the terminal or in the logs
    • +
  • WORKFLOWS: added RetroDECK.flatpak.sha files
    • +
  • WORKFLOWS: disabled nightly builds (was broken)
    • +
  • FRAMEWORK: now the PR builds are recognized same as cooker builds
    • +
  • FRAMEWORK: now there is a warning to check background windows, useful when installing RCPS3 firmware as some users were stuck on that screen without noticing the windows in the backgrounds
    • +
  • COOKER_UPDATER: added the hash check before uninstalling the flatpak
    • +
  • HELPER_FILES: updated links pointing to the new wiki
    • +
  • MAME-SA: added cheats
    • +
  • RYUJINX: added an helper file to specify how to install the firmware (not copying it in the folder)
    • +
  • RPCS3: included the confirm on quit preset, that can be enabled or disabled trough configurator like the other emulators
    • +
  • RETROARCH: fixed an issue where if a zip contained more than the game files it failed to load the game
    • +
  • CITRA_LIBRETRO: upscaled to 2x (was 4x but was too much), set system as "New 3DS"
    • +
  • GW_LIBRETRO: Handheld Electronic (GW) Libretro is now the defaulted Game And Watch emulator (due to a bug)
    • +
  • MESEN_LIBRETRO: enabled FDS disk auto load
    • +
  • SCUMMVM_LIBRETRO: provided assets
    • +
  • BIOS_CHECKER: added bios support for 3DO, GB, GBC, GBA, Neo Geo CD
    • +
  • BIOS_CHECKER: added more missing hashes
    • +
+

Known issues:

+
    +
  • Please check the know issues in the Wiki under General Infomration.
    • +
+ + https://github.com/XargonWan/RetroDECK/releases/tag/0.8.0b @@ -70,7 +107,7 @@
  • All the emulators and engines are updated to their latest version
  • ES-DE: updated to 3.0.1
    • -
  • RPCS3 is now running via shortcut (.desktop file) by default - WARN THE USERS TO MIGRATE and how to change it back
    • +
  • RPCS3 is now running via shortcut (.desktop file) by default
  • CITRA-SA: removed, it will available trough Ponzu. The libretro core is now the default emulator
  • YUZU: removed, Ryujinx is now the default emulator, it will available trough Ponzu
  • PONZU: added, check the wiki if interested in this preservational function
    • @@ -112,8 +149,8 @@
  • Removed talk names in the manifest as they're not needed anymore as enabled by default
  • Fixed an issue that prevented RetroDECK to work properly on some distributions on Wayland
  • Added the needed subfolders in retrodeck/bios
    • -
  • DVELOPER TOOLS: fixed some issues that preventing RetroDECK to be built locally
    • -
  • DVELOPER TOOLS: added a script to inject changes in the current RetroDECK installation in order to test script and config changes without a full manifest rebuild
    • +
  • DEVELOPER TOOLS: fixed some issues that preventing RetroDECK to be built locally
    • +
  • DEVELOPER TOOLS: added a script to inject changes in the current RetroDECK installation in order to test script and config changes without a full manifest rebuild

Known issues:

    diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index 2c04d96b..ebca27e7 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -22,7 +22,7 @@ finish-args: - --talk-name=org.freedesktop.login1.Manager - --filesystem=xdg-run/app/com.discordapp.Discord:create - --filesystem=xdg-config/gtk-3.0:ro - - --env=QT_QPA_PLATFORM=wayland-egl;wayland;xcb + - --env=QT_QPA_PLATFORM=wayland;wayland-egl;xcb # Dolphin - --allow=bluetooth # It allows an SDL application to specify its window class, which can be useful for window managers and desktop environments to identify and group similar windows @@ -69,7 +69,7 @@ modules: # The version number is hardcoded in /app/retrodeck/version # # UPDATE STEPS FOR MAIN: - # [x] Update the VERSION variable on line containing "VERSION=THISBRANCH" + # [ ] Update the VERSION variable on line containing "VERSION=THISBRANCH" # [x] Update the appdata.xml with the version number and notes # - name: version-initialization @@ -79,7 +79,7 @@ modules: # on main please update this with the version variable, eg: VERSION=0.8.0b # on cooker will be THISBRANCH - VERSION=0.8.0b + VERSION=THISBRANCH git checkout ${GITHUB_REF_NAME} mkdir -p ${FLATPAK_DEST}/retrodeck/ @@ -162,20 +162,6 @@ modules: url: https://ftp.osuosl.org/pub/blfs/conglomeration/libgudev/libgudev-237.tar.xz sha256: 0d06b21170d20c93e4f0534dbb9b0a8b4f1119ffb00b4031aaeb5b9148b686aa - # # - # DEPRECATED IN FAVOR OF COMPILED MAME TOOL # - # # - # - name: chdman-tool - # buildsystem: simple - # build-commands: - # - cmake -B . -G Ninja - # - cmake --build . - # - cp chdman /app/bin - # sources: - # - type: git - # url: https://github.com/CharlesThobe/chdman.git - # commit: f7cadf1720cbeba8a14f2685830ff424a0c7f6cd - - name: rclone buildsystem: simple build-commands: @@ -224,6 +210,7 @@ modules: url: https://github.com/mikefarah/yq/releases/download/v4.33.3/yq_linux_amd64 sha256: 4ee662847c588c3ef2fec8bfb304e8739e3dbaba87ccb9a608d691c88f5b64dc + # dependency of: CEMU - name: glslang buildsystem: cmake-ninja config-opts: @@ -236,8 +223,8 @@ modules: - /lib/cmake sources: - type: archive - url: https://github.com/KhronosGroup/glslang/archive/14.0.0.tar.gz - sha256: 80bbb916a23e94ea9cbfb1acb5d1a44a7e0c9613bcf5b5947c03f2273bdc92b0 + url: https://github.com/KhronosGroup/glslang/archive/14.1.0.tar.gz + sha256: b5e4c36d60eda7613f36cfee3489c6f507156829c707e1ecd7f48ca45b435322 x-checker-data: type: anitya stable-only: true @@ -357,7 +344,6 @@ modules: # ES-DE - START # https://gitlab.com/es-de/emulationstation-de - #This is disabled because we added the extension (line 11), check if the videos are ok. - name: ffmpeg config-opts: - --disable-static @@ -692,8 +678,8 @@ modules: - ln -s "${FLATPAK_DEST}/pcsx2-qt/usr/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt" sources: - type: file - url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.5645/pcsx2-v1.7.5645-linux-appimage-x64-Qt.AppImage - sha256: dcd11469a91d8daa57fe46719a968e73ed282d81925879aca9393527f8b695fd + url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.5769/pcsx2-v1.7.5769-linux-appimage-x64-Qt.AppImage + sha256: d819a339b9f3c43ee44fe9b6d975b9f76cff7716b5976a3b94f77e2cf4cab667 # PCSX2 - END @@ -1002,8 +988,8 @@ modules: - /lib/cmake sources: - type: archive - url: https://boostorg.jfrog.io/artifactory/main/release/1.84.0/source/boost_1_84_0.tar.bz2 - sha256: cc4b893acf645c9d4b698e9a0f08ca8846aa5d6c68275c14c3e7949c24109454 + url: https://boostorg.jfrog.io/artifactory/main/release/1.85.0/source/boost_1_85_0.tar.bz2 + sha256: 7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617 x-checker-data: type: anitya project-id: 6845 @@ -1080,8 +1066,8 @@ modules: x-checker-data: type: git tag-pattern: ^v([\d.]+-\d+)$ - tag: v2.0-73 - commit: 241915e1a6bfd92e4ffd0d6961a178335300e83f + tag: v2.0-79 + commit: efbbb817fe1cbe09ee132344b44a0f61f8b8ac96 - type: shell commands: - sed "s/set(EXPERIMENTAL_VERSION.*/set(EXPERIMENTAL_VERSION \"$(git describe @@ -1234,8 +1220,8 @@ modules: 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.1247/ryujinx-1.1.1247-linux_x64.tar.gz - sha256: c929a17b3fe819b155b1126ae5d255e71c986c0be257c92fbbae967e5070e51a + url: https://github.com/Ryujinx/release-channel-master/releases/download/1.1.1297/ryujinx-1.1.1297-linux_x64.tar.gz + sha256: 28b38754e7d2e92083b313b23278c180ae54ac025edbbd0276ec03baec0cec0f # Ryujinx Appimage - END diff --git a/automation_tools/flatpak_build_bundle_persistent.sh b/old/automation_tools/flatpak_build_bundle_persistent.sh similarity index 100% rename from automation_tools/flatpak_build_bundle_persistent.sh rename to old/automation_tools/flatpak_build_bundle_persistent.sh diff --git a/automation_tools/flatpak_build_download_only_persistent.sh b/old/automation_tools/flatpak_build_download_only_persistent.sh similarity index 100% rename from automation_tools/flatpak_build_download_only_persistent.sh rename to old/automation_tools/flatpak_build_download_only_persistent.sh diff --git a/automation_tools/flatpak_build_only_persistent.sh b/old/automation_tools/flatpak_build_only_persistent.sh similarity index 100% rename from automation_tools/flatpak_build_only_persistent.sh rename to old/automation_tools/flatpak_build_only_persistent.sh diff --git a/old/removed-workflows/TEST_release_info.yml b/old/disabled-workflows/TEST_release_info.yml similarity index 100% rename from old/removed-workflows/TEST_release_info.yml rename to old/disabled-workflows/TEST_release_info.yml diff --git a/old/removed-workflows/cooker-selfhosted-persistent.yml b/old/disabled-workflows/cooker-selfhosted-persistent.yml similarity index 73% rename from old/removed-workflows/cooker-selfhosted-persistent.yml rename to old/disabled-workflows/cooker-selfhosted-persistent.yml index 9cd619d7..711deb76 100644 --- a/old/removed-workflows/cooker-selfhosted-persistent.yml +++ b/old/disabled-workflows/cooker-selfhosted-persistent.yml @@ -145,7 +145,7 @@ jobs: ## Commits since last release ${{ steps.commits.outputs.commits }} - For the full release note for this build please refer to the channel [#BETA-TESTING](https://discord.gg/qQcrFvaA2C) on our Discord server. + For the full release note for this build please refer to the channel [#BETA-TESTING](https://discord.gg/WDc5C9YWMx) on our Discord server. Cooker channel is provided for the community to test fixes and explore new functionality. Please DO NOT open issues or ask support on this build. @@ -164,3 +164,47 @@ jobs: name: retrodeck-flatpak path: RetroDECK-cooker.flatpak continue-on-error: true + + # - name: Upload RetroDECK-cooker.flatpak to Gitea Release + # run: | + # # Set variables for Gitea host, organization, repository, access token, and release details + # GITEA_HOST="repo.retrodeck.net" + # ORGANIZATION="RetroDECK" + # REPO="RetroDECK-cooker" + # GITEA_TOKEN="${{ secrets.GITEA_TRIGGER_BUILD_TOKEN }}" + # RELEASE_NAME="RetroDECK ${{env.TAG}}" + # TAG="${{env.TAG}}" + # RELEASE_BODY="# Release Notes (Cooker) + # This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. + # On branch [${{env.BRANCH_NAME}}](https://repo.retrodeck.net/RetroDECK/RetroDECK/src/branch/${{env.BRANCH_NAME}}). + + # ## Commits since last release + # ${{ steps.commits.outputs.commits }} + + # For the full release note for this build please refer to the channel [#BETA-TESTING](https://discord.gg/WDc5C9YWMx) on our Discord server. + + # Cooker channel is provided for the community to test fixes and explore new functionality. + # Please DO NOT open issues or ask support on this build." + + # # Create a release using curl and capture the release ID + # release_response=$(curl -X POST \ + # -H "Authorization: token ${GITEA_TOKEN}" \ + # -H "Content-Type: application/json" \ + # -d "{\"tag_name\":\"$TAG\",\"name\":\"$RELEASE_NAME\",\"body\":\"$RELEASE_BODY\"}" \ + # "http://$GITEA_HOST/api/v1/repos/$ORGANIZATION/$REPO/releases") + + # # Extract the release ID from the response + # release_id=$(echo $release_response | jq -r '.id') + + # # Upload artifacts + # curl -X POST \ + # -H "Authorization: token ${GITEA_TOKEN}" \ + # -H "Content-Type: multipart/form-data" \ + # -F "attachment=@RetroDECK-cooker.flatpak" \ + # "http://$GITEA_HOST/api/v1/repos/$ORGANIZATION/$REPO/releases/$release_id/assets?name=RetroDECK-cooker.flatpak" + + # curl -X POST \ + # -H "Authorization: token ${GITEA_TOKEN}" \ + # -H "Content-Type: multipart/form-data" \ + # -F "attachment=@RetroDECK-Artifact.tar.gz" \ + # "http://$GITEA_HOST/api/v1/repos/$ORGANIZATION/$REPO/releases/$release_id/assets?name=RetroDECK-Artifact.tar.gz" diff --git a/old/disabled-workflows/cooker-selfhosted.yml b/old/disabled-workflows/cooker-selfhosted.yml new file mode 100644 index 00000000..4ffb693a --- /dev/null +++ b/old/disabled-workflows/cooker-selfhosted.yml @@ -0,0 +1,219 @@ +name: "Build cooker" + +on: + push: + branches: + - cooker* + - feat* + paths: + - '.github/workflows/**' + - 'automation_tools/**' + - 'emu-configs/**' + - 'es-configs/**' + - 'functions/**' + - 'rd-submodules/**' + - '*.sh' + - 'net.retrodeck.retrodeck.yml' + - 'net.retrodeck.retrodeck.appdata.xml' + pull_request: + branches: + - cooker* + + # Italy (CET): 11:00 PM + # Japan (JST): 7:00 AM + # schedule: + # - cron: '0 22 * * *' + + workflow_dispatch: + +jobs: + + Building_RetroDECK: + runs-on: self-hosted + steps: + + # Circumventing this bug: https://github.com/flatpak/flatpak-builder/issues/317 + - name: Remove stuck mounts + run: sudo umount -f /home/ubuntu/actions-runner/_work/RetroDECK/RetroDECK/.flatpak-builder/rofiles/* + continue-on-error: true + + - name: Clone RetroDECK repo + uses: actions/checkout@v3 + with: + submodules: 'true' + + - name: "Install dependencies" + run: "automation_tools/install_dependencies.sh" + + - name: Generate cooker build ID + run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/cooker_build_id.sh" + + - name: Get branch name + id: branch_name + run: echo "BRANCH_NAME=$(echo $GITHUB_REF | sed 's|refs/heads/||')" >> $GITHUB_ENV + + # if it's a feature branch it will not marked as "latest" cooker version + - name: "Set makeLatest (cooker only)" + run: | + if [[ "$BRANCH_NAME" == 'feat/'* || "$BRANCH_NAME" == 'refs/'* ]]; 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" == 'refs/'* ]]; then + pr_number=$(echo ${{env.BRANCH_NAME}} | awk -F'/' '{print $3}') + source_branch=$(curl -s "https://api.github.com/repos/XargonWan/RetroDECK/pulls/$pr_number" | jq -r '.head.ref') + source_branch=${source_branch//\//-} + echo "[DEBUG] source branch is: $source_branch" + echo "TAG=PR-$pr_number-$source_branch-${{ env.buildid }}" >> $GITHUB_ENV + else + echo "TAG=${{env.BRANCH_NAME}}-${{ env.buildid }}" >> $GITHUB_ENV + fi + echo "Version TAG: ${{ env.TAG }}" + + # backing up manifest in case download fails and hashes must be recalculated + - name: Manifest backup + run: "cp ${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml ${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml.bak" + + - name: Run pre-build automation tasks + run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" + + - name: "Adding flatpak portal for automated updates (cooker only)" + run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/cooker_flatpak_portal_add.sh" + + - name: "Updating release notes in appdata" + run: "automation_tools/appdata_management.sh" + + - name: "[DEBUG] Outputting manifest" + run: cat net.retrodeck.retrodeck.yml + + - name: "Build flatpak: download only" + id: "flatpak-download" + run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_download_only.sh" + continue-on-error: true + + # Sometimes flatpak download fails, in this case it tries a second time + - name: "Build flatpak: download only (retry)" + if: steps.flatpak-download.outcome == 'failure' + run: | + echo "Download failed, maybe some hash changed since the build start." + echo "Recalculating hashes and retrying download..." + rm -f "{GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml" + cp "${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml.bak" "${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml" + "${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" + "${GITHUB_WORKSPACE}/automation_tools/flatpak_build_download_only.sh" + + - name: Build flatpak + run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_only.sh" + + - name: Create Artifact for flathub + run: | + tar -czf ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz -C ${GITHUB_WORKSPACE}/retrodeck-flatpak-cooker . + hash=($(sha256sum ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.tar.gz)) + echo $hash > ${GITHUB_WORKSPACE}/RetroDECK-Artifact-cooker.sha + mv -f RetroDECK-Artifact-cooker.* ${{ secrets.ARTIFACT_REPO }} + continue-on-error: true + + - name: Create Bundle + run: "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/flatpak_build_bundle.sh" + + - name: Set environment variable with current branch name + run: echo "GITHUB_REF_SLUG=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV + + - name: Get commits since last release + run: | + # Get the latest release tag + LATEST_TAG=$(git describe --tags --abbrev=0) + # Get all commits since the latest release tag + COMMITS=$(git log $LATEST_TAG..HEAD --pretty=format:"- %s") + # Set the output variable + echo "::set-output name=commits::$COMMITS" + id: commits + continue-on-error: true + + - name: Publish the flatpak in a new cooker release + uses: ncipollo/release-action@v1 + with: + tag: "${{env.TAG}}" + body: | + # Release Notes (Cooker) + This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. + On branch [${{env.BRANCH_NAME}}](https://github.com/XargonWan/RetroDECK/tree/${{env.BRANCH_NAME}}). + + ## Commits since last release + ${{ steps.commits.outputs.commits }} + + For the full release note for this build please refer to the channel [#BETA-TESTING](https://discord.gg/WDc5C9YWMx) on our Discord server. + + Cooker channel is provided for the community to test fixes and explore new functionality. + Please DO NOT open issues or ask support on this build. + + artifacts: "RetroDECK-cooker.flatpak,RetroDECK-cooker.flatpak.sha,RetroDECK-Artifact.tar.gz" + allowUpdates: true + makeLatest: ${{env.MAKE_LATEST}} # if it's a feat branch is not considered the latest build + token: ${{ secrets.TRIGGER_BUILD_TOKEN }} + repo: RetroDECK-cooker + continue-on-error: true + + # In case it cannot publish the release at least it's providing the flatpak file for creating a manual release + - name: Upload RetroDECK-cooker.flatpak + uses: actions/upload-artifact@v3 + with: + name: retrodeck-flatpak + path: RetroDECK-cooker.flatpak + continue-on-error: true + + # - name: Upload RetroDECK-cooker.flatpak to Gitea Release + # run: | + # # Set variables for Gitea host, organization, repository, access token, and release details + # GITEA_HOST="repo.retrodeck.net" + # ORGANIZATION="RetroDECK" + # REPO="RetroDECK-cooker" + # GITEA_TOKEN="${{ secrets.GITEA_TRIGGER_BUILD_TOKEN }}" + # RELEASE_NAME="RetroDECK ${{env.TAG}}" + # TAG="${{env.TAG}}" + # RELEASE_BODY="# Release Notes (Cooker) + # This is a cooker snapshot based on the commit: ${{ github.event.repository.full_name }}@${{github.sha}}. + # On branch [${{env.BRANCH_NAME}}](https://repo.retrodeck.net/RetroDECK/RetroDECK/src/branch/${{env.BRANCH_NAME}}). + + # ## Commits since last release + # ${{ steps.commits.outputs.commits }} + + # For the full release note for this build please refer to the channel [#BETA-TESTING](https://discord.gg/WDc5C9YWMx) on our Discord server. + + # Cooker channel is provided for the community to test fixes and explore new functionality. + # Please DO NOT open issues or ask support on this build." + + # # Create a release using curl and capture the release ID + # release_response=$(curl -X POST \ + # -H "Authorization: token ${GITEA_TOKEN}" \ + # -H "Content-Type: application/json" \ + # -d "{\"tag_name\":\"$TAG\",\"name\":\"$RELEASE_NAME\",\"body\":\"$RELEASE_BODY\"}" \ + # "http://$GITEA_HOST/api/v1/repos/$ORGANIZATION/$REPO/releases") + + # # Extract the release ID from the response + # release_id=$(echo $release_response | jq -r '.id') + + # # Upload artifacts + # curl -X POST \ + # -H "Authorization: token ${GITEA_TOKEN}" \ + # -H "Content-Type: multipart/form-data" \ + # -F "attachment=@RetroDECK-cooker.flatpak" \ + # "http://$GITEA_HOST/api/v1/repos/$ORGANIZATION/$REPO/releases/$release_id/assets?name=RetroDECK-cooker.flatpak" + + # # Upload artifacts sha + # curl -X POST \ + # -H "Authorization: token ${GITEA_TOKEN}" \ + # -H "Content-Type: multipart/form-data" \ + # -F "attachment=@RetroDECK-cooker.flatpak.sha" \ + # "http://$GITEA_HOST/api/v1/repos/$ORGANIZATION/$REPO/releases/$release_id/assets?name=RetroDECK-cooker.flatpak.sha" + + # curl -X POST \ + # -H "Authorization: token ${GITEA_TOKEN}" \ + # -H "Content-Type: multipart/form-data" \ + # -F "attachment=@RetroDECK-Artifact.tar.gz" \ + # "http://$GITEA_HOST/api/v1/repos/$ORGANIZATION/$REPO/releases/$release_id/assets?name=RetroDECK-Artifact.tar.gz" diff --git a/old/removed-workflows/cooker.yml b/old/disabled-workflows/cooker.yml similarity index 100% rename from old/removed-workflows/cooker.yml rename to old/disabled-workflows/cooker.yml diff --git a/old/removed-workflows/flathub_push_cooker.yml b/old/disabled-workflows/flathub_push_cooker.yml similarity index 100% rename from old/removed-workflows/flathub_push_cooker.yml rename to old/disabled-workflows/flathub_push_cooker.yml diff --git a/old/removed-workflows/main.yml b/old/disabled-workflows/main.yml similarity index 100% rename from old/removed-workflows/main.yml rename to old/disabled-workflows/main.yml diff --git a/.github/workflows/submodule-update.yml b/old/disabled-workflows/submodule-update.yml similarity index 100% rename from .github/workflows/submodule-update.yml rename to old/disabled-workflows/submodule-update.yml diff --git a/old/removed-workflows/update-readthedocs.yml b/old/disabled-workflows/update-readthedocs.yml similarity index 100% rename from old/removed-workflows/update-readthedocs.yml rename to old/disabled-workflows/update-readthedocs.yml diff --git a/other_licenses.txt b/other_licenses.txt new file mode 100644 index 00000000..1b8073a9 --- /dev/null +++ b/other_licenses.txt @@ -0,0 +1,27 @@ +All Licenses of the projects we are using are listed on the wiki: +https://retrodeck.readthedocs.io/en/latest/wiki_about/donations-licenses/ + +If we have made some linkage errors or your license needs to be included in the projects github page please contact the RetroDECK Team on Discord or Matrix. + +--- + +Freedoom +https://github.com/freedoom/freedoom?tab=License-1-ov-file#readme + +Copyright © 2001-2024 Contributors to the Freedoom project. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + + Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + + Neither the name of the Freedoom project nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +For a list of contributors to the Freedoom project, see the file CREDITS. + +--- + + diff --git a/retrodeck.sh b/retrodeck.sh index bdfdae05..52cd7697 100644 --- a/retrodeck.sh +++ b/retrodeck.sh @@ -18,7 +18,7 @@ Arguments: --info-msg Print paths and config informations --configurator Starts the RetroDECK Configurator --compress-one Compresses target file to a compatible format - --compress-all Compresses all supported games into compatible format. Available formats are \"chd\", \"zip\", \"rvz\" and \"all\". + --compress-all Compresses all supported games into a compatible format. Available formats are \"chd\", \"zip\", \"rvz\" and \"all\". --reset-component Reset one or more component or emulator configs to the default values --reset-retrodeck Starts the initial RetroDECK installer (backup your data first!) @@ -58,6 +58,7 @@ https://retrodeck.net echo "You are about to reset one or more RetroDECK components or emulators." echo "Available options are: es-de, retroarch, cemu, dolphin, duckstation, gzdoom, melonds, pcsx3, pico8, ppsspp, primehack, rpcs3, ryujinx, xemu, vita3k, mame, boilr, all" read -p "Please enter the component you would like to reset: " component + component=$(echo "$component" | tr '[:upper:]' '[:lower:]') if [[ "$component" =~ ^(es-de|retroarch|cemu|dolphin|duckstation|gzdoom|mame|melonds|pcsx2|ppsspp|primehack|ryujinx|rpcs3|xemu|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 @@ -182,12 +183,6 @@ if [[ $update_check == "true" ]]; then log i "You're running the latest version" fi -# THIS IS A ONE-OFF FORCED REFRESH OF RETRODECK CONTROLLER PROFILES IN A 0.7.6b VERSION REFRESH - REMOVE BEFORE NEXT VERSION RELEASE -if [[ -f "$HOME/.steam/steam/controller_base/templates/RetroDECK_controller_config.vdf" ]]; then # If RetroDECK controller profile has been previously installed - install_retrodeck_controller_profile -fi -# REMOVE BEFORE NEXT VERSION RELEASE - # Normal Startup if [[ $steam_sync == "true" ]]; then diff --git a/tools/configurator.sh b/tools/configurator.sh index e00747f5..1808ea8a 100644 --- a/tools/configurator.sh +++ b/tools/configurator.sh @@ -107,12 +107,12 @@ source /app/libexec/global.sh configurator_welcome_dialog() { log i "Configurator: opening welcome dialog" if [[ $developer_options == "true" ]]; then - welcome_menu_options=("Presets & Settings" "Here you find various presets, tweaks and settings to customize your RetroDECK experience" \ - "Open Emulator" "Launch and configure each emulators settings (for advanced users)" \ + welcome_menu_options=("Presets & Settings" "Here you will find various presets, tweaks and settings to customize your RetroDECK experience" \ + "Open Emulator" "Launch and configure each emulator's settings (for advanced users)" \ "RetroDECK: Tools" "Compress games, move RetroDECK and install optional features" \ - "RetroDECK: Troubleshooting" "Backup data, perform BIOS / multi-disc file checks checks and emulator resets" \ + "RetroDECK: Troubleshooting" "Backup data, perform BIOS / multi-disc file checks and emulator resets" \ "RetroDECK: About" "Show additional information about RetroDECK" \ - "Sync with Steam" "Sync with Steam all the favorites games" \ + "Sync with Steam" "Sync all favorited games with Steam" \ "Developer Options" "Welcome to the DANGER ZONE") else welcome_menu_options=("Presets & Settings" "Here you find various presets, tweaks and settings to customize your RetroDECK experience" \ @@ -211,7 +211,7 @@ configurator_global_presets_and_settings_dialog() { --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \ --column="Choice" --column="Action" \ "Widescreen: Enable/Disable" "Enable or disable widescreen in supported systems" \ - "Ask-to-Exit: Enable/Disable" "Enable or disable emulators confirming when quitting in supported systems" \ + "Ask-to-Exit: Enable/Disable" "Enable or disable emulators confirming attempts to quit in supported systems" \ "Quick Resume: Enable/Disable" "Enable or disable save state auto-save/load in supported systems" \ "RetroAchievements: Login" "Log into the RetroAchievements service in supported systems" \ "RetroAchievements: Logout" "Disable RetroAchievements service in ALL supported systems" \ @@ -343,7 +343,7 @@ configurator_dolphin_input_textures_dialog() { zenity --question \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Configurator - Dolphin Textures: Universal Dynamic Input" \ - --text="Custom input textures are currently enabled. Do you want to disable them?." + --text="Custom input textures are currently enabled. Do you want to disable them?" if [ $? == 0 ] then @@ -357,7 +357,7 @@ configurator_dolphin_input_textures_dialog() { zenity --question \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Configurator - Dolphin Textures: Universal Dynamic Input" \ - --text="Custom input textures are currently disabled. Do you want to enable them?.\n\nThis process may take several minutes to complete." + --text="Custom input textures are currently disabled. Do you want to enable them?\n\nThis process may take several minutes to complete." if [ $? == 0 ] then @@ -381,7 +381,7 @@ configurator_primehack_input_textures_dialog() { zenity --question \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Configurator - Dolphin Custom Input Textures" \ - --text="Custom input textures are currently enabled. Do you want to disable them?." + --text="Custom input textures are currently enabled. Do you want to disable them?" if [ $? == 0 ] then @@ -395,7 +395,7 @@ configurator_primehack_input_textures_dialog() { zenity --question \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Configurator - Primehack Custom Input Textures" \ - --text="Custom input textures are currently disabled. Do you want to enable them?.\n\nThis process may take several minutes to complete." + --text="Custom input textures are currently disabled. Do you want to enable them?\n\nThis process may take several minutes to complete." if [ $? == 0 ] then @@ -419,7 +419,7 @@ configurator_power_user_warning_dialog() { choice=$(zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --ok-label="Yes" --extra-button="No" --extra-button="Never show this again" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Power User Warning" \ - --text="Making manual changes to an emulators configuration may create serious issues,\nand some settings may be overwitten during RetroDECK updates or when using presets.\n\nSome standalone emulator functions may not work properly outside of Desktop mode.\n\nPlease continue only if you know what you're doing.\n\nDo you want to continue?") + --text="Making manual changes to an emulator's configuration may create serious issues,\nand some settings may be overwitten during RetroDECK updates or when using presets.\n\nSome standalone emulator functions may not work properly outside of Desktop mode.\n\nPlease continue only if you know what you're doing.\n\nDo you want to continue?") fi rc=$? # Capture return code, as "Yes" button has no text value if [[ $rc == "0" ]]; then # If user clicked "Yes" @@ -608,12 +608,13 @@ configurator_retrodeck_tools_dialog() { ( update_rpcs3_firmware ) | - zenity --progress --pulsate \ + zenity --progress --no-cancel --pulsate --auto-close \ --icon-name=net.retrodeck.retrodeck \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title="Downloading PS3 Firmware" \ - --no-cancel \ - --auto-close + --width=400 --height=200 \ + --text="Dowloading and installing PS3 Firmware, please be patient.\n\nNOTICE - If the process is taking too long:\n\nSome windows might be running in the background that could require your attention: pop-ups from emulators or the upgrade itself that needs user input to continue.\n\n" + else configurator_generic_dialog "RetroDECK Configurator - Install: PS3 Firmware" "You do not appear to currently have Internet access, which is required by this tool. Please try again when network access has been restored." configurator_retrodeck_tools_dialog @@ -823,7 +824,7 @@ configurator_compress_single_game_dialog() { configurator_compression_tool_dialog else - configurator_generic_dialog "RetroDECK Configurator - RetroDECK: Compression Tool" "The selected file does not have any compatible compressed format." + configurator_generic_dialog "RetroDECK Configurator - RetroDECK: Compression Tool" "The selected file does not have any compatible compression formats." configurator_compression_tool_dialog fi else @@ -1053,7 +1054,7 @@ configurator_retrodeck_troubleshooting_dialog() { } configurator_check_bios_files() { - configurator_generic_dialog "RetroDECK Configurator - Check & Verify: BIOS Files" "This check will look for BIOS files that RetroDECK has identified as working.\n\nNot all BIOS files are required for games to work, please check the BIOS description for more information on its purpose.\n\nThere may be additional BIOS files that will function with the emulators that are not checked.\n\nSome more advanced emulators such as Ryujinx will have additional methods for verifiying the BIOS files are in working order." + configurator_generic_dialog "RetroDECK Configurator - Check & Verify: BIOS Files" "This check will look for BIOS files that RetroDECK has identified as working.\n\nNot all BIOS files are required for games to work, please check the BIOS description for more information on its purpose.\n\nBIOS files not known to this tool could still function.\n\nSome more advanced emulators such as Ryujinx will have additional methods to verify that the BIOS files are in working order." bios_checked_list=() check_bios_files "basic" @@ -1071,7 +1072,7 @@ configurator_check_bios_files() { } configurator_check_bios_files_expert_mode() { - configurator_generic_dialog "RetroDECK Configurator - Check & Verify: BIOS Files - Expert Mode" "This check will look for BIOS files that RetroDECK has identified as working.\n\nNot all BIOS files are required for games to work, please check the BIOS description for more information on its purpose.\n\nThere may be additional BIOS files that will function with the emulators that are not checked.\n\nSome more advanced emulators such as Ryujinx will have additional methods for verifiying the BIOS files are in working order." + configurator_generic_dialog "RetroDECK Configurator - Check & Verify: BIOS Files - Expert Mode" "This check will look for BIOS files that RetroDECK has identified as working.\n\nNot all BIOS files are required for games to work, please check the BIOS description for more information on its purpose.\n\nBIOS files not known to this tool could still function.\n\nSome more advanced emulators such as Ryujinx will have additional methods to verify that the BIOS files are in working order." bios_checked_list=() check_bios_files "expert" @@ -1192,7 +1193,7 @@ configurator_reset_dialog() { component_to_reset=$(zenity --list \ --title "RetroDECK Configurator Utility - Reset Specific RetroDECK Component" --cancel-label="Back" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --width=1200 --height=720 \ - --text="Which component do you want to reset to default?" \ + --text="Which component do you want to reset to default settings?" \ --column="Component" --column="Action" \ "BoilR" "Reset BoilR that manages the sync and scraping toward Steam library" \ "ES-DE" "Reset the ES-DE frontend" \ ) @@ -1298,7 +1299,7 @@ configurator_add_steam() { zenity --question \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Configurator - RetroDECK Steam Syncronization" \ - --text="Steam syncronization is current enabled. Do you want to disable it?\n\nThe already added shortcut will not be removed.\n" + --text="Steam syncronization is currently enabled. Do you want to disable it?\n\nThe already added shortcut will not be removed.\n" if [ $? == 0 ] # User clicked "Yes" then @@ -1310,7 +1311,7 @@ configurator_add_steam() { zenity --question \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Configurator - RetroDECK Steam Syncronization" \ - --text="Steam syncronization is current disabled. Do you want to enable it?\n\nAll the games marked as favorites will be syncronized with Steam thanks to BoilR.\nRemember to restart Steam each time to see the changes.\n" + --text="Steam syncronization is currently disabled. Do you want to enable it?\n\nAll the games marked as favorites will be syncronized with Steam thanks to BoilR.\nRemember to restart Steam each time to see the changes.\n" if [ $? == 0 ] then @@ -1421,7 +1422,7 @@ configurator_retrodeck_multiuser_dialog() { zenity --question \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Configurator - RetroDECK Multi-user Support" \ - --text="Multi-user support is current enabled. Do you want to disable it?\n\nIf there are more than one user configured,\nyou will be given a choice of which to use as the single RetroDECK user.\n\nThis users files will be moved to the default locations.\n\nOther users files will remain in the mutli-user-data folder.\n" + --text="Multi-user support is currently enabled. Do you want to disable it?\n\nIf there is more than one user configured,\nyou will be given a choice of which to use as the single RetroDECK user.\n\nThis user's files will be moved to the default locations.\n\nOther users' files will remain in the mutli-user-data folder.\n" if [ $? == 0 ] # User clicked "Yes" then @@ -1433,7 +1434,7 @@ configurator_retrodeck_multiuser_dialog() { zenity --question \ --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --title "RetroDECK Configurator - RetroDECK Multi-user support" \ - --text="Multi-user support is current disabled. Do you want to enable it?\n\nThe current users saves and states will be backed up and then moved to the \"retrodeck/multi-user-data\" folder.\nAdditional users will automatically be stored in their own folder here as they are added." + --text="Multi-user support is currently disabled. Do you want to enable it?\n\nThe current user's saves and states will be backed up and then moved to the \"retrodeck/multi-user-data\" folder.\nAdditional users will automatically be stored in their own folder here as they are added." if [ $? == 0 ] then