Jason Durand 01
8eff81aa54
Pause without freeze timeScale when dying
2022-04-02 19:17:37 -04: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
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
Yann Dupont 01
231070af77
Main menu
2022-04-02 16:30:32 -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
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
64b5704d34
Pull request #4 : Jason
...
Merge in CEGJ/ludumdare50 from jason to dev
* commit 'bd5efcb31a1335a9f65b63f37e5ae47b74ee7e0c':
Fixed exiting safe zone before game starts
Forgot to resolve deltaTime to Time.fixedDeltaTime
2022-04-02 17:07:55 +00:00
Jason Durand 01
bd5efcb31a
Fixed exiting safe zone before game starts
2022-04-02 13:06:36 -04:00
Jason Durand 01
87ef184ec7
Forgot to resolve deltaTime to Time.fixedDeltaTime
2022-04-02 13:03:35 -04:00
Jason Durand 01
5c4be70437
Pull request #3 : Jason
...
Merge in CEGJ/ludumdare50 from jason to dev
* commit '1112e06d471ef8a67c209a2bfa28b0ef34d5e781':
Added Press Start to start (without prompt though)
Added rough paused state
Added Entity.beingPushed() state without actually using it
Added NaughtyAttributes
2022-04-02 16:57:25 +00: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
Jason Durand 01
c6b9e5da93
Added Press Start to start (without prompt though)
2022-04-02 12:51:53 -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
Yann Dupont 01
0db69eab59
Blood sucking start
2022-04-02 12:25:09 -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
54c1a142e4
Merge remote-tracking branch 'origin/dev' into jason
2022-04-02 10:58:07 -04:00
