15 Commits

Author SHA1 Message Date
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
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
Soulaha Balde
bac85ff90f Gladiators stop targeting vampire if monster hit 2022-04-02 16:41:34 -04:00
Soulaha Balde
d1016df8bf Change minion to Entity 2022-04-02 15:12:15 -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
Yann Dupont 01
62bdfa65ab throw minions 2022-04-02 10:06:38 -04:00
Yann Dupont 01
5845572062 Throw start 2022-04-02 02:00:40 -04:00
Yann Dupont 01
c428a0e96f Throw start 2022-04-02 01:34:50 -04:00