aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorGarrett Brown <themagnificentmrb@gmail.com>2018-09-11 13:56:05 -0700
committerGarrett Brown <themagnificentmrb@gmail.com>2018-09-20 16:53:26 +0200
commit655373fcba24c00e25e038025e53af34b5186766 (patch)
tree32dc80b8978b7612e90167e10f734c5f3dc42374 /system
parentc945a6a7b96abdb8467a6807bea1bd1f767c40f2 (diff)
Game OSD: Show help dialog on first view
This adds a help dialog to the game OSD and encapsulates the GUI playback control mechanisms. The volume dialog has been modified to play the game in the background for audible feedback.
Diffstat (limited to 'system')
-rw-r--r--system/keymaps/joystick.xml2
-rwxr-xr-xsystem/settings/settings.xml6
2 files changed, 7 insertions, 1 deletions
diff --git a/system/keymaps/joystick.xml b/system/keymaps/joystick.xml
index c9dace69cf..63d10002d4 100644
--- a/system/keymaps/joystick.xml
+++ b/system/keymaps/joystick.xml
@@ -153,7 +153,7 @@
<!-- Reset is disabled until player can undo a reset -->
<!--<b hotkey="back">PlayerControl(Reset)</b> -->
<x hotkey="back">OSD</x>
- <y hotkey="back">FullScreen</y>
+ <y hotkey="back">OSD</y>
<start hotkey="back">Stop</start>
<!--
<rightbumper hotkey="back">Save</rightbumper>
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index 2dccdb212c..395d5816c2 100755
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -2023,6 +2023,12 @@
<default>true</default>
<control type="toggle" />
</setting>
+ <setting id="gamesgeneral.showosdhelp" type="boolean">
+ <visible>false</visible>
+ <level>0</level>
+ <default>true</default>
+ <control type="toggle" />
+ </setting>
<setting id="gamesgeneral.enableautosave" type="boolean" label="35253" help="35254">
<level>0</level>
<default>true</default>