Implemented a universal input for PS4 and KBM as well as fixing a few movement bugs

This commit is contained in:
Gregory Campbell
2020-01-05 15:57:18 -05:00
parent b9cfa34614
commit a557887275
3 changed files with 84 additions and 67 deletions
+69 -53
View File
@@ -38,13 +38,13 @@ InputManager:
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Fire1
m_Name: Crouch
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: left ctrl
altNegativeButton:
altPositiveButton: mouse 0
altPositiveButton:
gravity: 1000
dead: 0.001
sensitivity: 1000
@@ -54,29 +54,29 @@ InputManager:
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Fire2
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: left alt
altNegativeButton:
altPositiveButton: mouse 1
gravity: 1000
dead: 0.001
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Fire3
m_Name: Walk
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: left shift
altNegativeButton:
altPositiveButton: mouse 2
altPositiveButton:
gravity: 1000
dead: 0.001
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Stop
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: mouse 1
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: 0.001
sensitivity: 1000
@@ -182,11 +182,11 @@ InputManager:
axis: 1
joyNum: 0
- serializedVersion: 3
m_Name: Fire1
m_Name: Crouch
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: joystick button 0
positiveButton: joystick button 7
altNegativeButton:
altPositiveButton:
gravity: 1000
@@ -198,23 +198,7 @@ InputManager:
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Fire2
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: joystick button 1
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: 0.001
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Fire3
m_Name: Walk
descriptiveName:
descriptiveNegativeName:
negativeButton:
@@ -230,11 +214,11 @@ InputManager:
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Jump
m_Name: Stop
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: joystick button 3
positiveButton: joystick button 6
altNegativeButton:
altPositiveButton:
gravity: 1000
@@ -246,13 +230,13 @@ InputManager:
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Submit
m_Name: Jump
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: return
positiveButton: joystick button 1
altNegativeButton:
altPositiveButton: joystick button 0
altPositiveButton:
gravity: 1000
dead: 0.001
sensitivity: 1000
@@ -262,29 +246,61 @@ InputManager:
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Submit
m_Name: Mouse X
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: enter
positiveButton:
altNegativeButton:
altPositiveButton: space
altPositiveButton:
gravity: 1000
dead: 0.001
sensitivity: 1000
dead: 0.25
sensitivity: 0.1
snap: 0
invert: 0
type: 0
axis: 0
type: 2
axis: 2
joyNum: 0
- serializedVersion: 3
m_Name: Cancel
m_Name: Mouse Y
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton:
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: 0.25
sensitivity: 0.1
snap: 0
invert: 1
type: 2
axis: 3
joyNum: 0
- serializedVersion: 3
m_Name: Pause
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: escape
altNegativeButton:
altPositiveButton: joystick button 1
altPositiveButton:
gravity: 1000
dead: 0.001
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Pause
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: joystick button 9
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: 0.001
sensitivity: 1000