44 Commits

Author SHA1 Message Date
Yann Dupont 01
b6d889a18a Entities SFX 2022-04-03 17:46:13 -04:00
Yann Dupont 01
c0a25d4b41 Merge branch 'dev' into yann 2022-04-03 17:02:48 -04:00
Yann Dupont 01
960109e3e4 Added SFX to entity 2022-04-03 17:00:42 -04:00
Jason Durand 01
83cd668d52 Make Vampire empty color on death 2022-04-03 16:35:45 -04:00
Jason Durand 01
da9eefa00e Cleared off nullable warnings 2022-04-03 16:02:01 -04:00
Jason Durand 01
4b96196b69 Added GameFlowState change update to kill velocity 2022-04-03 15:19:14 -04:00
Soulaha Balde
50690c4100 merge Soulaha into dev 2022-04-03 03:02:31 -04:00
Yann Dupont 01
eafc0c63b6 Merge dev 2022-04-03 00:24:37 -04:00
Yann Dupont 01
fda1fdace1 Arena graphics 2022-04-02 23:57:27 -04:00
Jason Durand 01
c19966a4d2 Avoid FindObjectsOfType 2022-04-02 22:36:26 -04:00
Yann Dupont 01
40ed3d3921 Minions and gladiators sprites 2022-04-02 21:56:11 -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
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
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
Jason Durand 01
a7a29f4cce Started adding AIEntity's ThrownState 2022-04-02 15:50:30 -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