summaryrefslogtreecommitdiff
path: root/marching/ProjectSettings
diff options
context:
space:
mode:
Diffstat (limited to 'marching/ProjectSettings')
-rw-r--r--marching/ProjectSettings/DynamicsManager.asset4
-rw-r--r--marching/ProjectSettings/Physics2DSettings.asset2
-rw-r--r--marching/ProjectSettings/TagManager.asset4
3 files changed, 6 insertions, 4 deletions
diff --git a/marching/ProjectSettings/DynamicsManager.asset b/marching/ProjectSettings/DynamicsManager.asset
index fc90ab9..6f10efd 100644
--- a/marching/ProjectSettings/DynamicsManager.asset
+++ b/marching/ProjectSettings/DynamicsManager.asset
@@ -7,6 +7,7 @@ PhysicsManager:
m_Gravity: {x: 0, y: -9.81, z: 0}
m_DefaultMaterial: {fileID: 0}
m_BounceThreshold: 2
+ m_DefaultMaxDepenetrationVelocity: 10
m_SleepThreshold: 0.005
m_DefaultContactOffset: 0.01
m_DefaultSolverIterations: 6
@@ -17,7 +18,7 @@ PhysicsManager:
m_ClothInterCollisionDistance: 0.1
m_ClothInterCollisionStiffness: 0.2
m_ContactsGeneration: 1
- m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ m_LayerCollisionMatrix: 3fffffff3fffffff3fffffffffffffff3fffffff3fffffff88ffffff48ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_AutoSimulation: 1
m_AutoSyncTransforms: 0
m_ReuseCollisionCallbacks: 1
@@ -32,5 +33,6 @@ PhysicsManager:
m_FrictionType: 0
m_EnableEnhancedDeterminism: 0
m_EnableUnifiedHeightmaps: 1
+ m_ImprovedPatchFriction: 0
m_SolverType: 0
m_DefaultMaxAngularSpeed: 50
diff --git a/marching/ProjectSettings/Physics2DSettings.asset b/marching/ProjectSettings/Physics2DSettings.asset
index 6cfcdda..afe23b0 100644
--- a/marching/ProjectSettings/Physics2DSettings.asset
+++ b/marching/ProjectSettings/Physics2DSettings.asset
@@ -53,4 +53,4 @@ Physics2DSettings:
m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432}
m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745}
m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804}
- m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ m_LayerCollisionMatrix: 3fffffff3fffffff3fffffffffffffff3fffffff3fffffff88ffffff48ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/marching/ProjectSettings/TagManager.asset b/marching/ProjectSettings/TagManager.asset
index 848b401..890be5b 100644
--- a/marching/ProjectSettings/TagManager.asset
+++ b/marching/ProjectSettings/TagManager.asset
@@ -11,8 +11,8 @@ TagManager:
-
- Water
- UI
- -
- -
+ - Hurtbox
+ - Hitbox
-
-
-