Jason Durand 01
|
20d5e2c411
|
Merge remote-tracking branch 'origin/dev' into jason
|
2022-04-03 15:19:51 -04:00 |
|
Jason Durand 01
|
e470d5e918
|
Add minion icon on selector bar
|
2022-04-03 15:19:45 -04:00 |
|
Jason Durand 01
|
417bcd9485
|
Check IsTargetable in FindTarget
|
2022-04-03 15:19:35 -04:00 |
|
Jason Durand 01
|
4b96196b69
|
Added GameFlowState change update to kill velocity
|
2022-04-03 15:19:14 -04:00 |
|
Soulaha Balde
|
ea96a6ec7e
|
Merge branch 'soulaha' into dev
|
2022-04-03 15:04:05 -04:00 |
|
Soulaha Balde
|
65216fd6df
|
AI goes around safezone
|
2022-04-03 14:57:57 -04:00 |
|
Jason Durand 01
|
cfbde817a6
|
Sped up cam zoom and started when entering safe zone
|
2022-04-03 14:19:16 -04:00 |
|
Jason Durand 01
|
c2f414ac03
|
Fixed minion cooldown starting half way in build
|
2022-04-03 13:49:44 -04:00 |
|
Jason Durand 01
|
6a81231cc9
|
Integrated SampleScene
|
2022-04-03 13:32:49 -04:00 |
|
Jason Durand 01
|
4d59cedef3
|
Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
# Assets/Scripts/AIEntity.cs
# Assets/Scripts/GameFlowManager.cs
|
2022-04-03 13:25:16 -04:00 |
|
Jason Durand 01
|
93f6b72212
|
Pause menu!
|
2022-04-03 13:21:15 -04:00 |
|
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 |
|
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 |
|
Jason Durand 01
|
4afbbeb4f1
|
Merge remote-tracking branch 'origin/dev' into jason
|
2022-04-03 00:26:47 -04:00 |
|
Yann Dupont 01
|
eafc0c63b6
|
Merge dev
|
2022-04-03 00:24:37 -04:00 |
|
Jason Durand 01
|
543ae0599b
|
Added start button to pause game
|
2022-04-03 00:21:51 -04:00 |
|
Jason Durand 01
|
5440c56426
|
Fixed throwing minions without direction
|
2022-04-03 00:11:01 -04:00 |
|
Yann Dupont 01
|
fda1fdace1
|
Arena graphics
|
2022-04-02 23:57:27 -04:00 |
|
Jason Durand 01
|
7d66b97f5d
|
Fixed dying twice
|
2022-04-02 23:37:40 -04:00 |
|
Jason Durand 01
|
9b9a4a7380
|
Integrated into SampleScene
|
2022-04-02 22:46:47 -04:00 |
|
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 |
|
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
|
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
|
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 |
|