Commit 09f5b4bc authored by Andrew R Van Buren's avatar Andrew R Van Buren

Merge branch 'fixes' into 'master'

Fixes

See merge request !64
parents b0665e8f 160bb133
......@@ -13,49 +13,49 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: walk state
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: on ground
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: on wall
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: is wall sliding
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: is dashing
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: is dead
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: jump failed
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
......@@ -655,6 +655,30 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101839230351870134
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: is dead
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102112602750143940}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.9
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101909886002805576
AnimatorStateTransition:
m_ObjectHideFlags: 3
......@@ -1127,6 +1151,7 @@ AnimatorStateMachine:
m_ChildStateMachines: []
m_AnyStateTransitions:
- {fileID: 1101125233811007622}
- {fileID: 1101839230351870134}
m_EntryTransitions: []
m_StateMachineTransitions:
data:
......
......@@ -23,7 +23,7 @@ GameObject:
- component: {fileID: 58460928687217622}
- component: {fileID: 50635277209838516}
- component: {fileID: 114154880416009188}
m_Layer: 0
m_Layer: 10
m_Name: CaramelBullet
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -38,7 +38,7 @@ Transform:
m_GameObject: {fileID: 1971150978506544}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.84, y: 0.16, z: 2.3632812}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
......@@ -59,7 +59,7 @@ Rigidbody2D:
m_AngularDrag: 0.05
m_GravityScale: 0
m_Material: {fileID: 0}
m_Interpolate: 0
m_Interpolate: 1
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 4
......
......@@ -20,7 +20,7 @@ GameObject:
m_Component:
- component: {fileID: 4388568897880834}
- component: {fileID: 137326925538355346}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_11 (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -35,7 +35,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4737730228703230}
m_Layer: 0
m_Layer: 9
m_Name: 4_2
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -50,7 +50,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4210474468684820}
m_Layer: 0
m_Layer: 9
m_Name: LeftCollision
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -65,7 +65,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4367096098275012}
m_Layer: 0
m_Layer: 9
m_Name: 3_2
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -81,7 +81,7 @@ GameObject:
m_Component:
- component: {fileID: 4396709945358320}
- component: {fileID: 137371996294306878}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_2
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -96,7 +96,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4208526685599448}
m_Layer: 0
m_Layer: 9
m_Name: 1
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -111,7 +111,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4071526910235434}
m_Layer: 0
m_Layer: 9
m_Name: RightCollision
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -127,7 +127,7 @@ GameObject:
m_Component:
- component: {fileID: 4039479416434524}
- component: {fileID: 137312562844000470}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_10
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -143,7 +143,7 @@ GameObject:
m_Component:
- component: {fileID: 4716130678123532}
- component: {fileID: 212852537219820474}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_21
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -161,8 +161,8 @@ GameObject:
- component: {fileID: 61882708240328608}
- component: {fileID: 50612939754616198}
- component: {fileID: 114374962116521272}
- component: {fileID: 114936173987855878}
m_Layer: 0
- component: {fileID: 114979596987958142}
m_Layer: 9
m_Name: CaramelCamel 1
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -177,7 +177,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4823246290064910}
m_Layer: 0
m_Layer: 9
m_Name: 3_1
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -192,7 +192,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4954293851982568}
m_Layer: 0
m_Layer: 9
m_Name: 3_1
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -208,7 +208,7 @@ GameObject:
m_Component:
- component: {fileID: 4606983645023404}
- component: {fileID: 137332019274502504}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_7
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -224,7 +224,7 @@ GameObject:
m_Component:
- component: {fileID: 4620248151007130}
- component: {fileID: 137157597618032270}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_8
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -240,7 +240,7 @@ GameObject:
m_Component:
- component: {fileID: 4724619322177092}
- component: {fileID: 212488533858538128}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_21
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -255,7 +255,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4057912117710942}
m_Layer: 0
m_Layer: 9
m_Name: 2_2
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -271,7 +271,7 @@ GameObject:
m_Component:
- component: {fileID: 4574086607515342}
- component: {fileID: 137500676423231430}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_9
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -286,7 +286,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4872013403354572}
m_Layer: 0
m_Layer: 9
m_Name: 3_1
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -301,7 +301,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4515554206234028}
m_Layer: 0
m_Layer: 9
m_Name: 3_2
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -316,7 +316,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4470358841408516}
m_Layer: 0
m_Layer: 9
m_Name: 3_2
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -331,7 +331,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4941091013355774}
m_Layer: 0
m_Layer: 9
m_Name: 4_1
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -346,7 +346,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4039621771865638}
m_Layer: 0
m_Layer: 9
m_Name: 3_1
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -362,7 +362,7 @@ GameObject:
m_Component:
- component: {fileID: 4159264339429954}
- component: {fileID: 137334315310472328}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_17
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -378,7 +378,7 @@ GameObject:
m_Component:
- component: {fileID: 4842639175991340}
- component: {fileID: 137586620581906146}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_17
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -394,7 +394,7 @@ GameObject:
m_Component:
- component: {fileID: 4561397470128246}
- component: {fileID: 137826992682377294}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_17
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -410,13 +410,29 @@ GameObject:
m_Component:
- component: {fileID: 4256468423256944}
- component: {fileID: 137541923750040454}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_11 (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1638247360878750
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4809206058082632}
- component: {fileID: 61699916753184380}
m_Layer: 11
m_Name: FOV
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1729098685084282
GameObject:
m_ObjectHideFlags: 0
......@@ -426,7 +442,7 @@ GameObject:
m_Component:
- component: {fileID: 4782649599066812}
- component: {fileID: 95414549788855790}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamel
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -442,7 +458,7 @@ GameObject:
m_Component:
- component: {fileID: 4385519001713478}
- component: {fileID: 212431119300157070}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_21
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -457,7 +473,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4332966310578994}
m_Layer: 0
m_Layer: 9
m_Name: 3_2
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -472,7 +488,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4525679372324926}
m_Layer: 0
m_Layer: 9
m_Name: 2_1
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -487,7 +503,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4521116151827392}
m_Layer: 0
m_Layer: 9
m_Name: 5_1
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -503,7 +519,7 @@ GameObject:
m_Component:
- component: {fileID: 4544298713519796}
- component: {fileID: 137441206785984378}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_11 (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -519,7 +535,7 @@ GameObject:
m_Component:
- component: {fileID: 4305948622255506}
- component: {fileID: 212208202379602312}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_21
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -535,7 +551,7 @@ GameObject:
m_Component:
- component: {fileID: 4306017560089494}
- component: {fileID: 137375428078084376}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_6
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -551,7 +567,7 @@ GameObject:
m_Component:
- component: {fileID: 4825759970843370}
- component: {fileID: 137143252812781904}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_11 (5)
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -566,7 +582,7 @@ GameObject:
serializedVersion: 5
m_Component:
- component: {fileID: 4473145772095294}
m_Layer: 0
m_Layer: 9
m_Name: 2
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -582,7 +598,7 @@ GameObject:
m_Component:
- component: {fileID: 4832532355484878}
- component: {fileID: 137100406920068306}
m_Layer: 0
m_Layer: 9
m_Name: CaramelCamelBones_17
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -751,7 +767,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1139495411747536}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4, y: 3, z: 0}
m_LocalPosition: {x: 9, y: 6, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4782649599066812}
......@@ -1005,9 +1021,23 @@ Transform:
- {fileID: 4306017560089494}
- {fileID: 4071526910235434}
- {fileID: 4210474468684820}
- {fileID: 4809206058082632}
m_Father: {fileID: 4340557329068104}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4809206058082632
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1638247360878750}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4782649599066812}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4823246290064910
Transform:
m_ObjectHideFlags: 1
......@@ -1126,6 +1156,20 @@ Rigidbody2D:
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 4
--- !u!61 &61699916753184380
BoxCollider2D:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1638247360878750}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Size: {x: 8, y: 1}
--- !u!61 &61882708240328608
BoxCollider2D:
m_ObjectHideFlags: 1
......@@ -1168,7 +1212,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 763513e1173772545a16c3cb1a4d40d5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &114936173987855878
--- !u!114 &114979596987958142
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
......@@ -1176,14 +1220,21 @@ MonoBehaviour:
m_GameObject: {fileID: 1139495411747536}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2e2bb5cd0db6bc94bb8694e61c0ca18e, type: 3}
m_Script: {fileID: 11500000, guid: 222712d5b54cc7c43a5443c6cd5f9926, type: 3}
m_Name:
m_EditorClassIdentifier:
speed: 2
maxMoveDistance: 5
body: {fileID: 0}
rightCollisionPos: {fileID: 4071526910235434}
leftCollisionPos: {fileID: 4210474468684820}
hasEnteredView: 0
fieldOfView: {fileID: 61699916753184380}
projectile: {fileID: 1971150978506544, guid: 8661a74f5601bcc439f32768313bba41, type: 2}
maxDistance: 10
projectileSpeed: 4
fireCooldown: 1
isFacingRight: 0
angleOfSpread: 0
--- !u!137 &137100406920068306
SkinnedMeshRenderer:
m_ObjectHideFlags: 1
......
......@@ -583,7 +583,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1784255690954616}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.63, y: 3.54, z: 0}
m_LocalPosition: {x: 16.55, y: 6.36, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4838104525842692}
......@@ -1007,7 +1007,11 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
inputButtons:
disableScripts: []
disableScripts:
- {fileID: 114296284101528218}
- {fileID: 114496983445290320}
- {fileID: 114468523229820794}
state: 0
--- !u!114 &114468523229820794
MonoBehaviour:
m_ObjectHideFlags: 1
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1382304722217016}
m_IsPrefabParent: 1
--- !u!1 &1382304722217016
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 224836438208060128}
- component: {fileID: 222474643737891492}
- component: {fileID: 114813025803214224}
- component: {fileID: 114401677657256440}
- component: {fileID: 114032482133026322}
m_Layer: 5
m_Name: Timer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &114032482133026322
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1382304722217016}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!114 &114401677657256440
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1382304722217016}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!114 &114813025803214224
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1382304722217016}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name: