24 Commits

Author SHA1 Message Date
Jason Durand 01
8e0d1874dc Don't screen shake when throwing minion 2022-04-03 20:09:07 -04:00
Yann Dupont 01
46e1d0e05b Screenshake 2022-04-03 18:43:27 -04:00
Yann Dupont 01
b6d889a18a Entities SFX 2022-04-03 17:46:13 -04:00
Jason Durand 01
83cd668d52 Make Vampire empty color on death 2022-04-03 16:35:45 -04:00
Jason Durand 01
7d66b97f5d Fixed dying twice 2022-04-02 23:37:40 -04:00
Jason Durand 01
4c73354230 Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
#	Assets/Scripts/MinionThrower.cs
2022-04-02 22:38:17 -04:00
Jason Durand 01
c19966a4d2 Avoid FindObjectsOfType 2022-04-02 22:36:26 -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
Soulaha Balde
3d34d50acb Merge branch 'Soulaha' into dev 2022-04-02 19:04:39 -04:00
Jason Durand 01
ba164e5961 Fixed flakiness on safezone hopping 2022-04-02 17:52:41 -04:00
Soulaha Balde
bac85ff90f Gladiators stop targeting vampire if monster hit 2022-04-02 16:41:34 -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
Soulaha Balde
e4a304fdba Gladiator roam when vamp is safe and no monster 2022-04-02 14:41:47 -04:00
Jason Durand 01
172345c2ad Lose blood overtime and switch to Dead state 2022-04-02 13:22:38 -04:00
Soulaha Balde
0fa714cda9 Entity choose target, attack then stop if they die 2022-04-02 13:13:59 -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
Soulaha Balde
95e4388610 WIP base of AIEntity 2022-04-02 12:31:24 -04:00
Jason Durand 01
fbae06233e Added NaughtyAttributes 2022-04-02 10:44:39 -04:00
Jason Durand 01
74eb85dad5 Quickly integrated health bar 2022-04-02 05:12:27 -04:00