diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-17 07:36:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-17 07:36:38 +0200 |
| commit | 2e54c5372d2ff0894107fe877e579084fb1943a2 (patch) | |
| tree | e1c09da6225b908b7877f9967b77c5798f31cc27 /main/input_default.cpp | |
| parent | a5604130c55e099e831ba6d2bd5cee578cac16f2 (diff) | |
| parent | c672ff80c9703af393641050807075a5894d6a3c (diff) | |
Merge pull request #10386 from Corruptinator/master
Fixed OUYA Game Controller for 3.0
[ci skip]
Diffstat (limited to 'main/input_default.cpp')
| -rw-r--r-- | main/input_default.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp index e7dc9d4b70..d496717460 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -775,7 +775,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,", + "4f5559412047616d6520436f6e74726f,OUYA Game Controller,leftx:a1,lefty:a3,dpdown:b12,rightstick:b8,rightshoulder:b10,rightx:a6,start:b-86,righty:a7,dpleft:b13,lefttrigger:b15,x:b2,dpup:b11,leftstick:b7,leftshoulder:b9,y:b3,a:b0,dpright:b14,righttrigger:b16,b:b1,", #endif #ifdef JAVASCRIPT_ENABLED |