Merge branch 'main' into player-controller

2025-10-29 12:52:07 +01:00 · 2021-11-01 14:39:47 +01:00
parent 0e22401957 0e780162db
commit 134c2ac4e0
47 changed files with 3875 additions and 6 deletions
--- a/ProjectSettings/InputManager.asset
+++ b/ProjectSettings/InputManager.asset
@@ -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
@@ -294,11 +294,11 @@ InputManager:
    axis: 0
    joyNum: 0
  - serializedVersion: 3
-    m_Name: Sprint
+    m_Name: Reload
    descriptiveName: 
    descriptiveNegativeName: 
    negativeButton: 
-    positiveButton: left shift
+    positiveButton: r
    altNegativeButton: 
    altPositiveButton: joystick button 1
    gravity: 1000
@@ -309,3 +309,67 @@ InputManager:
    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
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -12,7 +12,7 @@ TagManager:
  - Water
  - UI
  - Ground
-  - 
+  - Weapon
  - 
  - 
  -