73 Commits

Author SHA1 Message Date
Jason Durand 01
fb0ddc76ea Forgot to hook up quit game 2022-04-03 13:36:08 -04:00
Jason Durand 01
6a81231cc9 Integrated SampleScene 2022-04-03 13:32:49 -04:00
Jason Durand 01
4d59cedef3 Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
#	Assets/Scripts/AIEntity.cs
#	Assets/Scripts/GameFlowManager.cs
2022-04-03 13:25:16 -04:00
Jason Durand 01
93f6b72212 Pause menu! 2022-04-03 13:21:15 -04:00
Yann Dupont 01
3d2396966b Entities drop shadows 2022-04-03 11:00:07 -04:00
Yann Dupont 01
6be7beb09a Lights 2022-04-03 10:46:00 -04:00
Yann Dupont 01
3bee3d98e9 Merge dev 2022-04-03 10:27:53 -04:00
Soulaha Balde
50690c4100 merge Soulaha into dev 2022-04-03 03:02:31 -04:00
Soulaha Balde
c289e1832d Missing apply to prefab arena 2022-04-03 01:28:53 -04:00
Yann Dupont 01
6df8135146 Reduce safe zone camera ease in/out duration 2022-04-03 01:01:29 -04:00
Yann Dupont 01
3700cf800a Fix health bar flip 2022-04-03 00:58:11 -04:00
Yann Dupont 01
48041ea26e Blood particles distance fix 2022-04-03 00:52:13 -04:00
Jason Durand 01
4afbbeb4f1 Merge remote-tracking branch 'origin/dev' into jason 2022-04-03 00:26:47 -04:00
Jason Durand 01
5440c56426 Fixed throwing minions without direction 2022-04-03 00:11:01 -04:00
Yann Dupont 01
1970399711 Health bars size fix 2022-04-03 00:03:03 -04:00
Yann Dupont 01
fda1fdace1 Arena graphics 2022-04-02 23:57:27 -04:00
Yann Dupont 01
5a4bb33d78 Tileset 2022-04-02 23:14:33 -04:00
Jason Durand 01
9b9a4a7380 Integrated into SampleScene 2022-04-02 22:46:47 -04:00
Yann Dupont 01
40ed3d3921 Minions and gladiators sprites 2022-04-02 21:56:11 -04:00
Yann Dupont 01
c259b3f4b6 merge dev 2022-04-02 19:34:26 -04:00
Jason Durand 01
271bd1d93f Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
#	Assets/Scripts/VampireEntity.cs
2022-04-02 19:18:50 -04:00
Jason Durand 01
8eff81aa54 Pause without freeze timeScale when dying 2022-04-02 19:17:37 -04:00
Yann Dupont 01
2140b3ff69 Merge branch 'dev' into yann 2022-04-02 19:07:27 -04:00
Soulaha Balde
3d34d50acb Merge branch 'Soulaha' into dev 2022-04-02 19:04:39 -04:00
Soulaha Balde
a1d2beca4f Represent death on sprites 2022-04-02 18:58:56 -04:00
Yann Dupont 01
8ce45566a0 Player sprite 2022-04-02 18:58:13 -04:00
Jason Durand 01
dd3d1fb57c Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
#	Assets/Prefabs/UI Canvas.prefab
#	Assets/Scripts/Arena Stats.asset
#	Assets/Scripts/GameFlowManager.cs
2022-04-02 17:54:42 -04:00
Jason Durand 01
d57eab3e92 Fixed throwing on ground 2022-04-02 17:42:24 -04:00
Jason Durand 01
c07aa285c8 Can throw enemies from safe zone 2022-04-02 17:20:01 -04:00
Yann Dupont 01
60734a9260 Screenshake script 2022-04-02 17:04:04 -04:00
Yann Dupont 01
eaef42e6a8 Start and safe zone prompts 2022-04-02 16:54:00 -04:00
Soulaha Balde
1fc46498d4 Tweak values:
Vampire movement speed
Blood loss rate
AI hp
2022-04-02 16:53:58 -04:00
Yann Dupont 01
a4876b4c5e Blood suck particles 2022-04-02 16:14:15 -04:00
Jason Durand 01
29711ae0e3 Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
#	Assets/Scripts/AIStats.cs
#	Assets/Scripts/Entity.cs
2022-04-02 15:53:17 -04:00
Yann Dupont 01
1b51d18790 Merge dev 2022-04-02 15:46:43 -04:00
Soulaha Balde
7bf70e3356 Merge branch 'Soulaha' into dev 2022-04-02 15:28:26 -04:00
Yann Dupont 01
8da172f91a Entities health bars 2022-04-02 15:23:48 -04:00
Yann Dupont 01
67fc4da188 Suck gain health 2022-04-02 15:14:48 -04:00
Jason Durand 01
25a10047ad Added quick game timer 2022-04-02 15:14:04 -04:00
Soulaha Balde
d1016df8bf Change minion to Entity 2022-04-02 15:12:15 -04:00
Soulaha Balde
e4a304fdba Gladiator roam when vamp is safe and no monster 2022-04-02 14:41:47 -04:00
Soulaha Balde
bdd20faaa8 Entity when target is dead, start roaming 2022-04-02 14:02:27 -04:00
Yann Dupont 01
afbd15217a Merge dev 2022-04-02 13:52:10 -04:00
Yann Dupont 01
6676819bbe Merge dev 2022-04-02 13:11:47 -04:00
Jason Durand 01
1112e06d47 Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
#	Assets/Scripts/Entity.cs
2022-04-02 12:54:54 -04:00
Jason Durand 01
c6b9e5da93 Added Press Start to start (without prompt though) 2022-04-02 12:51:53 -04:00
Soulaha Balde
95e4388610 WIP base of AIEntity 2022-04-02 12:31:24 -04:00
Yann Dupont 01
0db69eab59 Blood sucking start 2022-04-02 12:25:09 -04:00
Yann Dupont 01
755e6f4f0b Camera switch when in safe zone 2022-04-02 11:04:11 -04:00
Yann Dupont 01
310c4ce85f Minion throw health cost and reload time 2022-04-02 10:35:52 -04:00