Merge branch 'weapons-without-scriptableobjects'

This commit is contained in:
Noah4ever
2021-11-01 11:32:48 +01:00
29 changed files with 2750 additions and 4 deletions

View File

@@ -262,13 +262,13 @@ InputManager:
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Submit
m_Name: Interact
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: enter
positiveButton: e
altNegativeButton:
altPositiveButton: space
altPositiveButton: e
gravity: 1000
dead: 0.001
sensitivity: 1000
@@ -293,3 +293,83 @@ InputManager:
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Reload
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: r
altNegativeButton:
altPositiveButton: joystick button 1
gravity: 1000
dead: 0.001
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Fire
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: mouse 0
altNegativeButton:
altPositiveButton: joystick button 1
gravity: 1000
dead: 0.001
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Aim
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: mouse 1
altNegativeButton:
altPositiveButton: joystick button 1
gravity: 1000
dead: 0.001
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Drop
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: q
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: 0.001
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0
- serializedVersion: 3
m_Name: Pickup
descriptiveName:
descriptiveNegativeName:
negativeButton:
positiveButton: e
altNegativeButton:
altPositiveButton:
gravity: 1000
dead: 0.001
sensitivity: 1000
snap: 0
invert: 0
type: 0
axis: 0
joyNum: 0

View File

@@ -12,7 +12,7 @@ TagManager:
- Water
- UI
- Ground
-
- Weapon
-
-
-