Xargon/RetroDECK
1
0
Fork 0
mirror of https://github.com/RetroDECK/RetroDECK.git synced 2024-11-25 15:35:38 +00:00
Code Issues Actions 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-06-08 09:00:05 -04:00
parent a81dec5221 81ce48dd99
commit c4f4c2f1a3
5 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
emu-configs/citra/qt-config.ini
View file

@ -395,7 +395,7 @@ Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq=Ctrl+1
Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq\default=false Shortcuts\Main%20Window\Increase%20Speed%20Limit\KeySeq\default=false
Shortcuts\Main%20Window\Load%20Amiibo\Context=3 Shortcuts\Main%20Window\Load%20Amiibo\Context=3
Shortcuts\Main%20Window\Load%20Amiibo\Context\default=true Shortcuts\Main%20Window\Load%20Amiibo\Context\default=true
Shortcuts\Main%20Window\Load%20Amiibo\KeySeq=Ctrl+M Shortcuts\Main%20Window\Load%20Amiibo\KeySeq=Alt+M
Shortcuts\Main%20Window\Load%20Amiibo\KeySeq\default=false Shortcuts\Main%20Window\Load%20Amiibo\KeySeq\default=false
Shortcuts\Main%20Window\Load%20File\Context=1 Shortcuts\Main%20Window\Load%20File\Context=1
Shortcuts\Main%20Window\Load%20File\Context\default=false Shortcuts\Main%20Window\Load%20File\Context\default=false
@ -451,7 +451,7 @@ Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq=
Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq\default=false Shortcuts\Main%20Window\Toggle%20Per-Game%20Speed\KeySeq\default=false
Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context=1 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context=1
Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context\default=true Shortcuts\Main%20Window\Toggle%20Screen%20Layout\Context\default=true
Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq=Alt+0 Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq=Ctrl+L
Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq\default=false Shortcuts\Main%20Window\Toggle%20Screen%20Layout\KeySeq\default=false
Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context=1 Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context=1
Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context\default=true Shortcuts\Main%20Window\Toggle%20Status%20Bar\Context\default=true

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

@ -1105,7 +1105,7 @@ Shortcuts\Main%20Window\Load\Remove%20Amiibo\Context=3
Shortcuts\Main%20Window\Load\Remove%20Amiibo\Context\default=true Shortcuts\Main%20Window\Load\Remove%20Amiibo\Context\default=true
Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq= Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq=
Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq\default=false Shortcuts\Main%20Window\Load\Remove%20Amiibo\Controller_KeySeq\default=false
Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq=Ctrl+M Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq=Alt+M
Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq\default=false Shortcuts\Main%20Window\Load\Remove%20Amiibo\KeySeq\default=false
Shortcuts\Main%20Window\Load\Remove%20Amiibo\Repeat=false Shortcuts\Main%20Window\Load\Remove%20Amiibo\Repeat=false
Shortcuts\Main%20Window\Load\Remove%20Amiibo\Repeat\default=true Shortcuts\Main%20Window\Load\Remove%20Amiibo\Repeat\default=true

12
net.retrodeck.retrodeck.yml
View file

@ -26,6 +26,10 @@ finish-args:
- --filesystem=xdg-run/app/com.discordapp.Discord:create - --filesystem=xdg-run/app/com.discordapp.Discord:create
# Dolphin # Dolphin
- --allow=bluetooth - --allow=bluetooth
# PPSSPP
# It allows an SDL application to specify its window class, which can be useful for window managers and desktop environments to identify and group similar windows
- --env=SDL_VIDEO_X11_WMCLASS=net.retrodeck.retrodeck
- --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.retrodeck
cleanup: cleanup:
# ES-DE # ES-DE
@ -524,8 +528,8 @@ modules:
sources: sources:
- type: git - type: git
url: &ppsspp-url https://github.com/hrydgard/ppsspp.git url: &ppsspp-url https://github.com/hrydgard/ppsspp.git
tag: v1.15.3 tag: v1.15.4
commit: 6d619201bdd6d46a3e3d4b2a82a00148eb9ebc5a commit: 9a80120dc09997e40c0a73fda05c3e07a347259f
x-checker-data: x-checker-data:
type: anitya type: anitya
project-id: 12295 project-id: 12295
@ -563,8 +567,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-1440/yuzu-mainline-20230521-f82efe9f6.AppImage url: https://github.com/yuzu-emu/yuzu-mainline/releases/download/mainline-0-1461/yuzu-mainline-20230606-238e46ec9.AppImage
sha256: 7a18690ada3536be78f627425a884a6cc9b74f4b1e296a2de35f6f10a76336d8 sha256: 4b565923b5cabcde28788151ba4f3e392275386cd8b5ff246cc43a619607a290
# Yuzu - END # Yuzu - END

2
rd-submodules/retroarch

@ -1 +1 @@
Subproject commit 0b1cfb79e591e10488a3262d6b38db843c39a409 Subproject commit fbfdda61b3da092a71cc53999dd3e7b909f244e2

2
rd-submodules/shared-modules

@ -1 +1 @@
Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42 Subproject commit 50314360ded6fa3b9f0b602513b1164b7a6636ed