Skip to content

Commit

Permalink
Merge branch 'release/v1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
MaxSensation committed Jun 3, 2020
2 parents 44af919 + 7501174 commit a675d7b
Show file tree
Hide file tree
Showing 1,395 changed files with 347,983 additions and 219,578 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,5 @@ crashlytics-build.properties

Assets/Prefabs/Interactables/Pickups.meta
Assets/Animations/PlatformButtonAnimations.meta

.idea/
2 changes: 0 additions & 2 deletions .idea/.gitignore

This file was deleted.

2 changes: 0 additions & 2 deletions .idea/.idea.SignalParadox/.idea/.gitignore

This file was deleted.

192 changes: 0 additions & 192 deletions .idea/.idea.SignalParadox/.idea/contentModel.xml

This file was deleted.

4 changes: 0 additions & 4 deletions .idea/.idea.SignalParadox/.idea/encodings.xml

This file was deleted.

34 changes: 0 additions & 34 deletions .idea/.idea.SignalParadox/.idea/indexLayout.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/.idea.SignalParadox/.idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/.idea.SignalParadox/.idea/projectSettingsUpdater.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/.idea.SignalParadox/.idea/vcs.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/.idea.SignalParadox/riderModule.iml

This file was deleted.

30 changes: 30 additions & 0 deletions Assets/Animations/BodyTrapper/BodyTrapperMesh.controller
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 4834099713739386841}
m_Position: {x: 570, y: 190, z: 0}
- serializedVersion: 1
m_State: {fileID: 3515453766370148935}
m_Position: {x: 605, y: 255, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
Expand Down Expand Up @@ -508,6 +511,33 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &3515453766370148935
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: deathStanding
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: 1827226128182048838, guid: 72f8a25b4faed5148bd9b970f9eda43a,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &3914310062433057746
AnimatorStateTransition:
m_ObjectHideFlags: 1
Expand Down
Loading

0 comments on commit a675d7b

Please sign in to comment.