summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorruptinator <corruptinatorx01@gmail.com>2017-07-11 14:42:18 -0700
committerCorruptinator <corruptinatorx01@gmail.com>2017-07-11 19:17:28 -0700
commita6b519fe7141e9ffd7e2494202664f9b8264cdc6 (patch)
treee48aa520a301260c0ccd0a50306ea3e0190379ed
parenta5d500f0233913fe7622434225c5dc73ebaccd1e (diff)
OUYA Controller for Version 3.0 input_default.cpp
OUYA Game Controller for the Godot Game Engine version 3.0, allows the controller to be implemented in the if (ANDROID) part within input_default.cpp, hopefully fixing the problem that originated from #9390 on version 2.1.4 BETA as well.
-rw-r--r--main/input_default.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp
index bde1e84926..3361aa0678 100644
--- a/main/input_default.cpp
+++ b/main/input_default.cpp
@@ -770,6 +770,7 @@ static const char *s_ControllerMappings[] = {
"4e564944494120436f72706f72617469,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,",
"532e542e442e20496e74657261637420,3dfx InterAct HammerHead FX,leftx:a0,lefty:a1,dpdown:h0.4,rightstick:b25,rightshoulder:b27,rightx:a2,start:b31,righty:a3,dpleft:h0.8,lefttrigger:b28,x:b20,dpup:h0.1,back:b30,leftstick:b22,leftshoulder:b26,y:b21,a:b23,dpright:h0.2,righttrigger:b29,b:b24,",
"506572666f726d616e63652044657369,PDP Rock Candy Wireless Controller for PS3,leftx:a0,lefty:a1,dpdown:h0.4,rightstick:b6,rightshoulder:b18,rightx:a2,start:b16,righty:a3,dpleft:h0.8,lefttrigger:b9,x:b0,dpup:h0.1,back:h0.2,leftstick:b4,leftshoulder:b3,y:b2,a:b1,dpright:h0.2,righttrigger:b10,b:b17,",
+ "4f5559412047616d6520436f6e74726f,OUYA Game Controller,leftx:a0,lefty:a1,dpdown:b9,rightstick:b7,rightshoulder:b5,rightx:a3,start:b16,righty:a4,dpleft:b10,lefttrigger:b12,x:b1,dpup:b8,back:b14,leftstick:b6,leftshoulder:b4,y:b2,a:b0,dpright:b11,righttrigger:b13,b:b3,",
#endif
#ifdef JAVASCRIPT_ENABLED