diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-07-12 07:39:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-12 07:39:29 +0200 |
| commit | fca9c75f2b002f3bdcec086499e2ea07b86cf4a1 (patch) | |
| tree | 36c0ab0eed494f767d9fb64f002f90f8a99743f5 | |
| parent | f55fff35286eb970f5db0c0cbfd2e96eb3aff8bc (diff) | |
| parent | a6b519fe7141e9ffd7e2494202664f9b8264cdc6 (diff) | |
Merge pull request #9611 from Corruptinator/master
OUYA Controller GUID and button mapping for Godot 3.0 (Android)
| -rw-r--r-- | main/input_default.cpp | 1 |
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 |