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
Jason Durand 01
cc5507a2a5
Added control icon set
2022-04-02 22:29:55 -04:00
Yann Dupont 01
40ed3d3921
Minions and gladiators sprites
2022-04-02 21:56:11 -04:00
Yann Dupont 01
c259b3f4b6
merge dev
2022-04-02 19:34:26 -04:00
Yann Dupont 01
29731b13e0
Merge dev
2022-04-02 19:23:07 -04:00
Jason Durand 01
958218856e
Pull request #7 : Pause without freeze timeScale when dying
...
Merge in CEGJ/ludumdare50 from jason to dev
* commit '271bd1d93f11cc373fefc96c3736fbf4d24fba18':
Pause without freeze timeScale when dying
2022-04-02 23:22:06 +00: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
Yann Dupont 01
2140b3ff69
Merge branch 'dev' into yann
2022-04-02 19:07:27 -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
Yann Dupont 01
8ce45566a0
Player sprite
2022-04-02 18:58:13 -04:00
Jason Durand 01
01e26e6aad
Pull request #6 : Jason
...
Merge in CEGJ/ludumdare50 from jason to dev
* commit 'c3a6575d87bc26e89bae966cbf614fc7eb0b1107':
Reintegrated inspector stuff
Use IsInSafeZone + remove debug log
Fixed flakiness on safezone hopping
Fixed throwing on ground
Can throw enemies from safe zone
Started adding AIEntity's ThrownState
Added quick game timer
Moved GameFlowManager to Scripts/
Recopied SampleScene to JasonScene
2022-04-02 22:04:01 +00:00
Jason Durand 01
c3a6575d87
Reintegrated inspector stuff
2022-04-02 18:00:59 -04:00
Jason Durand 01
83d8bd6cf9
Use IsInSafeZone + remove debug log
2022-04-02 17:58:32 -04:00
Jason Durand 01
dd3d1fb57c
Merge remote-tracking branch 'origin/dev' into jason
...
# Conflicts:
# Assets/Prefabs/UI Canvas.prefab
# Assets/Scripts/Arena Stats.asset
# Assets/Scripts/GameFlowManager.cs
2022-04-02 17:54:42 -04:00
Jason Durand 01
ba164e5961
Fixed flakiness on safezone hopping
2022-04-02 17:52:41 -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
6879efdf24
spawn gladiator in waves
2022-04-02 17:17:47 -04:00
Yann Dupont 01
e3aba142c8
merge yann
2022-04-02 17:14:56 -04:00
Yann Dupont 01
60734a9260
Screenshake script
2022-04-02 17:04:04 -04:00
Yann Dupont 01
eaef42e6a8
Start and safe zone prompts
2022-04-02 16:54:00 -04:00
Soulaha Balde
1fc46498d4
Tweak values:
...
Vampire movement speed
Blood loss rate
AI hp
2022-04-02 16:53:58 -04:00
Soulaha Balde
bac85ff90f
Gladiators stop targeting vampire if monster hit
2022-04-02 16:41:34 -04:00
Yann Dupont 01
231070af77
Main menu
2022-04-02 16:30:32 -04:00
Soulaha Balde
c74dbe3aef
wait before going into normal arena spawn rate
2022-04-02 16:21:11 -04:00
Yann Dupont 01
a4876b4c5e
Blood suck particles
2022-04-02 16:14:15 -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
Jason Durand 01
25a10047ad
Added quick game timer
2022-04-02 15:14:04 -04:00
Soulaha Balde
d1016df8bf
Change minion to Entity
2022-04-02 15:12:15 -04:00
Yann Dupont 01
3afa90df38
Highlight halo
2022-04-02 15:00:06 -04:00
Yann Dupont 01
9d5121c1a4
Highlight halo
2022-04-02 14:59:08 -04:00
Jason Durand 01
3d804d9f44
Moved GameFlowManager to Scripts/
2022-04-02 14:49:11 -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
cc20964c12
Recopied SampleScene to JasonScene
2022-04-02 14:31:42 -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
ddccbf21a9
Pull request #5 : Jason
...
Merge in CEGJ/ludumdare50 from jason to dev
* commit 'd8289dce3f31a83e05a5c2ddb5cf9ea0823557c0':
Reset blood loss to 3
Basic play replay game loop
Lose blood overtime and switch to Dead state
2022-04-02 17:50:29 +00:00
Jason Durand 01
d8289dce3f
Reset blood loss to 3
2022-04-02 13:48:45 -04:00
Jason Durand 01
f3e2a3b3d8
Merge remote-tracking branch 'origin/dev' into jason
2022-04-02 13:47:15 -04:00
Jason Durand 01
f9ae46b504
Basic play replay game loop
2022-04-02 13:46:27 -04:00
Jason Durand 01
172345c2ad
Lose blood overtime and switch to Dead state
2022-04-02 13:22:38 -04:00
