Skip to content

Commit

Permalink
Stable version 0.7
Browse files Browse the repository at this point in the history
spawingen trees with a random rotation.

saving the lvl and XP

UI's fadein and fadeout effect added

startbutton added.
  • Loading branch information
koenvanderels authored and koenvanderels committed Jan 20, 2018
1 parent 258110c commit 91dc0e4
Show file tree
Hide file tree
Showing 542 changed files with 34,616 additions and 1,286 deletions.
38 changes: 19 additions & 19 deletions Assets/Amimations/animations/Camera.anim
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 2
time: 0
value: {x: -1.031, y: 312.8, z: 0}
value: {x: 1.891, y: 357.902, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
- serializedVersion: 2
time: 0.33035713
value: {x: 8.422, y: 263.812, z: 0}
inSlope: {x: 22.290949, y: -161.6101, z: 0}
outSlope: {x: 22.290949, y: -161.6101, z: 0}
inSlope: {x: 17.984844, y: -228.07625, z: 0}
outSlope: {x: 17.984844, y: -228.07625, z: 0}
tangentMode: 0
- serializedVersion: 2
time: 0.6785714
Expand All @@ -50,15 +50,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 2
time: 0
value: {x: -46.63629, y: 2.0584774, z: -4.649649}
value: {x: -50.16672, y: 1.1824021, z: -5.3740625}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
tangentMode: 0
- serializedVersion: 2
time: 0.33035713
value: {x: -45.668365, y: 2.1059854, z: -0.62524134}
inSlope: {x: 0, y: 0.28004718, z: 12.578128}
outSlope: {x: 0, y: 0.28004718, z: 12.578128}
inSlope: {x: 0, y: 2.5220366, z: 13.645685}
outSlope: {x: 0, y: 2.5220366, z: 13.645685}
tangentMode: 0
- serializedVersion: 2
time: 0.6785714
Expand Down Expand Up @@ -127,15 +127,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 2
time: 0
value: -1.031
value: 1.891
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.33035713
value: 8.422
inSlope: 22.290949
outSlope: 22.290949
inSlope: 17.984844
outSlope: 17.984844
tangentMode: 136
- serializedVersion: 2
time: 0.6785714
Expand All @@ -161,15 +161,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 2
time: 0
value: 312.8
value: 357.902
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.33035713
value: 263.812
inSlope: -161.6101
outSlope: -161.6101
inSlope: -228.07625
outSlope: -228.07625
tangentMode: 136
- serializedVersion: 2
time: 0.6785714
Expand Down Expand Up @@ -229,7 +229,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 2
time: 0
value: -46.63629
value: -50.16672
inSlope: 0
outSlope: 0
tangentMode: 136
Expand Down Expand Up @@ -263,15 +263,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 2
time: 0
value: 2.0584774
value: 1.1824021
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.33035713
value: 2.1059854
inSlope: 0.28004718
outSlope: 0.28004718
inSlope: 2.5220366
outSlope: 2.5220366
tangentMode: 136
- serializedVersion: 2
time: 0.6785714
Expand All @@ -297,15 +297,15 @@ AnimationClip:
m_Curve:
- serializedVersion: 2
time: 0
value: -4.649649
value: -5.3740625
inSlope: 0
outSlope: 0
tangentMode: 136
- serializedVersion: 2
time: 0.33035713
value: -0.62524134
inSlope: 12.578128
outSlope: 12.578128
inSlope: 13.645685
outSlope: 13.645685
tangentMode: 136
- serializedVersion: 2
time: 0.6785714
Expand Down
61 changes: 61 additions & 0 deletions Assets/Amimations/animations/Event.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
%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: Event
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: []
m_SampleRate: 1
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings: []
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0
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:
- time: 0
functionName: onAnimationFinished
data:
objectReferenceParameter: {fileID: 11500000, guid: ee1a2a382544b694b8df89b7842fd439,
type: 3}
floatParameter: 0
intParameter: 0
messageOptions: 0
10 changes: 10 additions & 0 deletions Assets/Amimations/animations/Event.anim.meta

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

4 changes: 2 additions & 2 deletions Assets/Amimations/controllers/CameraAnimator.controller
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ AnimatorController:
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 1
m_Controller: {fileID: 0}
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
Expand Down
40 changes: 31 additions & 9 deletions Assets/Amimations/controllers/PlayerAnimator.controller
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,27 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101396917604439262
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102496780791217624}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8557693
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101611501084268346
AnimatorStateTransition:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -132,43 +153,43 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101674890635444264
--- !u!1101 &1101757626708577248
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102922803254533462}
m_DstState: {fileID: 1102496780791217624}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8557693
m_ExitTime: 0.60526323
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &1101757626708577248
--- !u!1101 &1101880535020205472
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102496780791217624}
m_DstState: {fileID: 1102922803254533462}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.60526323
m_ExitTime: 0.8557693
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
Expand All @@ -184,7 +205,8 @@ AnimatorState:
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101674890635444264}
- {fileID: 1101880535020205472}
- {fileID: 1101396917604439262}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
Expand Down Expand Up @@ -290,7 +312,7 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102922803254533462}
m_Position: {x: 264, y: 120, z: 0}
m_Position: {x: 228, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102496780791217624}
m_Position: {x: 228, y: 48, z: 0}
Expand All @@ -307,6 +329,6 @@ AnimatorStateMachine:
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 60, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ExitPosition: {x: 780, y: 0, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102922803254533462}
Loading

0 comments on commit 91dc0e4

Please sign in to comment.