summaryrefslogtreecommitdiffhomepage
path: root/ProjectSettings
diff options
context:
space:
mode:
authorrealtradam <[email protected]>2022-12-09 21:44:21 -0500
committerrealtradam <[email protected]>2022-12-09 21:44:21 -0500
commitf4323d161a589b076b0ccd64e2a1cffcd09b0681 (patch)
treeeb90ba7ed6127c34be5e853a003b886cd1f09200 /ProjectSettings
parent3781e79da4829990dbb3cb6337eed2d3770b3595 (diff)
downloadMagnet-Run-3D-f4323d161a589b076b0ccd64e2a1cffcd09b0681.tar.gz
Magnet-Run-3D-f4323d161a589b076b0ccd64e2a1cffcd09b0681.zip
movement mechanics more complete
Diffstat (limited to 'ProjectSettings')
-rw-r--r--ProjectSettings/DynamicsManager.asset4
-rw-r--r--ProjectSettings/Packages/com.unity.probuilder/Settings.json26
-rw-r--r--ProjectSettings/TagManager.asset6
3 files changed, 29 insertions, 7 deletions
diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset
index 1596c42..e24df01 100644
--- a/ProjectSettings/DynamicsManager.asset
+++ b/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: fffdfffffffdfffffffdfffffffffffffffdfffffffdfffffffffffffffeffff7ffdffffc8fcffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_AutoSimulation: 1
m_AutoSyncTransforms: 0
m_ReuseCollisionCallbacks: 0
@@ -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/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json
index 8455fbd..887afd3 100644
--- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json
+++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json
@@ -104,6 +104,16 @@
"value": "{\"m_Value\":true}"
},
{
+ "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+ "key": "SelectEdgeLoop.selectIterative",
+ "value": "{\"m_Value\":false}"
+ },
+ {
+ "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
+ "key": "CollapseVertices.collapseToFirst",
+ "value": "{\"m_Value\":false}"
+ },
+ {
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "mesh.newShapePivotLocation",
"value": "{\"m_Value\":1}"
@@ -151,7 +161,7 @@
{
"type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "editor.lastMeshSelectMode",
- "value": "{\"m_Value\":2}"
+ "value": "{\"m_Value\":4}"
},
{
"type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
@@ -181,12 +191,12 @@
{
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "ShapeBuilder.LastPivotPosition",
- "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0}}"
+ "value": "{\"m_Value\":{\"x\":-12.0,\"y\":-0.00009999999747378752,\"z\":-12.0}}"
},
{
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "ShapeBuilder.LastSize",
- "value": "{\"m_Value\":{\"x\":40.0,\"y\":0.0,\"z\":40.0}}"
+ "value": "{\"m_Value\":{\"x\":24.0,\"y\":0.0,\"z\":24.0}}"
},
{
"type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
@@ -219,6 +229,11 @@
"value": "{}"
},
{
+ "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+ "key": "ShapeBuilder.Stairs",
+ "value": "{}"
+ },
+ {
"type": "UnityEngine.ProBuilder.ExtrudeMethod, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "editor.extrudeMethod",
"value": "{\"m_Value\":2}"
@@ -232,6 +247,11 @@
"type": "UnityEditor.ProBuilder.Actions.OffsetElements+CoordinateSpace, Unity.ProBuilder.Editor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "MoveElements.s_CoordinateSpace",
"value": "{\"m_Value\":0}"
+ },
+ {
+ "type": "UnityEditor.ProBuilder.Actions.MirrorObjects+MirrorSettings, Unity.ProBuilder.Editor, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
+ "key": "MirrorObjects.mirrorAxes",
+ "value": "{\"m_Value\":12}"
}
]
}
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 1c92a78..ad97e86 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -12,9 +12,9 @@ TagManager:
- Water
- UI
-
- -
- -
- -
+ - Agent
+ - Detailed
+ - Stairs
-
-
-