Merge branch 'cooker-0.6.4b' [skip ci]

This commit is contained in:
XargonWan 2023-04-04 18:38:22 +00:00
commit 52a83b07a0
13 changed files with 840 additions and 296 deletions

View file

@ -1,7 +1,7 @@
[UI] [UI]
SettingsVersion = 1 SettingsVersion = 1
InhibitScreensaver = true InhibitScreensaver = true
ConfirmShutdown = true ConfirmShutdown = false
StartPaused = false StartPaused = false
PauseOnFocusLoss = false PauseOnFocusLoss = false
StartFullscreen = true StartFullscreen = true

View file

@ -4,6 +4,7 @@ MainWindowGeometry = AdnQywADAAAAAAAAAAAAAAAAA7UAAAJ/AAAAAAAAAAAAAAO1AAACfwAAAAA
MainWindowState = AAAA/wAAAAD9AAAAAAAAA7YAAAJXAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAOAHQAbwBvAGwAQgBhAHIAAAAAAP////8AAAAAAAAAAA== MainWindowState = AAAA/wAAAAD9AAAAAAAAA7YAAAJXAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAOAHQAbwBvAGwAQgBhAHIAAAAAAP////8AAAAAAAAAAA==
PauseOnFocusLoss = true PauseOnFocusLoss = true
StartFullscreen = true StartFullscreen = true
ConfirmShutdown = false
[EmuCore] [EmuCore]

View file

@ -0,0 +1,6 @@
# Primehack Changes: Assign audio output, change AR to "Force 16:9"
change^DSP^Backend^Pulse^primehack^$primehackconf
change^Settings^AspectRatio^1^primehack^$primehackgfxconf
# Update "ask on quit" and "save on quit" on supported emulators (PCSX2, Duckstation)
change^UI^ConfirmShutdown^false^pcsx2^$pcsx2qtconf
change^Main^ConfirmPowerOff^false^duckstation^$duckstationconf

View file

@ -48,7 +48,7 @@ DisableScreenSaver = True
KeepWindowOnTop = False KeepWindowOnTop = False
Fullscreen = True Fullscreen = True
[Interface] [Interface]
ConfirmStop = False ConfirmStop = True
LanguageCode = LanguageCode =
OnScreenDisplayMessages = True OnScreenDisplayMessages = True
PauseOnFocusLost = False PauseOnFocusLost = False
@ -59,7 +59,7 @@ ThemeName = Clean
DebugModeEnabled = False DebugModeEnabled = False
CursorVisibility = 2 CursorVisibility = 2
[DSP] [DSP]
Backend = No Audio Output Backend = Pulse
EnableJIT = False EnableJIT = False
DSPThread = True DSPThread = True
[GBA] [GBA]

View file

@ -16,7 +16,7 @@ Lock Camera in Motion Puzzles = True
ReduceBloom = True ReduceBloom = True
ToggleArmRePosition = True ToggleArmRePosition = True
[Settings] [Settings]
AspectRatio = 3 AspectRatio = 1
BackendMultithreading = True BackendMultithreading = True
DumpBaseTextures = True DumpBaseTextures = True
DumpMipTextures = True DumpMipTextures = True

View file

@ -17,9 +17,9 @@
<rule type="staticpath"> <rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/org.libretro.RetroArch</entry> <entry>/var/lib/flatpak/exports/bin/org.libretro.RetroArch</entry>
<entry>~/.local/share/flatpak/exports/bin/org.libretro.RetroArch</entry> <entry>~/.local/share/flatpak/exports/bin/org.libretro.RetroArch</entry>
<entry>~/Applications/RetroArch-Linux-x86_64.AppImage</entry> <entry>~/Applications/RetroArch-Linux*.AppImage</entry>
<entry>~/.local/bin/RetroArch-Linux-x86_64.AppImage</entry> <entry>~/.local/bin/RetroArch-Linux*.AppImage</entry>
<entry>~/bin/RetroArch-Linux-x86_64.AppImage</entry> <entry>~/bin/RetroArch-Linux*.AppImage</entry>
</rule> </rule>
</emulator> </emulator>
<core name="RETROARCH"> <core name="RETROARCH">
@ -44,6 +44,17 @@
<entry>/usr/pkg/lib/libretro</entry> <entry>/usr/pkg/lib/libretro</entry>
</rule> </rule>
</core> </core>
<emulator name="ARES">
<!-- Multi-system emulator ares -->
<rule type="systempath">
<entry>ares</entry>
<entry>dev.ares.ares</entry>
</rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/dev.ares.ares</entry>
<entry>~/.local/share/flatpak/exports/bin/dev.ares.ares</entry>
</rule>
</emulator>
<emulator name="ATARI800"> <emulator name="ATARI800">
<!-- Atari 8-bit computer emulator Atari800 --> <!-- Atari 8-bit computer emulator Atari800 -->
<rule type="systempath"> <rule type="systempath">
@ -60,9 +71,9 @@
<rule type="staticpath"> <rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/net.cebix.basilisk</entry> <entry>/var/lib/flatpak/exports/bin/net.cebix.basilisk</entry>
<entry>~/.local/share/flatpak/exports/bin/net.cebix.basilisk</entry> <entry>~/.local/share/flatpak/exports/bin/net.cebix.basilisk</entry>
<entry>~/Applications/BasiliskII-x86_64.AppImage</entry> <entry>~/Applications/BasiliskII*.AppImage</entry>
<entry>~/.local/bin/BasiliskII-x86_64.AppImage</entry> <entry>~/.local/bin/BasiliskII*.AppImage</entry>
<entry>~/bin/BasiliskII-x86_64.AppImage</entry> <entry>~/bin/BasiliskII*.AppImage</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="BLASTEM"> <emulator name="BLASTEM">
@ -89,9 +100,13 @@
<emulator name="CEMU"> <emulator name="CEMU">
<!-- Nintendo Wii U emulator Cemu --> <!-- Nintendo Wii U emulator Cemu -->
<rule type="systempath"> <rule type="systempath">
<entry>cemu</entry>
<entry>Cemu</entry> <entry>Cemu</entry>
</rule> </rule>
<rule type="staticpath"> <rule type="staticpath">
<entry>~/Applications/Cemu*.AppImage</entry>
<entry>~/.local/bin/Cemu*.AppImage</entry>
<entry>~/bin/Cemu*.AppImage</entry>
<entry>~/Applications/Cemu/Cemu</entry> <entry>~/Applications/Cemu/Cemu</entry>
<entry>~/.local/bin/Cemu/Cemu</entry> <entry>~/.local/bin/Cemu/Cemu</entry>
<entry>~/bin/Cemu/Cemu</entry> <entry>~/bin/Cemu/Cemu</entry>
@ -101,6 +116,7 @@
<!-- Nintendo 3DS emulator Citra --> <!-- Nintendo 3DS emulator Citra -->
<rule type="systempath"> <rule type="systempath">
<entry>citra-qt</entry> <entry>citra-qt</entry>
<entry>citra</entry>
<entry>citra-emu.citra-nightly</entry> <entry>citra-emu.citra-nightly</entry>
<entry>org.citra_emu.citra</entry> <entry>org.citra_emu.citra</entry>
</rule> </rule>
@ -109,6 +125,17 @@
<entry>~/.local/share/flatpak/exports/bin/org.citra_emu.citra</entry> <entry>~/.local/share/flatpak/exports/bin/org.citra_emu.citra</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="CPCEMU">
<!-- Amstrad CPC emulator CPCemu -->
<rule type="systempath">
<entry>cpcemu</entry>
</rule>
<rule type="staticpath">
<entry>~/Applications/cpcemu/cpcemu</entry>
<entry>~/.local/bin/cpcemu/cpcemu</entry>
<entry>~/bin/cpcemu/cpcemu</entry>
</rule>
</emulator>
<emulator name="DESMUME"> <emulator name="DESMUME">
<!-- Nintendo DS emulator DeSmuME --> <!-- Nintendo DS emulator DeSmuME -->
<rule type="systempath"> <rule type="systempath">
@ -166,12 +193,12 @@
<rule type="staticpath"> <rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/org.duckstation.DuckStation</entry> <entry>/var/lib/flatpak/exports/bin/org.duckstation.DuckStation</entry>
<entry>~/.local/share/flatpak/exports/bin/org.duckstation.DuckStation</entry> <entry>~/.local/share/flatpak/exports/bin/org.duckstation.DuckStation</entry>
<entry>~/Applications/duckstation-nogui-x64.AppImage</entry> <entry>~/Applications/duckstation-nogui*.AppImage</entry>
<entry>~/.local/bin/duckstation-nogui-x64.AppImage</entry> <entry>~/.local/bin/duckstation-nogui*.AppImage</entry>
<entry>~/bin/duckstation-nogui-x64.AppImage</entry> <entry>~/bin/duckstation-nogui*.AppImage</entry>
<entry>~/Applications/duckstation-qt-x64.AppImage</entry> <entry>~/Applications/duckstation-qt*.AppImage</entry>
<entry>~/.local/bin/duckstation-qt-x64.AppImage</entry> <entry>~/.local/bin/duckstation-qt*.AppImage</entry>
<entry>~/bin/duckstation-qt-x64.AppImage</entry> <entry>~/bin/duckstation-qt*.AppImage</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="EASYRPG"> <emulator name="EASYRPG">
@ -185,6 +212,17 @@
<entry>~/bin/easyrpg/easyrpg-player</entry> <entry>~/bin/easyrpg/easyrpg-player</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="FINALBURN-NEO">
<!-- Arcade emulator FinalBurn Neo -->
<rule type="systempath">
<entry>fbneo</entry>
</rule>
<rule type="staticpath">
<entry>~/Applications/fbneo/fbneo</entry>
<entry>~/.local/bin/fbneo/fbneo</entry>
<entry>~/bin/fbneo/fbneo</entry>
</rule>
</emulator>
<emulator name="FLYCAST"> <emulator name="FLYCAST">
<!-- Sega Dreamcast emulator Flycast --> <!-- Sega Dreamcast emulator Flycast -->
<rule type="systempath"> <rule type="systempath">
@ -194,6 +232,9 @@
<rule type="staticpath"> <rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/org.flycast.Flycast</entry> <entry>/var/lib/flatpak/exports/bin/org.flycast.Flycast</entry>
<entry>~/.local/share/flatpak/exports/bin/org.flycast.Flycast</entry> <entry>~/.local/share/flatpak/exports/bin/org.flycast.Flycast</entry>
<entry>~/Applications/flycast*.AppImage</entry>
<entry>~/.local/bin/flycast*.AppImage</entry>
<entry>~/bin/flycast*.AppImage</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="FS-UAE"> <emulator name="FS-UAE">
@ -208,6 +249,59 @@
<entry>~/.local/share/flatpak/exports/bin/net.fsuae.FS-UAE</entry> <entry>~/.local/share/flatpak/exports/bin/net.fsuae.FS-UAE</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="FUSE">
<!-- Sinclair ZX Spectrum emulator Fuse -->
<rule type="systempath">
<entry>fuse</entry>
<entry>net.sf.fuse_emulator</entry>
</rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/net.sf.fuse_emulator</entry>
<entry>~/.local/share/flatpak/exports/bin/net.sf.fuse_emulator</entry>
</rule>
</emulator>
<emulator name="GARGOYLE">
<!-- Interactive fiction player Gargoyle -->
<rule type="systempath">
<entry>gargoyle</entry>
</rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/io.github.garglk.Gargoyle</entry>
<entry>~/.local/share/flatpak/exports/bin/io.github.garglk.Gargoyle</entry>
<entry>~/Applications/Gargoyle*.AppImage</entry>
<entry>~/.local/bin/Gargoyle*.AppImage</entry>
<entry>~/bin/Gargoyle*.AppImage</entry>
</rule>
</emulator>
<emulator name="GEARBOY">
<!-- Nintendo Game Boy and Game Boy Color emulator Gearboy -->
<rule type="systempath">
<entry>gearboy</entry>
</rule>
<rule type="staticpath">
<entry>~/Applications/gearboy/gearboy</entry>
<entry>~/.local/bin/gearboy/gearboy</entry>
<entry>~/bin/gearboy/gearboy</entry>
</rule>
</emulator>
<emulator name="GOPHER2600">
<!-- Atari 2600 emulator Gopher2600 -->
<rule type="staticpath">
<entry>~/Applications/gopher2600/gopher2600_linux_amd64</entry>
<entry>~/.local/bin/gopher2600/gopher2600_linux_amd64</entry>
<entry>~/bin/gopher2600/gopher2600_linux_amd64</entry>
</rule>
</emulator>
<emulator name="HATARI">
<!-- Atari ST/STE/TT/Falcon emulator Hatari -->
<rule type="systempath">
<entry>hatari</entry>
</rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/org.tuxfamily.hatari</entry>
<entry>~/.local/share/flatpak/exports/bin/org.tuxfamily.hatari</entry>
</rule>
</emulator>
<emulator name="HYPSEUS-SINGE"> <emulator name="HYPSEUS-SINGE">
<!-- Hypseus Singe, fork of arcade LaserDisc emulator Daphne --> <!-- Hypseus Singe, fork of arcade LaserDisc emulator Daphne -->
<rule type="systempath"> <rule type="systempath">
@ -257,6 +351,10 @@
<rule type="systempath"> <rule type="systempath">
<entry>mednafen</entry> <entry>mednafen</entry>
</rule> </rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/com.github.AmatCoder.mednaffe|flatpak run --command=mednafen com.github.AmatCoder.mednaffe</entry>
<entry>~/.local/share/flatpak/exports/bin/com.github.AmatCoder.mednaffe|flatpak run --command=mednafen com.github.AmatCoder.mednaffe</entry>
</rule>
</emulator> </emulator>
<emulator name="MELONDS"> <emulator name="MELONDS">
<!-- Nintendo DS and DSi emulator melonDS --> <!-- Nintendo DS and DSi emulator melonDS -->
@ -274,6 +372,7 @@
<!-- Nintendo Game Boy Advance emulator mGBA --> <!-- Nintendo Game Boy Advance emulator mGBA -->
<rule type="systempath"> <rule type="systempath">
<entry>mgba</entry> <entry>mgba</entry>
<entry>mgba-qt</entry>
<entry>io.mgba.mGBA</entry> <entry>io.mgba.mGBA</entry>
</rule> </rule>
<rule type="staticpath"> <rule type="staticpath">
@ -296,7 +395,7 @@
</rule> </rule>
</emulator> </emulator>
<emulator name="NESTOPIA-UE"> <emulator name="NESTOPIA-UE">
<!-- NES/Famicom emulator Nestopia UE --> <!-- Nintendo NES and Famicom emulator Nestopia UE -->
<rule type="systempath"> <rule type="systempath">
<entry>nestopia</entry> <entry>nestopia</entry>
</rule> </rule>
@ -305,6 +404,16 @@
<entry>~/.local/share/flatpak/exports/bin/ca._0ldsk00l.Nestopia</entry> <entry>~/.local/share/flatpak/exports/bin/ca._0ldsk00l.Nestopia</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="OPENMSX">
<!-- MSX home computer emulator openMSX -->
<rule type="systempath">
<entry>openmsx</entry>
</rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/org.openmsx.openMSX</entry>
<entry>~/.local/share/flatpak/exports/bin/org.openmsx.openMSX</entry>
</rule>
</emulator>
<emulator name="ORICUTRON"> <emulator name="ORICUTRON">
<!-- Tangerine Computer Systems emulator Oricutron --> <!-- Tangerine Computer Systems emulator Oricutron -->
<rule type="systempath"> <rule type="systempath">
@ -327,6 +436,18 @@
<entry>~/bin/pcsx2*-Qt.AppImage</entry> <entry>~/bin/pcsx2*-Qt.AppImage</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="PCSX2-LEGACY">
<!-- Sony PlayStation 2 emulator PCSX2 (legacy) -->
<rule type="systempath">
<entry>PCSX2</entry>
<entry>pcsx2</entry>
<entry>net.pcsx2.PCSX2</entry>
</rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/net.pcsx2.PCSX2</entry>
<entry>~/.local/share/flatpak/exports/bin/net.pcsx2.PCSX2</entry>
</rule>
</emulator>
<emulator name="PICO-8"> <emulator name="PICO-8">
<!-- PICO-8 Fantasy Console (game engine) --> <!-- PICO-8 Fantasy Console (game engine) -->
<rule type="systempath"> <rule type="systempath">
@ -362,6 +483,12 @@
<entry>~/.local/share/flatpak/exports/bin/org.ppsspp.PPSSPP</entry> <entry>~/.local/share/flatpak/exports/bin/org.ppsspp.PPSSPP</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="PRBOOM-PLUS">
<!-- Doom engine source port PrBoom+ -->
<rule type="systempath">
<entry>prboom-plus</entry>
</rule>
</emulator>
<emulator name="PRIMEHACK"> <emulator name="PRIMEHACK">
<!-- PrimeHack, fork of Nintendo GameCube and Wii emulator Dolphin --> <!-- PrimeHack, fork of Nintendo GameCube and Wii emulator Dolphin -->
<rule type="systempath"> <rule type="systempath">
@ -373,6 +500,17 @@
<entry>~/.local/share/flatpak/exports/bin/io.github.shiiion.primehack</entry> <entry>~/.local/share/flatpak/exports/bin/io.github.shiiion.primehack</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="PUNES">
<!-- Nintendo NES and Famicom emulator puNES -->
<rule type="systempath">
<entry>punes</entry>
</rule>
<rule type="staticpath">
<entry>~/Applications/punes/punes</entry>
<entry>~/.local/bin/punes/punes</entry>
<entry>~/bin/punes/punes</entry>
</rule>
</emulator>
<emulator name="REDREAM"> <emulator name="REDREAM">
<!-- Sega Dreamcast emulator Redream --> <!-- Sega Dreamcast emulator Redream -->
<rule type="systempath"> <rule type="systempath">
@ -384,6 +522,20 @@
<entry>~/bin/redream/redream</entry> <entry>~/bin/redream/redream</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="ROSALIES-MUPEN-GUI">
<!-- Nintendo 64 emulator Rosalie's Mupen GUI -->
<rule type="systempath">
<entry>RMG</entry>
<entry>com.github.Rosalie241.RMG</entry>
</rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/com.github.Rosalie241.RMG</entry>
<entry>~/.local/share/flatpak/exports/bin/com.github.Rosalie241.RMG</entry>
<entry>~/Applications/RMG*.AppImage</entry>
<entry>~/.local/bin/RMG*.AppImage</entry>
<entry>~/bin/RMG*.AppImage</entry>
</rule>
</emulator>
<emulator name="RPCS3"> <emulator name="RPCS3">
<!-- Sony PlayStation 3 emulator RPCS3 --> <!-- Sony PlayStation 3 emulator RPCS3 -->
<rule type="systempath"> <rule type="systempath">
@ -399,16 +551,6 @@
<entry>~/bin/rpcs3*.AppImage</entry> <entry>~/bin/rpcs3*.AppImage</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="SNES9X">
<!-- Super Nintendo emulator Snes9x -->
<rule type="systempath">
<entry>snes9x</entry>
</rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/com.snes9x.Snes9x</entry>
<entry>~/.local/share/flatpak/exports/bin/com.snes9x.Snes9x</entry>
</rule>
</emulator>
<emulator name="RUFFLE"> <emulator name="RUFFLE">
<!-- Adobe Flash player Ruffle --> <!-- Adobe Flash player Ruffle -->
<rule type="systempath"> <rule type="systempath">
@ -424,6 +566,7 @@
<!-- Nintendo Switch emulator Ryujinx --> <!-- Nintendo Switch emulator Ryujinx -->
<rule type="systempath"> <rule type="systempath">
<entry>Ryujinx</entry> <entry>Ryujinx</entry>
<entry>Ryujinx.Ava</entry>
<entry>org.ryujinx.Ryujinx</entry> <entry>org.ryujinx.Ryujinx</entry>
</rule> </rule>
<rule type="staticpath"> <rule type="staticpath">
@ -432,6 +575,20 @@
<entry>~/Applications/publish/Ryujinx</entry> <entry>~/Applications/publish/Ryujinx</entry>
<entry>~/.local/bin/publish/Ryujinx</entry> <entry>~/.local/bin/publish/Ryujinx</entry>
<entry>~/bin/publish/Ryujinx</entry> <entry>~/bin/publish/Ryujinx</entry>
<entry>~/Applications/publish/Ryujinx.Ava</entry>
<entry>~/.local/bin/publish/Ryujinx.Ava</entry>
<entry>~/bin/publish/Ryujinx.Ava</entry>
</rule>
</emulator>
<emulator name="SAMEBOY">
<!-- Nintendo Game Boy and Game Boy Color emulator SameBoy -->
<rule type="systempath">
<entry>sameboy</entry>
<entry>io.github.sameboy.SameBoy</entry>
</rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/io.github.sameboy.SameBoy</entry>
<entry>~/.local/share/flatpak/exports/bin/io.github.sameboy.SameBoy</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="SCUMMVM"> <emulator name="SCUMMVM">
@ -457,14 +614,14 @@
</rule> </rule>
</emulator> </emulator>
<emulator name="SHEEPSHAVER"> <emulator name="SHEEPSHAVER">
<!-- Macintosh PowerPC emulator SheepShaver --> <!-- Apple Macintosh PowerPC emulator SheepShaver -->
<rule type="systempath"> <rule type="systempath">
<entry>SheepShaver</entry> <entry>SheepShaver</entry>
</rule> </rule>
<rule type="staticpath"> <rule type="staticpath">
<entry>~/Applications/SheepShaver-x86_64.AppImage</entry> <entry>~/Applications/SheepShaver*.AppImage</entry>
<entry>~/.local/bin/SheepShaver-x86_64.AppImage</entry> <entry>~/.local/bin/SheepShaver*.AppImage</entry>
<entry>~/bin/SheepShaver-x86_64.AppImage</entry> <entry>~/bin/SheepShaver*.AppImage</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="SIMCOUPE"> <emulator name="SIMCOUPE">
@ -478,10 +635,22 @@
<entry>~/bin/simcoupe/simcoupe</entry> <entry>~/bin/simcoupe/simcoupe</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="SIMPLE64">
<!-- Nintendo 64 emulator simple64 -->
<rule type="systempath">
<entry>simple64-gui</entry>
<entry>io.github.simple64.simple64</entry>
</rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/io.github.simple64.simple64</entry>
<entry>~/.local/share/flatpak/exports/bin/io.github.simple64.simple64</entry>
</rule>
</emulator>
<emulator name="SNES9X"> <emulator name="SNES9X">
<!-- Super Nintendo emulator Snes9x --> <!-- Super Nintendo emulator Snes9x -->
<rule type="systempath"> <rule type="systempath">
<entry>snes9x</entry> <entry>snes9x</entry>
<entry>snes9x-gtk</entry>
</rule> </rule>
<rule type="staticpath"> <rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/com.snes9x.Snes9x</entry> <entry>/var/lib/flatpak/exports/bin/com.snes9x.Snes9x</entry>
@ -494,6 +663,10 @@
<entry>solarus-run</entry> <entry>solarus-run</entry>
<entry>solarus.run</entry> <entry>solarus.run</entry>
</rule> </rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/org.solarus_games.solarus.Launcher|flatpak run --command=solarus-run org.solarus_games.solarus.Launcher</entry>
<entry>~/.local/share/flatpak/exports/bin/org.solarus_games.solarus.Launcher|flatpak run --command=solarus-run org.solarus_games.solarus.Launcher</entry>
</rule>
</emulator> </emulator>
<emulator name="STEAM"> <emulator name="STEAM">
<!-- Valve Steam --> <!-- Valve Steam -->
@ -501,6 +674,39 @@
<entry>steam</entry> <entry>steam</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="STELLA">
<!-- Atari 2600 emulator Stella -->
<rule type="systempath">
<entry>stella</entry>
<entry>io.github.stella_emu.Stella</entry>
</rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/io.github.stella_emu.Stella</entry>
<entry>~/.local/share/flatpak/exports/bin/io.github.stella_emu.Stella</entry>
</rule>
</emulator>
<emulator name="SUPERMODEL">
<!-- Sega Model 3 emulator Supermodel -->
<rule type="systempath">
<entry>supermodel</entry>
</rule>
<rule type="staticpath">
<entry>~/Applications/Supermodel/supermodel</entry>
<entry>~/.local/bin/Supermodel/supermodel</entry>
<entry>~/bin/Supermodel/supermodel</entry>
</rule>
</emulator>
<emulator name="TRIFORCE">
<!-- Triforce, fork of Nintendo GameCube and Wii emulator Dolphin -->
<rule type="systempath">
<entry>dolphin-emu-triforce</entry>
</rule>
<rule type="staticpath">
<entry>~/Applications/dolphin-emu-triforce*.AppImage</entry>
<entry>~/.local/bin/dolphin-emu-triforce*.AppImage</entry>
<entry>~/bin/dolphin-emu-triforce*.AppImage</entry>
</rule>
</emulator>
<emulator name="TSUGARU"> <emulator name="TSUGARU">
<!-- Fujitsu FM Towns emulator Tsugaru --> <!-- Fujitsu FM Towns emulator Tsugaru -->
<rule type="staticpath"> <rule type="staticpath">
@ -515,6 +721,29 @@
<entry>visualboyadvance-m</entry> <entry>visualboyadvance-m</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="VICE-X64SC">
<!-- Commodore 8-bit computer emulator VICE (x64sc accurate) -->
<rule type="systempath">
<entry>x64sc</entry>
<entry>vice-jz.x64sc</entry>
<entry>net.sf.VICE</entry>
</rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/net.sf.VICE</entry>
<entry>~/.local/share/flatpak/exports/bin/net.sf.VICE</entry>
</rule>
</emulator>
<emulator name="VICE-XVIC">
<!-- Commodore 8-bit computer emulator VICE (xvic VIC-20) -->
<rule type="systempath">
<entry>xvic</entry>
<entry>vice-jz.xvic</entry>
</rule>
<rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xvic net.sf.VICE</entry>
<entry>~/.local/share/flatpak/exports/bin/net.sf.VICE|flatpak run --command=xvic net.sf.VICE</entry>
</rule>
</emulator>
<emulator name="VITA3K"> <emulator name="VITA3K">
<!-- Sony PlayStation Vita emulator Vita3K --> <!-- Sony PlayStation Vita emulator Vita3K -->
<rule type="systempath"> <rule type="systempath">
@ -536,9 +765,9 @@
<rule type="staticpath"> <rule type="staticpath">
<entry>/var/lib/flatpak/exports/bin/app.xemu.xemu</entry> <entry>/var/lib/flatpak/exports/bin/app.xemu.xemu</entry>
<entry>~/.local/share/flatpak/exports/bin/app.xemu.xemu</entry> <entry>~/.local/share/flatpak/exports/bin/app.xemu.xemu</entry>
<entry>~/Applications/Xemu*.AppImage</entry> <entry>~/Applications/xemu*.AppImage</entry>
<entry>~/.local/bin/Xemu*.AppImage</entry> <entry>~/.local/bin/xemu*.AppImage</entry>
<entry>~/bin/Xemu*.AppImage</entry> <entry>~/bin/xemu*.AppImage</entry>
</rule> </rule>
</emulator> </emulator>
<emulator name="XROAR"> <emulator name="XROAR">

View file

@ -1,9 +1,12 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<bool name="AlternativeEmulatorPerGame" value="true" /> <bool name="AlternativeEmulatorPerGame" value="true" />
<bool name="ApplicationUpdaterPrereleases" value="false" />
<bool name="CollectionShowSystemInfo" value="true" /> <bool name="CollectionShowSystemInfo" value="true" />
<bool name="CustomEventScripts" value="false" /> <bool name="CustomEventScripts" value="false" />
<bool name="DebugSkipInputLogging" value="false" /> <bool name="DebugSkipInputLogging" value="false" />
<bool name="DisableComposition" value="true" /> <bool name="DebugSkipMissingThemeFiles" value="false" />
<bool name="DebugSkipMissingThemeFilesCustomCollections" value="true" />
<bool name="DisableComposition" value="false" />
<bool name="DisplayGPUStatistics" value="false" /> <bool name="DisplayGPUStatistics" value="false" />
<bool name="EnableMenuKidMode" value="false" /> <bool name="EnableMenuKidMode" value="false" />
<bool name="FavFirstCustom" value="false" /> <bool name="FavFirstCustom" value="false" />
@ -13,12 +16,13 @@
<bool name="FavoritesStar" value="true" /> <bool name="FavoritesStar" value="true" />
<bool name="FoldersOnTop" value="true" /> <bool name="FoldersOnTop" value="true" />
<bool name="GamelistFilters" value="true" /> <bool name="GamelistFilters" value="true" />
<bool name="GamelistVideoAudio" value="true" /> <bool name="GamelistVideoPillarbox" value="true" />
<bool name="GamelistVideoPillarbox" value="false" />
<bool name="GamelistVideoScanlines" value="false" /> <bool name="GamelistVideoScanlines" value="false" />
<bool name="IgnoreGamelist" value="false" /> <bool name="InputIgnoreKeyboard" value="false" />
<bool name="InputOnlyFirstController" value="false" /> <bool name="InputOnlyFirstController" value="false" />
<bool name="LegacyGamelistFileLocation" value="false" />
<bool name="ListScrollOverlay" value="false" /> <bool name="ListScrollOverlay" value="false" />
<bool name="MAMENameStripExtraInfo" value="true" />
<bool name="MediaViewerKeepVideoRunning" value="true" /> <bool name="MediaViewerKeepVideoRunning" value="true" />
<bool name="MediaViewerScreenshotScanlines" value="true" /> <bool name="MediaViewerScreenshotScanlines" value="true" />
<bool name="MediaViewerStretchVideos" value="false" /> <bool name="MediaViewerStretchVideos" value="false" />
@ -44,8 +48,8 @@
<bool name="RunInBackground" value="false" /> <bool name="RunInBackground" value="false" />
<bool name="Scrape3DBoxes" value="false" /> <bool name="Scrape3DBoxes" value="false" />
<bool name="ScrapeBackCovers" value="false" /> <bool name="ScrapeBackCovers" value="false" />
<bool name="ScrapeControllers" value="false" />
<bool name="ScrapeCovers" value="true" /> <bool name="ScrapeCovers" value="true" />
<bool name="ScrapeFanArt" value="false" />
<bool name="ScrapeGameNames" value="true" /> <bool name="ScrapeGameNames" value="true" />
<bool name="ScrapeMarquees" value="true" /> <bool name="ScrapeMarquees" value="true" />
<bool name="ScrapeMetadata" value="true" /> <bool name="ScrapeMetadata" value="true" />
@ -54,13 +58,15 @@
<bool name="ScrapeScreenshots" value="true" /> <bool name="ScrapeScreenshots" value="true" />
<bool name="ScrapeTitleScreens" value="false" /> <bool name="ScrapeTitleScreens" value="false" />
<bool name="ScrapeVideos" value="true" /> <bool name="ScrapeVideos" value="true" />
<bool name="ScraperAutomaticRemoveDots" value="true" />
<bool name="ScraperConvertUnderscores" value="true" />
<bool name="ScraperExcludeRecursively" value="true" /> <bool name="ScraperExcludeRecursively" value="true" />
<bool name="ScraperHaltOnInvalidMedia" value="false" /> <bool name="ScraperHaltOnInvalidMedia" value="false" />
<bool name="ScraperIncludeFolders" value="false" /> <bool name="ScraperIncludeFolders" value="true" />
<bool name="ScraperInteractive" value="false" /> <bool name="ScraperInteractive" value="false" />
<bool name="ScraperOverwriteData" value="false" /> <bool name="ScraperOverwriteData" value="false" />
<bool name="ScraperRegionFallback" value="true" />
<bool name="ScraperRespectExclusions" value="true" /> <bool name="ScraperRespectExclusions" value="true" />
<bool name="ScraperRetryPeerVerification" value="false" />
<bool name="ScraperSearchMetadataName" value="true" /> <bool name="ScraperSearchMetadataName" value="true" />
<bool name="ScraperSemiautomatic" value="true" /> <bool name="ScraperSemiautomatic" value="true" />
<bool name="ScraperUseAccountScreenScraper" value="true" /> <bool name="ScraperUseAccountScreenScraper" value="true" />
@ -71,41 +77,55 @@
<bool name="ScreensaverSlideshowScanlines" value="true" /> <bool name="ScreensaverSlideshowScanlines" value="true" />
<bool name="ScreensaverStretchImages" value="false" /> <bool name="ScreensaverStretchImages" value="false" />
<bool name="ScreensaverStretchVideos" value="false" /> <bool name="ScreensaverStretchVideos" value="false" />
<bool name="ScreensaverVideoAudio" value="false" /> <bool name="ScreensaverVideoAudio" value="true" />
<bool name="ScreensaverVideoBlur" value="false" /> <bool name="ScreensaverVideoBlur" value="false" />
<bool name="ScreensaverVideoGameInfo" value="true" /> <bool name="ScreensaverVideoGameInfo" value="true" />
<bool name="ScreensaverVideoScanlines" value="true" /> <bool name="ScreensaverVideoScanlines" value="true" />
<bool name="ScrollIndicators" value="true" />
<bool name="ShowHelpPrompts" value="true" /> <bool name="ShowHelpPrompts" value="true" />
<bool name="ShowHiddenFiles" value="true" /> <bool name="ShowHiddenFiles" value="true" />
<bool name="ShowHiddenGames" value="true" /> <bool name="ShowHiddenGames" value="true" />
<bool name="ShowQuitMenu" value="false" /> <bool name="ShowQuitMenu" value="false" />
<bool name="SpecialCharsASCII" value="false" /> <bool name="ThemeVariantTriggers" value="true" />
<bool name="UseCustomCollectionsSystem" value="true" />
<bool name="VideoUpscaleFrameRate" value="false" /> <bool name="VideoUpscaleFrameRate" value="false" />
<bool name="ViewsVideoAudio" value="true" />
<bool name="VirtualKeyboard" value="true" /> <bool name="VirtualKeyboard" value="true" />
<int name="AntiAliasing" value="0" />
<int name="DisplayIndex" value="1" /> <int name="DisplayIndex" value="1" />
<int name="MaxVRAM" value="256" /> <int name="LottieMaxFileCache" value="150" />
<int name="LottieMaxTotalCache" value="1024" />
<int name="MaxVRAM" value="512" />
<int name="ScraperConnectionTimeout" value="30" />
<int name="ScraperRetryOnErrorCount" value="3" />
<int name="ScraperRetryOnErrorTimer" value="3" />
<int name="ScraperTransferTimeout" value="120" />
<int name="ScreenRotate" value="0" />
<int name="ScreensaverSwapImageTimeout" value="10000" /> <int name="ScreensaverSwapImageTimeout" value="10000" />
<int name="ScreensaverSwapVideoTimeout" value="0" /> <int name="ScreensaverSwapVideoTimeout" value="0" />
<int name="ScreensaverTimer" value="300000" /> <int name="ScreensaverTimer" value="300000" />
<int name="SoundVolumeNavigation" value="70" /> <int name="SoundVolumeNavigation" value="70" />
<int name="SoundVolumeVideos" value="80" /> <int name="SoundVolumeVideos" value="80" />
<string name="ApplicationVersion" value="1.2.1" /> <string name="ApplicationUpdaterFrequency" value="always" />
<string name="CollectionSystemsAuto" value="all" /> <string name="ApplicationUpdaterLastCheck" value="20230331T153206" />
<string name="ApplicationVersion" value="2.0.0" />
<string name="CollectionCustomGrouping" value="unthemed" />
<string name="CollectionSystemsAuto" value="" />
<string name="CollectionSystemsCustom" value="" /> <string name="CollectionSystemsCustom" value="" />
<string name="DefaultSortOrder" value="filename, ascending" /> <string name="DefaultSortOrder" value="filename, ascending" />
<string name="ExitButtonCombo" value="F4" />
<string name="GamelistViewStyle" value="automatic" /> <string name="GamelistViewStyle" value="automatic" />
<string name="InputControllerType" value="xbox" /> <string name="InputControllerType" value="xbox" />
<string name="KeyboardQuitShortcut" value="AltF4" />
<string name="LaunchScreenDuration" value="normal" /> <string name="LaunchScreenDuration" value="normal" />
<string name="LegacyThemeTransitions" value="builtin-instant" />
<string name="MediaDirectory" value="" /> <string name="MediaDirectory" value="" />
<string name="MenuOpeningEffect" value="scale-up" /> <string name="MenuOpeningEffect" value="scale-up" />
<string name="MiximageBoxSize" value="small" /> <string name="MiximageBoxSize" value="medium" />
<string name="MiximagePhysicalMediaSize" value="medium" /> <string name="MiximagePhysicalMediaSize" value="medium" />
<string name="MiximageResolution" value="1280x800" /> <string name="MiximageResolution" value="1280x800" />
<string name="MiximageScreenshotScaling" value="sharp" /> <string name="MiximageScreenshotScaling" value="sharp" />
<string name="OpenGLVersion" value="" />
<string name="QuickSystemSelect" value="leftrightshoulders" />
<string name="ROMDirectory" value="~/ROMs" /> <string name="ROMDirectory" value="~/ROMs" />
<string name="RandomEntryButton" value="games" />
<string name="SaveGamelistsMode" value="always" /> <string name="SaveGamelistsMode" value="always" />
<string name="Scraper" value="screenscraper" /> <string name="Scraper" value="screenscraper" />
<string name="ScraperLanguage" value="en" /> <string name="ScraperLanguage" value="en" />
@ -115,7 +135,10 @@
<string name="ScreensaverSlideshowImageDir" value="~/.emulationstation/slideshow/custom_images" /> <string name="ScreensaverSlideshowImageDir" value="~/.emulationstation/slideshow/custom_images" />
<string name="ScreensaverType" value="video" /> <string name="ScreensaverType" value="video" />
<string name="StartupSystem" value="" /> <string name="StartupSystem" value="" />
<string name="ThemeSet" value="art-book-next" /> <string name="ThemeAspectRatio" value="" />
<string name="TransitionStyle" value="slide" /> <string name="ThemeColorScheme" value="" />
<string name="ThemeSet" value="art-book-next-de" />
<string name="ThemeTransitions" value="automatic" />
<string name="ThemeVariant" value="" />
<string name="UIMode" value="full" /> <string name="UIMode" value="full" />
<string name="UIMode_passkey" value="uuddlrlrba" /> <string name="UIMode_passkey" value="uuddlrlrba" />

File diff suppressed because it is too large Load diff

View file

@ -224,8 +224,6 @@ desktop_mode_warning() {
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \ --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK Desktop Mode Warning" \ --title "RetroDECK Desktop Mode Warning" \
--text="You appear to be running RetroDECK in the Steam Deck's Desktop mode!\n\nSome functions of RetroDECK may not work properly in Desktop mode, such as the Steam Deck's normal controls.\n\nRetroDECK is best enjoyed in Game mode!\n\nDo you still want to proceed?") --text="You appear to be running RetroDECK in the Steam Deck's Desktop mode!\n\nSome functions of RetroDECK may not work properly in Desktop mode, such as the Steam Deck's normal controls.\n\nRetroDECK is best enjoyed in Game mode!\n\nDo you still want to proceed?")
fi
fi
rc=$? # Capture return code, as "Yes" button has no text value rc=$? # Capture return code, as "Yes" button has no text value
if [[ $rc == "1" ]]; then # If any button other than "Yes" was clicked if [[ $rc == "1" ]]; then # If any button other than "Yes" was clicked
if [[ $choice == "No" ]]; then if [[ $choice == "No" ]]; then
@ -234,6 +232,8 @@ desktop_mode_warning() {
set_setting_value $rd_conf "desktop_mode_warning" "false" retrodeck # Store desktop mode warning variable for future checks set_setting_value $rd_conf "desktop_mode_warning" "false" retrodeck # Store desktop mode warning variable for future checks
fi fi
fi fi
fi
fi
} }
set_setting_value() { set_setting_value() {
@ -248,38 +248,38 @@ set_setting_value() {
"retrodeck" | "citra" | "melonds" | "yuzu" ) "retrodeck" | "citra" | "melonds" | "yuzu" )
if [[ -z $current_section_name ]]; then if [[ -z $current_section_name ]]; then
sed -i 's^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' $1 sed -i 's^\^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' $1
else else
sed -i '\^\['"$current_section_name"'\]^,\^'"$setting_name_to_change"'.*^s^'"$setting_name_to_change"'=.*^'"$setting_name_to_change"'='"$setting_value_to_change"'^' $1 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
;; ;;
"retroarch" ) "retroarch" )
if [[ -z $current_section_name ]]; then if [[ -z $current_section_name ]]; then
sed -i 's^'"$setting_name_to_change"' = \".*\"^'"$setting_name_to_change"' = \"'"$setting_value_to_change"'\"^' $1 sed -i 's^\^'"$setting_name_to_change"' = \".*\"^'"$setting_name_to_change"' = \"'"$setting_value_to_change"'\"^' $1
else else
sed -i '\^\['"$current_section_name"'\]^,\^'"$setting_name_to_change"'.*^s^'"$setting_name_to_change"' = \".*\"^'"$setting_name_to_change"' = \"'"$setting_value_to_change"'\"^' $1 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
;; ;;
"dolphin" | "duckstation" | "pcsx2" | "ppsspp" | "xemu" ) "dolphin" | "duckstation" | "pcsx2" | "ppsspp" | "primehack" | "xemu" )
if [[ -z $current_section_name ]]; then if [[ -z $current_section_name ]]; then
sed -i 's^'"$setting_name_to_change"' =.*^'"$setting_name_to_change"' = '"$setting_value_to_change"'^' $1 sed -i 's^\^'"$setting_name_to_change"' =.*^'"$setting_name_to_change"' = '"$setting_value_to_change"'^' $1
else else
sed -i '\^\['"$current_section_name"'\]^,\^'"$setting_name_to_change"'.*^s^'"$setting_name_to_change"' =.*^'"$setting_name_to_change"' = '"$setting_value_to_change"'^' $1 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
;; ;;
"rpcs3" ) # This does not currently work for settings with a $ in them "rpcs3" ) # This does not currently work for settings with a $ in them
if [[ -z $current_section_name ]]; then if [[ -z $current_section_name ]]; then
sed -i 's^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' $1 sed -i 's^\^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' $1
else else
sed -i '\^\['"$current_section_name"'\]^,\^'"$setting_name_to_change"'.*^s^'"$setting_name_to_change"': .*^'"$setting_name_to_change"': '"$setting_value_to_change"'^' $1 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
;; ;;
"emulationstation" ) "emulationstation" )
sed -i "s%$setting_name_to_change\" \" value=\".*\"%$setting_name_to_change\" \" value=\"$setting_value_to_change\"" $1 sed -i "s%^$setting_name_to_change\" \" value=\".*\"%$setting_name_to_change\" \" value=\"$setting_value_to_change\"" $1
;; ;;
esac esac
@ -321,7 +321,7 @@ get_setting_value() {
if [[ -z $current_section_name ]]; then if [[ -z $current_section_name ]]; then
echo $(grep -o -P "(?<=^$current_setting_name=).*" $1) echo $(grep -o -P "(?<=^$current_setting_name=).*" $1)
else else
sed -n '\^\['"$current_section_name"'\]^,\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name=).*" sed -n '\^\['"$current_section_name"'\]^,\^\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^\^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name=).*"
fi fi
;; ;;
@ -329,15 +329,15 @@ get_setting_value() {
if [[ -z $current_section_name ]]; then if [[ -z $current_section_name ]]; then
echo $(grep -o -P "(?<=^$current_setting_name = \").*(?=\")" $1) echo $(grep -o -P "(?<=^$current_setting_name = \").*(?=\")" $1)
else else
sed -n '\^\['"$current_section_name"'\]^,\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name = \").*(?=\")" sed -n '\^\['"$current_section_name"'\]^,\^\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^\^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name = \").*(?=\")"
fi fi
;; ;;
"dolphin" | "duckstation" | "pcsx2" | "ppsspp" | "xemu" ) # For files with this syntax - setting_name = setting_value "dolphin" | "duckstation" | "pcsx2" | "ppsspp" | "primehack" | "xemu" ) # For files with this syntax - setting_name = setting_value
if [[ -z $current_section_name ]]; then if [[ -z $current_section_name ]]; then
echo $(grep -o -P "(?<=^$current_setting_name = ).*" $1) echo $(grep -o -P "(?<=^$current_setting_name = ).*" $1)
else else
sed -n '\^\['"$current_section_name"'\]^,\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name = ).*" sed -n '\^\['"$current_section_name"'\]^,\^\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^\^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=^$current_setting_name = ).*"
fi fi
;; ;;
@ -345,7 +345,7 @@ get_setting_value() {
if [[ -z $current_section_name ]]; then if [[ -z $current_section_name ]]; then
echo $(grep -o -P "(?<=$current_setting_name: ).*" $1) echo $(grep -o -P "(?<=$current_setting_name: ).*" $1)
else else
sed -n '\^\['"$current_section_name"'\]^,\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=$current_setting_name: ).*" sed -n '\^\['"$current_section_name"'\]^,\^\^'"$current_setting_name"'^{ \^\['"$current_section_name"'\]^! { \^\^'"$current_setting_name"'^ p } }' $1 | grep -o -P "(?<=$current_setting_name: ).*"
fi fi
;; ;;
@ -380,7 +380,7 @@ disable_setting() {
# This function will add a '#' to the beginning of a defined setting line, disabling it. # This function will add a '#' to the beginning of a defined setting line, disabling it.
# USAGE: disable_setting $setting_file $setting_line $system $section (optional) # USAGE: disable_setting $setting_file $setting_line $system $section (optional)
local current_setting_line"$2" local current_setting_line="$2"
local current_section_name="$4" local current_section_name="$4"
case $3 in case $3 in
@ -400,7 +400,7 @@ enable_setting() {
# This function will remove a '#' to the beginning of a defined setting line, enabling it. # This function will remove a '#' to the beginning of a defined setting line, enabling it.
# USAGE: enable_setting $setting_file $setting_line $system $section (optional) # USAGE: enable_setting $setting_file $setting_line $system $section (optional)
local current_setting_line"$2" local current_setting_line="$2"
local current_section_name="$4" local current_section_name="$4"
case $3 in case $3 in
@ -545,31 +545,35 @@ do
case $action in case $action in
"disable_file" ) "disable_file" )
disable_file $setting_name eval disable_file $setting_name
;; ;;
"enable_file" ) "enable_file" )
enable_file $setting_name eval enable_file $setting_name
;; ;;
"add_setting" ) "add_setting" )
add_setting $3 "$setting_name" $system_name $current_section eval add_setting $3 "$setting_name" $system_name $current_section
;; ;;
"disable_setting" ) "disable_setting" )
disable_setting $3 "$setting_name" $system_name $current_section eval disable_setting $3 "$setting_name" $system_name $current_section
;; ;;
"enable_setting" ) "enable_setting" )
enable_setting $3 "$setting_name" $system_name $current_section eval enable_setting $3 "$setting_name" $system_name $current_section
;; ;;
"change" ) "change" )
set_setting_value $3 "$setting_name" "$setting_value" $system_name $current_section eval set_setting_value $3 "$setting_name" "$setting_value" $system_name $current_section
;;
*"#"* )
# Comment line in patch file
;; ;;
* ) * )
echo "Config file malformed" echo "Config line malformed: $action"
;; ;;
esac esac
@ -588,31 +592,35 @@ do
case $action in case $action in
"disable_file" ) "disable_file" )
disable_file $config_file eval disable_file $config_file
;; ;;
"enable_file" ) "enable_file" )
enable_file $config_file eval enable_file $config_file
;; ;;
"add_setting" ) "add_setting" )
add_setting $config_file "$setting_name" $system_name $current_section eval add_setting $config_file "$setting_name" $system_name $current_section
;; ;;
"disable_setting" ) "disable_setting" )
disable_setting $config_file "$setting_name" $system_name $current_section eval disable_setting $config_file "$setting_name" $system_name $current_section
;; ;;
"enable_setting" ) "enable_setting" )
enable_setting $config_file "$setting_name" $system_name $current_section eval enable_setting $config_file "$setting_name" $system_name $current_section
;; ;;
"change" ) "change" )
set_setting_value $config_file "$setting_name" "$setting_value" $system_name $current_section eval set_setting_value $config_file "$setting_name" "$setting_value" $system_name $current_section
;;
*"#"* )
# Comment line in patch file
;; ;;
* ) * )
echo "Config file malformed" echo "Config line malformed: $action"
;; ;;
esac esac
@ -1283,18 +1291,19 @@ finit() {
mkdir -pv $roms_folder mkdir -pv $roms_folder
zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="RetroDECK will now install the needed files.\nPlease wait up to one minute,\nanother message will notify when the process will be finished.\n\nPress OK to continue." zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" \
--text="RetroDECK will now install the needed files, which can take up to one minute.\nRetroDECK will start once the process is completed.\n\nPress OK to continue."
(
# Recreating the folder # Recreating the folder
rm -rfv /var/config/emulationstation/ rm -rf /var/config/emulationstation/
mkdir -pv /var/config/emulationstation/ mkdir -p /var/config/emulationstation/
# Initializing ES-DE # Initializing ES-DE
# TODO: after the next update of ES-DE this will not be needed - let's test it # TODO: after the next update of ES-DE this will not be needed - let's test it
emulationstation --home /var/config/emulationstation --create-system-dirs emulationstation --home /var/config/emulationstation --create-system-dirs
#zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK" --text="RetroDECK will now install the needed files.\nPlease wait up to one minute,\nanother message will notify when the process will be finished.\n\nPress OK to continue."
# Initializing ROMs folder - Original in retrodeck home (or SD Card) # Initializing ROMs folder - Original in retrodeck home (or SD Card)
dir_prep $roms_folder "/var/config/emulationstation/ROMs" dir_prep $roms_folder "/var/config/emulationstation/ROMs"
@ -1315,7 +1324,6 @@ finit() {
dir_prep "$roms_folder/pico8" "$bios_folder/pico-8/carts" # Symlink default game location to RD roms for cleanliness (this location is overridden anyway by the --root_path launch argument anyway) dir_prep "$roms_folder/pico8" "$bios_folder/pico-8/carts" # Symlink default game location to RD roms for cleanliness (this location is overridden anyway by the --root_path launch argument anyway)
dir_prep "$saves_folder/pico-8" "$bios_folder/pico-8/cdata" # PICO-8 saves folder dir_prep "$saves_folder/pico-8" "$bios_folder/pico-8/cdata" # PICO-8 saves folder
(
ra_init ra_init
standalones_init standalones_init
) | ) |
@ -1325,12 +1333,6 @@ finit() {
--text="RetroDECK is finishing the initial setup process, please wait." --text="RetroDECK is finishing the initial setup process, please wait."
create_lock create_lock
zenity --icon-name=net.retrodeck.retrodeck --info --no-wrap \
--window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
--title "RetroDECK" \
--text="Installation completed.\nPlease put your roms in:\n\n$roms_folder\n\nand your bioses in\n\n$bios_folder\n\nThen start the program again.\nIf you wish to change the roms location, you may use the tool located the tools section of RetroDECK.\n\nIMPORTANT NOTES:\n- RetroDECK must be manually added and launched from your Steam Library in order to work correctly.\n- It's recommended to use the 'RetroDECK Offical Controller Config' from Steam (under community layouts).\n- It's suggested to use BoilR to automatically add the SteamGridDB images to Steam (this will be automated soon).\nhttps://github.com/PhilipK/BoilR"
# TODO: Replace the stuff above with BoilR code when ready
} }
#========================= #=========================

View file

@ -65,6 +65,23 @@
<project_license>GPL-3.0</project_license> <project_license>GPL-3.0</project_license>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<releases> <releases>
<release version="0.6.4b" date="2023-04-04">
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.4b</url>
<description>
<p>New features - General</p>
<ul>
<li>Updated to ES-DE 2.0</li>
<li>Added the NSO Menu Interpreted theme</li>
<li>Updated all included themes</li>
<li>Updated the Emulators/RetroArch + cores</li>
</ul>
<p>Bug fixes and other changes</p>
<ul>
<li>Fixed an audio issue in the Primehack configuration</li>
<li>Various backend fixes</li>
</ul>
</description>
</release>
<release version="0.6.3b" date="2023-03-24"> <release version="0.6.3b" date="2023-03-24">
<url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.3b</url> <url>https://github.com/XargonWan/RetroDECK/releases/tag/0.6.3b</url>
<description> <description>

View file

@ -66,11 +66,11 @@ modules:
# The version number is hardcoded in /app/retrodeck/version # The version number is hardcoded in /app/retrodeck/version
# #
# UPDATE STEPS FOR MAIN: # UPDATE STEPS FOR MAIN:
# [X] Update the VERSION variable # [ ] Update the VERSION variable
# [X] Update the appdata.xml with the version number and notes # [ ] Update the appdata.xml with the version number and notes
# [X] change branch into main in version-initialization (first one) # [ ] change branch into main in version-initialization (first one)
# [X] change branch into main in retrodeck module (last one) # [ ] change branch into main in retrodeck module (last one)
# [X] if header (before modules) was edited, edit it even in flathub.yml # [ ] if header (before modules) was edited, edit it even in flathub.yml
# #
- name: version-initialization - name: version-initialization
buildsystem: simple buildsystem: simple
@ -78,7 +78,7 @@ modules:
- | - |
git checkout ${GITHUB_REF_NAME} git checkout ${GITHUB_REF_NAME}
mkdir -p ${FLATPAK_DEST}/retrodeck/ mkdir -p ${FLATPAK_DEST}/retrodeck/
VERSION="0.6.3b" VERSION="cooker-0.6.4b"
if [[ $VERSION == *"cooker"* ]]; if [[ $VERSION == *"cooker"* ]];
then then
VERSION="$VERSION-[$(git rev-parse --short HEAD)]" VERSION="$VERSION-[$(git rev-parse --short HEAD)]"
@ -88,7 +88,7 @@ modules:
sources: sources:
- type: git - type: git
url: https://github.com/XargonWan/RetroDECK.git url: https://github.com/XargonWan/RetroDECK.git
branch: main branch: cooker-0.6.4b
- name: xmlstarlet - name: xmlstarlet
config-opts: config-opts:
@ -239,13 +239,15 @@ modules:
# But we don't include them 1:1 as RetroDECK got some specific configs in some cases # But we don't include them 1:1 as RetroDECK got some specific configs in some cases
- name: emulationstation-de - name: emulationstation-de
buildsystem: cmake-ninja buildsystem: cmake-ninja
config-opts:
- DRETRODECK=on
cleanup: cleanup:
- es-app - es-app
- es-core - es-core
sources: sources:
- type: git - type: git
url: https://gitlab.com/es-de/emulationstation-de url: https://gitlab.com/es-de/emulationstation-de
branch: f8d782f1f3b1fba8a119b793edd01f37e0258953 branch: 608d8a3c09abc5db398cdadc09e18fd2dfbaf570
- type: shell - type: shell
commands: commands:
- sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp - sed -i 's/QUIT EMULATIONSTATION/QUIT RETRODECK/g' es-app/src/guis/GuiMenu.cpp
@ -257,35 +259,45 @@ modules:
# ES-DE Themes - START # ES-DE Themes - START
- name: art-book-next - name: art-book-next-es-de
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next/ - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-es-de/
- mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next/ - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/art-book-next-es-de/
sources: sources:
- type: git - type: git
url: https://github.com/anthonycaccese/art-book-next-retropie.git url: https://github.com/anthonycaccese/art-book-next-es-de.git
commit: 23932f484a9949313baf80f92b2fbca38a7a8f37 commit: a0dc0cccaa3f1475feb58e551fe732d982e161c0
- name: alekfull-nx-light - name: alekfull-nx-es-de
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-light/ - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-es-de/
- mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-light/ - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/alekfull-nx-es-de/
sources: sources:
- type: git - type: git
url: https://github.com/anthonycaccese/alekfull-nx-retropie.git url: https://github.com/anthonycaccese/alekfull-nx-es-de.git
commit: 67c8c8dee086bd06bcdc6dc34bb9bef1e1c11be7 commit: 5011e5dca75663ff18602f3af9d17e9e880880ef
- name: retrofix-revisited - name: retrofix-revisited-es-de
buildsystem: simple buildsystem: simple
build-commands: build-commands:
- mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited/ - mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited-es-de/
- mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited/ - mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/retrofix-revisited-es-de/
sources: sources:
- type: git - type: git
url: https://github.com/anthonycaccese/retrofix-revisited-retropie.git url: https://github.com/anthonycaccese/retrofix-revisited-es-de.git
commit: 6e75c9521426e69eb9abcb39d135d97a17d14568 commit: 23b80225078d2a3723039a8e94b6147c84065028
- name: nso-menu-interpreted-es-de
buildsystem: simple
build-commands:
- mkdir -p ${FLATPAK_DEST}/share/emulationstation/themes/nso-menu-interpreted-es-de/
- mv -f * ${FLATPAK_DEST}/share/emulationstation/themes/nso-menu-interpreted-es-de/
sources:
- type: git
url: https://github.com/anthonycaccese/nso-menu-interpreted-es-de.git
commit: f129c2d88e060a6c5d7643de5aeb02a0cc013de3
# ES-DE Themes - END # ES-DE Themes - END
@ -486,8 +498,8 @@ modules:
- ln -s "${FLATPAK_DEST}/yuzu/usr/bin/yuzu" "${FLATPAK_DEST}/bin/yuzu" - ln -s "${FLATPAK_DEST}/yuzu/usr/bin/yuzu" "${FLATPAK_DEST}/bin/yuzu"
sources: sources:
- type: file - type: file
url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1369/yuzu-mainline-20230312-54c359d1e.AppImage url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1388/yuzu-mainline-20230330-03db6543e.AppImage
sha256: 219874f72ea09856c8f1349d7bf744ecbd2823a469bd29f036b386924f5c5a97 sha256: aca7c691f74b0cf74c1801d9960266bc1ce818bca9c242945b95545d22b04d80
# Yuzu - END # Yuzu - END
@ -520,8 +532,8 @@ modules:
sources: sources:
- type: archive - type: archive
url: >- url: >-
https://github.com/citra-emu/citra-nightly/releases/download/nightly-1854/citra-unified-source-20230312-2cbf6fb.tar.xz https://github.com/citra-emu/citra-nightly/releases/download/nightly-1872/citra-unified-source-20230330-f96047f.tar.xz
sha256: 018cb7dce3aa29a548a6e4cbad65d97babd98d2cdd1a4848a7c95c117f92fdf5 sha256: 3c49b691d46a1253df7477d1e9d771b7d15b967459851c096150e9952e160bfa
x-checker-data: x-checker-data:
type: json type: json
url: https://api.github.com/repos/citra-emu/citra-nightly/releases/latest url: https://api.github.com/repos/citra-emu/citra-nightly/releases/latest
@ -550,8 +562,8 @@ modules:
- ln -s "${FLATPAK_DEST}/pcsx2-qt/usr/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt" - ln -s "${FLATPAK_DEST}/pcsx2-qt/usr/bin/pcsx2-qt" "${FLATPAK_DEST}/bin/pcsx2-qt"
sources: sources:
- type: file - type: file
url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.4225/pcsx2-v1.7.4225-linux-AppImage-64bit-Qt.AppImage url: https://github.com/PCSX2/pcsx2/releases/download/v1.7.4303/pcsx2-v1.7.4303-linux-AppImage-64bit-Qt.AppImage
sha256: e8ed326851941b212193c2bd193ca87efdcc70c18971f45749273a32893fec68 sha256: 5680bcc510f0898e6078c60ef2ef1d987b8414e1296c5ff88bd87933e4a314b3
# PCSX2 - END # PCSX2 - END
@ -735,8 +747,8 @@ modules:
sources: sources:
- type: git - type: git
url: https://github.com/xemu-project/xemu.git url: https://github.com/xemu-project/xemu.git
tag: v0.7.85 tag: v0.7.86
commit: 065c74a00fe402f65147e9b0d1a1eeac1b4b609f commit: 4a99fd0f1855fc52e15885812abd3ee4bb2b3847
x-checker-data: x-checker-data:
type: json type: json
url: https://api.github.com/repos/xemu-project/xemu/releases/latest url: https://api.github.com/repos/xemu-project/xemu/releases/latest
@ -817,10 +829,10 @@ modules:
sources: sources:
- type: git - type: git
url: https://github.com/RPCS3/rpcs3.git url: https://github.com/RPCS3/rpcs3.git
commit: cf5346c263111760752cabb94767c07c501207c4 commit: 3e556c710b3256d23b9e524e44d45ba8bbf63814
- type: git - type: git
url: https://github.com/intel/ittapi.git url: https://github.com/intel/ittapi.git
commit: 2de8a23f6130036dcd4d1b78d05df3187951d298 commit: 4a3762fbc517475bfb0586efc513e51c164108c9
dest: ittapi/ittapi dest: ittapi/ittapi
disable-shallow-clone: true disable-shallow-clone: true
# remove git-lfs hook # remove git-lfs hook
@ -1095,4 +1107,4 @@ modules:
sources: sources:
- type: git - type: git
url: https://github.com/XargonWan/RetroDECK.git url: https://github.com/XargonWan/RetroDECK.git
branch: main branch: cooker-0.6.4b

View file

@ -200,7 +200,7 @@ post_update() {
dir_prep "$bios_folder/pico-8/cdata" "$saves_folder/pico-8" # PICO-8 saves folder dir_prep "$bios_folder/pico-8/cdata" "$saves_folder/pico-8" # PICO-8 saves folder
fi fi
if [[ $prev_version -le "063" ]]; then if [[ $prev_version -le "063" ]]; then
# In version 0.6.2b, the following changes were made that required config file updates/reset: # In version 0.6.3b, the following changes were made that required config file updates/reset:
# - Put Dolphin and Primehack save states in different folders inside $rd_home/states # - Put Dolphin and Primehack save states in different folders inside $rd_home/states
# - Fix symlink to hard-coded PICO-8 config folder (dir_prep doesn't like ~) # - Fix symlink to hard-coded PICO-8 config folder (dir_prep doesn't like ~)
# - Overwrite Citra and Yuzu configs, as controller mapping was broken due to emulator updates. # - Overwrite Citra and Yuzu configs, as controller mapping was broken due to emulator updates.
@ -221,6 +221,14 @@ post_update() {
# Remove unneeded tools folder, as location has changed to RO space # Remove unneeded tools folder, as location has changed to RO space
rm -rfv /var/config/retrodeck/tools/ rm -rfv /var/config/retrodeck/tools/
fi fi
if [[ $prev_version -le "064" ]]; then
# In version 0.6.4b, the following changes were made:
# Changed settings in Primehack: The audio output was not selected by default, default AR was also incorrect.
# Changed settings in Duckstation and PCSX2: The "ask on exit" was disabled and "save on exit" was enabled.
# The default configs have been updated for new installs and resets, a patch was created to address existing installs.
deploy_multi_patch "emu-configs/patches/updates/064b_update.patch"
fi
# The following commands are run every time. # The following commands are run every time.

@ -1 +1 @@
Subproject commit 717b78093797270877ec416e58082f1c71d435d8 Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409