mirror of
https://github.com/RetroDECK/RetroDECK.git
synced 2024-11-25 07:25:38 +00:00
Merge branch 'cooker-0.7.0b-icenine451' of https://github.com/icenine451/RetroDECK into cooker-0.7.0b-icenine451
This commit is contained in:
commit
b89f91511b
|
@ -1,3 +1,3 @@
|
|||
# The proper format for this file is
|
||||
# URL^PLACEHOLDERTEXT
|
||||
https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip^DOOMSHAPLACEHOLDER
|
||||
https://buildbot.libretro.com/assets/cores/DOOM/Doom%20%28Shareware%29.zip^DOOMSHAPLACEHOLDER
|
|
@ -4,7 +4,7 @@
|
|||
# sh automation_tools/update_sha.sh
|
||||
|
||||
rd_manifest=${GITHUB_WORKSPACE}/net.retrodeck.retrodeck.yml
|
||||
sha_update_list=${GITHUB_WORKSPACE}/automation_tools/sha_update_list.txt
|
||||
sha_update_list=${GITHUB_WORKSPACE}/automation_tools/sha_update_list.cfg
|
||||
|
||||
echo "Manifest location: $rd_manifest"
|
||||
echo "Hash update list location: $sha_update_list"
|
||||
|
|
|
@ -126,4 +126,4 @@ gluck.rom^fuse/^Unknown^ZX Spectrum^Pentagon 512K/1024 ROM (Required)
|
|||
256s-0.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required)
|
||||
256s-1.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required)
|
||||
256s-2.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required)
|
||||
256s-3.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required)
|
||||
256s-3.rom^fuse/^Unknown^ZX Spectrum^Scorpion 256K ROM (Required)
|
||||
|
|
|
@ -32,4 +32,4 @@ mastersystem
|
|||
nds
|
||||
nes
|
||||
snes
|
||||
snesna
|
||||
snesna
|
||||
|
|
|
@ -3,4 +3,4 @@ uuddlrlrstart^echo Visit the Configurator to behold your new-found powers.
|
|||
uuddlrlrstart^echo But beware, with great power comes great responsibility...
|
||||
gameovermangameover^set_setting_value $rd_conf developer_options false retrodeck options
|
||||
gameovermangameover^echo You have relinquished your powers in the name of saftey.
|
||||
gameovermangameover^echo This was a wise choice.
|
||||
gameovermangameover^echo This was a wise choice.
|
||||
|
|
|
@ -8,4 +8,4 @@ primehack
|
|||
rpcs3
|
||||
Ryujinx
|
||||
xemu
|
||||
yuzu
|
||||
yuzu
|
||||
|
|
|
@ -57,4 +57,4 @@
|
|||
.unf
|
||||
.unif
|
||||
.xex
|
||||
.xfd
|
||||
.xfd
|
||||
|
|
|
@ -23,4 +23,4 @@ cloud_saves=false
|
|||
multi_user_mode=false
|
||||
ask_default_user=true
|
||||
default_user=
|
||||
developer_options=false
|
||||
developer_options=false
|
||||
|
|
|
@ -4,9 +4,9 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de-p
|
|||
@@ -10,2 +10,3 @@
|
||||
#include "guis/GuiMenu.h"
|
||||
+#include "utils/PlatformUtil.h"
|
||||
|
||||
|
||||
@@ -66,2 +67,4 @@
|
||||
|
||||
|
||||
+ addEntry("RETRODECK CONFIGURATOR", 0x777777FF, false, [this] { openRetroDeckConfigurator(); });
|
||||
+
|
||||
if (!Settings::getInstance()->getBool("ForceKiosk") &&
|
||||
|
@ -21,7 +21,7 @@ diff -au1r emulationstation-de/es-app/src/guis/GuiMenu.cpp emulationstation-de-p
|
|||
+ addEntry("QUIT RETRODECK", 0x777777FF, false, [this] { openQuitMenu(); });
|
||||
#endif
|
||||
@@ -1704,2 +1707,15 @@
|
||||
|
||||
|
||||
+void GuiMenu::openRetroDeckConfigurator()
|
||||
+{
|
||||
+ // Launch the configurator.sh script
|
||||
|
|
Loading…
Reference in a new issue