Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Seans branch #6

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Seans branch #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c1b4414
Merge pull request #3 from jevan1000/Jevan's-Branch
jevan-smith Apr 17, 2018
4e06bc0
idk
SeanMilty95 Apr 18, 2018
01a1bb3
Merge branch 'SeansBranch' of https://github.com/jevan1000/Legend-of-…
SeanMilty95 Apr 18, 2018
eff2ebe
sdf
SeanMilty95 Apr 18, 2018
0ecc9ed
Merge branch 'master' into SeansBranch
SeanMilty95 Apr 18, 2018
ec34362
stops moving when in attack rnge
SeanMilty95 Apr 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file modified sheildmaiden/.vs/sheildmaiden/v15/Server/sqlite3/storage.ide
View file
Open in desktop
Binary file not shown.
144 changes: 139 additions & 5 deletions sheildmaiden/Assets/Animations/BlackBat/Demo Enemy.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,19 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: Attack
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: Dead
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
Expand All @@ -33,6 +39,54 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1101045683164555942
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Dead
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102172221673747090}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.10480893
m_TransitionOffset: 0
m_ExitTime: 0.625
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101167508841783612
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Dead
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102172221673747090}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.0752964
m_TransitionOffset: 0
m_ExitTime: 0.46428573
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101264414201851922
AnimatorStateTransition:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -129,6 +183,54 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101613059585097598
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Dead
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102172221673747090}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.07437423
m_TransitionOffset: 0
m_ExitTime: 0.5714285
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101720772416250926
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Dead
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102172221673747090}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.07542825
m_TransitionOffset: 0
m_ExitTime: 0.57142854
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101721609219203534
AnimatorStateTransition:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -231,6 +333,31 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &1102172221673747090
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: death
m_Speed: 1.5
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: 51e80f2dc8a2c0f48b75af167d14645e, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102404847027623742
AnimatorState:
serializedVersion: 5
Expand All @@ -243,6 +370,7 @@ AnimatorState:
m_Transitions:
- {fileID: 1101721609219203534}
- {fileID: 1101779096833185058}
- {fileID: 1101045683164555942}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand Down Expand Up @@ -270,6 +398,7 @@ AnimatorState:
m_Transitions:
- {fileID: 1101264414201851922}
- {fileID: 1101507781502771948}
- {fileID: 1101167508841783612}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand Down Expand Up @@ -322,6 +451,7 @@ AnimatorState:
m_Transitions:
- {fileID: 1101274182744893224}
- {fileID: 1101890763785176514}
- {fileID: 1101720772416250926}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand Down Expand Up @@ -349,6 +479,7 @@ AnimatorState:
m_Transitions:
- {fileID: 1101934526269546834}
- {fileID: 1101534878768672794}
- {fileID: 1101613059585097598}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand Down Expand Up @@ -380,13 +511,16 @@ AnimatorStateMachine:
m_Position: {x: 312, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102956193121887314}
m_Position: {x: 660, y: 120, z: 0}
m_Position: {x: 756, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102765584780374418}
m_Position: {x: 312, y: 240, z: 0}
m_Position: {x: 312, y: 324, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102404847027623742}
m_Position: {x: 660, y: 240, z: 0}
m_Position: {x: 756, y: 324, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102172221673747090}
m_Position: {x: 528, y: 216, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
Expand Down
95 changes: 95 additions & 0 deletions sheildmaiden/Assets/Animations/BlackBat/death.anim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
%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: death
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: 21300080, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- time: 0.083333336
value: {fileID: 21300082, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- time: 0.16666667
value: {fileID: 21300084, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- time: 0.25
value: {fileID: 21300086, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- time: 0.33333334
value: {fileID: 21300088, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- time: 0.41666666
value: {fileID: 21300090, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- time: 0.5
value: {fileID: 21300092, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- time: 0.5833333
value: {fileID: 21300094, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- time: 0.6666667
value: {fileID: 21300096, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- time: 0.75
value: {fileID: 21300098, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
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: 21300080, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- {fileID: 21300082, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- {fileID: 21300084, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- {fileID: 21300086, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- {fileID: 21300088, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- {fileID: 21300090, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- {fileID: 21300092, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- {fileID: 21300094, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- {fileID: 21300096, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
- {fileID: 21300098, guid: ca7f5c56fdfb8da43a57ae335a6a6ba2, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.8333333
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
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: []
10 changes: 10 additions & 0 deletions sheildmaiden/Assets/Animations/BlackBat/death.anim.meta
View file
Open in desktop

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

Loading