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

This commit is contained in:
icenine451 2023-05-10 09:57:42 -04:00
commit eaa5f5bd2b
48 changed files with 73 additions and 93 deletions

View file

@ -1,9 +1,9 @@
"controller_mappings" "controller_mappings"
{ {
"version" "3" "version" "3"
"revision" "1482" "revision" "1540"
"title" "RetroDECK official layout v.0.7" "title" "RetroDECK: Official Layout - v.0.7b"
"description" "The Official RetroDECK Layout" "description" "The Official RetroDECK Layout."
"creator" "76561197985498748" "creator" "76561197985498748"
"progenitor" "" "progenitor" ""
"url" "autosave:///home/deck/.local/share/Steam/steamapps/common/Steam Controller Configs/25233020/config/retrodeck/controller_neptune.vdf" "url" "autosave:///home/deck/.local/share/Steam/steamapps/common/Steam Controller Configs/25233020/config/retrodeck/controller_neptune.vdf"
@ -12,7 +12,7 @@
"controller_caps" "23117823" "controller_caps" "23117823"
"major_revision" "0" "major_revision" "0"
"minor_revision" "0" "minor_revision" "0"
"Timestamp" "-608407264" "Timestamp" "-879036768"
"actions" "actions"
{ {
"Default" "Default"
@ -1422,7 +1422,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo.png, #232323 #AD0000" "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, #232323 #FFFFFF"
} }
} }
} }
@ -1510,14 +1510,6 @@
"binding" "key_press S, Save State, RD-document-save.png, " "binding" "key_press S, Save State, RD-document-save.png, "
} }
} }
"Full_Press"
{
"bindings"
{
"binding" "key_press LEFT_SHIFT, , "
"binding" "key_press F1, , "
}
}
} }
"disabled_activators" "disabled_activators"
{ {
@ -1535,13 +1527,6 @@
"binding" "key_press A, Load State, RD-folder-blue-backup.png, " "binding" "key_press A, Load State, RD-folder-blue-backup.png, "
} }
} }
"Full_Press"
{
"bindings"
{
"binding" "key_press F1, , "
}
}
} }
"disabled_activators" "disabled_activators"
{ {
@ -1614,7 +1599,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press ESCAPE, Escape, RD-emblem-unreadable.png, " "binding" "key_press ESCAPE, Escape, RD-ESC.png, "
} }
} }
} }
@ -1745,7 +1730,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo.png, #232323 #AD0000" "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, "
} }
} }
} }
@ -1761,8 +1746,8 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press LEFT_CONTROL, Previous State, RD-go-next.png, " "binding" "key_press LEFT_CONTROL, Previous State, RD-go-previous.png, #232323 #FFFFFF"
"binding" "key_press J, Previous State, RD-go-next.png, " "binding" "key_press J, Previous State, RD-go-previous.png, #232323 #FFFFFF"
} }
} }
} }
@ -1778,8 +1763,8 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press LEFT_CONTROL, Next State, RD-go-previous.png, " "binding" "key_press LEFT_CONTROL, Next State, RD-go-next.png, "
"binding" "key_press K, Next State, RD-go-previous.png, " "binding" "key_press K, Next State, RD-go-next.png, "
} }
} }
} }
@ -1799,14 +1784,6 @@
"binding" "key_press S, Save State, RD-document-save.png, " "binding" "key_press S, Save State, RD-document-save.png, "
} }
} }
"Full_Press"
{
"bindings"
{
"binding" "key_press LEFT_SHIFT, , "
"binding" "key_press F1, , "
}
}
} }
"disabled_activators" "disabled_activators"
{ {
@ -1824,13 +1801,6 @@
"binding" "key_press A, Load State, RD-folder-blue-backup.png, " "binding" "key_press A, Load State, RD-folder-blue-backup.png, "
} }
} }
"Full_Press"
{
"bindings"
{
"binding" "key_press F1, , "
}
}
} }
"disabled_activators" "disabled_activators"
{ {
@ -1844,8 +1814,8 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press LEFT_CONTROL, Undo Load, RD-edit-undo.png, #232323 #FFFFFF" "binding" "key_press LEFT_CONTROL, Undo Load, RD-Arrow-33.png, "
"binding" "key_press 8, Undo Load, RD-edit-undo.png, #232323 #FFFFFF" "binding" "key_press 8, Undo Load, RD-Arrow-33.png, "
} }
} }
} }
@ -1861,8 +1831,8 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press LEFT_CONTROL, Undo Save, RD-edit-undo.png, #232323 #AD3A00" "binding" "key_press LEFT_CONTROL, Undo Save, RD-Arrow-34.png, "
"binding" "key_press 9, Undo Save, RD-edit-undo.png, #232323 #AD3A00" "binding" "key_press 9, Undo Save, RD-Arrow-34.png, "
} }
} }
} }
@ -2225,7 +2195,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo.png, #232323 #AD0000" "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, "
} }
} }
} }
@ -2309,8 +2279,8 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press LEFT_CONTROL, Reset Emulation Speed, RD-zoom-original.png, " "binding" "key_press LEFT_CONTROL, Reset / Toggle Emulation Speed, RD-zoom-original.png, "
"binding" "key_press 3, Reset Emulation Speed, RD-zoom-original.png, " "binding" "key_press 3, Reset / Toggle Emulation Speed, RD-zoom-original.png, "
} }
} }
} }
@ -2707,7 +2677,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo.png, #232323 #AD0000" "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, "
} }
} }
} }
@ -3197,7 +3167,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo.png, #232323 #AD0000" "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, "
} }
} }
} }
@ -3713,7 +3683,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo.png, #232323 #AD0000" "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, "
} }
} }
} }
@ -3761,7 +3731,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press ESCAPE, Escape, RD-emblem-unreadable.png, " "binding" "key_press ESCAPE, Escape, RD-ESC.png, "
} }
} }
} }
@ -3793,8 +3763,8 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press LEFT_ALT, ALT + F4, RD-security-low.png, " "binding" "key_press LEFT_ALT, ALT + F4, RD-F4.png, "
"binding" "key_press F4, ALT + F4, RD-security-low.png, " "binding" "controller_action empty_sub_command, ALT + F4, RD-F4.png, "
} }
} }
} }
@ -3810,7 +3780,39 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press TAB, Tab, RD-emblem-documents.png, " "binding" "key_press TAB, Tab, RD-Tab.png, "
}
}
}
"disabled_activators"
{
}
}
"touch_menu_button_7"
{
"activators"
{
"Full_Press"
{
"bindings"
{
"binding" "key_press RETURN, Enter, RD-Enter.png, "
}
}
}
"disabled_activators"
{
}
}
"touch_menu_button_8"
{
"activators"
{
"Full_Press"
{
"bindings"
{
"binding" "key_press F1, F1, RD-F1.png, "
} }
} }
} }
@ -4173,7 +4175,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo.png, #232323 #AD0000" "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, "
} }
} }
} }
@ -4632,7 +4634,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo.png, #232323 #AD0000" "binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo-red.png, "
} }
} }
} }
@ -4665,8 +4667,8 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press LEFT_ALT, Button 1 - Service, RD-emblem-encrypted-locked.png, #232323 #AD00AD" "binding" "key_press LEFT_ALT, Button 1 - Service, RD-Arcade-BLUE.png, "
"binding" "key_press 1, Button 1 - Service, RD-emblem-encrypted-locked.png, #232323 #AD00AD" "binding" "key_press 1, Button 1 - Service, RD-Arcade-BLUE.png, "
} }
} }
} }
@ -4682,8 +4684,8 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press LEFT_ALT, Button 2 - Service, RD-emblem-encrypted-locked.png, #232323 #0074AD" "binding" "key_press LEFT_ALT, Button 2 - Service, RD-Arcade-GREEN.png, "
"binding" "key_press 2, Button 2 - Service, RD-emblem-encrypted-locked.png, #232323 #0074AD" "binding" "key_press 2, Button 2 - Service, RD-Arcade-GREEN.png, "
} }
} }
} }
@ -4699,8 +4701,8 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press LEFT_ALT, Button 3 - Service, RD-emblem-encrypted-locked.png, #232323 #00AD00" "binding" "key_press LEFT_ALT, Button 3 - Service, RD-Arcade-RED.png, "
"binding" "key_press 3, Button 3 - Service, RD-emblem-encrypted-locked.png, #232323 #00AD00" "binding" "key_press 3, Button 3 - Service, RD-Arcade-RED.png, "
} }
} }
} }
@ -4716,8 +4718,8 @@
{ {
"bindings" "bindings"
{ {
"binding" "key_press LEFT_ALT, Button 4 - Service, RD-emblem-encrypted-locked.png, #232323 #AD0051" "binding" "key_press LEFT_ALT, Button 4 - Service, RD-Arcade-YELLOW.png, "
"binding" "key_press 4, Button 4 - Service, RD-emblem-encrypted-locked.png, #232323 #AD0051" "binding" "key_press 4, Button 4 - Service, RD-Arcade-YELLOW.png, "
} }
} }
} }
@ -5040,7 +5042,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo.png, #232323 #AD0000" "binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo-red.png, "
} }
} }
} }
@ -5562,7 +5564,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo.png, #232323 #AD0000" "binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo-red.png, "
} }
} }
} }
@ -6027,7 +6029,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo.png, #232323 #AD0000" "binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo-red.png, "
} }
} }
} }
@ -6578,7 +6580,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo.png, #232323 #AD0000" "binding" "controller_action CHANGE_PRESET 1 1 1, Back, RD-edit-undo-red.png, "
} }
} }
} }
@ -7102,7 +7104,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo.png, #232323 #AD0000" "binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo-red.png, "
} }
} }
} }
@ -7499,7 +7501,7 @@
{ {
"bindings" "bindings"
{ {
"binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo.png, #232323 #AD0000" "binding" "controller_action CHANGE_PRESET 9 1 1, Back, RD-edit-undo-red.png, "
} }
} }
} }
@ -8349,13 +8351,6 @@
"binding" "key_press M, OPEN MENU, , " "binding" "key_press M, OPEN MENU, , "
} }
} }
"Full_Press"
{
"bindings"
{
"binding" "key_press M, , "
}
}
} }
"disabled_activators" "disabled_activators"
{ {
@ -8373,13 +8368,6 @@
"binding" "key_press A, LOAD STATE, , " "binding" "key_press A, LOAD STATE, , "
} }
} }
"Full_Press"
{
"bindings"
{
"binding" "key_press F1, , "
}
}
} }
"disabled_activators" "disabled_activators"
{ {
@ -8397,14 +8385,6 @@
"binding" "key_press S, SAVE STATE, , " "binding" "key_press S, SAVE STATE, , "
} }
} }
"Full_Press"
{
"bindings"
{
"binding" "key_press LEFT_SHIFT, , "
"binding" "key_press F1, , "
}
}
} }
"disabled_activators" "disabled_activators"
{ {

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 194 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 157 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 180 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 166 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 182 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 180 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 160 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 178 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 182 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 163 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 158 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 180 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 183 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 179 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 182 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 169 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 163 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 183 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 168 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 165 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 191 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
res/binding-icons/RD-F1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 193 B

BIN
res/binding-icons/RD-F4.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 190 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 628 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB