Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
431414e
fix(DashState): fix player jamming when dash on ground
Brookoko Apr 6, 2019
2f41fa5
feat(InputHandler): add input handler for player state
Brookoko Apr 6, 2019
2cfe160
refactor(Player): add player observer
Brookoko Apr 6, 2019
2508804
feat(Player): add event system in player states
Brookoko Apr 7, 2019
557dee0
refactor(AI): clean up ant states and add diffuse material to entity
Brookoko Apr 9, 2019
3467dec
refactor(Ant): add better rage behaviour
Brookoko Apr 9, 2019
d9d7b52
fix(Hitbox): fix entity collision
Brookoko Apr 9, 2019
a99e082
refactor(Dash): add time limitation between dashes
Brookoko Apr 9, 2019
2c35e48
refactor(Hitbox): separate logic from effects
Brookoko Apr 10, 2019
923495d
fix(Dash): fix uncorrect default dash behaviour
Brookoko Apr 10, 2019
d99140a
refactor(Scene): clean up code
Brookoko Apr 10, 2019
d2b16c6
refactor(Player): clean up code
Brookoko Apr 10, 2019
6562736
refactor(MoveController): clean up code
Brookoko Apr 10, 2019
3379445
refactor(AI): clean up code
Brookoko Apr 11, 2019
4642c9f
refactor(Hitbox): change entity interation
Brookoko Apr 11, 2019
6ec365f
refactor(Effect): clean up effect code
Brookoko Apr 14, 2019
a3f3748
fix(Effect): fix death effect
Brookoko Apr 15, 2019
9ddadd1
refactor(Hitbox): add player attack hitbox on jump and fall state
Brookoko Apr 15, 2019
aa57f72
feat(Font): add basic fonts
Brookoko Apr 16, 2019
fd2d8a2
feat(Animation): add menu fade animation
Brookoko Apr 16, 2019
1cba874
refactor(Materials): clean up materials
Brookoko Apr 16, 2019
ebc4787
refactor(Script): add menu scripts
Brookoko Apr 16, 2019
b75cb55
refactor(project): clean up files layout
Brookoko Apr 16, 2019
8cf2e1b
refactor(dash): improve entity interaction
Brookoko Apr 28, 2019
d5beaff
feat(menu): add popUp system
Brookoko Apr 28, 2019
69c3553
feat(material): add material for effects
Brookoko Apr 28, 2019
df4e481
feat(scene): add camera utils
Brookoko Apr 28, 2019
0e8f9db
feat(player): add fallout mechanic and input key disablinng
Brookoko Apr 28, 2019
75d8f42
feat(animation): add new animation
Brookoko Apr 28, 2019
d9a1901
feat(scene): improve scene layout
Brookoko Apr 28, 2019
6fd80a2
feat(font): add new fonts
Brookoko May 4, 2019
a12d2df
feat(animation): add menu fading animation
Brookoko May 4, 2019
779aa82
feat(menu): add basic option configuration and popup text
Brookoko May 4, 2019
ba43d5e
fix(player): fix ground detection
Brookoko May 4, 2019
f952aa3
feat(scene): add basic level enter/exit point
Brookoko May 4, 2019
5741820
feat(scene): add basic scene control unit
Brookoko May 4, 2019
045605e
feat(tile): add new tile pallet
Brookoko May 4, 2019
333ff53
feat(save/load): add basic save/load
Brookoko May 4, 2019
980b669
refactor(script): clean up code
Brookoko May 4, 2019
3a2c286
feat(project): update unity to 2019 version
Brookoko May 4, 2019
0e586cb
feat(save/load): add save/load module
Brookoko May 4, 2019
0587abd
feat(scene): add test levels
Brookoko May 4, 2019
d48c2fd
refactor(save/load): change save/load of level data
Brookoko May 6, 2019
6771906
fix(save/load): fix multiple object saving
Brookoko May 7, 2019
8b84b71
fix(input): fix bug with change button and availability
Brookoko May 8, 2019
6221e17
refactor(AI): split IEnemy interface
Brookoko May 19, 2019
1a47b23
refactor(AI): implement IEnemy interface
Brookoko May 19, 2019
43784f0
feat(cutscene): add basic script for cutscene
Brookoko May 19, 2019
85e6e43
feat(effects): add animation effects
Brookoko May 19, 2019
096b0a2
refactor(hitbox): clean up code
Brookoko May 19, 2019
f89a172
feat(menu): add template for pop up display and basic game UI
Brookoko May 19, 2019
842c76b
feat(move): add IMovable interface
Brookoko May 19, 2019
e16528b
feat(save/load): add ability to remove object from scene
Brookoko May 19, 2019
ae6520d
refactor(scene): clean up code
Brookoko May 19, 2019
f28ac4d
feat(effect): add heal effect
Brookoko May 19, 2019
b833116
feat(hitbox): add healing
Brookoko May 19, 2019
59ccf4b
feat(menu): clean up code
Brookoko May 19, 2019
2e71f01
feat(save/load): add reload progress
Brookoko May 19, 2019
9ab2815
refactor(player): clean up code
Brookoko May 19, 2019
8322f6d
feat(script): add score
Brookoko May 19, 2019
33a097f
feat(animation): add fading animation
Brookoko May 19, 2019
c682b52
feat(material): add UI sprite
Brookoko May 19, 2019
8606565
feat(scene): add new levels
Brookoko May 19, 2019
1c12a8f
feat(prefabs): add collectible objects
Brookoko May 19, 2019
22f0e3d
feat(popup): add help pop up
Brookoko May 19, 2019
c2962fe
refactor(project): update project setting
Brookoko May 19, 2019
caa8464
refactor(material): change sprite import setting
Brookoko May 19, 2019
23ef763
refactor(script): clean up code
Brookoko May 20, 2019
d59d23d
feat(scene): add demo end scene
Brookoko May 27, 2019
0820b97
Create README.md
Brookoko May 27, 2019
151a646
Update README.md
Brookoko May 27, 2019
3214a28
feat(score): add score for killing enemy and score saving
Brookoko Jun 1, 2019
12c63f8
Merge branch 'dev' of github.com:Brookoko/Coursework into dev
Brookoko Jun 1, 2019
11d3e9d
fix(player): fix bug with crouch and dash states
Brookoko Jun 5, 2019
9af90ca
feat(scene): add menu music
Brookoko Jun 8, 2019
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
  •  
  •  
  •  
74 changes: 74 additions & 0 deletions Assets/Animation/Acorn.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Acorn
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: 21300000, guid: b6bd832411f65410381d33458375068a, type: 3}
- time: 0.125
value: {fileID: 21300000, guid: 04750fd00d8744105871eda35fd42569, type: 3}
- time: 0.25
value: {fileID: 21300000, guid: d19cd1636092d45cd9581f0bd094cf9c, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 8
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: 21300000, guid: b6bd832411f65410381d33458375068a, type: 3}
- {fileID: 21300000, guid: 04750fd00d8744105871eda35fd42569, type: 3}
- {fileID: 21300000, guid: d19cd1636092d45cd9581f0bd094cf9c, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.375
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 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_Events: []
8 changes: 8 additions & 0 deletions Assets/Animation/Acorn.anim.meta

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

80 changes: 35 additions & 45 deletions Assets/Animation/Ant/Ant.controller
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-8107204743342727294
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Movement
m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: Rage
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102030050473318604}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.2
m_HasExitTime: 1
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -34,45 +62,6 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!114 &114314061799349032
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b06c70420cb370a4780b2eeb32de53a3, type: 3}
m_Name:
m_EditorClassIdentifier:
timeToWait: 2.5
--- !u!114 &114467045716209478
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c24928720d08cc4e8b2dbaab5eccceec, type: 3}
m_Name:
m_EditorClassIdentifier:
rageTime: 2
--- !u!114 &114867248448653400
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 42e76b49a6104475bad0dd0eb4d79d8e, type: 3}
m_Name:
m_EditorClassIdentifier:
moveDuration: 3
--- !u!1101 &1101197836389509908
AnimatorStateTransition:
m_ObjectHideFlags: 1
Expand All @@ -84,6 +73,9 @@ AnimatorStateTransition:
- m_ConditionMode: 2
m_ConditionEvent: Rage
m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: Movement
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1102664623564697944}
m_Solo: 0
Expand Down Expand Up @@ -211,8 +203,7 @@ AnimatorState:
m_Transitions:
- {fileID: 1101658157429263068}
- {fileID: 1101553138525416458}
m_StateMachineBehaviours:
- {fileID: 114867248448653400}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
Expand All @@ -239,8 +230,8 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101197836389509908}
m_StateMachineBehaviours:
- {fileID: 114467045716209478}
- {fileID: -8107204743342727294}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
Expand Down Expand Up @@ -268,8 +259,7 @@ AnimatorState:
m_Transitions:
- {fileID: 1101556975016106098}
- {fileID: 1101548296421705210}
m_StateMachineBehaviours:
- {fileID: 114314061799349032}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
Expand Down
Loading