Skip to content

Commit 1518999

Browse files
offalynneoffalynne
committed
Update
1 parent 63238d1 commit 1518999

110 files changed

Lines changed: 2233 additions & 475 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Input.resource_order‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,35 @@
11
{
22
"FolderOrderSettings":[
3-
{"name":"Input Plug-Ins","order":2,"path":"folders/Input Plug-Ins.yy",},
4-
{"name":"Retro Gamepads","order":1,"path":"folders/Input Plug-Ins/Retro Gamepads.yy",},
3+
{"name":"Input Plug-Ins","order":3,"path":"folders/Input Plug-Ins.yy",},
4+
{"name":"Color","order":1,"path":"folders/Input Plug-Ins/Color.yy",},
5+
{"name":"Gyro & Motion","order":2,"path":"folders/Input Plug-Ins/Gyro & Motion.yy",},
6+
{"name":"Party Multiplayer","order":3,"path":"folders/Input Plug-Ins/Party Multiplayer.yy",},
7+
{"name":"Retro Gamepads","order":6,"path":"folders/Input Plug-Ins/Retro Gamepads.yy",},
58
{"name":"(System)","order":1,"path":"folders/Input Plug-Ins/Retro Gamepads/(System).yy",},
6-
{"name":"Config","order":2,"path":"folders/Input Plug-Ins/Retro Gamepads/Config.yy",},
7-
{"name":"Input","order":3,"path":"folders/Input.yy",},
8-
{"name":"Test Case","order":4,"path":"folders/Test Case.yy",},
9+
{"name":"Trigger Effects","order":4,"path":"folders/Input Plug-Ins/Trigger Effects.yy",},
10+
{"name":"Vibration","order":5,"path":"folders/Input Plug-Ins/Vibration.yy",},
11+
{"name":"Input","order":4,"path":"folders/Input.yy",},
12+
{"name":"Gamepads","order":10,"path":"folders/Input/Plug-In API/Gamepads.yy",},
13+
{"name":"Test Case","order":5,"path":"folders/Test Case.yy",},
914
],
1015
"ResourceOrderSettings":[
11-
{"name":"acVibrationTest","order":12,"path":"animcurves/acVibrationTest/acVibrationTest.yy",},
12-
{"name":"objTest_RetroIcons","order":7,"path":"objects/objTest_RetroIcons/objTest_RetroIcons.yy",},
13-
{"name":"objTest000_Verbs","order":3,"path":"objects/objTest000_Verbs/objTest000_Verbs.yy",},
14-
{"name":"objTest002_Clusters","order":13,"path":"objects/objTest002_Clusters/objTest002_Clusters.yy",},
15-
{"name":"objTest003_AdvancedCheckers","order":8,"path":"objects/objTest003_AdvancedCheckers/objTest003_AdvancedCheckers.yy",},
16-
{"name":"objTest004_VirtualButton","order":11,"path":"objects/objTest004_VirtualButton/objTest004_VirtualButton.yy",},
17-
{"name":"objTest005_Rebinding","order":1,"path":"objects/objTest005_Rebinding/objTest005_Rebinding.yy",},
18-
{"name":"objTest006_ManyCheckers","order":4,"path":"objects/objTest006_ManyCheckers/objTest006_ManyCheckers.yy",},
19-
{"name":"objTest100_Gyro","order":2,"path":"objects/objTest100_Gyro/objTest100_Gyro.yy",},
20-
{"name":"objTest101_Vibration","order":9,"path":"objects/objTest101_Vibration/objTest101_Vibration.yy",},
21-
{"name":"objTest102_Color","order":7,"path":"objects/objTest102_Color/objTest102_Color.yy",},
22-
{"name":"objTest103_TriggerEffects","order":6,"path":"objects/objTest103_TriggerEffects/objTest103_TriggerEffects.yy",},
23-
{"name":"objTest104_Party","order":10,"path":"objects/objTest104_Party/objTest104_Party.yy",},
24-
{"name":"objTest200_ConsoleSuite","order":5,"path":"objects/objTest200_ConsoleSuite/objTest200_ConsoleSuite.yy",},
25-
{"name":"rmTestConsoleSuite","order":1,"path":"rooms/rmTestConsoleSuite/rmTestConsoleSuite.yy",},
26-
{"name":"__InputRetroClass","order":2,"path":"scripts/__InputRetroClass/__InputRetroClass.yy",},
27-
{"name":"__InputRetroIconConfigN64","order":1,"path":"scripts/__InputRetroIconConfigN64/__InputRetroIconConfigN64.yy",},
28-
{"name":"__InputRetroIconConfigNeoGeo","order":2,"path":"scripts/__InputRetroIconConfigNeoGeo/__InputRetroIconConfigNeoGeo.yy",},
29-
{"name":"__InputRetroIconConfigSaturn","order":3,"path":"scripts/__InputRetroIconConfigSaturn/__InputRetroIconConfigSaturn.yy",},
16+
{"name":"objTest_RetroIcons","order":6,"path":"objects/objTest_RetroIcons/objTest_RetroIcons.yy",},
17+
{"name":"rmTest","order":1,"path":"rooms/rmTest/rmTest.yy",},
18+
{"name":"__InputRetroIconConfigGameCube","order":2,"path":"scripts/__InputRetroIconConfigGameCube/__InputRetroIconConfigGameCube.yy",},
19+
{"name":"__InputRetroIconConfigN64","order":3,"path":"scripts/__InputRetroIconConfigN64/__InputRetroIconConfigN64.yy",},
20+
{"name":"__InputRetroIconConfigNeoGeo","order":4,"path":"scripts/__InputRetroIconConfigNeoGeo/__InputRetroIconConfigNeoGeo.yy",},
21+
{"name":"__InputRetroIconConfigSaturn","order":5,"path":"scripts/__InputRetroIconConfigSaturn/__InputRetroIconConfigSaturn.yy",},
3022
{"name":"__InputRetroSystem","order":1,"path":"scripts/__InputRetroSystem/__InputRetroSystem.yy",},
23+
{"name":"__InputRetroTypeAdd","order":2,"path":"scripts/__InputRetroTypeAdd/__InputRetroTypeAdd.yy",},
24+
{"name":"InputPlugInDefine","order":4,"path":"scripts/InputPlugInDefine/InputPlugInDefine.yy",},
25+
{"name":"InputPlugInError","order":11,"path":"scripts/InputPlugInError/InputPlugInError.yy",},
26+
{"name":"InputPlugInExists","order":6,"path":"scripts/InputPlugInExists/InputPlugInExists.yy",},
27+
{"name":"InputPlugInGetAllVerbs","order":8,"path":"scripts/InputPlugInGetAllVerbs/InputPlugInGetAllVerbs.yy",},
28+
{"name":"InputPlugInGetFrame","order":9,"path":"scripts/InputPlugInGetFrame/InputPlugInGetFrame.yy",},
29+
{"name":"InputPlugInGetTime","order":7,"path":"scripts/InputPlugInGetTime/InputPlugInGetTime.yy",},
30+
{"name":"InputPlugInRegisterCallback","order":5,"path":"scripts/InputPlugInRegisterCallback/InputPlugInRegisterCallback.yy",},
31+
{"name":"InputPlugInVerbSet","order":2,"path":"scripts/InputPlugInVerbSet/InputPlugInVerbSet.yy",},
32+
{"name":"InputPlugInVerbStateRead","order":3,"path":"scripts/InputPlugInVerbStateRead/InputPlugInVerbStateRead.yy",},
33+
{"name":"InputPlugInVerbStateSet","order":1,"path":"scripts/InputPlugInVerbStateSet/InputPlugInVerbStateSet.yy",},
3134
],
3235
}

‎datafiles/gamecontrollerdb.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1816,7 +1816,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
18161816
33313433353539306634656436353432,8BitDo Dogbone,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
18171817
38426974446f20446f67626f6e65204d,8BitDo Dogbone,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,platform:Android,
18181818
34343439373236623466343934376233,8BitDo FC30 Pro,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b28,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b29,righttrigger:b7,start:b5,x:b30,y:b2,platform:Android,
1819-
38426974446f204e4743204d6f646b69,8BitDo GameCube,a:b0,b:b2,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,paddle1:b18,paddle2:b17,rightshoulder:b15,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b1,y:b3,platform:Android,
1819+
38426974446f204e4743204d6f646b69,8BitDo GameCube,a:b0,b:b2,back:b4,dpdown:b12,dpleft:b13,dpright:b14,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,paddle1:b18,paddle2:b17,rightshoulder:b15,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b1,y:b3,platform:Android,
18201820
38426974446f2038426974446f204c69,8BitDo Lite,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
18211821
30643332373663313263316637356631,8BitDo Lite 2,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
18221822
38426974446f204c6974652032000000,8BitDo Lite 2,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
@@ -1930,6 +1930,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
19301930
4a6f792d436f6e20284c290000000000,Joy-Con (L),a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,rightshoulder:b20,start:b17,x:b19,y:b2,platform:Android,
19311931
38383665633039363066383334653465,Joy-Con (R),a:b0,b:b1,back:b5,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,rightshoulder:b20,start:b18,x:b19,y:b2,platform:Android,
19321932
39363561613936303237333537383931,Joy-Con (R),a:b0,b:b1,back:b5,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,rightshoulder:b20,start:b18,x:b19,y:b2,platform:Android,
1933+
39373064396565646338333134303131,Joy-Con (R),a:b1,b:b2,back:b5,leftstick:b8,leftx:a1~,lefty:a0,start:b6,x:b0,y:b3,platform:Android,
19331934
4a6f792d436f6e202852290000000000,Joy-Con (R),a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,rightshoulder:b20,start:b18,x:b19,y:b2,platform:Android,
19341935
39656136363638323036303865326464,JYS Aapter,a:b1,b:b19,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
19351936
63316564383539663166353034616434,JYS Adapter,a:b1,b:b3,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b0,y:b2,platform:Android,
@@ -1963,6 +1964,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
19631964
39306635663061636563316166303966,Mocute M053,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
19641965
7573622067616d657061642020202020,NEXT SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,righttrigger:b6,start:b9,x:b3,y:b0,platform:Android,
19651966
050000007e05000009200000ffff0f00,Nintendo Switch Pro Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b16,x:b17,y:b2,platform:Android,
1967+
31316661666466633938376335383661,Nintendo Switch Pro Controller,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,misc1:b5,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,start:b6,x:b3,y:b2,platform:Android,
19661968
34323437396534643531326161633738,Nintendo Switch Pro Controller,a:b0,b:b1,back:b15,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,misc1:b5,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
19671969
50726f20436f6e74726f6c6c65720000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b17,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b2,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b10,rightx:a2,righty:a3,start:b18,y:b3,platform:Android,
19681970
36326533353166323965623661303933,NSO N64 Controller,+rightx:b17,+righty:b10,-rightx:b2,-righty:b19,a:b1,b:b0,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,misc1:b7,rightshoulder:b20,righttrigger:b15,start:b18,platform:Android,
@@ -2026,6 +2028,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
20262028
61343739353764363165343237303336,Retro Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b17,lefttrigger:b18,leftx:a0,lefty:a1,start:b10,x:b2,y:b3,platform:Android,
20272029
526574726f696420506f636b65742043,Retroid Pocket,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b17,paddle2:b18,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
20282030
582d426f7820436f6e74726f6c6c6572,Retroid Pocket,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b17,paddle2:b18,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
2031+
64633735616665613536653363336132,Retroid Pocket,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,paddle1:b19,paddle2:b20,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
20292032
38653130373365613538333235303036,Retroid Pocket 2,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
20302033
64363363336633363736393038313463,Retrolink,a:b1,b:b0,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,start:b6,platform:Android,
20312034
37393234373533633333323633646531,RetroUSB N64 RetroPort,+rightx:b17,+righty:b15,-rightx:b18,-righty:b6,a:b10,b:b9,dpdown:b19,dpleft:b1,dpright:b0,dpup:b2,leftshoulder:b7,lefttrigger:b20,leftx:a0,lefty:a1,rightshoulder:b5,start:b3,platform:Android,

0 commit comments

Comments
 (0)