Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2025-01-31 04:25:39 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/cooker-0.7.0b' into cooker-0.7.0b-icenine451

Browse source
This commit is contained in:
icenine451 2023-05-08 14:25:00 -04:00
parent abeb20fd97 ac25f5feee
commit 3156237a2e
9 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
emu-configs/defaults/citra/citra-qt-config.ini
View file

@ -332,7 +332,7 @@ Paths\moviePlaybackPath=
Paths\movieRecordPath=
Paths\recentFiles=@Invalid()
Paths\romsPath=
Paths\screenshotPath=
Paths\screenshotPath=RETRODECKHOMEDIR/screenshots
Paths\symbolsPath=
Paths\videoDumpingPath=
Shortcuts\Main%20Window\Advance%20Frame\Context=2

2
emu-configs/defaults/retroarch/retroarch.cfg
View file

@ -3071,7 +3071,7 @@ savestates_in_content_dir = "false"
scan_without_core_match = "false"
screen_brightness = "100"
screen_orientation = "0"
screenshot_directory = ":\screenshots"
screenshot_directory = "RETRODECKHOMEDIR/screenshots"
screenshots_in_content_dir = "false"
settings_show_accessibility = "true"
settings_show_achievements = "true"

2
emu-configs/defaults/yuzu/qt-config.ini
View file

@ -1011,7 +1011,7 @@ Paths\romsPath=
Paths\symbolsPath=
Screenshots\enable_screenshot_save_as=true
Screenshots\enable_screenshot_save_as\default=true
Screenshots\screenshot_path=/home/deck/.var/app/org.yuzu_emu.yuzu/data/yuzu/screenshots
Screenshots\screenshot_path=RETRODECKHOMEDIR/screenshots
Shortcuts\Main%20Window\Audio%20Mute\Unmute\Context=1
Shortcuts\Main%20Window\Audio%20Mute\Unmute\Context\default=true
Shortcuts\Main%20Window\Audio%20Mute\Unmute\Controller_KeySeq=Home+Dpad_Right

2
emu-configs/mame/mame.ini
View file

@ -28,7 +28,7 @@ cfg_directory /var/config/mame/cfg
nvram_directory /var/config/mame/nvram
input_directory /var/config/mame/inp
state_directory /var/config/mame/sta
snapshot_directory $HOME/retrodeck/screenshots
snapshot_directory RETRODECKHOMEDIR/screenshots
diff_directory /var/config/mame/diff
comment_directory /var/config/mame/comments
share_directory /var/config/mame/share

4
emu-configs/retroarch/retroarch-core-options.cfg
View file

@ -159,7 +159,6 @@ dolphin_wait_for_shaders = "disabled"
dolphin_widescreen = "enabled"
dolphin_widescreen_hack = "disabled"
dolphin_wiimote_continuous_scanning = "disabled"
dosbox_pure_savestate = "off"
duckstation_BIOS.PatchFastBoot = "true"
duckstation_BIOS.PathNTSCJ = "scph5500.bin"
duckstation_BIOS.PathNTSCU = "scph5501.bin"
@ -597,4 +596,5 @@ ppsspp_texture_replacement = "disabled"
ppsspp_texture_scaling_level = "Off"
ppsspp_texture_scaling_type = "xbrz"
ppsspp_texture_shader = "Off"
ppsspp_vertex_cache = "disabled"
ppsspp_vertex_cache = "disabled"
swanstation_GPU_Renderer = "Vulkan"

2
net.retrodeck.retrodeck.yml
View file

@ -777,6 +777,8 @@ modules:
- type: git
url: https://github.com/melonDS-emu/melonDS.git
commit: 430de6b2702bb93faa8c2004aff3fbd084db4a1e
- type: patch
path: rd-submodules/melonds/hotkeys.patch
# MELONDS - END

18
rd-submodules/melonds/hotkeys.patch Normal file
View file

@ -0,0 +1,18 @@
diff -au1r melonDS/src/frontend/qt_sdl/main.cpp melonDS/src/frontend/qt_sdl/main.cpp
--- melonDS/src/frontend/qt_sdl/main.cpp 2023-05-06 17:27:24.822375255 +0200
+++ melonDS/src/frontend/qt_sdl/main.cpp 2023-05-06 17:47:19.587498189 +0200
@@ -1467,3 +1467,3 @@
actSaveState[0] = submenu->addAction("File...");
- actSaveState[0]->setShortcut(QKeySequence(Qt::ShiftModifier | Qt::Key_F9));
+ actSaveState[0]->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_S));
actSaveState[0]->setData(QVariant(0));
@@ -1483,3 +1483,3 @@
actLoadState[0] = submenu->addAction("File...");
- actLoadState[0]->setShortcut(QKeySequence(Qt::Key_F9));
+ actLoadState[0]->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_A));
actLoadState[0]->setData(QVariant(0));
@@ -1489,3 +1489,3 @@
actUndoStateLoad = menu->addAction("Undo state load");
- actUndoStateLoad->setShortcut(QKeySequence(Qt::Key_F12));
+ actUndoStateLoad->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_8));
connect(actUndoStateLoad, &QAction::triggered, this, &MainWindow::onUndoStateLoad);

2
rd-submodules/retroarch

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

2
rd-submodules/shared-modules

@ -1 +1 @@
Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42
Subproject commit a337dd0c6b7209a316dc6fa142323972e128c85d