Yann Dupont 01
|
3bee3d98e9
|
Merge dev
|
2022-04-03 10:27:53 -04:00 |
|
Soulaha Balde
|
50690c4100
|
merge Soulaha into dev
|
2022-04-03 03:02:31 -04:00 |
|
Soulaha Balde
|
c289e1832d
|
Missing apply to prefab arena
|
2022-04-03 01:28:53 -04:00 |
|
Yann Dupont 01
|
6df8135146
|
Reduce safe zone camera ease in/out duration
|
2022-04-03 01:01:29 -04:00 |
|
Yann Dupont 01
|
3700cf800a
|
Fix health bar flip
|
2022-04-03 00:58:11 -04:00 |
|
Yann Dupont 01
|
48041ea26e
|
Blood particles distance fix
|
2022-04-03 00:52:13 -04:00 |
|
Yann Dupont 01
|
1970399711
|
Health bars size fix
|
2022-04-03 00:03:03 -04:00 |
|
Yann Dupont 01
|
fda1fdace1
|
Arena graphics
|
2022-04-02 23:57:27 -04:00 |
|
Yann Dupont 01
|
5a4bb33d78
|
Tileset
|
2022-04-02 23:14:33 -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 |
|
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
|
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
|
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
|
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 |
|
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 |
|
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 |
|
Soulaha Balde
|
e4a304fdba
|
Gladiator roam when vamp is safe and no monster
|
2022-04-02 14:41:47 -04:00 |
|
Soulaha Balde
|
bdd20faaa8
|
Entity when target is dead, start roaming
|
2022-04-02 14:02:27 -04:00 |
|
Yann Dupont 01
|
afbd15217a
|
Merge dev
|
2022-04-02 13:52:10 -04:00 |
|
Yann Dupont 01
|
6676819bbe
|
Merge dev
|
2022-04-02 13:11:47 -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 |
|
Jason Durand 01
|
c6b9e5da93
|
Added Press Start to start (without prompt though)
|
2022-04-02 12:51:53 -04:00 |
|
Soulaha Balde
|
95e4388610
|
WIP base of AIEntity
|
2022-04-02 12:31:24 -04:00 |
|
Yann Dupont 01
|
0db69eab59
|
Blood sucking start
|
2022-04-02 12:25:09 -04:00 |
|
Yann Dupont 01
|
755e6f4f0b
|
Camera switch when in safe zone
|
2022-04-02 11:04:11 -04:00 |
|
Yann Dupont 01
|
310c4ce85f
|
Minion throw health cost and reload time
|
2022-04-02 10:35:52 -04:00 |
|
Yann Dupont 01
|
62bdfa65ab
|
throw minions
|
2022-04-02 10:06:38 -04:00 |
|
Yann Dupont 01
|
f1d104d7cd
|
Merge branch 'dev' into yann
|
2022-04-02 09:14:11 -04:00 |
|
Jason Durand 01
|
0d33a6b3c6
|
Lowered monster speed
|
2022-04-02 06:05:38 -04:00 |
|
Jason Durand 01
|
9484c6d2fb
|
Use rigidbodies to move Entities
|
2022-04-02 05:55:33 -04:00 |
|
Jason Durand 01
|
0fa139faca
|
Toggle player rigidbody on safe zone instead of zone's collider
|
2022-04-02 05:38:55 -04:00 |
|
Jason Durand 01
|
b275bcc1db
|
Using AnimationCurve instead of cubic ease out for jump
|
2022-04-02 05:26:04 -04:00 |
|
Jason Durand 01
|
74eb85dad5
|
Quickly integrated health bar
|
2022-04-02 05:12:27 -04:00 |
|
Jason Durand 01
|
6343c83a4e
|
Unzoomed camera
|
2022-04-02 04:50:55 -04:00 |
|
Jason Durand 01
|
c8649ed6f9
|
Added basic monster spawners
|
2022-04-02 04:45:21 -04:00 |
|