diff options
Diffstat (limited to 'ProjectSettings')
| -rw-r--r-- | ProjectSettings/InputManager.asset | 33 | ||||
| -rw-r--r-- | ProjectSettings/Packages/com.unity.probuilder/Settings.json | 23 | ||||
| -rw-r--r-- | ProjectSettings/TimeManager.asset | 2 |
3 files changed, 53 insertions, 5 deletions
diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index b16147e..33be1e4 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -22,6 +22,22 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 + m_Name: Horizontal Camera + descriptiveName: + descriptiveNegativeName: + negativeButton: j + positiveButton: l + altNegativeButton: q + altPositiveButton: e + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 m_Name: Vertical descriptiveName: descriptiveNegativeName: @@ -38,6 +54,22 @@ InputManager: axis: 0 joyNum: 0 - serializedVersion: 3 + m_Name: Vertical Camera + descriptiveName: + descriptiveNegativeName: + negativeButton: k + positiveButton: i + altNegativeButton: x + altPositiveButton: z + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 m_Name: Fire1 descriptiveName: descriptiveNegativeName: @@ -485,3 +517,4 @@ InputManager: type: 2 axis: 5 joyNum: 0 + m_UsePhysicalKeys: 0 diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 887afd3..3f85c03 100644 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -19,6 +19,11 @@ "value": "{\"m_Value\":\"ProBuilderLog.txt\"}" }, { + "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.materialPalettePath", + "value": "{\"m_Value\":\"Assets/ProBuilder Data/Default Material Palette.asset\"}" + }, + { "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "about.identifier", "value": "{\"m_Value\":{\"m_Major\":5,\"m_Minor\":0,\"m_Patch\":6,\"m_Build\":-1,\"m_Type\":\"\",\"m_Metadata\":\"\",\"m_Date\":\"\"}}" @@ -114,6 +119,11 @@ "value": "{\"m_Value\":false}" }, { + "type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "SelectEdgeRing.selectIterative", + "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}" @@ -161,7 +171,7 @@ { "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.lastMeshSelectMode", - "value": "{\"m_Value\":4}" + "value": "{\"m_Value\":8}" }, { "type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", @@ -181,7 +191,7 @@ { "type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", "key": "ShapeBuilder.ActiveShapeIndex", - "value": "{\"m_Value\":6}" + "value": "{\"m_Value\":5}" }, { "type": "System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", @@ -191,12 +201,12 @@ { "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "ShapeBuilder.LastPivotPosition", - "value": "{\"m_Value\":{\"x\":-12.0,\"y\":-0.00009999999747378752,\"z\":-12.0}}" + "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0}}" }, { "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "ShapeBuilder.LastSize", - "value": "{\"m_Value\":{\"x\":24.0,\"y\":0.0,\"z\":24.0}}" + "value": "{\"m_Value\":{\"x\":-5.0,\"y\":5.0,\"z\":-5.0}}" }, { "type": "UnityEngine.Vector3, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", @@ -234,6 +244,11 @@ "value": "{}" }, { + "type": "UnityEngine.ProBuilder.Shapes.Shape, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "ShapeBuilder.Pipe", + "value": "{}" + }, + { "type": "UnityEngine.ProBuilder.ExtrudeMethod, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.extrudeMethod", "value": "{\"m_Value\":2}" diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset index 558a017..d03d67a 100644 --- a/ProjectSettings/TimeManager.asset +++ b/ProjectSettings/TimeManager.asset @@ -6,4 +6,4 @@ TimeManager: Fixed Timestep: 0.02 Maximum Allowed Timestep: 0.33333334 m_TimeScale: 1 - Maximum Particle Timestep: 0.03 + Maximum Particle Timestep: 0.02 |