+mv

25 files changed, 391 insertions, 370 deletions

diff --git a/JamTools/Assets/JamTools/ActiveRagdoll2D.meta b/JamTools/Assets/JamTools/ActiveRagdoll2D.meta
new file mode 100644
index 0000000..5f4ad96
--- /dev/null
+++ b/JamTools/Assets/JamTools/ActiveRagdoll2D.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 001bc74a2add2254eaf78f1566c8545b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/JamTools/Assets/JamTools/FPSControllerVelocity.meta b/JamTools/Assets/JamTools/FPSControllerVelocity.meta
new file mode 100644
index 0000000..227f681
--- /dev/null
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7732dae90f704384394cc14825110264
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/JamTools/Assets/JamTools/FPSControllerVelocity/Demo.meta b/JamTools/Assets/JamTools/FPSControllerVelocity/Demo.meta
new file mode 100644
index 0000000..2a00aa8
--- /dev/null
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Demo.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f84b396f8b41e8f41b846515fc1c8756
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/JamTools/Assets/JamTools/FPSControllerVelocity/Demo/Scenes.meta b/JamTools/Assets/JamTools/FPSControllerVelocity/Demo/Scenes.meta
new file mode 100644
index 0000000..0c66c80
--- /dev/null
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Demo/Scenes.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: abbac024f1fc4294486feff6da1486ef
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/JamTools/Assets/JamTools/Scenes/FPSCharacterController.unity b/JamTools/Assets/JamTools/FPSControllerVelocity/Demo/Scenes/FPSCharacterController.unity
index 8a8d2f3..dae43c4 100644
--- a/JamTools/Assets/JamTools/Scenes/FPSCharacterController.unity
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Demo/Scenes/FPSCharacterController.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1944,7 +1944,7 @@ Canvas:
   m_Enabled: 1
   serializedVersion: 3
   m_RenderMode: 2
-  m_Camera: {fileID: 963194227}
+  m_Camera: {fileID: 1950957598}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
@@ -7448,11 +7448,6 @@ Transform:
   m_Father: {fileID: 896524441}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!20 &963194227 stripped
-Camera:
-  m_CorrespondingSourceObject: {fileID: 963194227, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-  m_PrefabInstance: {fileID: 1293970797}
-  m_PrefabAsset: {fileID: 0}
 --- !u!43 &994454689
 Mesh:
   m_ObjectHideFlags: 0
@@ -8970,75 +8965,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1213064840}
   m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!1001 &1293970797
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 3755607823128161098, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-      propertyPath: m_MoveSmooth
-      value: 0.1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3755607823128161098, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-      propertyPath: m_LookSensitive
-      value: 500
-      objectReference: {fileID: 0}
-    - target: {fileID: 3755607823128161098, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-      propertyPath: m_MoveSmoothWithTime
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3755607823128161140, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-      propertyPath: m_RootOrder
-      value: 12
-      objectReference: {fileID: 0}
-    - target: {fileID: 3755607823128161140, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 7.2635603
-      objectReference: {fileID: 0}
-    - target: {fileID: 3755607823128161140, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -0.26
-      objectReference: {fileID: 0}
-    - target: {fileID: 3755607823128161140, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -0.6
-      objectReference: {fileID: 0}
-    - target: {fileID: 3755607823128161140, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3755607823128161140, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3755607823128161140, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3755607823128161140, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3755607823128161140, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3755607823128161140, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3755607823128161140, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3755607823128161143, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
-      propertyPath: m_Name
-      value: Player
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 9fe5972a3b043bf459d903bda86ae2ba, type: 3}
 --- !u!1 &1304633275
 GameObject:
   m_ObjectHideFlags: 0
@@ -15541,6 +15467,11 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1924073677}
   m_CullTransparentMesh: 1
+--- !u!20 &1950957598 stripped
+Camera:
+  m_CorrespondingSourceObject: {fileID: 6879717248509490095, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+  m_PrefabInstance: {fileID: 6879717249385526193}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1966873324
 GameObject:
   m_ObjectHideFlags: 0
@@ -16039,3 +15970,76 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b338d16f2565167408259c170d8f52b3, type: 3}
+--- !u!1001 &6879717249385526193
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 7739210602112578966, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_LookSmooth
+      value: 0.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7739210602112578966, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_MoveSmooth
+      value: 0.2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7739210602112578966, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_LookSensitive
+      value: 1000
+      objectReference: {fileID: 0}
+    - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_RootOrder
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 7.2635603
+      objectReference: {fileID: 0}
+    - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.26
+      objectReference: {fileID: 0}
+    - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7739210602112578984, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7739210602112578985, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_Interpolate
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7739210602112578987, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
+      propertyPath: m_Name
+      value: Player_Velocity
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8ec8551d12bf0c649a5ba9d04f879de5, type: 3}
diff --git a/JamTools/Assets/JamTools/Scenes/FPSCharacterController.unity.meta b/JamTools/Assets/JamTools/FPSControllerVelocity/Demo/Scenes/FPSCharacterController.unity.meta
index 952bd1e..952bd1e 100644
--- a/JamTools/Assets/JamTools/Scenes/FPSCharacterController.unity.meta
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Demo/Scenes/FPSCharacterController.unity.meta
diff --git a/JamTools/Assets/JamTools/FPSControllerVelocity/Prefabs.meta b/JamTools/Assets/JamTools/FPSControllerVelocity/Prefabs.meta
new file mode 100644
index 0000000..e67db62
--- /dev/null
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Prefabs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 97feb81dcde151a4c9f45611b85c106c
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/JamTools/Assets/JamTools/Prefabs/Player.prefab b/JamTools/Assets/JamTools/FPSControllerVelocity/Prefabs/Player_Velocity.prefab
index daed565..9df88ff 100644
--- a/JamTools/Assets/JamTools/Prefabs/Player.prefab
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Prefabs/Player_Velocity.prefab
@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &581680371
+--- !u!1 &6879717248509490093
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,39 +8,9 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 581680372}
-  m_Layer: 6
-  m_Name: Foot
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &581680372
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 581680371}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.035, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 3755607822235943213}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &963194225
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 963194228}
-  - component: {fileID: 963194227}
-  - component: {fileID: 963194226}
+  - component: {fileID: 6879717248509490088}
+  - component: {fileID: 6879717248509490095}
+  - component: {fileID: 6879717248509490094}
   m_Layer: 0
   m_Name: Main Camera
   m_TagString: MainCamera
@@ -48,27 +18,27 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &963194228
+--- !u!4 &6879717248509490088
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 963194225}
+  m_GameObject: {fileID: 6879717248509490093}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 3755607823435741754}
+  m_Father: {fileID: 7739210601870697702}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!20 &963194227
+--- !u!20 &6879717248509490095
 Camera:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 963194225}
+  m_GameObject: {fileID: 6879717248509490093}
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 1
@@ -105,15 +75,15 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
---- !u!81 &963194226
+--- !u!81 &6879717248509490094
 AudioListener:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 963194225}
+  m_GameObject: {fileID: 6879717248509490093}
   m_Enabled: 1
---- !u!1 &1514607782
+--- !u!1 &6879717248958439983
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -121,29 +91,29 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1514607783}
+  - component: {fileID: 6879717248958439976}
   m_Layer: 6
-  m_Name: Upper
+  m_Name: Foot
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1514607783
+--- !u!4 &6879717248958439976
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1514607782}
+  m_GameObject: {fileID: 6879717248958439983}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.108, z: 0}
+  m_LocalPosition: {x: 0, y: -0.035, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 2071361618}
-  m_RootOrder: 1
+  m_Father: {fileID: 7739210600721244145}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1747156835
+--- !u!1 &6879717249098648186
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -151,29 +121,29 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 1747156836}
+  - component: {fileID: 6879717249098648187}
   m_Layer: 6
-  m_Name: Lower
+  m_Name: Upper
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &1747156836
+--- !u!4 &6879717249098648187
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1747156835}
+  m_GameObject: {fileID: 6879717249098648186}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.3, z: 0}
+  m_LocalPosition: {x: 0, y: 0.108, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 2071361618}
-  m_RootOrder: 0
+  m_Father: {fileID: 6879717249617651342}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2071361617
+--- !u!1 &6879717249617651341
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -181,8 +151,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2071361618}
-  - component: {fileID: 2071361619}
+  - component: {fileID: 6879717249617651342}
+  - component: {fileID: 6879717249617651343}
   m_Layer: 6
   m_Name: StairChecker
   m_TagString: Untagged
@@ -190,37 +160,37 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2071361618
+--- !u!4 &6879717249617651342
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2071361617}
+  m_GameObject: {fileID: 6879717249617651341}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: -0.694, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 1747156836}
-  - {fileID: 1514607783}
-  m_Father: {fileID: 3755607823128161140}
+  - {fileID: 6879717249872257464}
+  - {fileID: 6879717249098648187}
+  m_Father: {fileID: 7739210602112578984}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2071361619
+--- !u!114 &6879717249617651343
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2071361617}
+  m_GameObject: {fileID: 6879717249617651341}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: aa1da003e4adb0a4882351b5858277d2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  upper: {fileID: 1514607783}
-  lower: {fileID: 1747156836}
---- !u!1 &3755607822235943212
+  upper: {fileID: 6879717249098648187}
+  lower: {fileID: 6879717249872257464}
+--- !u!1 &6879717249872257471
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -228,9 +198,97 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3755607822235943213}
-  - component: {fileID: 3755607822235943203}
-  - component: {fileID: 4144800332532561314}
+  - component: {fileID: 6879717249872257464}
+  m_Layer: 6
+  m_Name: Lower
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6879717249872257464
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6879717249872257471}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.3, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6879717249617651342}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7192055133203588255
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8767450641809511506}
+  - component: {fileID: 6401592115772403490}
+  - component: {fileID: 747489763930998893}
+  m_Layer: 6
+  m_Name: WallChecker
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8767450641809511506
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7192055133203588255}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.05, y: 0.5, z: 1.05}
+  m_Children: []
+  m_Father: {fileID: 7739210602112578984}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6401592115772403490
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7192055133203588255}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 32f00fa7c9bddb34a9f2255a5ad0d669, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!64 &747489763930998893
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7192055133203588255}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 26
+  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &7739210600721244144
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7739210600721244145}
+  - component: {fileID: 7739210600721244159}
+  - component: {fileID: 7421056502815140734}
   m_Layer: 6
   m_Name: GroundChecker
   m_TagString: Untagged
@@ -238,48 +296,48 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3755607822235943213
+--- !u!4 &7739210600721244145
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607822235943212}
+  m_GameObject: {fileID: 7739210600721244144}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: -0.966, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 581680372}
-  m_Father: {fileID: 3755607823128161140}
+  - {fileID: 6879717248958439976}
+  m_Father: {fileID: 7739210602112578984}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &3755607822235943203
+--- !u!114 &7739210600721244159
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607822235943212}
+  m_GameObject: {fileID: 7739210600721244144}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 77cfc1aa874d7ae4c906191d64538a3a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_Foot: {fileID: 581680372}
---- !u!135 &4144800332532561314
+  m_Foot: {fileID: 6879717248958439976}
+--- !u!135 &7421056502815140734
 SphereCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607822235943212}
+  m_GameObject: {fileID: 7739210600721244144}
   m_Material: {fileID: 0}
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
   m_Radius: 0.41830033
   m_Center: {x: 0, y: 0.33, z: -0.0037634373}
---- !u!1 &3755607822786182922
+--- !u!1 &7739210601246302678
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -287,7 +345,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3755607822786182923}
+  - component: {fileID: 7739210601246302679}
   m_Layer: 7
   m_Name: Muzzle
   m_TagString: Untagged
@@ -295,21 +353,21 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3755607822786182923
+--- !u!4 &7739210601246302679
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607822786182922}
+  m_GameObject: {fileID: 7739210601246302678}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: -0, y: -0, z: 0.61}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 3755607823301764077}
+  m_Father: {fileID: 7739210602005167409}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3755607823128161143
+--- !u!1 &7739210601870697721
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -317,100 +375,31 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3755607823128161140}
-  - component: {fileID: 3755607823128161141}
-  - component: {fileID: 3755607823128161098}
-  - component: {fileID: 104493165}
+  - component: {fileID: 7739210601870697702}
   m_Layer: 6
-  m_Name: Player
+  m_Name: Eye
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3755607823128161140
+--- !u!4 &7739210601870697702
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607823128161143}
+  m_GameObject: {fileID: 7739210601870697721}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 7.2635603, y: -0.26, z: 14.075805}
+  m_LocalPosition: {x: 0, y: 0.76, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 3755607823625089714}
-  - {fileID: 3755607823435741754}
-  - {fileID: 3755607822235943213}
-  - {fileID: 2798309367730113166}
-  - {fileID: 2071361618}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
+  - {fileID: 7739210602005167409}
+  - {fileID: 6879717248509490088}
+  m_Father: {fileID: 7739210602112578984}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!54 &3755607823128161141
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607823128161143}
-  serializedVersion: 2
-  m_Mass: 30
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 1
-  m_IsKinematic: 0
-  m_Interpolate: 0
-  m_Constraints: 112
-  m_CollisionDetection: 2
---- !u!114 &3755607823128161098
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607823128161143}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9013df258fd554e4e80d2a39ae1c5a86, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Modules: -1
-  m_Eye: {fileID: 3755607823435741754}
-  m_Body: {fileID: 108258044}
-  m_GroundChecker: {fileID: 3755607822235943203}
-  m_WallChecker: {fileID: 553569468365550078}
-  m_LookSensitive: 1000
-  m_LookSmooth: 0.2
-  m_LookSmoothMultiplier: 100
-  m_LookSmoothWithTime: 1
-  m_MoveSpeed: 500
-  m_MoveSmooth: 0.25
-  m_MoveSmoothMultiplier: 100
-  m_MoveSmoothWithTime: 1
-  m_MoveSpeedInAir: 500
-  m_Muzzle: {fileID: 3755607822786182923}
-  m_HittableLayers:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_ShotInfiniteDistance: 100
-  m_WallJumpForce: 1
-  m_WallJumpPower: 10000
-  m_ExtraGravity: {x: 0, y: 0, z: 0}
---- !u!114 &104493165
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607823128161143}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ec838ef829bbe05498510200c17766a4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Bullet: {fileID: 4396925871583976770, guid: 7f51e5dfe22a2f045b0b8b5c468152de, type: 3}
---- !u!1 &3755607823301764076
+--- !u!1 &7739210602005167408
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -418,9 +407,9 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3755607823301764077}
-  - component: {fileID: 3755607823301764064}
-  - component: {fileID: 3755607823301764067}
+  - component: {fileID: 7739210602005167409}
+  - component: {fileID: 7739210602005167420}
+  - component: {fileID: 7739210602005167423}
   m_Layer: 7
   m_Name: Gun
   m_TagString: Untagged
@@ -428,36 +417,36 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3755607823301764077
+--- !u!4 &7739210602005167409
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607823301764076}
+  m_GameObject: {fileID: 7739210602005167408}
   m_LocalRotation: {x: -0.052238453, y: -0.11051678, z: -0.012230438, w: 0.99242514}
   m_LocalPosition: {x: 0.246, y: -0.11, z: 0.67}
   m_LocalScale: {x: 0.1, y: 0.1, z: 0.3}
   m_Children:
-  - {fileID: 3755607822786182923}
-  m_Father: {fileID: 3755607823435741754}
+  - {fileID: 7739210601246302679}
+  m_Father: {fileID: 7739210601870697702}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: -6.107, y: -12.669, z: -0.734}
---- !u!33 &3755607823301764064
+--- !u!33 &7739210602005167420
 MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607823301764076}
+  m_GameObject: {fileID: 7739210602005167408}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &3755607823301764067
+--- !u!23 &7739210602005167423
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607823301764076}
+  m_GameObject: {fileID: 7739210602005167408}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 0
@@ -492,7 +481,7 @@ MeshRenderer:
   m_SortingLayer: 1
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &3755607823435741733
+--- !u!1 &7739210602112578987
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -500,31 +489,100 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3755607823435741754}
+  - component: {fileID: 7739210602112578984}
+  - component: {fileID: 7739210602112578985}
+  - component: {fileID: 7739210602112578966}
+  - component: {fileID: 6879717248498036401}
   m_Layer: 6
-  m_Name: Eye
+  m_Name: Player_Velocity
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3755607823435741754
+--- !u!4 &7739210602112578984
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607823435741733}
+  m_GameObject: {fileID: 7739210602112578987}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.76, z: 0}
+  m_LocalPosition: {x: 7.2635603, y: -0.26, z: -0.6}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 3755607823301764077}
-  - {fileID: 963194228}
-  m_Father: {fileID: 3755607823128161140}
-  m_RootOrder: 1
+  - {fileID: 7739210602622086254}
+  - {fileID: 7739210601870697702}
+  - {fileID: 7739210600721244145}
+  - {fileID: 8767450641809511506}
+  - {fileID: 6879717249617651342}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3755607823625089725
+--- !u!54 &7739210602112578985
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7739210602112578987}
+  serializedVersion: 2
+  m_Mass: 30
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 112
+  m_CollisionDetection: 2
+--- !u!114 &7739210602112578966
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7739210602112578987}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9013df258fd554e4e80d2a39ae1c5a86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Modules: -1
+  m_Eye: {fileID: 7739210601870697702}
+  m_Body: {fileID: 6879717248493419552}
+  m_GroundChecker: {fileID: 7739210600721244159}
+  m_WallChecker: {fileID: 6401592115772403490}
+  m_LookSensitive: 500
+  m_LookSmooth: 0.2
+  m_LookSmoothMultiplier: 100
+  m_LookSmoothWithTime: 1
+  m_MoveSpeed: 500
+  m_MoveSmooth: 0.1
+  m_MoveSmoothMultiplier: 100
+  m_MoveSmoothWithTime: 1
+  m_MoveSpeedInAir: 500
+  m_Muzzle: {fileID: 7739210601246302679}
+  m_HittableLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ShotInfiniteDistance: 100
+  m_WallJumpForce: 1
+  m_WallJumpPower: 10000
+  m_ExtraGravity: {x: 0, y: 0, z: 0}
+--- !u!114 &6879717248498036401
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7739210602112578987}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ec838ef829bbe05498510200c17766a4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Bullet: {fileID: 4396925871583976770, guid: 7f51e5dfe22a2f045b0b8b5c468152de, type: 3}
+--- !u!1 &7739210602622086241
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -532,11 +590,11 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3755607823625089714}
-  - component: {fileID: 3755607823625089713}
-  - component: {fileID: 3755607823625089712}
-  - component: {fileID: 3755607823625089715}
-  - component: {fileID: 108258044}
+  - component: {fileID: 7739210602622086254}
+  - component: {fileID: 7739210602622086253}
+  - component: {fileID: 7739210602622086252}
+  - component: {fileID: 7739210602622086255}
+  - component: {fileID: 6879717248493419552}
   m_Layer: 6
   m_Name: Body
   m_TagString: Untagged
@@ -544,35 +602,35 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3755607823625089714
+--- !u!4 &7739210602622086254
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607823625089725}
+  m_GameObject: {fileID: 7739210602622086241}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 3755607823128161140}
+  m_Father: {fileID: 7739210602112578984}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &3755607823625089713
+--- !u!33 &7739210602622086253
 MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607823625089725}
+  m_GameObject: {fileID: 7739210602622086241}
   m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &3755607823625089712
+--- !u!23 &7739210602622086252
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607823625089725}
+  m_GameObject: {fileID: 7739210602622086241}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -607,13 +665,13 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!136 &3755607823625089715
+--- !u!136 &7739210602622086255
 CapsuleCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607823625089725}
+  m_GameObject: {fileID: 7739210602622086241}
   m_Material: {fileID: 13400000, guid: 88e7227246830b942910801154d623b9, type: 2}
   m_IsTrigger: 0
   m_Enabled: 1
@@ -621,73 +679,15 @@ CapsuleCollider:
   m_Height: 2
   m_Direction: 1
   m_Center: {x: 0, y: 0, z: 0}
---- !u!114 &108258044
+--- !u!114 &6879717248493419552
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3755607823625089725}
+  m_GameObject: {fileID: 7739210602622086241}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 2c8f58020a68c9a4cad47eca148231ff, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &4374959424473659971
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2798309367730113166}
-  - component: {fileID: 553569468365550078}
-  - component: {fileID: 6135652675925644977}
-  m_Layer: 6
-  m_Name: WallChecker
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2798309367730113166
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4374959424473659971}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.05, y: 0.5, z: 1.05}
-  m_Children: []
-  m_Father: {fileID: 3755607823128161140}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &553569468365550078
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4374959424473659971}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 32f00fa7c9bddb34a9f2255a5ad0d669, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!64 &6135652675925644977
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4374959424473659971}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 1
-  m_CookingOptions: 26
-  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
diff --git a/JamTools/Assets/JamTools/Prefabs/Player.prefab.meta b/JamTools/Assets/JamTools/FPSControllerVelocity/Prefabs/Player_Velocity.prefab.meta
index caf4b3d..689e2b6 100644
--- a/JamTools/Assets/JamTools/Prefabs/Player.prefab.meta
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Prefabs/Player_Velocity.prefab.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9fe5972a3b043bf459d903bda86ae2ba
+guid: 8ec8551d12bf0c649a5ba9d04f879de5
 PrefabImporter:
   externalObjects: {}
   userData: 
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController.meta b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts.meta
index 0156136..0156136 100644
--- a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController.meta
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts.meta
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/FPSCharacterController.cs b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/FPSCharacterController.cs
index 1f40e34..f995c8e 100644
--- a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/FPSCharacterController.cs
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/FPSCharacterController.cs
@@ -178,8 +178,8 @@ namespace JamTools
             Vector3 velocity = new Vector3(m_MoveDirection.x * Time.deltaTime * m_MoveSpeed, vy, m_MoveDirection.z * Time.deltaTime * m_MoveSpeed);

 

             float t = m_MoveSmoothWithTime ? Time.deltaTime : 1;

-			//m_Rigidbody.velocity = Vector3.Lerp(m_Rigidbody.velocity, velocity, m_MoveSmooth * t * m_MoveSmoothMultiplier);

-			m_Rigidbody.AddForce(velocity * m_MoveSmoothMultiplier, ForceMode.VelocityChange);

+			m_Rigidbody.velocity = Vector3.Lerp(m_Rigidbody.velocity, velocity, m_MoveSmooth * t * m_MoveSmoothMultiplier);

+			//m_Rigidbody.AddForce(velocity * m_MoveSmoothMultiplier, ForceMode.VelocityChange);

 		}

 

         void MoveInAirUpdate()

diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/FPSCharacterController.cs.meta b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/FPSCharacterController.cs.meta
index 555d7fe..555d7fe 100644
--- a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/FPSCharacterController.cs.meta
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/FPSCharacterController.cs.meta
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/GroundChecker.cs b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/GroundChecker.cs
index 6fa3a60..6fa3a60 100644
--- a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/GroundChecker.cs
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/GroundChecker.cs
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/GroundChecker.cs.meta b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/GroundChecker.cs.meta
index 6d7d500..6d7d500 100644
--- a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/GroundChecker.cs.meta
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/GroundChecker.cs.meta
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/Player.cs b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/Player.cs
index f26d6ce..f26d6ce 100644
--- a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/Player.cs
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/Player.cs
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/Player.cs.meta b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/Player.cs.meta
index d39ac17..d39ac17 100644
--- a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/Player.cs.meta
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/Player.cs.meta
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/PlayerBody.cs b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/PlayerBody.cs
index 709b756..709b756 100644
--- a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/PlayerBody.cs
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/PlayerBody.cs
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/PlayerBody.cs.meta b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/PlayerBody.cs.meta
index 218de82..218de82 100644
--- a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/PlayerBody.cs.meta
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/PlayerBody.cs.meta
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/StairChecker.cs b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/StairChecker.cs
index d5b881e..d5b881e 100644
--- a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/StairChecker.cs
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/StairChecker.cs
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/StairChecker.cs.meta b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/StairChecker.cs.meta
index bf23780..bf23780 100644
--- a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/StairChecker.cs.meta
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/StairChecker.cs.meta
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/WallChecker.cs b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/WallChecker.cs
index 8137670..8137670 100644
--- a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/WallChecker.cs
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/WallChecker.cs
diff --git a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/WallChecker.cs.meta b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/WallChecker.cs.meta
index 2041b9f..2041b9f 100644
--- a/JamTools/Assets/JamTools/Scripts/Character/FPSCharacterController/WallChecker.cs.meta
+++ b/JamTools/Assets/JamTools/FPSControllerVelocity/Scripts/WallChecker.cs.meta
diff --git a/JamTools/Assets/JamTools/Scripts/Character/CameraFollow.cs b/JamTools/Assets/JamTools/Scripts/Character/CameraFollow.cs
index 79a535b..c711f87 100644
--- a/JamTools/Assets/JamTools/Scripts/Character/CameraFollow.cs
+++ b/JamTools/Assets/JamTools/Scripts/Character/CameraFollow.cs
@@ -4,31 +4,5 @@ using UnityEngine;
 

 namespace JamTools

 {

-

-	[RequireComponent(typeof(Camera))]

-	public class CameraFollow : MonoBehaviour

-	{

-		[SerializeField] private Transform m_Target;

-

-		[SerializeField] private Vector3 m_Offset;

-

-		private Camera m_Camera;

-

-		private void Awake()

-		{

-			m_Camera = GetComponent<Camera>();

-		}

-

-		void Start()

-		{

-

-		}

-

-		void Update()

-		{

-			m_Camera.transform.position = m_Target.position;

-			m_Camera.transform.rotation = m_Target.rotation;

-		}

-	}

-

+    

 }
\ No newline at end of file
diff --git a/JamTools/ProjectSettings/EditorBuildSettings.asset b/JamTools/ProjectSettings/EditorBuildSettings.asset
index 251a9f0..8c1b4db 100644
--- a/JamTools/ProjectSettings/EditorBuildSettings.asset
+++ b/JamTools/ProjectSettings/EditorBuildSettings.asset
@@ -6,6 +6,6 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/JamTools/Scenes/FPSCharacterController.unity
+    path: Assets/JamTools/FPSControllerVelocity/Demo/Scenes/FPSCharacterController.unity
     guid: 9fc0d4010bbf28b4594072e72b8655ab
   m_configObjects: {}
diff --git a/JamTools/UserSettings/EditorUserSettings.asset b/JamTools/UserSettings/EditorUserSettings.asset
index efe914b..d015a0c 100644
--- a/JamTools/UserSettings/EditorUserSettings.asset
+++ b/JamTools/UserSettings/EditorUserSettings.asset
@@ -14,6 +14,9 @@ EditorUserSettings:
     RecentlyUsedScenePath-2:
       value: 22424703114646710c03382d1f2f4c5f25141d24293b69161d1a3e3be3f2353bf6e224cae8342b2e360ee33916701431fb1e10
       flags: 0
+    RecentlyUsedScenePath-3:
+      value: 22424703114646710c03382d1f2f4c5f30272b092326322222251136f0d63134ede43ffdfe751b39340da00f073b0f3ae1452f3bc528020a030ffe1a14ed331c1fd10aca16c41a0e850c12c7d904
+      flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0