27 Commits

Author SHA1 Message Date
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
d1016df8bf Change minion to Entity 2022-04-02 15:12:15 -04:00
Soulaha Balde
bdd20faaa8 Entity when target is dead, start roaming 2022-04-02 14:02:27 -04:00
Yann Dupont 01
63cd2600e1 Merge dev 2022-04-02 13:58:19 -04:00
Yann Dupont 01
afbd15217a Merge dev 2022-04-02 13:52:10 -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
Yann Dupont 01
6676819bbe Merge dev 2022-04-02 13:11:47 -04:00
Jason Durand 01
87ef184ec7 Forgot to resolve deltaTime to Time.fixedDeltaTime 2022-04-02 13:03:35 -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
Yann Dupont 01
2284280d01 Blood tokens 2022-04-02 12:34:07 -04:00
Soulaha Balde
95e4388610 WIP base of AIEntity 2022-04-02 12:31:24 -04:00
Jason Durand 01
027c287a43 Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
#	Assets/Scripts/PlayerMovement.cs
2022-04-02 12:26:45 -04:00
Yann Dupont 01
24d739af4a Merge branch 'dev' into yann 2022-04-02 12:25:40 -04:00
Jason Durand 01
7ac89eb72f Added rough paused state 2022-04-02 12:05:08 -04:00
Yann Dupont 01
755e6f4f0b Camera switch when in safe zone 2022-04-02 11:04:11 -04:00
Jason Durand 01
fe334f8d15 Added Entity.beingPushed() state without actually using it 2022-04-02 11:02:29 -04:00
Jason Durand 01
fbae06233e Added NaughtyAttributes 2022-04-02 10:44:39 -04:00
Soulaha Balde
7af161f29d Only attack if target is not null 2022-04-02 10:01:52 -04:00
Jason Durand 01
9484c6d2fb Use rigidbodies to move Entities 2022-04-02 05:55:33 -04:00
Jason Durand 01
74eb85dad5 Quickly integrated health bar 2022-04-02 05:12:27 -04:00
Soulaha Balde
fd74f48350 Entity can damage another with periodic attacks 2022-04-02 01:29:49 -04:00
Soulaha Balde
10e9fc074b Basic entities move into atk range to target 2022-04-02 00:30:13 -04:00