Skip to content

Commit

Permalink
Merge pull request #32 from Sanity404Studios/ActiveDev001
Browse files Browse the repository at this point in the history
Pre-Alpha Merge
  • Loading branch information
TheDeathSinger committed Feb 25, 2016
2 parents 80a899e + cbdab0e commit 9421fff
Show file tree
Hide file tree
Showing 250 changed files with 18,422 additions and 233 deletions.
9 changes: 9 additions & 0 deletions Assets/Animations/Platforming/Character/Menu.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

69 changes: 69 additions & 0 deletions Assets/Animations/Platforming/Character/Menu/Idle.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Idle
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: .216666669
value: {fileID: 21300028, guid: 97c84dedebb46fe43873fa418a0ddd0f, type: 3}
- time: .716666698
value: {fileID: 21300030, guid: 97c84dedebb46fe43873fa418a0ddd0f, type: 3}
- time: 1.2166667
value: {fileID: 21300028, guid: 97c84dedebb46fe43873fa418a0ddd0f, 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:
- path: 0
attribute: 0
script: {fileID: 0}
classID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300028, guid: 97c84dedebb46fe43873fa418a0ddd0f, type: 3}
- {fileID: 21300030, guid: 97c84dedebb46fe43873fa418a0ddd0f, type: 3}
- {fileID: 21300028, guid: 97c84dedebb46fe43873fa418a0ddd0f, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_StartTime: 0
m_StopTime: 1.23333335
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 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_GenerateMotionCurves: 0
m_Events: []
8 changes: 8 additions & 0 deletions Assets/Animations/Platforming/Character/Menu/Idle.anim.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: p1_spritesheet_14
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 110704150}
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!1102 &110243158
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Idle
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_Motion: {fileID: 7400000, guid: 7a60c028207fffc40a8c2f4aa3e8916d, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
--- !u!1107 &110704150
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 110243158}
m_Position: {x: 200, y: 0, 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: 110243158}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ AnimatorStateTransition:
m_TransitionDuration: .25
m_TransitionOffset: 0
m_ExitTime: .84375
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand Down Expand Up @@ -109,7 +109,7 @@ AnimatorStateTransition:
m_TransitionDuration: .25
m_TransitionOffset: 0
m_ExitTime: .732142866
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand Down Expand Up @@ -154,7 +154,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: .25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: .745762706
m_HasExitTime: 0
Expand Down Expand Up @@ -262,7 +262,7 @@ AnimatorStateTransition:
m_TransitionDuration: .25
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand Down Expand Up @@ -521,7 +521,7 @@ AnimatorStateMachine:
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 1236, y: -24, z: 0}
m_EntryPosition: {x: 600, y: -324, z: 0}
m_EntryPosition: {x: 576, y: -324, z: 0}
m_ExitPosition: {x: 1236, y: 12, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 110299872}
90 changes: 55 additions & 35 deletions Assets/Animations/Platforming/MovingPlatform/MovingPlatform.anim
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,24 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- time: 0
value: {x: 13.5500002, y: .5, z: 0}
inSlope: {x: 2.25749993, y: 0, z: 0}
outSlope: {x: -.573194921, y: 0, z: 0}
value: {x: 19.5799999, y: 3.76999998, z: 0}
inSlope: {x: 2.25749993, y: 1.9466666, z: 0}
outSlope: {x: 2.74212742, y: 1.9466666, z: 0}
tangentMode: 0
- time: 4
value: {x: 22.5799999, y: .5, z: 0}
inSlope: {x: -.584268451, y: 0, z: 0}
outSlope: {x: -.501412272, y: 0, z: 0}
- time: 3
value: {x: 32.4900017, y: 9.60999966, z: 0}
inSlope: {x: 3.58463383, y: .973333299, z: 0}
outSlope: {x: 3.31285119, y: .973333299, z: 0}
tangentMode: 0
- time: 8
value: {x: 13.5500002, y: .5, z: 0}
inSlope: {x: .856463492, y: 0, z: 0}
outSlope: {x: -2.25749993, y: 0, z: 0}
- time: 5
value: {x: 19.5799999, y: 9.60999966, z: 0}
inSlope: {x: -10.0387201, y: -1.9466666, z: 0}
outSlope: {x: -2.76684952, y: -1.9466666, z: 0}
tangentMode: 0
- time: 6.5
value: {x: 19.5799999, y: 3.76999998, z: 0}
inSlope: {x: .353686869, y: -3.8933332, z: 0}
outSlope: {x: 0, y: -3.8933332, z: 0}
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
Expand All @@ -54,7 +59,7 @@ AnimationClip:
m_AnimationClipSettings:
serializedVersion: 2
m_StartTime: 0
m_StopTime: 8
m_StopTime: 6.5
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
Expand All @@ -73,19 +78,24 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- time: 0
value: 13.5500002
value: 19.5799999
inSlope: 2.25749993
outSlope: -.573194921
outSlope: 2.74212742
tangentMode: 1
- time: 3
value: 32.4900017
inSlope: 3.58463383
outSlope: 3.31285119
tangentMode: 1
- time: 4
value: 22.5799999
inSlope: -.584268451
outSlope: -.501412272
- time: 5
value: 19.5799999
inSlope: -10.0387201
outSlope: -2.76684952
tangentMode: 1
- time: 8
value: 13.5500002
inSlope: .856463492
outSlope: -2.25749993
- time: 6.5
value: 19.5799999
inSlope: .353686869
outSlope: 0
tangentMode: 1
m_PreInfinity: 2
m_PostInfinity: 2
Expand All @@ -97,19 +107,24 @@ AnimationClip:
serializedVersion: 2
m_Curve:
- time: 0
value: .5
inSlope: 0
outSlope: 0
value: 3.76999998
inSlope: 1.9466666
outSlope: 1.9466666
tangentMode: 10
- time: 4
value: .5
inSlope: 0
outSlope: 0
- time: 3
value: 9.60999966
inSlope: .973333299
outSlope: .973333299
tangentMode: 10
- time: 8
value: .5
inSlope: 0
outSlope: 0
- time: 5
value: 9.60999966
inSlope: -1.9466666
outSlope: -1.9466666
tangentMode: 10
- time: 6.5
value: 3.76999998
inSlope: -3.8933332
outSlope: -3.8933332
tangentMode: 10
m_PreInfinity: 2
m_PostInfinity: 2
Expand All @@ -125,12 +140,17 @@ AnimationClip:
inSlope: 0
outSlope: 0
tangentMode: 10
- time: 4
- time: 3
value: 0
inSlope: 0
outSlope: 0
tangentMode: 10
- time: 5
value: 0
inSlope: 0
outSlope: 0
tangentMode: 10
- time: 8
- time: 6.5
value: 0
inSlope: 0
outSlope: 0
Expand Down
Loading

0 comments on commit 9421fff

Please sign in to comment.