21 Commits

Author SHA1 Message Date
Soulaha Balde
67de6189a1 Merge branch 'soulaha' into dev 2022-04-03 18:55:24 -04:00
Soulaha Balde
9d51ed4cfd Arena can spawn diff gladiators w/ x ratio each 2022-04-03 18:33:50 -04:00
Jason Durand 01
45f76762fb Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
#	Assets/Scripts/Arena.cs
#	Assets/Scripts/Entity.cs
2022-04-03 18:24:40 -04:00
Jason Durand 01
f93d30105b Only start spawning when starting gameplay 2022-04-03 18:05:13 -04:00
Yann Dupont 01
6c5cb5a659 Wave start SFX 2022-04-03 17:59:59 -04:00
Soulaha Balde
facb2b51fe offset spawning of gladiator to avoid stacking 2022-04-03 16:15:24 -04:00
Soulaha Balde
ef113a6a43 Wave size increases by x every y wave 2022-04-03 15:58:24 -04:00
Soulaha Balde
65216fd6df AI goes around safezone 2022-04-03 14:57:57 -04:00
Jason Durand 01
c19966a4d2 Avoid FindObjectsOfType 2022-04-02 22:36: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
c07aa285c8 Can throw enemies from safe zone 2022-04-02 17:20:01 -04:00
Soulaha Balde
6879efdf24 spawn gladiator in waves 2022-04-02 17:17:47 -04:00
Soulaha Balde
c74dbe3aef wait before going into normal arena spawn rate 2022-04-02 16:21:11 -04:00
Soulaha Balde
d1016df8bf Change minion to Entity 2022-04-02 15:12:15 -04:00
Jason Durand 01
7ac89eb72f Added rough paused state 2022-04-02 12:05:08 -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
Jason Durand 01
c8649ed6f9 Added basic monster spawners 2022-04-02 04:45:21 -04:00
Jason Durand 01
761d6876cc Fixed safezone collider enabled by default + Added empty Arena component 2022-04-02 04:16:36 -04:00