From 2afe05bd4963be038221888ed0d93fdf3915863f Mon Sep 17 00:00:00 2001 From: Pieter Hulshoff Date: Sun, 26 May 2019 15:00:45 +0200 Subject: [PATCH] Updated for release 0.9.0 --- Package/Environment/Common/controls.conf | 283 + .../Common/layouts/Aeon Nox/layout 4x3.xml | 80 +- .../Common/layouts/Aeon Nox/layout.xml | 80 +- .../Common/layouts/Aeon Nox/splash.xml | 5 +- .../Common/meta/hyperlist/MAME.xml | 16234 ++++++++++++---- Package/Environment/Common/settings.conf | 22 +- RetroFE/Source/Version.cpp | 4 +- 7 files changed, 12619 insertions(+), 4089 deletions(-) diff --git a/Package/Environment/Common/controls.conf b/Package/Environment/Common/controls.conf index 2cf0a22..1058831 100755 --- a/Package/Environment/Common/controls.conf +++ b/Package/Environment/Common/controls.conf @@ -15,3 +15,286 @@ random = R select = Return, 1, joyButton10 back = Escape, joyButton6 quit = Q + +deadZone = 30 + + +# See below for a list of key codes that can be used for configuring the controls: + +###################### ###################################################### +# Code # Description +###################### ###################################################### +# "0" +# "1" +# "2" +# "3" +# "4" +# "5" +# "6" +# "7" +# "8" +# "9" +# "A" +# "AC Back" the Back key (application control keypad) +# "AC Bookmarks" the Bookmarks key (application control keypad) +# "AC Forward" the Forward key (application control keypad) +# "AC Home" the Home key (application control keypad) +# "AC Refresh" the Refresh key (application control keypad) +# "AC Search" the Search key (application control keypad) +# "AC Stop" the Stop key (application control keypad) +# "Again" the Again key (Redo) +# "AltErase" Erase-Eaze +# "'" +# "Application" the Application / Compose / Context Menu (Windows) +# key +# "AudioMute" the Mute volume key +# "AudioNext" the Next Track media key +# "AudioPlay" the Play media key +# "AudioPrev" the Previous Track media key +# "AudioStop" the Stop media key) +# "B" +# "\" Located at the lower left of the return key on ISO +# keyboards and at the right end of the QWERTY row +# on ANSI keyboards. Produces REVERSE SOLIDUS +# (backslash) and VERTICAL LINE in a US layout, +# REVERSE SOLIDUS and VERTICAL LINE in a UK Mac layout, +# NUMBER SIGN and TILDE in a UK Windows layout, DOLLAR +# SIGN and POUND SIGN in a Swiss German layout, +# NUMBER SIGN and APOSTROPHE in a German layout, GRAVE +# ACCENT and POUND SIGN in a French Mac layout, and +# ASTERISK and MICRO SIGN in a French Windows layout. +# "Backspace" +# "BrightnessDown" the Brightness Down key +# "BrightnessUp" the Brightness Up key +# "C" +# "Calculator" the Calculator key +# "Cancel" +# "CapsLock" +# "Clear" +# "Clear / Again" +# "," +# "Computer" the My Computer key +# "Copy" +# "CrSel" +# "CurrencySubUnit" the Currency Subunit key +# "CurrencyUnit" the Currency Unit key +# "Cut" +# "D" +# "DecimalSeparator" the Decimal Separator key +# "Delete" +# "DisplaySwitch" display mirroring/dual display switch, video mode +# switch +# "Down" the Down arrow key (navigation keypad) +# "E" +# "Eject" the Eject key) +# "End" +# "=" +# "Escape" the Esc key) +# "Execute" +# "ExSel" +# "F" +# "F1" +# "F10" +# "F11" +# "F12" +# "F13" +# "F14" +# "F15" +# "F16" +# "F17" +# "F18" +# "F19" +# "F2" +# "F20" +# "F21" +# "F22" +# "F23" +# "F24" +# "F3" +# "F4" +# "F5" +# "F6" +# "F7" +# "F8" +# "F9" +# "Find" +# "G" +# "`" Located in the top left corner (on both ANSI and ISO +# keyboards). Produces GRAVE ACCENT and TILDE in a US +# Windows layout and in US and UK Mac layouts on ANSI +# keyboards, GRAVE ACCENT and NOT SIGN in a UK Windows +# layout, SECTION SIGN and PLUS-MINUS SIGN in US and +# UK Mac layouts on ISO keyboards, SECTION SIGN and +# DEGREE SIGN in a Swiss German layout (Mac: only on +# ISO keyboards), CIRCUMFLEX ACCENT and DEGREE SIGN +# in a German layout (Mac: only on ISO keyboards), +# SUPERSCRIPT TWO and TILDE in a French Windows layout, +# COMMERCIAL AT and NUMBER SIGN in a French Mac layout +# on ISO keyboards, and LESS-THAN SIGN and GREATER-THAN +# SIGN in a Swiss German, German, or French Mac layout +# on ANSI keyboards. +# "H" +# "Help" +# "Home" +# "I" +# "Insert" insert on PC, help on some Mac keyboards (but does +# send code 73, not 117) +# "J" +# "K" +# "KBDIllumDown" the Keyboard Illumination Down key +# "KBDIllumToggle" the Keyboard Illumination Toggle key +# "KBDIllumUp" the Keyboard Illumination Up key +# "Keypad 0" the 0 key (numeric keypad) +# "Keypad 00" the 00 key (numeric keypad) +# "Keypad 000" the 000 key (numeric keypad) +# "Keypad 1" the 1 key (numeric keypad) +# "Keypad 2" the 2 key (numeric keypad) +# "Keypad 3" the 3 key (numeric keypad) +# "Keypad 4" the 4 key (numeric keypad) +# "Keypad 5" the 5 key (numeric keypad) +# "Keypad 6" the 6 key (numeric keypad) +# "Keypad 7" the 7 key (numeric keypad) +# "Keypad 8" the 8 key (numeric keypad) +# "Keypad 9" the 9 key (numeric keypad) +# "Keypad A" the A key (numeric keypad) +# "Keypad &" the & key (numeric keypad) +# "Keypad @" the @ key (numeric keypad) +# "Keypad B" the B key (numeric keypad) +# "Keypad Backspace" the Backspace key (numeric keypad) +# "Keypad Binary" the Binary key (numeric keypad) +# "Keypad C" the C key (numeric keypad) +# "Keypad Clear" the Clear key (numeric keypad) +# "Keypad ClearEntry" the Clear Entry key (numeric keypad) +# "Keypad :" the : key (numeric keypad) +# "Keypad ," the Comma key (numeric keypad) +# "Keypad D" the D key (numeric keypad) +# "Keypad &&" the && key (numeric keypad) +# "Keypad ||" the || key (numeric keypad) +# "Keypad Decimal" the Decimal key (numeric keypad) +# "Keypad /" the / key (numeric keypad) +# "Keypad E" the E key (numeric keypad) +# "Keypad Enter" the Enter key (numeric keypad) +# "Keypad =" the = key (numeric keypad) +# "Keypad = (AS400)" the Equals AS400 key (numeric keypad) +# "Keypad !" the ! key (numeric keypad) +# "Keypad F" the F key (numeric keypad) +# "Keypad >" the Greater key (numeric keypad) +# "Keypad #" the # key (numeric keypad) +# "Keypad Hexadecimal" the Hexadecimal key (numeric keypad) +# "Keypad {" the Left Brace key (numeric keypad) +# "Keypad (" the Left Parenthesis key (numeric keypad) +# "Keypad <" the Less key (numeric keypad) +# "Keypad MemAdd" the Mem Add key (numeric keypad) +# "Keypad MemClear" the Mem Clear key (numeric keypad) +# "Keypad MemDivide" the Mem Divide key (numeric keypad) +# "Keypad MemMultiply" the Mem Multiply key (numeric keypad) +# "Keypad MemRecall" the Mem Recall key (numeric keypad) +# "Keypad MemStore" the Mem Store key (numeric keypad) +# "Keypad MemSubtract" the Mem Subtract key (numeric keypad) +# "Keypad -" the - key (numeric keypad) +# "Keypad \*" the \* key (numeric keypad) +# "Keypad Octal" the Octal key (numeric keypad) +# "Keypad %" the Percent key (numeric keypad) +# "Keypad ." the . key (numeric keypad) +# "Keypad +" the + key (numeric keypad) +# "Keypad +/-" the +/- key (numeric keypad) +# "Keypad ^" the Power key (numeric keypad) +# "Keypad }" the Right Brace key (numeric keypad) +# "Keypad )" the Right Parenthesis key (numeric keypad) +# "Keypad Space" the Space key (numeric keypad) +# "Keypad Tab" the Tab key (numeric keypad) +# "Keypad \|" the \| key (numeric keypad) +# "Keypad XOR" the XOR key (numeric keypad) +# "L" +# "Left Alt" alt, option +# "Left Ctrl" +# "Left" the Left arrow key (navigation keypad) +# "[" +# "Left GUI" windows, command (apple), meta +# "Left Shift" +# "M" +# "Mail" the Mail/eMail key +# "MediaSelect" the Media Select key +# "Menu" +# "-" +# "ModeSwitch" I'm not sure if this is really not covered by any of +# the above, but since there's a special KMOD_MODE for +# it I'm adding it here +# "Mute" +# "N" +# "Numlock" the Num Lock key (PC) / the Clear key (Mac) +# "O" +# "Oper" +# "Out" +# "P" +# "PageDown" +# "PageUp" +# "Paste" +# "Pause" the Pause / Break key +# "." +# "Power" The USB document says this is a status flag, not a +# physical key - but some Mac keyboards do have a +# power key. +# "PrintScreen" +# "Prior" +# "Q" +# "R" +# "Right Alt" alt gr, option +# "Right Ctrl" +# "Return" the Enter key (main keyboard) +# "Return" +# "Right GUI" windows, command (apple), meta +# "Right" the Right arrow key (navigation keypad) +# "]" +# "Right Shift" +# "S" +# "ScrollLock" +# "Select" +# ";" +# "Separator" +# "/" +# "Sleep" the Sleep key +# "Space" the Space Bar key(s) +# "Stop" +# "SysReq" the SysReq key +# "T" +# "Tab" the Tab key +# "ThousandsSeparator" the Thousands Separator key +# "U" +# "Undo" +# "Up" the Up arrow key (navigation keypad) +# "V" +# "VolumeDown" +# "VolumeUp" +# "W" +# "WWW" the WWW/World Wide Web key +# "X" +# "Y" +# "Z" +# "#" ISO USB keyboards actually use this code instead of +# 49 for the same key, but all OSes I've seen treat +# the two codes identically. So, as an implementor, +# unless your keyboard generates both of those codes +# and your OS treats them differently, you should +# generate SDL_SCANCODE_BACKSLASH instead of this +# code. As a user, you should not rely on this code +# becauseSDL will never generate it with most (all?) +# keyboards. +# "&" +# "*" +# "@" +# "^" +# ":" +# "$" +# "!" +# ">" +# "#" +# "(" +# "<" +# "%" +# "+" +# "?" +# ")" +# "_" + +# These codes were taken from https://wiki.libsdl.org/SDL_Keycode diff --git a/Package/Environment/Common/layouts/Aeon Nox/layout 4x3.xml b/Package/Environment/Common/layouts/Aeon Nox/layout 4x3.xml index 9ee01fd..424e71d 100755 --- a/Package/Environment/Common/layouts/Aeon Nox/layout 4x3.xml +++ b/Package/Environment/Common/layouts/Aeon Nox/layout 4x3.xml @@ -179,18 +179,30 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -536,7 +548,7 @@ - + @@ -957,7 +969,7 @@ - + @@ -1019,18 +1031,30 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -1040,12 +1064,14 @@ - + + + diff --git a/Package/Environment/Common/layouts/Aeon Nox/layout.xml b/Package/Environment/Common/layouts/Aeon Nox/layout.xml index a7aaf5b..ad6dcbd 100755 --- a/Package/Environment/Common/layouts/Aeon Nox/layout.xml +++ b/Package/Environment/Common/layouts/Aeon Nox/layout.xml @@ -179,18 +179,30 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -536,7 +548,7 @@ - + @@ -973,7 +985,7 @@ - + @@ -1035,18 +1047,30 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -1056,12 +1080,14 @@ - + + + diff --git a/Package/Environment/Common/layouts/Aeon Nox/splash.xml b/Package/Environment/Common/layouts/Aeon Nox/splash.xml index d9a2edb..9c26815 100755 --- a/Package/Environment/Common/layouts/Aeon Nox/splash.xml +++ b/Package/Environment/Common/layouts/Aeon Nox/splash.xml @@ -30,7 +30,10 @@ - diff --git a/Package/Environment/Common/settings.conf b/Package/Environment/Common/settings.conf index 82df411..88896cc 100644 --- a/Package/Environment/Common/settings.conf +++ b/Package/Environment/Common/settings.conf @@ -11,27 +11,32 @@ ####################################### # Display ####################################### + fullscreen = no horizontal = stretch # or enter in the screen pixel width (i.e 1024) -vertical = stretch # or enter in the screen pixel width (i.e 768) -layout = Aeon Nox +vertical = stretch # or enter in the screen pixel width (i.e 768) +layout = Aeon Nox # Hide the mouse hideMouse = yes # Hide () and [] from game titles -showParenthesis = no -showSquareBrackets = no +showParenthesis = yes +showSquareBrackets = yes # specify the name of the first collection to load on start firstCollection = Main -# specify whether RetroFE should switch to Favorites list if it exists. -autoFavorites = true +# specify the first playlist RetroFE should start in; default is "all" +firstPlaylist = favorites + +# specify the size of the lastplayed playlist +lastplayedSize = 10 # specify whether RetroFE should remember the last selected game rememberMenu = true + ####################################### # Video playback settings ####################################### @@ -42,14 +47,17 @@ videoEnable = yes # Number of times to loop video playback (enter 0 to continuously loop) videoLoop = 0 + ####################################### # General ####################################### + # specify whether RetroFE should close when pressing back on the main menu exitOnFirstPageBack = no # enter 0 attract mode, otherwise enter the number of seconds to wait before enabling attract mode -attractModeTime = 45 +attractModeTime = 60 +attractModeNextTime = 20 # specify whether RetroFE should remember the last highlighted menu when re-entering a menu rememberMenu = yes diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp index d177d7a..65946d1 100644 --- a/RetroFE/Source/Version.cpp +++ b/RetroFE/Source/Version.cpp @@ -20,8 +20,8 @@ std::string retrofe_version_major = "0"; -std::string retrofe_version_minor = "8"; -std::string retrofe_version_build = "35"; +std::string retrofe_version_minor = "9"; +std::string retrofe_version_build = "0"; std::string Version::getString( )