Merge branch 'janis' into main

2025-10-30 04:27:09 +01:00 · 2021-09-26 14:25:56 +02:00
parent ccd0008ade 56bf23aa63
commit 284d995fc5
118 changed files with 5309 additions and 5684 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: Build
    descriptiveName: 
    descriptiveNegativeName: 
    negativeButton: 
-    positiveButton: enter
+    positiveButton: b
    altNegativeButton: 
-    altPositiveButton: space
+    altPositiveButton: 
    gravity: 1000
    dead: 0.001
    sensitivity: 1000
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -6,6 +6,8 @@ TagManager:
  tags:
  - Undefined
  - Event
+  - Building
+  - Terrain
  layers:
  - Default
  - TransparentFX