diff --git a/automation-tools/alchemist/desired_versions.sh b/automation-tools/alchemist/desired_versions.sh index 99253e70..6f1656e5 100644 --- a/automation-tools/alchemist/desired_versions.sh +++ b/automation-tools/alchemist/desired_versions.sh @@ -56,8 +56,9 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08" # Link: https://flathub.org/en/apps/org.azahar_emu.Azahar # ------------------------------------------------------------------------------ # MAIN (Stable) -# Version: 2125.1.1 - export AZAHAR_DESIRED_VERSION="fd0b3050e4da6a7df8915f63fb8c1d551c7ca8c684568dc62c1681fd316a288c" +# Version: 2126.1.1 + export AZAHAR_DESIRED_VERSION="6739873b8d51ad294e1d8ac08f772d3e52ad5e7cd49b6d7404d5e01ec8227414" + # COOKER (Override) # export AZAHAR_DESIRED_VERSION="latest" @@ -82,8 +83,8 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08" # Link: https://flathub.org/en/apps/org.DolphinEmu.dolphin-emu # ------------------------------------------------------------------------------ # MAIN (Stable) -# Version: 2603a - export DOLPHIN_DESIRED_VERSION="798fc13ec9f60c686a5478c0b1409901b375a4fd39a0a95139a3af662741423e" +# Version: 2609 + export DOLPHIN_DESIRED_VERSION="594afeb78ede945c8fe0e774649443cf12b0706188ce03bb3cd49e3004659e5b" # COOKER (Override) # export DOLPHIN_DESIRED_VERSION="latest" @@ -108,8 +109,8 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08" # Link: https://flathub.org/en/apps/org.mamedev.MAME # ------------------------------------------------------------------------------ # MAIN (Stable) -# Version: 0.287 - export MAME_DESIRED_VERSION="3dbe7b7f802da3b0c1628d604bee9925d67174a5efb7e4ae2235266ce2946739" +# Version: 0.289 + export MAME_DESIRED_VERSION="41ebdb5c266627f4d1f02ba11f8109e793d2381081b68afc48714dd48a703788" # COOKER (Override) # export MAME_DESIRED_VERSION="latest" @@ -141,17 +142,14 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08" # PPSSPP_DESIRED_VERSION="latest" - - - # ------------------------------------------------------------------------------ # Ruffle - Flash Player Emulator # Source: Flatpak - Flathub # Link: https://flathub.org/en/apps/rs.ruffle.Ruffle # ------------------------------------------------------------------------------ # MAIN (Stable) -# Version: 0.2.0 - export RUFFLE_DESIRED_VERSION="37f584d0df86cb04ea4479f0c0f274241adc8692a16a6dc1b0b9d293b7f72685" +# Version: 0.6.0 + export RUFFLE_DESIRED_VERSION="8ba62e830fc7cbf6fbbaf7388dc202d2933b0d9126c99c7296c0bc6f93de6f2a" # COOKER (Override) # export RUFFLE_DESIRED_VERSION="latest" @@ -163,8 +161,8 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08" # Link: https://flathub.org/en/apps/com.steamgriddb.steam-rom-manager # ------------------------------------------------------------------------------ # MAIN (Stable) -# Version: 2.5.34 - export STEAM_ROM_MANAGER_DESIRED_VERSION="b563c9f81ecad09e9a19f5093484fc00ba08fb375b81542e8d889b15fe9f7bff" +# Version: 2.5.44 + export STEAM_ROM_MANAGER_DESIRED_VERSION="c1eebb375d6ca39f4d417c4cb862a62099eb43a6fb2e3392977739770abee96f" # COOKER (Override) # export STEAM_ROM_MANAGER_DESIRED_VERSION="latest" @@ -176,8 +174,8 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08" # Link: https://flathub.org/en/apps/app.xemu.xemu # ------------------------------------------------------------------------------ # MAIN (Stable) -# Version: 0.8.135 - export XEMU_DESIRED_VERSION="998fb7d93048da8b4dc98665d09f7e81ff4e73bedb732b67b7ad97a6f55d4316" +# Version: 0.8.136 + export XEMU_DESIRED_VERSION="2f8b8889edcf69fb2ba2a8691371a7bb49febeba360e9c87555379c50ba946e9" # COOKER (Override) # export XEMU_DESIRED_VERSION="latest" @@ -198,7 +196,7 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08" # Link: https://github.com/RPCS3/rpcs3-binaries-linux/ # ------------------------------------------------------------------------------ # MAIN (Stable) -# Version: 0.0.40-19397 +# Version: 0.0.42-20127 export RPCS3_DESIRED_VERSION="latest" # COOKER (Override) @@ -223,7 +221,7 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08" # Link: https://github.com/PCSX2/pcsx2/releases/ # ------------------------------------------------------------------------------ # MAIN (Stable) - export PCSX2_DESIRED_VERSION="v2.6.3" + export PCSX2_DESIRED_VERSION="v2.8.2" # COOKER (Override) # export PCSX2_DESIRED_VERSION="newest" @@ -246,7 +244,7 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08" # Link: https://gitlab.com/solarus-games/solarus/-/releases/ # ------------------------------------------------------------------------------ # MAIN (Stable) - export SOLARUS_DESIRED_VERSION="v2.0.4" + export SOLARUS_DESIRED_VERSION="v2.1.3" # COOKER (Override) # export SOLARUS_DESIRED_VERSION="latest" @@ -281,7 +279,7 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08" # Link: https://github.com/RetroDECK/ES-DE/releases # ------------------------------------------------------------------------------ # MAIN (Stable) -# Version: 3.4.0 +# Version: 3.5.0 export ES_DE_DESIRED_VERSION="latest" # COOKER (Override) @@ -316,10 +314,10 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08" # ------------------------------------------------------------------------------ # XRoar - Tano Dragon Emulator # Source: Binary (RetroDECK-built) -# Link: https://github.com/RetroDECK/XRoar/releases +# Link: https://github.com/RetroDECK/XRoar/releases | https://www.6809.org.uk/xroar/ # ------------------------------------------------------------------------------ # MAIN (Stable) -# Version: 1.10 +# Version: 1.12.1 export XROAR_DESIRED_VERSION="latest" # COOKER (Override) @@ -343,295 +341,15 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08" # ------------------------------------------------------------------------------ # Vita3K - PlayStation Vita Emulator # Source: AppImage (RetroDECK-mirrored) -# Link: https://github.com/RetroDECK/Vita3K-bin/releases +# Link: https://github.com/Vita3K/Vita3K-builds/releases # ------------------------------------------------------------------------------ # MAIN (Stable) - export VITA3K_DESIRED_VERSION="3996" + export VITA3K_DESIRED_VERSION="4103" # COOKER (Override) # export VITA3K_DESIRED_VERSION="latest" - - -# ============================================================================== -# Component Desired Versions - Future -# ============================================================================== -# New components being developed in the Cooker branch for an upcoming major release. -# These components are planned for future inclusion and are not yet part of the -# current stable version. -# ============================================================================== - -# ------------------------------------------------------------------------------ -# Adventure Game Studio -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export AGS_DESIRED_VERSION="newest" - -# COOKER (Override) - export AGS_DESIRED_VERSION="newest" - - -# ------------------------------------------------------------------------------ -# Commander X16 8-bit Computer -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export COMMANDER_X16_DESIRED_VERSION="latest" - -# COOKER (Override) - export COMMANDER_X16_DESIRED_VERSION="latest" - -# ------------------------------------------------------------------------------ -# DOSBox-X - Enhanced DOSBox Engine -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export DOSBOX_X_DESIRED_VERSION="latest" - -# COOKER (Override) - export DOSBOX_X_DESIRED_VERSION="latest" - - -# ------------------------------------------------------------------------------ -# ECWOLF - Wolfenstein 3D Engine -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export ECWOLF_DESIRED_VERSION="latest" - -# COOKER (Override) - export ECWOLF_DESIRED_VERSION="latest" - - -# ------------------------------------------------------------------------------ -# EKA2L1 - Symbian OS Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export EKA2L1_DESIRED_VERSION="latest" - -# COOKER (Override) - export EKA2L1_DESIRED_VERSION="latest" - -# ------------------------------------------------------------------------------ -# FS-UAE - Amiga Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export FS_UAE_DESIRED_VERSION="" - -# COOKER (Override) - export FS_UAE_DESIRED_VERSION="latest" - - -# ------------------------------------------------------------------------------ -# Flycast - Dreamcast Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export FLYCAST_DESIRED_VERSION="latest" - -# COOKER (Override) - export FLYCAST_DESIRED_VERSION="latest" - - -# ------------------------------------------------------------------------------ -# Gargoyle - Interactive Fiction Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export GARGOYLE_DESIRED_VERSION="" - -# COOKER (Override) - export GARGOYLE_DESIRED_VERSION="latest" - - -# ------------------------------------------------------------------------------ -# Hypseus - Laser Disc Arcade Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export HYPSEUS_DESIRED_VERSION="" - -# COOKER (Override) - export HYPSEUS_DESIRED_VERSION="latest" - - -# ------------------------------------------------------------------------------ -# Ironwail - Quake Engine -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export IRONWAIL_DESIRED_VERSION="latest" - -# COOKER (Override) - export IRONWAIL_DESIRED_VERSION="latest" - -# ------------------------------------------------------------------------------ -# Ikeman Go - Fighting Engine -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export IKEMANGO_DESIRED_VERSION="latest" - -# COOKER (Override) - export IKEMANGO_DESIRED_VERSION="latest" - - -# ------------------------------------------------------------------------------ -# KEGS - Apple IIGS Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export KEGS_DESIRED_VERSION="1.38" - -# COOKER (Override) - export KEGS_DESIRED_VERSION="1.38" - - -# ------------------------------------------------------------------------------ -# Lindbergh - SEGA Lindbergh Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export LINDBERGH_DESIRED_VERSION="latest" - -# COOKER (Override) - export LINDBERGH_DESIRED_VERSION="latest" - -# ------------------------------------------------------------------------------ -# Mednafen - Multi Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export MEDNAFEN_DESIRED_VERSION="latest" - -# COOKER (Override) - export MEDNAFEN_DESIRED_VERSION="latest" - -# ------------------------------------------------------------------------------ -# Mudlet - MUD Client -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export MUDLET_DESIRED_VERSION="latest" - -# COOKER (Override) - export MUDLET_DESIRED_VERSION="latest" - -# ------------------------------------------------------------------------------ -# Open Surge Engine - 2D Game Engine -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export OPENSURGE_DESIRED_VERSION="latest" - -# COOKER (Override) - export OPENSURGE_DESIRED_VERSION="latest" - - -# ------------------------------------------------------------------------------ -# Orictron - Oric-1/Atmos/Telestrat/Pravetz 8D emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export ORICUTRON_DESIRED_VERSION="20260123" - -# COOKER (Override) - export ORICUTRON_DESIRED_VERSION="20260123" - -# ------------------------------------------------------------------------------ -# Raze - Duke Nukem Engine -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export RAZE_DESIRED_VERSION="latest" - -# COOKER (Override) - export RAZE_DESIRED_VERSION="latest" - - -# ------------------------------------------------------------------------------ -# ScummVM - Point-and-Click Adventure Engine -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export SCUMMVM_DESIRED_VERSION="latest" - -# COOKER (Override) - export SCUMMVM_DESIRED_VERSION="latest" - - -# ------------------------------------------------------------------------------ -# SDL2TRS - TRS-80 Model I/III/4/4P Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export SDL2TRS_DESIRED_VERSION="latest" - -# COOKER (Override) - export SDL2TRS_DESIRED_VERSION="latest" - -# ------------------------------------------------------------------------------ -# ShadPS4 - PlayStation 4 Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export SHADPS4_DESIRED_VERSION="latest" - -# COOKER (Override) - export SHADPS4_DESIRED_VERSION="latest" - - -# ------------------------------------------------------------------------------ -# SimCoupe - SAM Coupé Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export SIMCOUPE_DESIRED_VERSION="latest" - -# COOKER (Override) - export SIMCOUPE_DESIRED_VERSION="latest" - - -# ------------------------------------------------------------------------------ -# SuperModel - SEGA Model 3 Arcade Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export SUPERMODEL_DESIRED_VERSION="latest" - -# COOKER (Override) - export SUPERMODEL_DESIRED_VERSION="latest" - - -# ------------------------------------------------------------------------------ -# Tsugaru - FM TOWNS Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export SUPERMODEL_DESIRED_VERSION="newest" - -# COOKER (Override) - export TSUGARU_DESIRED_VERSION="newest" - -# ------------------------------------------------------------------------------ -# UZDoom - Modern Doom Engine -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export UZDOOM_DESIRED_VERSION="latest" - -# COOKER (Override) - export UZDOOM_DESIRED_VERSION="latest" - - -# ------------------------------------------------------------------------------ -# VPinball - Virtual Pinball Engine -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export VPINBALL_DESIRED_VERSION="newest" - -# COOKER (Override) - export VPINBALL_DESIRED_VERSION="newest" - - -# ------------------------------------------------------------------------------ -# Xenia Edge - Xbox 360 Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export XENIA_EDGE_DESIRED_VERSION="newest" - -# COOKER (Override) - export XENIA_EDGE_DESIRED_VERSION="newest" - -# ------------------------------------------------------------------------------ -# ZEsarUX - ZX Second-Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export ZESARUX_DESIRED_VERSION="latest" - -# COOKER (Override) - export ZESARUX_DESIRED_VERSION="latest" - - # ------------------------------------------------------------------ # Framework Component Desired Version # ----------------------------------- @@ -646,30 +364,3 @@ else export FRAMEWORK_DESIRED_VERSION="main-latest on $(date +%Y-%m-%d)" fi -# ============================================================================== -# Component Desired Versions - Removed -# ============================================================================== -# Components that has been removed or was never included into RetroDECK -# due to some factor. -# ============================================================================== - - -# ------------------------------------------------------------------------------ -# Eden - Nintendo Switch Emulator -# ------------------------------------------------------------------------------ -# MAIN (Stable) -# export EDEN_DESIRED_VERSION="latest" - -# COOKER (Override) - export EDEN_DESIRED_VERSION="latest" - -# ------------------------------------------------------------------------------ -# Ryubing - Nintendo Switch Emulator -# Source: AppImage -# Link: https://git.ryujinx.app/ryubing/ryujinx/-/releases/ -# ------------------------------------------------------------------------------ -# MAIN (Stable) - export RYUBING_DESIRED_VERSION="latest" - -# COOKER (Override) -# export RYUBING_DESIRED_VERSION="latest" diff --git a/azahar/component_launcher.sh b/azahar/component_launcher.sh index 755020ab..3d6ca053 100755 --- a/azahar/component_launcher.sh +++ b/azahar/component_launcher.sh @@ -12,4 +12,4 @@ log i "RetroDECK is now launching $component_name" log d "Library path is: $LD_LIBRARY_PATH" log d "AppDir is: $component_path" -exec "$component_path/bin/azahar" --fullscreen "$@" +exec "$component_path/bin/azahar" --f "$@" diff --git a/azahar/rd_assets/rd_config/qt-config.ini b/azahar/rd_assets/rd_config/qt-config.ini index 06da6240..86b476d1 100644 --- a/azahar/rd_assets/rd_config/qt-config.ini +++ b/azahar/rd_assets/rd_config/qt-config.ini @@ -13,6 +13,8 @@ output_device=Auto output_device\default=true output_type=0 output_type\default=true +simulate_headphones_plugged=false +simulate_headphones_plugged\default=true volume=1 volume\default=true @@ -37,6 +39,8 @@ camera_outer_right_name=blank camera_outer_right_name\default=true [Controls] +controller_hotkey_maptype=0 +controller_hotkey_maptype\default=false profile=0 profile\default=true profiles\1\button_a="button:0,engine:sdl,guid:030079f6de280000ff11000001000000,port:0" @@ -81,6 +85,8 @@ profiles\1\circle_pad="axis_x:0,axis_y:1,deadzone:0.100000,engine:sdl,guid:03007 profiles\1\circle_pad\default=false profiles\1\controller_touch_device= profiles\1\controller_touch_device\default=true +profiles\1\input_maptype=2 +profiles\1\input_maptype\default=true profiles\1\motion_device=engine:cemuhookudp profiles\1\motion_device\default=false profiles\1\name=Default @@ -141,6 +147,8 @@ profiles\2\circle_pad="axis_x:0,axis_y:1,deadzone:0.100000,engine:sdl,guid:03007 profiles\2\circle_pad\default=false profiles\2\controller_touch_device= profiles\2\controller_touch_device\default=true +profiles\2\input_maptype=2 +profiles\2\input_maptype\default=true profiles\2\motion_device=engine:cemuhookudp profiles\2\motion_device\default=false profiles\2\name=RD-Player-2 @@ -176,6 +184,8 @@ use_cpu_jit=true use_cpu_jit\default=true [Data%20Storage] +async_fs_operations=true +async_fs_operations\default=true compress_cia_installs=false compress_cia_installs\default=true nand_directory=RETRODECKSAVESDIR/n3ds/azahar/nand/ @@ -270,12 +280,16 @@ LLE\SPI=false LLE\SPI\default=true LLE\SSL=false LLE\SSL\default=true +enable_exception_handler=false +enable_exception_handler\default=true enable_rpc_server=false enable_rpc_server\default=true gdbstub_port=24689 gdbstub_port\default=true instant_debug_log=false instant_debug_log\default=true +pica_debugging=false +pica_debugging\default=true record_frame_times=false renderer_debug=false renderer_debug\default=true @@ -399,6 +413,8 @@ resolution_factor=2 resolution_factor\default=false shaders_accurate_mul=true shaders_accurate_mul\default=true +simulate_3ds_gpu_timings=false +simulate_3ds_gpu_timings\default=true spirv_shader_gen=true spirv_shader_gen\default=true texture_filter=0 @@ -417,6 +433,8 @@ use_integer_scaling=false use_integer_scaling\default=true use_shader_jit=true use_shader_jit\default=true +use_skip_duplicate_frames=false +use_skip_duplicate_frames\default=true use_vsync=true use_vsync\default=true use_vsync_new=false @@ -534,74 +552,136 @@ Paths\screenshotPath=RETRODECKSCREENSHOTSDIR/n3ds/azahar Paths\screenshotPath\default=false Paths\symbolsPath= Paths\videoDumpingPath= -Shortcuts\Main%20Window\Advance%20Frame\Context=1 -Shortcuts\Main%20Window\Advance%20Frame\Context\default=false +Shortcuts\Main%20Window\Advance%20Frame\Context=2 +Shortcuts\Main%20Window\Advance%20Frame\Context\default=true Shortcuts\Main%20Window\Advance%20Frame\KeySeq= Shortcuts\Main%20Window\Advance%20Frame\KeySeq\default=true -Shortcuts\Main%20Window\Audio%20Mute\Unmute\Context=1 +Shortcuts\Main%20Window\Advance%20Frame\controller_keyseq= +Shortcuts\Main%20Window\Advance%20Frame\controller_keyseq\default=true +Shortcuts\Main%20Window\Audio%20Mute\Unmute\Context=2 Shortcuts\Main%20Window\Audio%20Mute\Unmute\Context\default=true Shortcuts\Main%20Window\Audio%20Mute\Unmute\KeySeq= Shortcuts\Main%20Window\Audio%20Mute\Unmute\KeySeq\default=false -Shortcuts\Main%20Window\Audio%20Volume%20Down\Context=1 +Shortcuts\Main%20Window\Audio%20Mute\Unmute\controller_keyseq= +Shortcuts\Main%20Window\Audio%20Mute\Unmute\controller_keyseq\default=true +Shortcuts\Main%20Window\Audio%20Volume%20Down\Context=2 Shortcuts\Main%20Window\Audio%20Volume%20Down\Context\default=true Shortcuts\Main%20Window\Audio%20Volume%20Down\KeySeq= Shortcuts\Main%20Window\Audio%20Volume%20Down\KeySeq\default=true -Shortcuts\Main%20Window\Audio%20Volume%20Up\Context=1 +Shortcuts\Main%20Window\Audio%20Volume%20Down\controller_keyseq= +Shortcuts\Main%20Window\Audio%20Volume%20Down\controller_keyseq\default=true +Shortcuts\Main%20Window\Audio%20Volume%20Up\Context=2 Shortcuts\Main%20Window\Audio%20Volume%20Up\Context\default=true Shortcuts\Main%20Window\Audio%20Volume%20Up\KeySeq= Shortcuts\Main%20Window\Audio%20Volume%20Up\KeySeq\default=true -Shortcuts\Main%20Window\Capture%20Screenshot\Context=3 +Shortcuts\Main%20Window\Audio%20Volume%20Up\controller_keyseq= +Shortcuts\Main%20Window\Audio%20Volume%20Up\controller_keyseq\default=true +Shortcuts\Main%20Window\Capture%20Screenshot\Context=2 Shortcuts\Main%20Window\Capture%20Screenshot\Context\default=true Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq=Ctrl+X Shortcuts\Main%20Window\Capture%20Screenshot\KeySeq\default=false -Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context=1 +Shortcuts\Main%20Window\Capture%20Screenshot\controller_keyseq= +Shortcuts\Main%20Window\Capture%20Screenshot\controller_keyseq\default=true +Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context=2 Shortcuts\Main%20Window\Continue\Pause%20Emulation\Context\default=true Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq=Ctrl+P Shortcuts\Main%20Window\Continue\Pause%20Emulation\KeySeq\default=false -Shortcuts\Main%20Window\Decrease%203D%20Factor\Context=1 -Shortcuts\Main%20Window\Decrease%203D%20Factor\Context\default=false +Shortcuts\Main%20Window\Continue\Pause%20Emulation\controller_keyseq= +Shortcuts\Main%20Window\Continue\Pause%20Emulation\controller_keyseq\default=true +Shortcuts\Main%20Window\Debug%20Pause\Context=2 +Shortcuts\Main%20Window\Debug%20Pause\Context\default=true +Shortcuts\Main%20Window\Debug%20Pause\KeySeq= +Shortcuts\Main%20Window\Debug%20Pause\KeySeq\default=true +Shortcuts\Main%20Window\Debug%20Pause\controller_keyseq= +Shortcuts\Main%20Window\Debug%20Pause\controller_keyseq\default=true +Shortcuts\Main%20Window\Debug%20Resume\Context=2 +Shortcuts\Main%20Window\Debug%20Resume\Context\default=true +Shortcuts\Main%20Window\Debug%20Resume\KeySeq= +Shortcuts\Main%20Window\Debug%20Resume\KeySeq\default=true +Shortcuts\Main%20Window\Debug%20Resume\controller_keyseq= +Shortcuts\Main%20Window\Debug%20Resume\controller_keyseq\default=true +Shortcuts\Main%20Window\Debug%20Schedule%20All\Context=2 +Shortcuts\Main%20Window\Debug%20Schedule%20All\Context\default=true +Shortcuts\Main%20Window\Debug%20Schedule%20All\KeySeq= +Shortcuts\Main%20Window\Debug%20Schedule%20All\KeySeq\default=true +Shortcuts\Main%20Window\Debug%20Schedule%20All\controller_keyseq= +Shortcuts\Main%20Window\Debug%20Schedule%20All\controller_keyseq\default=true +Shortcuts\Main%20Window\Debug%20Step\Context=2 +Shortcuts\Main%20Window\Debug%20Step\Context\default=true +Shortcuts\Main%20Window\Debug%20Step\KeySeq= +Shortcuts\Main%20Window\Debug%20Step\KeySeq\default=true +Shortcuts\Main%20Window\Debug%20Step\controller_keyseq= +Shortcuts\Main%20Window\Debug%20Step\controller_keyseq\default=true +Shortcuts\Main%20Window\Debug%20Unschedule%20All\Context=2 +Shortcuts\Main%20Window\Debug%20Unschedule%20All\Context\default=true +Shortcuts\Main%20Window\Debug%20Unschedule%20All\KeySeq= +Shortcuts\Main%20Window\Debug%20Unschedule%20All\KeySeq\default=true +Shortcuts\Main%20Window\Debug%20Unschedule%20All\controller_keyseq= +Shortcuts\Main%20Window\Debug%20Unschedule%20All\controller_keyseq\default=true +Shortcuts\Main%20Window\Decrease%203D%20Factor\Context=2 +Shortcuts\Main%20Window\Decrease%203D%20Factor\Context\default=true Shortcuts\Main%20Window\Decrease%203D%20Factor\KeySeq= Shortcuts\Main%20Window\Decrease%203D%20Factor\KeySeq\default=false +Shortcuts\Main%20Window\Decrease%203D%20Factor\controller_keyseq= +Shortcuts\Main%20Window\Decrease%203D%20Factor\controller_keyseq\default=true Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context=2 Shortcuts\Main%20Window\Decrease%20Speed%20Limit\Context\default=true Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq=Ctrl+2 Shortcuts\Main%20Window\Decrease%20Speed%20Limit\KeySeq\default=false -Shortcuts\Main%20Window\Exit%20Azahar\Context=1 +Shortcuts\Main%20Window\Decrease%20Speed%20Limit\controller_keyseq= +Shortcuts\Main%20Window\Decrease%20Speed%20Limit\controller_keyseq\default=true +Shortcuts\Main%20Window\Exit%20Azahar\Context=2 Shortcuts\Main%20Window\Exit%20Azahar\Context\default=true Shortcuts\Main%20Window\Exit%20Azahar\KeySeq=Ctrl+Q Shortcuts\Main%20Window\Exit%20Azahar\KeySeq\default=true +Shortcuts\Main%20Window\Exit%20Azahar\controller_keyseq= +Shortcuts\Main%20Window\Exit%20Azahar\controller_keyseq\default=true Shortcuts\Main%20Window\Exit%20Citra\Context=1 Shortcuts\Main%20Window\Exit%20Citra\Context\default=true Shortcuts\Main%20Window\Exit%20Citra\KeySeq=Ctrl+Q Shortcuts\Main%20Window\Exit%20Citra\KeySeq\default=true -Shortcuts\Main%20Window\Exit%20Fullscreen\Context=1 +Shortcuts\Main%20Window\Exit%20Fullscreen\Context=2 Shortcuts\Main%20Window\Exit%20Fullscreen\Context\default=true -Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Ctrl+O +Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq=Ctrl+M Shortcuts\Main%20Window\Exit%20Fullscreen\KeySeq\default=false -Shortcuts\Main%20Window\Fullscreen\Context=1 +Shortcuts\Main%20Window\Exit%20Fullscreen\controller_keyseq= +Shortcuts\Main%20Window\Exit%20Fullscreen\controller_keyseq\default=true +Shortcuts\Main%20Window\Fullscreen\Context=2 Shortcuts\Main%20Window\Fullscreen\Context\default=true Shortcuts\Main%20Window\Fullscreen\KeySeq=Ctrl+Return Shortcuts\Main%20Window\Fullscreen\KeySeq\default=false -Shortcuts\Main%20Window\Increase%203D%20Factor\Context=1 -Shortcuts\Main%20Window\Increase%203D%20Factor\Context\default=false +Shortcuts\Main%20Window\Fullscreen\controller_keyseq= +Shortcuts\Main%20Window\Fullscreen\controller_keyseq\default=true +Shortcuts\Main%20Window\Increase%203D%20Factor\Context=2 +Shortcuts\Main%20Window\Increase%203D%20Factor\Context\default=true Shortcuts\Main%20Window\Increase%203D%20Factor\KeySeq= Shortcuts\Main%20Window\Increase%203D%20Factor\KeySeq\default=false +Shortcuts\Main%20Window\Increase%203D%20Factor\controller_keyseq= +Shortcuts\Main%20Window\Increase%203D%20Factor\controller_keyseq\default=true Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context=2 Shortcuts\Main%20Window\Increase%20Speed%20Limit\Context\default=true Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq=Ctrl+1 Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq\default=false -Shortcuts\Main%20Window\Load%20Amiibo\Context=3 +Shortcuts\Main%20Window\Increase%20Speed%20Limit\controller_keyseq= +Shortcuts\Main%20Window\Increase%20Speed%20Limit\controller_keyseq\default=true +Shortcuts\Main%20Window\Load%20Amiibo\Context=2 Shortcuts\Main%20Window\Load%20Amiibo\Context\default=true Shortcuts\Main%20Window\Load%20Amiibo\KeySeq=Alt+M Shortcuts\Main%20Window\Load%20Amiibo\KeySeq\default=false -Shortcuts\Main%20Window\Load%20File\Context=1 -Shortcuts\Main%20Window\Load%20File\Context\default=false +Shortcuts\Main%20Window\Load%20Amiibo\controller_keyseq= +Shortcuts\Main%20Window\Load%20Amiibo\controller_keyseq\default=true +Shortcuts\Main%20Window\Load%20File\Context=2 +Shortcuts\Main%20Window\Load%20File\Context\default=true Shortcuts\Main%20Window\Load%20File\KeySeq= Shortcuts\Main%20Window\Load%20File\KeySeq\default=false -Shortcuts\Main%20Window\Load%20from%20Newest%20Non-Quicksave%20Slot\Context=1 +Shortcuts\Main%20Window\Load%20File\controller_keyseq= +Shortcuts\Main%20Window\Load%20File\controller_keyseq\default=true +Shortcuts\Main%20Window\Load%20from%20Newest%20Non-Quicksave%20Slot\Context=2 Shortcuts\Main%20Window\Load%20from%20Newest%20Non-Quicksave%20Slot\Context\default=true Shortcuts\Main%20Window\Load%20from%20Newest%20Non-Quicksave%20Slot\KeySeq= Shortcuts\Main%20Window\Load%20from%20Newest%20Non-Quicksave%20Slot\KeySeq\default=false +Shortcuts\Main%20Window\Load%20from%20Newest%20Non-Quicksave%20Slot\controller_keyseq= +Shortcuts\Main%20Window\Load%20from%20Newest%20Non-Quicksave%20Slot\controller_keyseq\default=true Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\Context=1 Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\Context\default=true Shortcuts\Main%20Window\Load%20from%20Newest%20Slot\KeySeq=Ctrl+A @@ -610,105 +690,150 @@ Shortcuts\Main%20Window\Multiplayer%20Browse%20Public%20Game%20Lobby\Context=2 Shortcuts\Main%20Window\Multiplayer%20Browse%20Public%20Game%20Lobby\Context\default=true Shortcuts\Main%20Window\Multiplayer%20Browse%20Public%20Game%20Lobby\KeySeq=Ctrl+B Shortcuts\Main%20Window\Multiplayer%20Browse%20Public%20Game%20Lobby\KeySeq\default=true -Shortcuts\Main%20Window\Multiplayer%20Browse%20Public%20Rooms\Context=1 -Shortcuts\Main%20Window\Multiplayer%20Browse%20Public%20Rooms\Context\default=false +Shortcuts\Main%20Window\Multiplayer%20Browse%20Public%20Rooms\Context=2 +Shortcuts\Main%20Window\Multiplayer%20Browse%20Public%20Rooms\Context\default=true Shortcuts\Main%20Window\Multiplayer%20Browse%20Public%20Rooms\KeySeq= Shortcuts\Main%20Window\Multiplayer%20Browse%20Public%20Rooms\KeySeq\default=false -Shortcuts\Main%20Window\Multiplayer%20Create%20Room\Context=1 -Shortcuts\Main%20Window\Multiplayer%20Create%20Room\Context\default=false +Shortcuts\Main%20Window\Multiplayer%20Browse%20Public%20Rooms\controller_keyseq= +Shortcuts\Main%20Window\Multiplayer%20Browse%20Public%20Rooms\controller_keyseq\default=true +Shortcuts\Main%20Window\Multiplayer%20Create%20Room\Context=2 +Shortcuts\Main%20Window\Multiplayer%20Create%20Room\Context\default=true Shortcuts\Main%20Window\Multiplayer%20Create%20Room\KeySeq= Shortcuts\Main%20Window\Multiplayer%20Create%20Room\KeySeq\default=false -Shortcuts\Main%20Window\Multiplayer%20Direct%20Connect%20to%20Room\Context=1 -Shortcuts\Main%20Window\Multiplayer%20Direct%20Connect%20to%20Room\Context\default=false +Shortcuts\Main%20Window\Multiplayer%20Create%20Room\controller_keyseq= +Shortcuts\Main%20Window\Multiplayer%20Create%20Room\controller_keyseq\default=true +Shortcuts\Main%20Window\Multiplayer%20Direct%20Connect%20to%20Room\Context=2 +Shortcuts\Main%20Window\Multiplayer%20Direct%20Connect%20to%20Room\Context\default=true Shortcuts\Main%20Window\Multiplayer%20Direct%20Connect%20to%20Room\KeySeq= Shortcuts\Main%20Window\Multiplayer%20Direct%20Connect%20to%20Room\KeySeq\default=false -Shortcuts\Main%20Window\Multiplayer%20Leave%20Room\Context=1 -Shortcuts\Main%20Window\Multiplayer%20Leave%20Room\Context\default=false +Shortcuts\Main%20Window\Multiplayer%20Direct%20Connect%20to%20Room\controller_keyseq= +Shortcuts\Main%20Window\Multiplayer%20Direct%20Connect%20to%20Room\controller_keyseq\default=true +Shortcuts\Main%20Window\Multiplayer%20Leave%20Room\Context=2 +Shortcuts\Main%20Window\Multiplayer%20Leave%20Room\Context\default=true Shortcuts\Main%20Window\Multiplayer%20Leave%20Room\KeySeq= Shortcuts\Main%20Window\Multiplayer%20Leave%20Room\KeySeq\default=false +Shortcuts\Main%20Window\Multiplayer%20Leave%20Room\controller_keyseq= +Shortcuts\Main%20Window\Multiplayer%20Leave%20Room\controller_keyseq\default=true Shortcuts\Main%20Window\Multiplayer%20Show%20Current%20Room\Context=2 Shortcuts\Main%20Window\Multiplayer%20Show%20Current%20Room\Context\default=true Shortcuts\Main%20Window\Multiplayer%20Show%20Current%20Room\KeySeq=Ctrl+R Shortcuts\Main%20Window\Multiplayer%20Show%20Current%20Room\KeySeq\default=true -Shortcuts\Main%20Window\Quick%20Load\Context=1 +Shortcuts\Main%20Window\Multiplayer%20Show%20Current%20Room\controller_keyseq= +Shortcuts\Main%20Window\Multiplayer%20Show%20Current%20Room\controller_keyseq\default=true +Shortcuts\Main%20Window\Quick%20Load\Context=2 Shortcuts\Main%20Window\Quick%20Load\Context\default=true Shortcuts\Main%20Window\Quick%20Load\KeySeq=Ctrl+A Shortcuts\Main%20Window\Quick%20Load\KeySeq\default=false -Shortcuts\Main%20Window\Quick%20Save\Context=1 +Shortcuts\Main%20Window\Quick%20Load\controller_keyseq= +Shortcuts\Main%20Window\Quick%20Load\controller_keyseq\default=true +Shortcuts\Main%20Window\Quick%20Save\Context=2 Shortcuts\Main%20Window\Quick%20Save\Context\default=true Shortcuts\Main%20Window\Quick%20Save\KeySeq=Ctrl+S Shortcuts\Main%20Window\Quick%20Save\KeySeq\default=false +Shortcuts\Main%20Window\Quick%20Save\controller_keyseq= +Shortcuts\Main%20Window\Quick%20Save\controller_keyseq\default=true Shortcuts\Main%20Window\Remove%20Amiibo\Context=2 Shortcuts\Main%20Window\Remove%20Amiibo\Context\default=true Shortcuts\Main%20Window\Remove%20Amiibo\KeySeq=Alt+N Shortcuts\Main%20Window\Remove%20Amiibo\KeySeq\default=false -Shortcuts\Main%20Window\Restart%20Emulation\Context=1 +Shortcuts\Main%20Window\Remove%20Amiibo\controller_keyseq= +Shortcuts\Main%20Window\Remove%20Amiibo\controller_keyseq\default=true +Shortcuts\Main%20Window\Restart%20Emulation\Context=2 Shortcuts\Main%20Window\Restart%20Emulation\Context\default=true Shortcuts\Main%20Window\Restart%20Emulation\KeySeq=Ctrl+R Shortcuts\Main%20Window\Restart%20Emulation\KeySeq\default=false -Shortcuts\Main%20Window\Rotate%20Screens%20Upright\Context=1 +Shortcuts\Main%20Window\Restart%20Emulation\controller_keyseq= +Shortcuts\Main%20Window\Restart%20Emulation\controller_keyseq\default=true +Shortcuts\Main%20Window\Rotate%20Screens%20Upright\Context=2 Shortcuts\Main%20Window\Rotate%20Screens%20Upright\Context\default=true Shortcuts\Main%20Window\Rotate%20Screens%20Upright\KeySeq=Alt+Y Shortcuts\Main%20Window\Rotate%20Screens%20Upright\KeySeq\default=false -Shortcuts\Main%20Window\Save%20to%20Oldest%20Non-Quicksave%20Slot\Context=1 +Shortcuts\Main%20Window\Rotate%20Screens%20Upright\controller_keyseq= +Shortcuts\Main%20Window\Rotate%20Screens%20Upright\controller_keyseq\default=true +Shortcuts\Main%20Window\Save%20to%20Oldest%20Non-Quicksave%20Slot\Context=2 Shortcuts\Main%20Window\Save%20to%20Oldest%20Non-Quicksave%20Slot\Context\default=true Shortcuts\Main%20Window\Save%20to%20Oldest%20Non-Quicksave%20Slot\KeySeq= Shortcuts\Main%20Window\Save%20to%20Oldest%20Non-Quicksave%20Slot\KeySeq\default=false +Shortcuts\Main%20Window\Save%20to%20Oldest%20Non-Quicksave%20Slot\controller_keyseq= +Shortcuts\Main%20Window\Save%20to%20Oldest%20Non-Quicksave%20Slot\controller_keyseq\default=true Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\Context=1 Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\Context\default=true Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\KeySeq=Ctrl+S Shortcuts\Main%20Window\Save%20to%20Oldest%20Slot\KeySeq\default=false -Shortcuts\Main%20Window\Stop%20Emulation\Context=1 +Shortcuts\Main%20Window\Stop%20Emulation\Context=2 Shortcuts\Main%20Window\Stop%20Emulation\Context\default=true Shortcuts\Main%20Window\Stop%20Emulation\KeySeq= Shortcuts\Main%20Window\Stop%20Emulation\KeySeq\default=false -Shortcuts\Main%20Window\Swap%20Screens\Context=1 +Shortcuts\Main%20Window\Stop%20Emulation\controller_keyseq= +Shortcuts\Main%20Window\Stop%20Emulation\controller_keyseq\default=true +Shortcuts\Main%20Window\Swap%20Screens\Context=2 Shortcuts\Main%20Window\Swap%20Screens\Context\default=true Shortcuts\Main%20Window\Swap%20Screens\KeySeq=Ctrl+Tab Shortcuts\Main%20Window\Swap%20Screens\KeySeq\default=false +Shortcuts\Main%20Window\Swap%20Screens\controller_keyseq= +Shortcuts\Main%20Window\Swap%20Screens\controller_keyseq\default=true Shortcuts\Main%20Window\Toggle%203D\Context=2 Shortcuts\Main%20Window\Toggle%203D\Context\default=true Shortcuts\Main%20Window\Toggle%203D\KeySeq=F6 Shortcuts\Main%20Window\Toggle%203D\KeySeq\default=false +Shortcuts\Main%20Window\Toggle%203D\controller_keyseq= +Shortcuts\Main%20Window\Toggle%203D\controller_keyseq\default=true Shortcuts\Main%20Window\Toggle%20Custom%20Textures\Context=2 Shortcuts\Main%20Window\Toggle%20Custom%20Textures\Context\default=true Shortcuts\Main%20Window\Toggle%20Custom%20Textures\KeySeq=F7 Shortcuts\Main%20Window\Toggle%20Custom%20Textures\KeySeq\default=true -Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context=1 +Shortcuts\Main%20Window\Toggle%20Custom%20Textures\controller_keyseq= +Shortcuts\Main%20Window\Toggle%20Custom%20Textures\controller_keyseq\default=true +Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context=2 Shortcuts\Main%20Window\Toggle%20Filter%20Bar\Context\default=true Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq= Shortcuts\Main%20Window\Toggle%20Filter%20Bar\KeySeq\default=false -Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context=1 -Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context\default=false +Shortcuts\Main%20Window\Toggle%20Filter%20Bar\controller_keyseq= +Shortcuts\Main%20Window\Toggle%20Filter%20Bar\controller_keyseq\default=true +Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context=2 +Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\Context\default=true Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq= Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\KeySeq\default=false -Shortcuts\Main%20Window\Toggle%20Per-Application%20Speed\Context=1 -Shortcuts\Main%20Window\Toggle%20Per-Application%20Speed\Context\default=false +Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\controller_keyseq= +Shortcuts\Main%20Window\Toggle%20Frame%20Advancing\controller_keyseq\default=true +Shortcuts\Main%20Window\Toggle%20Per-Application%20Speed\Context=2 +Shortcuts\Main%20Window\Toggle%20Per-Application%20Speed\Context\default=true Shortcuts\Main%20Window\Toggle%20Per-Application%20Speed\KeySeq= Shortcuts\Main%20Window\Toggle%20Per-Application%20Speed\KeySeq\default=false -Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context=1 +Shortcuts\Main%20Window\Toggle%20Per-Application%20Speed\controller_keyseq= +Shortcuts\Main%20Window\Toggle%20Per-Application%20Speed\controller_keyseq\default=true +Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context=2 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context\default=true Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq=Ctrl+L Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq\default=false -Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context=1 +Shortcuts\Main%20Window\Toggle%20Screen%20Layout\controller_keyseq= +Shortcuts\Main%20Window\Toggle%20Screen%20Layout\controller_keyseq\default=true +Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context=2 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context\default=true Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq= Shortcuts\Main%20Window\Toggle%20Status%20Bar\KeySeq\default=false -Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context=1 -Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context\default=false +Shortcuts\Main%20Window\Toggle%20Status%20Bar\controller_keyseq= +Shortcuts\Main%20Window\Toggle%20Status%20Bar\controller_keyseq\default=true +Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context=2 +Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\Context\default=true Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\KeySeq= Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\KeySeq\default=true +Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\controller_keyseq= +Shortcuts\Main%20Window\Toggle%20Texture%20Dumping\controller_keyseq\default=true Shortcuts\Main%20Window\Toggle%20Turbo%20Mode\Context=2 Shortcuts\Main%20Window\Toggle%20Turbo%20Mode\Context\default=true Shortcuts\Main%20Window\Toggle%20Turbo%20Mode\KeySeq=Ctrl+T Shortcuts\Main%20Window\Toggle%20Turbo%20Mode\KeySeq\default=false -UILayout\gameListHeaderState=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x6\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x6\xce\0\0\0\x6\x1\x1\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x6\0\0\x2\x80\0\0\0\x1\0\0\0\0\0\0\0\x86\0\0\0\x1\0\0\0\0\0\0\0k\0\0\0\x1\0\0\0\0\0\0\0\x62\0\0\0\x1\0\0\0\0\0\0\0\x44\0\0\0\x1\0\0\0\0\0\0\x2\xb7\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0i\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1) -UILayout\geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\x1\0\0\0\x19\0\0\x6\xce\0\0\x2p\0\0\0\x1\0\0\0\x19\0\0\x6\xce\0\0\x2p\0\0\0\0\0\0\0\0\a\x80\0\0\0\x1\0\0\0\x19\0\0\x6\xce\0\0\x2p) -UILayout\geometryRenderWindow=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x1\x8f\0\0\x1\xdf\0\0\0\0\0\0\0\0\xff\xff\xff\xff\xff\xff\xff\xff\0\0\0\0\0\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x1\x8f\0\0\x1\xdf) +Shortcuts\Main%20Window\Toggle%20Turbo%20Mode\controller_keyseq= +Shortcuts\Main%20Window\Toggle%20Turbo%20Mode\controller_keyseq\default=true +UILayout\gameListHeaderState=@ByteArray() +UILayout\geometry=@ByteArray() +UILayout\geometryRenderWindow=@ByteArray() +UILayout\geometrySecondaryWindow=@ByteArray() UILayout\microProfileDialogGeometry=@ByteArray() UILayout\microProfileDialogVisible=false UILayout\microProfileDialogVisible\default=true -UILayout\state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0W\0\x61\0i\0t\0T\0r\0\x65\0\x65\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0^\0\xff\xff\xff\0\0\0\x1\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\b\xfb\0\0\0\x18\0\x41\0R\0M\0R\0\x65\0g\0i\0s\0t\0\x65\0r\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0j\0\xff\xff\xff\xfb\0\0\0 \0G\0r\0\x61\0p\0h\0i\0\x63\0s\0\x44\0\x65\0\x62\0u\0g\0g\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0^\0\xff\xff\xff\xfb\0\0\0\"\0P\0i\0\x63\0\x61\0 \0\x43\0o\0m\0m\0\x61\0n\0\x64\0 \0L\0i\0s\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x89\0\xff\xff\xff\xfb\0\0\0*\0P\0i\0\x63\0\x61\0\x42\0r\0\x65\0\x61\0k\0P\0o\0i\0n\0t\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x89\0\xff\xff\xff\xfb\0\0\0 \0P\0i\0\x63\0\x61\0V\0\x65\0r\0t\0\x65\0x\0S\0h\0\x61\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\x1\xeb\0\xff\xff\xff\xfb\0\0\0\x12\0\x43\0i\0T\0r\0\x61\0\x63\0i\0n\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x43\0\xff\xff\xff\xfb\0\0\0.\0L\0L\0\x45\0S\0\x65\0r\0v\0i\0\x63\0\x65\0M\0o\0\x64\0u\0l\0\x65\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0^\0\xff\xff\xff\xfb\0\0\0\x16\0I\0P\0\x43\0R\0\x65\0\x63\0o\0r\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xcf\0\xff\xff\xff\0\0\x6\xce\0\0\x2\x12\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0) +UILayout\state=@ByteArray() calloutFlags=0 calloutFlags\default=true confirmClose=false diff --git a/es-de/component_update.sh b/es-de/component_update.sh index 66e743bf..f37f9577 100644 --- a/es-de/component_update.sh +++ b/es-de/component_update.sh @@ -78,3 +78,15 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.10.0b") == "true fi fi +if [[ $(check_version_is_older_than "$version_being_updated" "0.10.10b") == "true" ]]; then + # With the RetroDECK 0.10.10b, that brings ES-DE 3.5.0 update, the splash screen progress bar color default value is added + + if ! [[ $(get_setting_value "$es_de_config" "SplashScreenProgressBarColor" "es_settings") ]]; then + add_setting_line "$es_de_config" 'name="SplashScreenProgressBarColor" value="C858E6FF"' "es_settings" + fi + if ! [[ $(get_setting_value "$es_de_config" "SplashScreenProgressBarColor" "es_settings") == "C858E6FF" ]]; then + log i "0.10.10b Upgrade - Postmove: ES-DE - Default RetroDECK splash screen progress bar color is set, fixing it in ES-DE config" + set_setting_value "$es_de_config" "SplashScreenProgressBarColor" "C858E6FF" "es_settings" + fi +fi + diff --git a/es-de/rd_assets/rd_config/es_settings.xml b/es-de/rd_assets/rd_config/es_settings.xml index d7d48653..e53b067e 100644 --- a/es-de/rd_assets/rd_config/es_settings.xml +++ b/es-de/rd_assets/rd_config/es_settings.xml @@ -166,6 +166,7 @@ + diff --git a/melonds/component_launcher.sh b/melonds/component_launcher.sh index 10b577e8..0ae0f382 100755 --- a/melonds/component_launcher.sh +++ b/melonds/component_launcher.sh @@ -4,9 +4,9 @@ component_name="$(basename "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")" component_path="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)" -export LD_LIBRARY_PATH="$rd_shared_libs:$rd_shared_libs/org.gnome.Platform/49/:${DEFAULT_LD_LIBRARY_PATH}" -export QT_PLUGIN_PATH="${QT_PLUGIN_PATH}" -export QT_QPA_PLATFORM_PLUGIN_PATH="${QT_QPA_PLATFORM_PLUGIN_PATH}" +export LD_LIBRARY_PATH="$component_path/lib:$rd_shared_libs/org.kde.Platform/6.10/:${DEFAULT_LD_LIBRARY_PATH}" +export QT_PLUGIN_PATH="$rd_shared_libs/org.kde.Platform/6.10/plugins/:${QT_PLUGIN_PATH}" +export QT_QPA_PLATFORM_PLUGIN_PATH="$rd_shared_libs/org.kde.Platform/6.10/plugins/platforms/:${QT_QPA_PLATFORM_PLUGIN_PATH}" log i "RetroDECK is now launching $component_name" log d "Library path is: $LD_LIBRARY_PATH" diff --git a/melonds/component_prepare.sh b/melonds/component_prepare.sh index b3e0b786..b7e19931 100755 --- a/melonds/component_prepare.sh +++ b/melonds/component_prepare.sh @@ -11,14 +11,23 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands create_dir -d "$XDG_CONFIG_HOME/melonDS/" cp -fv "$component_config/melonDS.toml" "$melonds_config" + + create_dir "$saves_path/nds/melonds" + create_dir "$states_path/nds/melonds" + dir_prep "$bios_path" "$XDG_CONFIG_HOME/melonDS/bios" + set_setting_value "$melonds_config" "BIOS9Path" "\"$bios_path/bios9.bin\"" "melonds" "DS" set_setting_value "$melonds_config" "BIOS7Path" "\"$bios_path/bios7.bin\"" "melonds" "DS" set_setting_value "$melonds_config" "FirmwarePath" "\"$bios_path/firmware.bin\"" "melonds" "DS" + + set_setting_value "$melonds_config" "NANDPath" "\"$bios_path/dsi_nand.bin\"" "melonds" "DSi" + set_setting_value "$melonds_config" "BIOS7Path" "\"$bios_path/dsi_bios7.bin\"" "melonds" "DSi" + set_setting_value "$melonds_config" "BIOS9Path" "\"$bios_path/dsi_bios9.bin\"" "melonds" "DSi" + set_setting_value "$melonds_config" "FirmwarePath" "\"$bios_path/dsi_firmware.bin\"" "melonds" "DSi" + set_setting_value "$melonds_config" "SaveFilePath" "\"$saves_path/nds/melonds\"" "melonds" "Instance0" set_setting_value "$melonds_config" "SavestatePath" "\"$states_path/nds/melonds\"" "melonds" "Instance0" - create_dir "$saves_path/nds/melonds" - create_dir "$states_path/nds/melonds" - dir_prep "$bios_path" "$XDG_CONFIG_HOME/melonDS/bios" + fi if [[ "$action" == "postmove" ]]; then # Run only post-move commands @@ -27,9 +36,16 @@ if [[ "$action" == "postmove" ]]; then # Run only post-move commands log i "----------------------" dir_prep "$bios_path" "$XDG_CONFIG_HOME/melonDS/bios" + set_setting_value "$melonds_config" "BIOS9Path" "\"$bios_path/bios9.bin\"" "melonds" "DS" set_setting_value "$melonds_config" "BIOS7Path" "\"$bios_path/bios7.bin\"" "melonds" "DS" set_setting_value "$melonds_config" "FirmwarePath" "\"$bios_path/firmware.bin\"" "melonds" "DS" + + set_setting_value "$melonds_config" "NANDPath" "\"$bios_path/dsi_nand.bin\"" "melonds" "DSi" + set_setting_value "$melonds_config" "BIOS7Path" "\"$bios_path/dsi_bios7.bin\"" "melonds" "DSi" + set_setting_value "$melonds_config" "BIOS9Path" "\"$bios_path/dsi_bios9.bin\"" "melonds" "DSi" + set_setting_value "$melonds_config" "FirmwarePath" "\"$bios_path/dsi_firmware.bin\"" "melonds" "DSi" + set_setting_value "$melonds_config" "SaveFilePath" "\"$saves_path/nds/melonds\"" "melonds" "Instance0" set_setting_value "$melonds_config" "SavestatePath" "\"$states_path/nds/melonds\"" "melonds" "Instance0" fi diff --git a/melonds/component_recipe.json b/melonds/component_recipe.json index 734ae8cf..b9edfe77 100755 --- a/melonds/component_recipe.json +++ b/melonds/component_recipe.json @@ -12,6 +12,16 @@ "source": "bin", "dest": "bin" }, + { + "type": "dir", + "source": "lib", + "dest": "lib" + }, + { + "type": "dir", + "source": "share/licenses/net.kuribo64.melonDS/", + "dest": "docs" + }, { "type": "create", "dest": "component_version", @@ -55,19 +65,51 @@ ], "libs": [ { - "library": "libevdev.so.2", - "runtime_name": "org.gnome.Platform", - "runtime_version": "49", + "library": "libQt6Multimedia.so.6", + "runtime_name": "org.kde.Platform", + "runtime_version": "6.10", "dest": "shared-libs" }, { - "library": "libenet.so.7", - "source": "lib", + "library": "libQt6Network.so.6", + "runtime_name": "org.kde.Platform", + "runtime_version": "6.10", "dest": "shared-libs" }, { - "library": "libfaad.so.2", - "source": "lib", + "library": "libQt6Gui.so.6", + "runtime_name": "org.kde.Platform", + "runtime_version": "6.10", + "dest": "shared-libs" + }, + { + "library": "libQt6DBus.so.6", + "runtime_name": "org.kde.Platform", + "runtime_version": "6.10", + "dest": "shared-libs" + }, + { + "library": "libQt6Core.so.6", + "runtime_name": "org.kde.Platform", + "runtime_version": "6.10", + "dest": "shared-libs" + }, + { + "library": "libQt6Widgets.so.6", + "runtime_name": "org.kde.Platform", + "runtime_version": "6.10", + "dest": "shared-libs" + }, + { + "library": "libQt6WaylandClient.so.6", + "runtime_name": "org.kde.Platform", + "runtime_version": "6.10", + "dest": "shared-libs" + }, + { + "library": "libQt6XcbQpa.so.6", + "runtime_name": "org.kde.Platform", + "runtime_version": "6.10", "dest": "shared-libs" } ] diff --git a/melonds/component_update.sh b/melonds/component_update.sh index 73bd91b9..9f59a710 100644 --- a/melonds/component_update.sh +++ b/melonds/component_update.sh @@ -4,6 +4,15 @@ # These actions happen conditionally based on the version being upgraded ######################################################################### +if [[ $(check_version_is_older_than "$version_being_updated" "0.10.10b") == "true" ]]; then + + log i "0.10.10b Upgrade - MelonDS: Reset" + + prepare_component "reset" "melonds" + +fi + + if [[ $(check_version_is_older_than "$version_being_updated" "0.10.1b") == "true" ]]; then log i "0.10.1b Upgrade - Fix Bios Path: MelonDS" diff --git a/melonds/rd_assets/rd_config/melonDS.toml b/melonds/rd_assets/rd_config/melonDS.toml index 7ac1ec4a..ebec8059 100644 --- a/melonds/rd_assets/rd_config/melonDS.toml +++ b/melonds/rd_assets/rd_config/melonDS.toml @@ -1,69 +1,51 @@ -RecentROM = [] -SlowmoFPS = 30.0 -TargetFPS = 60.0 +LastROMFolder = "" +LastBIOSFolder = "" +PauseLostFocus = true FastForwardFPS = 1000.0 +RecentROM = [""] UITheme = "" +SlowmoFPS = 30.0 +TargetFPS = 60.0 AudioSync = false LimitFPS = true -PauseLostFocus = true [Instance0] +CheatFilePath = "" JoystickID = 0 SavestatePath = "RETRODECKSTATESDIR/nds/melonds" SaveFilePath = "RETRODECKSAVESDIR/nds/melonds" EnableCheats = false +[Instance0.DS] +[Instance0.DS.Battery] +LevelOkay = true + [Instance0.Window2] Enabled = false -[Instance0.Joystick] -HK_GuitarGripBlue = -1 -HK_GuitarGripYellow = -1 -HK_GuitarGripGreen = -1 -HK_SlowMoToggle = -1 -HK_Lid = -1 -Y = 3 -HK_FrameStep = -1 -HK_SolarSensorIncrease = -1 -HK_GuitarGripRed = -1 -L = 4 -R = 5 -Up = 257 -HK_FullscreenToggle = -1 -HK_SlowMo = -1 -HK_Pause = -1 -Right = 258 -Start = 7 -Select = 6 -X = 2 -B = 1 -Down = 260 -A = 0 -HK_Mic = -1 -HK_FastForward = -1 -HK_FrameLimitToggle = -1 -Left = 264 -HK_SwapScreens = -1 -HK_SwapScreenEmphasis = -1 -HK_Reset = -1 -HK_PowerButton = -1 -HK_VolumeDown = -1 -HK_SolarSensorDecrease = -1 -HK_VolumeUp = -1 -HK_FastForwardToggle = -1 - [Instance0.Keyboard] -HK_GuitarGripBlue = -1 -HK_GuitarGripYellow = -1 -HK_GuitarGripGreen = -1 -HK_SlowMoToggle = -1 -HK_Lid = 134217804 +HK_Reset = 67108946 +HK_PowerButton = -1 +HK_SwapScreenEmphasis = 67108940 +HK_SwapScreens = 83886081 +Left = -1 Y = -1 HK_FrameStep = -1 HK_SolarSensorIncrease = 671088683 -HK_GuitarGripRed = -1 +A = -1 L = -1 R = -1 +HK_GuitarGripRed = -1 +HK_VolumeDown = -1 +HK_GuitarGripBlue = -1 +HK_Lid = 134217804 +HK_SolarSensorDecrease = 671088685 +HK_VolumeUp = -1 +HK_GuitarGripGreen = -1 +HK_SlowMoToggle = -1 +HK_FastForwardToggle = 603979819 +HK_GuitarGripYellow = -1 +HK_FrameLimitToggle = -1 Up = -1 HK_FullscreenToggle = 83886084 HK_SlowMo = -1 @@ -74,29 +56,55 @@ Select = -1 X = -1 B = -1 Down = -1 -A = -1 HK_Mic = 134217808 -HK_FastForward = 603979819 -HK_FrameLimitToggle = -1 -Left = -1 -HK_SwapScreens = 83886081 -HK_SwapScreenEmphasis = -1 -HK_Reset = 67108946 +HK_FastForward = -1 + +[Instance0.Joystick] +HK_Reset = -1 HK_PowerButton = -1 +HK_SwapScreenEmphasis = -1 +HK_SwapScreens = -1 +Left = 264 +Y = 2 +HK_FrameStep = -1 +HK_SolarSensorIncrease = -1 +A = 1 +L = 4 +R = 5 +HK_GuitarGripRed = -1 HK_VolumeDown = -1 -HK_SolarSensorDecrease = 671088685 +HK_GuitarGripBlue = -1 +HK_Lid = -1 +HK_SolarSensorDecrease = -1 HK_VolumeUp = -1 +HK_GuitarGripGreen = -1 +HK_SlowMoToggle = -1 HK_FastForwardToggle = -1 +HK_GuitarGripYellow = -1 +HK_FrameLimitToggle = -1 +Up = 257 +HK_FullscreenToggle = -1 +HK_SlowMo = -1 +HK_Pause = -1 +Right = 258 +Start = 7 +Select = 6 +X = 3 +B = 0 +Down = 260 +HK_Mic = -1 +HK_FastForward = -1 -[Instance0.Window3] -Enabled = false +[Instance0.Audio] +DSiVolumeSync = false +Volume = 256 [Instance0.Window0] Enabled = true ScreenFilter = false ShowOSD = true ScreenAspectTop = 0 -IntegerScaling = true +IntegerScaling = false ScreenSizing = 3 ScreenSwap = false Geometry = "AdnQywADAAAAAAAAAAAAAAAAAv8AAAGhAAAAAAAAAAAAAAL/AAABoQAAAAAAAAAAB4AAAAAAAAAAAAAAAv8AAAGh" @@ -105,19 +113,28 @@ ScreenGap = 0 ScreenAspectBot = 0 ScreenRotation = 0 -[Instance0.Audio] -DSiVolumeSync = false -Volume = 256 - -[Instance0.DS] -[Instance0.DS.Battery] -LevelOkay = true +[Instance0.Window3] +Enabled = false [Instance0.DSi] [Instance0.DSi.Battery] Charging = true Level = 15 +[Instance0.RTC] +Offset = 0 + +[Instance0.Gdb] +Enabled = false + +[Instance0.Gdb.ARM7] +Port = 3334 +BreakOnStartup = false + +[Instance0.Gdb.ARM9] +Port = 3333 +BreakOnStartup = false + [Instance0.Firmware] FavouriteColour = 0 BirthdayDay = 4 @@ -129,31 +146,50 @@ OverrideSettings = false [Instance0.Window1] Enabled = false -[Mouse] -HideSeconds = 5 -Hide = true - [Mic] WavPath = "" Device = "" InputType = 1 +[Mouse] +HideSeconds = 5 +Hide = true + +[LAN] +DirectMode = false + +[Audio] +Interpolation = 0 +BitDepth = 0 + +[DS] +FirmwarePath = "RETRODECKBIOSDIR/firmware.bin" +BIOS7Path = "RETRODECKBIOSDIR/bios7.bin" +BIOS9Path = "RETRODECKBIOSDIR/bios9.bin" + +[Emu] +ExternalBIOSEnable = true +DirectBoot = true +ConsoleType = 0 + [Savestate] RelocSRAM = false +[MP] +RecvTimeout = 25 +AudioMode = 1 + [3D] Renderer = 1 [3D.GL] -BetterPolygons = false -ScaleFactor = 1 +BetterPolygons = true +ScaleFactor = 3 +HiresCoordinates = true [3D.Soft] Threaded = true -[LAN] -DirectMode = false - [Screen] VSyncInterval = 1 VSync = false @@ -167,28 +203,12 @@ BranchOptimisations = true MaxBlockSize = 32 Enable = false -[Audio] -Interpolation = 0 - -[Emu] -ExternalBIOSEnable = true -DirectBoot = true -ConsoleType = 0 - -[DS] -FirmwarePath = "RETRODECKBIOSDIR/firmware.bin" -BIOS7Path = "RETRODECKBIOSDIR/bios7.bin" -BIOS9Path = "RETRODECKBIOSDIR/bios9.bin" - -[DLDI] -FolderSync = false -ReadOnly = false -ImagePath = "dldi.bin" -ImageSize = 0 -Enable = false - [DSi] -NANDPath = "" +NANDPath = "RETRODECKBIOSDIR/dsi_nand.bin" +BIOS7Path = "RETRODECKBIOSDIR/dsi_bios7.bin" +BIOS9Path = "RETRODECKBIOSDIR/dsi_bios9.bin" +FirmwarePath = "RETRODECKBIOSDIR/dsi_firmware.bin" +FullBIOSBoot = false [DSi.Camera1] DeviceName = "" @@ -202,14 +222,22 @@ ImagePath = "" XFlip = false InputType = 0 +[DSi.DSP] +HLE = true + [DSi.SD] FolderSync = false ReadOnly = false ImagePath = "dsisd.bin" ImageSize = 0 Enable = false +FolderPath = "" -[MP] -RecvTimeout = 25 -AudioMode = 1 +[DLDI] +FolderSync = false +ReadOnly = false +ImagePath = "dldi.bin" +ImageSize = 0 +Enable = false +FolderPath = "" diff --git a/ppsspp/component_prepare.sh b/ppsspp/component_prepare.sh index 8e0650a8..4fbe87f2 100755 --- a/ppsspp/component_prepare.sh +++ b/ppsspp/component_prepare.sh @@ -19,6 +19,7 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands dir_prep "$shaders_path/PPSSPP" "$ppsspp_shaders_path" dir_prep "$mods_path/PPSSPP/PLUGINS" "$ppsspp_mods_path" dir_prep "$logs_path/PPSSPP" "$ppsspp_logs_path" + dir_prep "$storage_path/PPSSPP/GAME" "$XDG_CONFIG_HOME/ppsspp/PSP/GAME" log i "Preparing PPSSPP cheats" create_dir -d "$cheats_path/PPSSPP" @@ -30,7 +31,7 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands log i "PPSSPP cheats backed up to $backup_file" fi - unzip -q -o -j "$component_extras/CWCheat-Database-Plus--master.zip" "*/cheat.db" -d "$cheats_path/PPSSPP" + cp -fv "$component_extras/cheat.db" "$cheats_path/PPSSPP" log i "Preparing PPSSPP BIOS" create_dir -d "$bios_path/PPSSPP" @@ -50,4 +51,6 @@ if [[ "$action" == "postmove" ]]; then # Run only post-move commands dir_prep "$cheats_path/PPSSPP" "$ppsspp_cheats_path" dir_prep "$mods_path/PPSSPP/PLUGINS" "$ppsspp_mods_path" dir_prep "$logs_path/PPSSPP" "$ppsspp_logs_path" + dir_prep "$storage_path/PPSSPP/GAME" "$XDG_CONFIG_HOME/ppsspp/PSP/GAME" + fi diff --git a/ppsspp/component_recipe.json b/ppsspp/component_recipe.json index be413b9f..05fb9ca7 100755 --- a/ppsspp/component_recipe.json +++ b/ppsspp/component_recipe.json @@ -78,14 +78,14 @@ ] }, { - "source_url": "https://github.com/Zaykus/PSPemu/releases/download/{VERSION}/CWCheat-Database-Plus--master.zip", + "source_url": "https://raw.githubusercontent.com/Saramagrean/CWCheat-Database-Plus-/refs/heads/master/cheat.db", "version": "latest", - "source_type": "github-release", + "source_type": "http", "extraction_type": "local", "assets": [ { "type": "file", - "source": "$WORKDIR/CWCheat-Database-Plus--master.zip", + "source": "$WORKDIR/cheat.db", "dest": "rd_extras" } ] @@ -103,4 +103,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/ppsspp/component_update.sh b/ppsspp/component_update.sh index efe367ae..2d077c4b 100644 --- a/ppsspp/component_update.sh +++ b/ppsspp/component_update.sh @@ -60,3 +60,13 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.10.7b") == "true fi +if [[ $(check_version_is_older_than "$version_being_updated" "0.10.10b") == "true" ]]; then + + log i "0.10.10b Upgrade - PPSSPP: GAME" + + create_dir -d "$storage_path/PPSSPP/GAME" + cp -fv "$XDG_CONFIG_HOME/ppsspp/PSP/GAME/"* "$storage_path/PPSSPP/GAME" + dir_prep "$storage_path/PPSSPP/GAME" "$XDG_CONFIG_HOME/ppsspp/PSP/GAME" + +fi + diff --git a/retroarch/component_manifest.json b/retroarch/component_manifest.json index ee32ae6b..6c7db847 100644 --- a/retroarch/component_manifest.json +++ b/retroarch/component_manifest.json @@ -2645,7 +2645,12 @@ }, { "filename": "naomi2.zip", - "md5": "9b85e0de6ef359e5006c9b79a5a266b0", + "md5": [ + "c50072cbab75673e1b1a6b94355e6fa8", + "843c0d51237dc945f57237c4b9872b1d", + "339c59ece7d4d6803880c91bbb44ac93", + "dfaae8d206ffb390ed1cf9529ccc123d" + ], "system": "dreamcast", "description": "Naomi 2 BIOS", "paths": "$bios_path/dc" @@ -4376,7 +4381,7 @@ }, { "filename": "yrw801.rom", - "md5": "32760893ce06db3e3930627755ba065c", + "md5": "42af93619160ef2116416f74a6cb12f2", "system": "msx", "description": "YR-W801 system ROM" }, @@ -5109,4 +5114,4 @@ ] } } -} +} \ No newline at end of file diff --git a/retroarch/component_prepare.sh b/retroarch/component_prepare.sh index 318ac5a7..b23efec4 100755 --- a/retroarch/component_prepare.sh +++ b/retroarch/component_prepare.sh @@ -150,18 +150,54 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands set_setting_value "$retroarch_config_scummvm" "savepath" "$saves_path/scummvm" "libretro_scummvm" "scummvm" set_setting_value "$retroarch_config_scummvm" "browser_lastpath" "$roms_path/scummvm" "libretro_scummvm" "scummvm" - # Texture Packs + # PPSSPP + log i "-----------------------------------------------------------" + log i "Prepearing PPSSPP LIBRETRO" + log i "-----------------------------------------------------------" + + dir_prep "$texture_packs_path/retroarch-core/PPSSPP/TEXTURES" "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/TEXTURES" + dir_prep "$mods_path/retroarch-core/PPSSPP/PLUGINS" "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/PLUGINS" + dir_prep "$shaders_path/retroarch-core/PPSSPP/shaders" "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/shaders" + dir_prep "$storage_path/retroarch-core/PPSSPP/GAME" "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/GAME" + + # Dolphin + log i "-----------------------------------------------------------" + log i "Prepearing Dolphin LIBRETRO" + log i "-----------------------------------------------------------" + + dir_prep "$texture_packs_path/retroarch-core/Dolphin/Textures" "$XDG_CONFIG_HOME/retroarch/saves/dolphin-emu/User/Load/Textures/" + dir_prep "$mods_path/retroarch-core/Dolphin/GraphicMods" "$XDG_CONFIG_HOME/retroarch/saves/dolphin-emu/User/Load/GraphicMods" + + # Dolphin + log i "-----------------------------------------------------------" + log i "Prepearing Citra LIBRETRO" + log i "-----------------------------------------------------------" + + dir_prep "$texture_packs_path/retroarch-core/Citra/textures" "$XDG_CONFIG_HOME/retroarch/saves/Citra/load/textures" + dir_prep "$mods_path/retroarch-core/Citra/mods" "$XDG_CONFIG_HOME/retroarch/saves/Citra/load/mods" + + # Mesen + log i "-----------------------------------------------------------" + log i "Prepearing Mesen LIBRETRO" + log i "-----------------------------------------------------------" + dir_prep "$texture_packs_path/retroarch-core/Mesen/HdPacks" "$bios_path/HdPacks" + + # Mupen64Plus + log i "-----------------------------------------------------------" + log i "Prepearing Mupen64Plus LIBRETRO" + log i "-----------------------------------------------------------" + dir_prep "$texture_packs_path/retroarch-core/Mupen64Plus/cache" "$bios_path/Mupen64plus/cache" dir_prep "$texture_packs_path/retroarch-core/Mupen64Plus/hires_texture" "$bios_path/Mupen64plus/hires_texture" - dir_prep "$texture_packs_path/retroarch-core/Citra/textures" "$XDG_CONFIG_HOME/retroarch/saves/Citra/load/textures" - dir_prep "$texture_packs_path/retroarch-core/Dolphin/Textures" "$XDG_CONFIG_HOME/retroarch/saves/dolphin-emu/User/Load/Textures/" - dir_prep "$texture_packs_path/retroarch-core/PPSSPP/TEXTURES" "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/TEXTURES" + + # Flycast + log i "-----------------------------------------------------------" + log i "Prepearing Flycast LIBRETRO" + log i "-----------------------------------------------------------" + dir_prep "$texture_packs_path/retroarch-core/Flycast/textures" "$bios_path/dc/textures" - # Mods - dir_prep "$mods_path/retroarch-core/Citra/mods" "$XDG_CONFIG_HOME/retroarch/saves/Citra/load/mods" - dir_prep "$mods_path/retroarch-core/Dolphin/GraphicMods" "$XDG_CONFIG_HOME/retroarch/saves/dolphin-emu/User/Load/GraphicMods" fi if [[ "$action" == "postmove" ]]; then # Run only post-move commands @@ -196,6 +232,7 @@ if [[ "$action" == "postmove" ]]; then # Run only post-move commands # Shaders dir_prep "$shaders_path/retroarch-core/fbneo/blend" "$bios_path/fbneo/blend" + dir_prep "$shaders_path/retroarch-core/PPSSPP/shaders" "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/shaders" # Mods dir_prep "$mods_path/retroarch-core/Citra/mods" "$XDG_CONFIG_HOME/retroarch/saves/Citra/load/mods" @@ -203,6 +240,7 @@ if [[ "$action" == "postmove" ]]; then # Run only post-move commands dir_prep "$mods_path/retroarch-core/fbneo/patched" "$bios_path/fbneo/patched" dir_prep "$mods_path/retroarch-core/fbneo/ips" "$bios_path/fbneo/ips" dir_prep "$mods_path/retroarch-core/fbneo/romdata" "$bios_path/fbneo/romdata" + dir_prep "$mods_path/retroarch-core/PPSSPP/PLUGINS" "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/PLUGINS" # Settings set_setting_value "$retroarch_config" "savefile_directory" "$saves_path" "retroarch" @@ -222,4 +260,9 @@ if [[ "$action" == "postmove" ]]; then # Run only post-move commands set_setting_value "$retroarch_config" "video_filter_dir" "$shaders_path/retroarch/filters/video" "retroarch" set_setting_value "$retroarch_config" "video_shader_dir" "$shaders_path/retroarch/shaders" "retroarch" set_setting_value "$retroarch_config" "overlay_directory" "$borders_path/retroarch" "retroarch" + + # DLC / Storage + + dir_prep "$storage_path/retroarch-core/PPSSPP/GAME" "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/GAME" + fi diff --git a/retroarch/component_recipe.json b/retroarch/component_recipe.json index 669e3887..4cdd53a0 100755 --- a/retroarch/component_recipe.json +++ b/retroarch/component_recipe.json @@ -28,7 +28,7 @@ }, { "type": "merge", - "source": "$REPO_ROOT/$COMPONENT_NAME/rd_assets/rd_extras/genesis-plus-gx-expanded-rom-size-paprium_libretro", + "source": "$REPO_ROOT/$COMPONENT_NAME/rd_assets/rd_extras/genesis_plus_gx_paprium_libretro", "dest": "$WORKDIR/cores" }, { diff --git a/retroarch/component_update.sh b/retroarch/component_update.sh index 0add2e01..5cc06d4c 100644 --- a/retroarch/component_update.sh +++ b/retroarch/component_update.sh @@ -129,6 +129,24 @@ if [[ $(check_version_is_older_than "$version_being_updated" "0.10.9b") == "true dir_prep "$cheats_path/retroarch-core/LRPS2/cheats_ws" "$bios_path/pcsx2/cheats_ws" dir_prep "$cheats_path/retroarch-core/LRPS2/cheats_ni" "$bios_path/pcsx2/cheats_ni" dir_prep "$texture_packs_path/retroarch-core/LRPS2/textures" "$bios_path/pcsx2/textures" + +fi + +if [[ $(check_version_is_older_than "$version_being_updated" "0.10.10b") == "true" ]]; then + + dir_prep "$mods_path/retroarch-core/PPSSPP/PLUGINS" "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/PLUGINS" + dir_prep "$shaders_path/retroarch-core/PPSSPP/shaders" "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/shaders" + + create_dir -d "$storage_path/retroarch-core/PPSSPP/GAME" + cp -fv "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/GAME/"* "$storage_path/retroarch-core/PPSSPP/GAME" + dir_prep "$storage_path/retroarch-core/PPSSPP/GAME" "$XDG_CONFIG_HOME/retroarch/saves/PPSSPP/PSP/GAME" + + set_setting_value "$retroarch_config_core_options" "melonds_opengl_better_polygons" "enabled" "retroarch" + set_setting_value "$retroarch_config_core_options" "melonds_opengl_filtering" "nearest" "retroarch" + set_setting_value "$retroarch_config_core_options" "melonds_opengl_resolution" "3" "retroarch" + delete_setting "$retroarch_config_core_options" "melonds_opengl_renderer" "retroarch" + add_setting "$retroarch_config_core_options" "melonds_number_of_screen_layouts" "8" "retroarch" + add_setting "$retroarch_config_core_options" "melonds_render_mode" "opengl" "retroarch" fi ####################################### diff --git a/retroarch/rd_assets/rd_config/retroarch-core-options.cfg b/retroarch/rd_assets/rd_config/retroarch-core-options.cfg index 232758b4..9a4e7635 100644 --- a/retroarch/rd_assets/rd_config/retroarch-core-options.cfg +++ b/retroarch/rd_assets/rd_config/retroarch-core-options.cfg @@ -394,10 +394,11 @@ melonds_jit_branch_optimisations = "enabled" melonds_jit_enable = "enabled" melonds_jit_fast_memory = "enabled" melonds_jit_literal_optimisations = "enabled" -melonds_opengl_better_polygons = "disabled" +melonds_number_of_screen_layouts = "8" +melonds_opengl_better_polygons = "enabled" melonds_opengl_filtering = "nearest" -melonds_opengl_renderer = "disabled" -melonds_opengl_resolution = "1x native (256x192)" +melonds_opengl_resolution = "3" +melonds_render_mode = "opengl" melonds_randomize_mac_address = "disabled" melonds_screen_gap = "0" melonds_screen_layout = "Top/Bottom" diff --git a/retroarch/rd_assets/rd_extras/genesis-plus-gx-expanded-rom-size-paprium_libretro/genesis-plus-gx-expanded-rom-size-paprium_libretro.info b/retroarch/rd_assets/rd_extras/genesis_plus_gx_paprium_libretro/genesis_plus_gx_paprium_libretro.info similarity index 77% rename from retroarch/rd_assets/rd_extras/genesis-plus-gx-expanded-rom-size-paprium_libretro/genesis-plus-gx-expanded-rom-size-paprium_libretro.info rename to retroarch/rd_assets/rd_extras/genesis_plus_gx_paprium_libretro/genesis_plus_gx_paprium_libretro.info index e38df008..4729df41 100644 --- a/retroarch/rd_assets/rd_extras/genesis-plus-gx-expanded-rom-size-paprium_libretro/genesis-plus-gx-expanded-rom-size-paprium_libretro.info +++ b/retroarch/rd_assets/rd_extras/genesis_plus_gx_paprium_libretro/genesis_plus_gx_paprium_libretro.info @@ -1,12 +1,12 @@ # Software Information -display_name = "Sega - MS/GG/MD/CD (Genesis Plus GX) Expanded" +display_name = "Sega - Paprium (Genesis Plus GX)" authors = "Charles McDonald|Eke-Eke" supported_extensions = "mdx|md|smd|gen|bin|cue|iso|sms|bms|gg|sg|68k|sgd|chd|m3u" -corename = "Genesis Plus GX" +corename = "Genesis Plus GX (Paprium)" categories = "Emulator" license = "Non-commercial" permissions = "" -display_version = "v1.7.5" +display_version = "v1.7.4" # Hardware Information manufacturer = "Sega" @@ -68,4 +68,4 @@ firmware11_path = "ggenie.bin" firmware11_opt = "true" notes = "(!) sk2chip.bin (md5): b4e76e416b887f4e7413ba76fa735f16|(!) sk.bin (md5): 4ea493ea4e9f6c9ebfccbdb15110367e" -description = "A port of the Genesis Plus GX emulator with Expanded MAXROMSIZE to libretro. Originally designed to run on the Wii console via homebrew, Genesis Plus GX was one of the first cores ported to libretro, and it has always been the first choice for any 8- and 16-bit Sega consoles, from Master System to Game Gear to Genesis/Mega Drive to Sega CD. Only the 32X is not supported. The core is both fast and highly accurate and it benefits from a tight and feature-filled integration with libretro." +description = "A port of the Genesis Plus GX emulator to libretro. Originally designed to run on the Wii console via homebrew, Genesis Plus GX was one of the first cores ported to libretro, and it has always been the first choice for any 8- and 16-bit Sega consoles, from Master System to Game Gear to Genesis/Mega Drive to Sega CD. Only the 32X is not supported. The core is both fast and highly accurate and it benefits from a tight and feature-filled integration with libretro." diff --git a/retroarch/rd_assets/rd_extras/genesis-plus-gx-expanded-rom-size-paprium_libretro/genesis-plus-gx-expanded-rom-size-paprium_libretro.so b/retroarch/rd_assets/rd_extras/genesis_plus_gx_paprium_libretro/genesis_plus_gx_paprium_libretro.so old mode 100644 new mode 100755 similarity index 64% rename from retroarch/rd_assets/rd_extras/genesis-plus-gx-expanded-rom-size-paprium_libretro/genesis-plus-gx-expanded-rom-size-paprium_libretro.so rename to retroarch/rd_assets/rd_extras/genesis_plus_gx_paprium_libretro/genesis_plus_gx_paprium_libretro.so index 267bda3f..b3e3178f Binary files a/retroarch/rd_assets/rd_extras/genesis-plus-gx-expanded-rom-size-paprium_libretro/genesis-plus-gx-expanded-rom-size-paprium_libretro.so and b/retroarch/rd_assets/rd_extras/genesis_plus_gx_paprium_libretro/genesis_plus_gx_paprium_libretro.so differ diff --git a/rpcs3/component_launcher.sh b/rpcs3/component_launcher.sh index 0c4c7b2f..d87c5443 100755 --- a/rpcs3/component_launcher.sh +++ b/rpcs3/component_launcher.sh @@ -7,6 +7,7 @@ component_path="$(cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)" export LD_LIBRARY_PATH="$component_path/lib:${DEFAULT_LD_LIBRARY_PATH}" export QT_PLUGIN_PATH="${QT_PLUGIN_PATH}" export QT_QPA_PLATFORM_PLUGIN_PATH="${QT_QPA_PLATFORM_PLUGIN_PATH}" +unset FLATPAK_ID log i "RetroDECK is now launching $component_name" log d "Library path is: $LD_LIBRARY_PATH" diff --git a/solarus/component_recipe.json b/solarus/component_recipe.json index 409d9b93..ed031328 100755 --- a/solarus/component_recipe.json +++ b/solarus/component_recipe.json @@ -70,6 +70,11 @@ } ], "libs": [ + { + "library": "libsolarus.so.2.1.3", + "source": "usr/lib", + "dest": "shared-libs" + }, { "library": "libSDL2_image-2.0.so.0", "runtime_name": "org.kde.Platform", @@ -83,12 +88,7 @@ "dest": "shared-libs" }, { - "library": "libsolarus.so.2.0.4", - "source": "usr/lib", - "dest": "shared-libs" - }, - { - "library": "libluajit-5.1.so.2.1.0", + "library": "libluajit-5.1.so.2", "source": "usr/lib", "dest": "shared-libs" }, diff --git a/steam-rom-manager/component_functions.sh b/steam-rom-manager/component_functions.sh index b02120d2..46114b85 100755 --- a/steam-rom-manager/component_functions.sh +++ b/steam-rom-manager/component_functions.sh @@ -431,3 +431,12 @@ install_retrodeck_controller_profile_and_add_to_steam() { configurator_generic_dialog "RetroDeck Configurator - Steam Flatpak Warning" "You are using the Flatpak Version of Steam.\n\nTo allow RetroDECK to launch, Steam must be granted the following permission:\norg.freedesktop.Flatpak\n\nPlease read the RetroDECK wiki for instructions" fi } + +finit_install_controller_profile_dialog() { + if get_steam_user "get_type"; then + rd_zenity --question --no-wrap --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" --title "RetroDECK Initial Install - Add to Steam" --cancel-label="No" --ok-label "Yes" \ + --text="Would you like to install the RetroDECK Steam Controller Templates and add RetroDECK to Steam?\n\nNeeded for optimal controller support via Steam Input.\n\nHighly Recommended!" + else + return 1 + fi +} diff --git a/target_components_version_list.md b/target_components_version_list.md deleted file mode 100644 index e69de29b..00000000 diff --git a/vita3k/component_prepare.sh b/vita3k/component_prepare.sh index e9a0903b..cd02a836 100755 --- a/vita3k/component_prepare.sh +++ b/vita3k/component_prepare.sh @@ -12,7 +12,7 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands # NOTE: the component is writing in "." so it must be placed in the rw filesystem. A symlink of the binary is already placed in /app/bin/Vita3K rm -rf "$XDG_CONFIG_HOME/Vita3K" create_dir "$XDG_CONFIG_HOME/Vita3K" - cp -fv "$component_config/config.yml" "$vita3k_config" # component config + cp -fr "$component_config/"* "$XDG_CONFIG_HOME/Vita3K" create_dir "$storage_path/psvita/Vita3K/" cp -frv "$component_config/ux0" "$storage_path/psvita/Vita3K/" # User config set_setting_value "$vita3k_config" "pref-path" "$storage_path/psvita/Vita3K/" "vita3k" diff --git a/vita3k/component_recipe.json b/vita3k/component_recipe.json index d53c0722..83740041 100755 --- a/vita3k/component_recipe.json +++ b/vita3k/component_recipe.json @@ -13,8 +13,38 @@ }, { "type": "dir", - "source": "usr/share/Vita3K/", - "dest": "share/Vita3K/" + "source": "usr/share/Vita3K/gui-configs/", + "dest": "bin/gui-configs/" + }, + { + "type": "dir", + "source": "usr/share/Vita3K/shaders-builtin/", + "dest": "bin/shaders-builtin/" + }, + { + "type": "dir", + "source": "usr/share/Vita3K/translations/", + "dest": "bin/translations/" + }, + { + "type": "dir", + "source": "usr/translations/", + "dest": "bin/translations/" + }, + { + "type": "dir", + "source": "usr/share/VITA3K_APP_NAME/", + "dest": "bin/VITA3K_APP_NAME/" + }, + { + "type": "dir", + "source": "usr/share/doc/", + "dest": "docs" + }, + { + "type": "dir", + "source": "usr/plugins/", + "dest": "plugins" }, { "type": "dir", diff --git a/vita3k/rd_assets/rd_config/config.yml b/vita3k/rd_assets/rd_config/config.yml index 699dc661..b7a47283 100644 --- a/vita3k/rd_assets/rd_config/config.yml +++ b/vita3k/rd_assets/rd_config/config.yml @@ -1,23 +1,20 @@ --- -initial-setup: true +initial-setup: false gdbstub: false log-active-shaders: false log-uniforms: false log-compat-warn: false -validation-layer: false +validation-layer: true pstv-mode: false show-mode: false demo-mode: false -show-gui: false -show-info-bar: false apps-list-grid: false -display-system-apps: true stretch_the_display_area: false fullscreen_hd_res_pixel_perfect: true -show-live-area-screen: true -icon-size: 64 archive-log: false backend-renderer: Vulkan +custom-driver-name: "" +turbo-mode: false gpu-idx: 0 high-accuracy: true resolution-multiplier: 1 @@ -29,17 +26,19 @@ texture-cache: true async-pipeline-compilation: true show-compile-shaders: true hashless-texture-cache: false -import-textures: false +import-textures: true export-textures: false export-as-png: true +memory-mapping: double-buffer boot-apps-full-screen: true +show-live-area-screen: true audio-backend: SDL audio-volume: 100 ngs-enable: true sys-button: 1 sys-lang: 1 -sys-date-format: 2 -sys-time-format: 0 +sys-date-format: 1 +sys-time-format: 1 cpu-pool-size: 10 modules-mode: 0 delay-background: 4 @@ -51,51 +50,83 @@ pref-path: RETRODECKHOMEDIR/bios/Vita3K/ discord-rich-presence: false wait-for-debugger: false color-surface-debug: false -show-touchpad-cursor: true performance-overlay: false performance-overlay-detail: 0 performance-overlay-position: 0 screenshot-format: 1 disable-motion: false controller-analog-multiplier: 1 -keyboard-button-select: 229 -keyboard-button-start: 40 -keyboard-button-up: 82 -keyboard-button-right: 79 -keyboard-button-down: 81 -keyboard-button-left: 80 -keyboard-button-l1: 20 -keyboard-button-r1: 8 -keyboard-button-l2: 24 -keyboard-button-r2: 18 -keyboard-button-l3: 9 -keyboard-button-r3: 11 -keyboard-button-triangle: 25 -keyboard-button-circle: 6 -keyboard-button-cross: 27 -keyboard-button-square: 29 -keyboard-leftstick-left: 4 -keyboard-leftstick-right: 7 -keyboard-leftstick-up: 26 -keyboard-leftstick-down: 22 -keyboard-rightstick-left: 13 -keyboard-rightstick-right: 15 -keyboard-rightstick-up: 12 -keyboard-rightstick-down: 14 -keyboard-button-psbutton: 19 -keyboard-gui-toggle-gui: 10 -keyboard-gui-fullscreen: 68 -keyboard-gui-toggle-touch: 23 -keyboard-toggle-texture-replacement: 0 -keyboard-take-screenshot: 0 +keyboard-button-select: ShiftRight +keyboard-button-start: Enter +keyboard-button-up: ArrowUp +keyboard-button-right: ArrowRight +keyboard-button-down: ArrowDown +keyboard-button-left: ArrowLeft +keyboard-button-l1: KeyQ +keyboard-button-r1: KeyE +keyboard-button-l2: KeyU +keyboard-button-r2: KeyO +keyboard-button-l3: KeyF +keyboard-button-r3: KeyH +keyboard-button-triangle: KeyV +keyboard-button-circle: KeyC +keyboard-button-cross: KeyX +keyboard-button-square: KeyZ +keyboard-leftstick-left: KeyA +keyboard-leftstick-right: KeyD +keyboard-leftstick-up: KeyW +keyboard-leftstick-down: KeyS +keyboard-rightstick-left: KeyJ +keyboard-rightstick-right: KeyL +keyboard-rightstick-up: KeyI +keyboard-rightstick-down: KeyK +keyboard-button-psbutton: KeyP +keyboard-gui-fullscreen: Tab +keyboard-gui-toggle-touch: KeyT +keyboard-toggle-texture-replacement: Unbound +keyboard-take-screenshot: Unbound +keyboard-pinch-modifier: Unbound +keyboard-alternate-pinch-in: Unbound +keyboard-alternate-pinch-out: Unbound +keyboard-button-select-alt: Unbound +keyboard-button-start-alt: Unbound +keyboard-button-up-alt: Unbound +keyboard-button-right-alt: Unbound +keyboard-button-down-alt: Unbound +keyboard-button-left-alt: Unbound +keyboard-button-l1-alt: Unbound +keyboard-button-r1-alt: Unbound +keyboard-button-l2-alt: Unbound +keyboard-button-r2-alt: Unbound +keyboard-button-l3-alt: Unbound +keyboard-button-r3-alt: Unbound +keyboard-button-triangle-alt: Unbound +keyboard-button-circle-alt: Unbound +keyboard-button-cross-alt: Unbound +keyboard-button-square-alt: Unbound +keyboard-leftstick-left-alt: Unbound +keyboard-leftstick-right-alt: Unbound +keyboard-leftstick-up-alt: Unbound +keyboard-leftstick-down-alt: Unbound +keyboard-rightstick-left-alt: Unbound +keyboard-rightstick-right-alt: Unbound +keyboard-rightstick-up-alt: Unbound +keyboard-rightstick-down-alt: Unbound +keyboard-button-psbutton-alt: Unbound +keyboard-gui-fullscreen-alt: Unbound +keyboard-gui-toggle-touch-alt: Unbound +keyboard-toggle-texture-replacement-alt: Unbound +keyboard-take-screenshot-alt: Unbound +keyboard-pinch-modifier-alt: Unbound +keyboard-alternate-pinch-in-alt: Unbound +keyboard-alternate-pinch-out-alt: Unbound user-id: 00 -user-auto-connect: true +user-auto-connect: false user-lang: "" -display-info-message: true show-welcome: false -check-for-updates: false +warn-missing-firmware: true +check-for-updates-mode: 0 file-loading-delay: 0 -asia-font-support: false shader-cache: true spirv-shader: false fps-hack: true @@ -107,6 +138,14 @@ http-timeout-sleep-ms: 100 http-read-end-attempts: 10 http-read-end-sleep-ms: 250 adhoc-addr: 0 +front-camera-type: 0 +front-camera-id: "" +front-camera-image: "" +front-camera-color: 0 +back-camera-type: 0 +back-camera-id: "" +back-camera-image: "" +back-camera-color: 0 tracy-primitive-impl: false controller-binds: - 0 @@ -124,6 +163,13 @@ controller-binds: - 12 - 13 - 14 +controller-axis-binds: + - 0 + - 1 + - 2 + - 3 + - 4 + - 5 controller-led-color: [] lle-modules: diff --git a/vita3k/rd_assets/rd_config/gui-configs/CurrentSettings.ini b/vita3k/rd_assets/rd_config/gui-configs/CurrentSettings.ini new file mode 100644 index 00000000..4d6c4e49 --- /dev/null +++ b/vita3k/rd_assets/rd_config/gui-configs/CurrentSettings.ini @@ -0,0 +1,26 @@ +[GameList] +headerStateV2=@ByteArray() +iconCrop=0 +iconSize=25 +sortAsc=true +sortCol=1 +visibleColumnsV2=icon, title, title_id, version, category, compatibility, last_played, time_played, parental_level, size_on_disk + +[Logger] +fontFamily=DejaVu Sans Mono + +[MainWindow] +confirmExitApp=false +gamelistVisible=true +geometry=@ByteArray() +loggerVisible=true +mwState=@ByteArray() +titleBarsVisible=true +toolBarVisible=true +windowState=@ByteArray() + +[Meta] +currentStylesheet=dark + +[Settings] +geometry=@ByteArray() diff --git a/vita3k/rd_assets/rd_config/new_config.yml b/vita3k/rd_assets/rd_config/new_config.yml deleted file mode 100644 index 498ed4dc..00000000 --- a/vita3k/rd_assets/rd_config/new_config.yml +++ /dev/null @@ -1,181 +0,0 @@ ---- -initial-setup: false -gdbstub: false -log-active-shaders: false -log-uniforms: false -log-compat-warn: false -validation-layer: true -pstv-mode: false -show-mode: false -demo-mode: false -apps-list-grid: false -stretch_the_display_area: false -fullscreen_hd_res_pixel_perfect: false -archive-log: false -backend-renderer: Vulkan -custom-driver-name: "" -turbo-mode: false -gpu-idx: 0 -high-accuracy: true -resolution-multiplier: 1 -disable-surface-sync: true -screen-filter: Bilinear -v-sync: true -anisotropic-filtering: 1 -texture-cache: true -async-pipeline-compilation: true -show-compile-shaders: true -hashless-texture-cache: false -import-textures: false -export-textures: false -export-as-png: true -memory-mapping: double-buffer -boot-apps-full-screen: true -show-live-area-screen: false -audio-backend: SDL -audio-volume: 100 -ngs-enable: true -sys-button: 1 -sys-lang: 1 -sys-date-format: 1 -sys-time-format: 1 -cpu-pool-size: 10 -modules-mode: 0 -delay-background: 4 -delay-start: 10 -background-alpha: 0.3 -log-level: 0 -cpu-opt: true -pref-path: RETRODECKHOMEDIR/bios/Vita3K/ -discord-rich-presence: false -wait-for-debugger: false -color-surface-debug: false -performance-overlay: false -performance-overlay-detail: 0 -performance-overlay-position: 0 -screenshot-format: 1 -disable-motion: false -controller-analog-multiplier: 1 -keyboard-button-select: ShiftRight -keyboard-button-start: Enter -keyboard-button-up: ArrowUp -keyboard-button-right: ArrowRight -keyboard-button-down: ArrowDown -keyboard-button-left: ArrowLeft -keyboard-button-l1: KeyQ -keyboard-button-r1: KeyE -keyboard-button-l2: KeyU -keyboard-button-r2: KeyO -keyboard-button-l3: KeyF -keyboard-button-r3: KeyH -keyboard-button-triangle: KeyV -keyboard-button-circle: KeyC -keyboard-button-cross: KeyX -keyboard-button-square: KeyZ -keyboard-leftstick-left: KeyA -keyboard-leftstick-right: KeyD -keyboard-leftstick-up: KeyW -keyboard-leftstick-down: KeyS -keyboard-rightstick-left: KeyJ -keyboard-rightstick-right: KeyL -keyboard-rightstick-up: KeyI -keyboard-rightstick-down: KeyK -keyboard-button-psbutton: KeyP -keyboard-gui-fullscreen: F11 -keyboard-gui-toggle-touch: KeyT -keyboard-toggle-texture-replacement: Unbound -keyboard-take-screenshot: Unbound -keyboard-pinch-modifier: Unbound -keyboard-alternate-pinch-in: Unbound -keyboard-alternate-pinch-out: Unbound -keyboard-button-select-alt: Unbound -keyboard-button-start-alt: Unbound -keyboard-button-up-alt: Unbound -keyboard-button-right-alt: Unbound -keyboard-button-down-alt: Unbound -keyboard-button-left-alt: Unbound -keyboard-button-l1-alt: Unbound -keyboard-button-r1-alt: Unbound -keyboard-button-l2-alt: Unbound -keyboard-button-r2-alt: Unbound -keyboard-button-l3-alt: Unbound -keyboard-button-r3-alt: Unbound -keyboard-button-triangle-alt: Unbound -keyboard-button-circle-alt: Unbound -keyboard-button-cross-alt: Unbound -keyboard-button-square-alt: Unbound -keyboard-leftstick-left-alt: Unbound -keyboard-leftstick-right-alt: Unbound -keyboard-leftstick-up-alt: Unbound -keyboard-leftstick-down-alt: Unbound -keyboard-rightstick-left-alt: Unbound -keyboard-rightstick-right-alt: Unbound -keyboard-rightstick-up-alt: Unbound -keyboard-rightstick-down-alt: Unbound -keyboard-button-psbutton-alt: Unbound -keyboard-gui-fullscreen-alt: Unbound -keyboard-gui-toggle-touch-alt: Unbound -keyboard-toggle-texture-replacement-alt: Unbound -keyboard-take-screenshot-alt: Unbound -keyboard-pinch-modifier-alt: Unbound -keyboard-alternate-pinch-in-alt: Unbound -keyboard-alternate-pinch-out-alt: Unbound -user-id: 00 -user-auto-connect: false -user-lang: "" -show-welcome: false -warn-missing-firmware: true -check-for-updates-mode: 0 -file-loading-delay: 0 -shader-cache: true -spirv-shader: false -fps-hack: true -current-ime-lang: 4 -psn-signed-in: 0 -http-enable: true -http-timeout-attempts: 50 -http-timeout-sleep-ms: 100 -http-read-end-attempts: 10 -http-read-end-sleep-ms: 250 -adhoc-addr: 0 -front-camera-type: 0 -front-camera-id: "" -front-camera-image: "" -front-camera-color: 0 -back-camera-type: 0 -back-camera-id: "" -back-camera-image: "" -back-camera-color: 0 -tracy-primitive-impl: false -controller-binds: - - 0 - - 1 - - 2 - - 3 - - 4 - - 5 - - 6 - - 7 - - 8 - - 9 - - 10 - - 11 - - 12 - - 13 - - 14 -controller-axis-binds: - - 0 - - 1 - - 2 - - 3 - - 4 - - 5 -controller-led-color: - [] -lle-modules: - [] -ime-langs: - - 4 -tracy-advanced-profiling-modules: - [] -...