diff --git a/README.md b/README.md index a073f236b..de005f79a 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@
-Comprehensive cross-platform input for GameMaker 2022 LTS by Juju Adams, Alynne Keith, and Friends
+Comprehensive cross-platform input for GameMaker 2022 LTS by Juju Adams, Alynne Keith, and Friends
diff --git a/datafiles/controllertypes.csv b/datafiles/controllertypes.csv index 3814ffde1..14378ef9d 100644 --- a/datafiles/controllertypes.csv +++ b/datafiles/controllertypes.csv @@ -25,7 +25,7 @@ CommunitySuperFamicom,351221ab,10280900,c82d3028,c82d21ab,c82d1028 Community8BitDo,c82d0090,c82d0061,c82d0021,c82d1890,02100090,351212ab,35124028,02200090,c82d2028,c82d4028,c82d6228,c82d0030,c82d0130,c82d0451,c82d1290,c82d20ab,c82d0160,c82d1038,c82d2038,c82d0060,c82d0260,c82d0161,c82d0261,c82d6528,c82d9000,c82d0190,c82d1590,c82d3032,20380900,10380900,c82d0360,c82d0361,c82d0660,c82d1030,c82d1151,c82d1251,c82d2090 CommunityGameCube,26092625,7e053703,26098888,79004318,79004418,79004518,79004618,79004718,430b0500,341a05f7,9b282100,9b283400,9b283700,9b283a00,9b283d00,9b286200,9b286500,9b289200,9b289500,6f0e8501,d62011a7 CommunityXBox360,ad1bf904,c6241a89,c6241b89,ac056b05,bc205656,79003018,a30618f5,38072045,38076252,38076352,38076652,d81401a0,d814cecf,d814cefa,242f3900,6e050320,300f1101,d602e589,38072644,55090372,55091472,450c2043,45130830,6b1401a1,32150009,341a0104,341a0108,341a0608,341a0908,d620ad0d,d6207162,d620e589,f827bf0b,242f00b7,3136860c,58622033,58622047,78696e70,79004f18,b4041024,0d0f1110,c3110791,32150507,32150707,49190304,c6242a89,c6242b89,17274431,c0110055,c0110591,c1110191,c2110791,fa190706,15200182,bc206412,efbeedfe,49190204,79000200 -CommunityXBoxOne,f5100870,c82d0121,6f0e02d8,242f3700,3215290a,6f0ed702,5e04030b,d6200228,15194000,8a350102,8a350202,c82d0220,952e4b43 +CommunityXBoxOne,f5100870,c82d0121,6f0e02d8,242f3700,3215290a,6f0ed702,5e04030b,d6200228,15194000,8a350102,8a350202,c82d0220,952e4b43,952e4d43,952e4e43 CommunityPSX,6f0e0109,63252605,6f0e1101,31730100,09124488,120a0100,25090218,ba222010,9b284400,9b284500,9b284600,9b284700,151a6222,6206d570,4f0423b3,4f0403d0,4f0408d0,4f0409d0,6d04d1ca,4c053713,a3062106,a30620f6,a30623f6,38078731,38078232,38078433,38078034,38076382,38071888,380756a8,120c1307,120c1cf1,6f0e1401,6f0e1901,6f0e1a01,6f0e2f01,6f0e3001,6f0e3201,8f0e1431,0d0f1000,0d0f1100,0d0f1300,0d0f2100,0d0f2200,0d0f2600,0d0f2700,0d0f2d00,0d0f2500,0d0f3200,0d0f3d00,0d0f4000,0d0f4200,0d0f4900,0d0f4b00,0d0f5100,0d0f5400,0d0f6400,300f1611,c0110355,120cf90e,d81407cd,32150204,7c180006,341a0302,4f1f0800,d6206000,d6209f31,d6201d57,d6209557,d620c757,d620e557,f025c183,6e050520,6e050620,300f1211,4f0420b3,4f0401d0,88880804,504c5354,ff00cb01,83055020,830531b0,9d0d1330,300f1210,6b140203,6b140303,addeefbe,6b140103,63252306,c82d0751,c82d0851,d9040200,d904160f,4c05da0c,e3059605,25090118,25090088,25096888,ba220701,430b0300,8f0e0000,8f0e0610,8f0e0910,8f0e1330,ff114133,bd1201e0,bd1202e0,f025c283,f025c483,66666706,66660288,66660488,5f143102 CommunityPS4,8f0e1411,0d0f0101,0d0fa500,0d0fa600,120e120c,160e120c,1a1e120c,0d0fc000,6b140906,952e2577,120c300e,120c0807,120c110e,120c160e,120c180e,120c1e0e,120cf10e,120cf70e,120cf21c,120cf31c,120cf41c,120cf51c,120c111e,120c121e,120c181e,120c191e,120c1c1e,120ca857,120ca957,120caa57,120cab57,120c210e,38078532 CommunityPS5,8a350302,8a350402 diff --git a/datafiles/sdl2.txt b/datafiles/sdl2.txt index e1e1fcaf0..100638717 100644 --- a/datafiles/sdl2.txt +++ b/datafiles/sdl2.txt @@ -1569,7 +1569,9 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2, 03000000a306000020f6000011010000,Saitek PS2700 Rumble,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Linux, 05000000e804000000a000001b010000,Samsung EIGP20,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux, 03000000d81d00000e00000010010000,Savior,a:b0,b:b1,back:b8,leftshoulder:b6,leftstick:b10,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b11,righttrigger:b3,start:b9,x:b4,y:b5,platform:Linux, -03000000952e00004b43000011010000,Scuf Envision,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux, +03000000952e00004b43000011010000,Scuf Envision,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux, +03000000952e00004d43000011010000,Scuf Envision,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux, +03000000952e00004e43000011010000,Scuf Envision,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux, 03000000a30c00002500000011010000,Sega Genesis Mini 3B Controller,a:b2,b:b1,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,righttrigger:b5,start:b9,platform:Linux, 03000000790000001100000011010000,Sega Saturn,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b4,start:b9,x:b0,y:b3,platform:Linux, 03000000790000002201000011010000,Sega Saturn,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b5,rightshoulder:b6,righttrigger:b7,start:b9,x:b2,y:b3,platform:Linux, diff --git a/scripts/__input_macros/__input_macros.gml b/scripts/__input_macros/__input_macros.gml index 43c0d816e..25d503347 100644 --- a/scripts/__input_macros/__input_macros.gml +++ b/scripts/__input_macros/__input_macros.gml @@ -1,7 +1,7 @@ // Feather disable all -#macro __INPUT_VERSION "6.2.4 beta 4" -#macro __INPUT_DATE "2024-05-05" +#macro __INPUT_VERSION "6.2.5" +#macro __INPUT_DATE "2024-05-18" #macro __INPUT_DEBUG false