Merge pull request #2 from MontanaJohns/wip-never-let-this-see-the-light-of-day-rope-prototype-DistanceHinge+simulated

rope prototype distance hinge+simulated

8 files changed, 267 insertions, 2 deletions

diff --git a/Assets/Animations/MontanaJohns.meta b/Assets/Animations/MontanaJohns.meta
new file mode 100644
index 0000000..6005515
--- /dev/null
+++ b/Assets/Animations/MontanaJohns.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 266df54c1e6640943b5549c0a60fbc37
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Animations/MontanaJohns/MontanaJohns.controller b/Assets/Animations/MontanaJohns/MontanaJohns.controller
new file mode 100644
index 0000000..cfb8eec
--- /dev/null
+++ b/Assets/Animations/MontanaJohns/MontanaJohns.controller
@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-4381722352777846568
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Run
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 16f0d19faa73a274788329f7368084f1, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MontanaJohns
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 830988249226544064}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1107 &830988249226544064
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -4381722352777846568}
+    m_Position: {x: 380, y: 120, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -4381722352777846568}
diff --git a/Assets/Animations/MontanaJohns/MontanaJohns.controller.meta b/Assets/Animations/MontanaJohns/MontanaJohns.controller.meta
new file mode 100644
index 0000000..d38ee98
--- /dev/null
+++ b/Assets/Animations/MontanaJohns/MontanaJohns.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5b3446f9fca03924ea2739d6e2d1f00e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Animations/MontanaJohns/Player.controller b/Assets/Animations/MontanaJohns/Player.controller
new file mode 100644
index 0000000..4d4a73d
--- /dev/null
+++ b/Assets/Animations/MontanaJohns/Player.controller
@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-989215695225172247
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -45171433127652272}
+    m_Position: {x: 330, y: 110, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -45171433127652272}
+--- !u!1102 &-45171433127652272
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: run
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 16f0d19faa73a274788329f7368084f1, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Player
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -989215695225172247}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
diff --git a/Assets/Animations/MontanaJohns/Player.controller.meta b/Assets/Animations/MontanaJohns/Player.controller.meta
new file mode 100644
index 0000000..ff283bc
--- /dev/null
+++ b/Assets/Animations/MontanaJohns/Player.controller.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8ece3251730e7134f9bbe0852b7c6612
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Animations/MontanaJohns/run.anim b/Assets/Animations/MontanaJohns/run.anim
new file mode 100644
index 0000000..fdce640
--- /dev/null
+++ b/Assets/Animations/MontanaJohns/run.anim
@@ -0,0 +1,89 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: run
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 1256470140, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+    - time: 0.083333336
+      value: {fileID: -1042349849, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+    - time: 0.16666667
+      value: {fileID: 216792634, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+    - time: 0.25
+      value: {fileID: 1044303231, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+    - time: 0.33333334
+      value: {fileID: 299380834, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+    - time: 0.41666666
+      value: {fileID: -1460522098, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+    - time: 0.5
+      value: {fileID: -1969183652, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+    - time: 0.5833333
+      value: {fileID: -919123645, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 1256470140, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+    - {fileID: -1042349849, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+    - {fileID: 216792634, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+    - {fileID: 1044303231, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+    - {fileID: 299380834, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+    - {fileID: -1460522098, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+    - {fileID: -1969183652, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+    - {fileID: -919123645, guid: 8b08bada3c2ac5e4cb65721a772f0f99, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.59999996
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
diff --git a/Assets/Animations/MontanaJohns/run.anim.meta b/Assets/Animations/MontanaJohns/run.anim.meta
new file mode 100644
index 0000000..ec1c104
--- /dev/null
+++ b/Assets/Animations/MontanaJohns/run.anim.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 16f0d19faa73a274788329f7368084f1
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Animations/Prototype/Run.anim b/Assets/Animations/Prototype/Run.anim
index 7183182..bb7d17d 100644
--- a/Assets/Animations/Prototype/Run.anim
+++ b/Assets/Animations/Prototype/Run.anim
@@ -20,7 +20,7 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: -560681948, guid: 72a632f763991754fb9722d38264d272, type: 3}
+      value: {fileID: 927410543, guid: 72a632f763991754fb9722d38264d272, type: 3}
     - time: 0.083333336
       value: {fileID: 927410543, guid: 72a632f763991754fb9722d38264d272, type: 3}
     - time: 0.16666667
@@ -54,7 +54,7 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: -560681948, guid: 72a632f763991754fb9722d38264d272, type: 3}
+    - {fileID: 927410543, guid: 72a632f763991754fb9722d38264d272, type: 3}
     - {fileID: 927410543, guid: 72a632f763991754fb9722d38264d272, type: 3}
     - {fileID: -1632938849, guid: 72a632f763991754fb9722d38264d272, type: 3}
     - {fileID: -774491187, guid: 72a632f763991754fb9722d38264d272, type: 3}