Yann Dupont 01
|
cf81f1c621
|
Merge branch 'dev' into yann
|
2022-04-03 18:59:44 -04:00 |
|
Soulaha Balde
|
67de6189a1
|
Merge branch 'soulaha' into dev
|
2022-04-03 18:55:24 -04:00 |
|
Yann Dupont 01
|
46e1d0e05b
|
Screenshake
|
2022-04-03 18:43:27 -04:00 |
|
Soulaha Balde
|
9d51ed4cfd
|
Arena can spawn diff gladiators w/ x ratio each
|
2022-04-03 18:33:50 -04:00 |
|
Jason Durand 01
|
45f76762fb
|
Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
# Assets/Scripts/Arena.cs
# Assets/Scripts/Entity.cs
|
2022-04-03 18:24:40 -04:00 |
|
Jason Durand 01
|
5f4b0142db
|
Very simple high score
|
2022-04-03 18:23:46 -04:00 |
|
Yann Dupont 01
|
4a4c95d302
|
Jump/land SFX
|
2022-04-03 18:07:43 -04:00 |
|
Jason Durand 01
|
f93d30105b
|
Only start spawning when starting gameplay
|
2022-04-03 18:05:13 -04:00 |
|
Yann Dupont 01
|
6c5cb5a659
|
Wave start SFX
|
2022-04-03 17:59:59 -04:00 |
|
Soulaha Balde
|
f78582aac8
|
Different values for monsters
|
2022-04-03 17:56:30 -04:00 |
|
Yann Dupont 01
|
02f7d4c5b3
|
Blood suck SFX
|
2022-04-03 17:53:08 -04:00 |
|
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 |
|
Soulaha Balde
|
c718c9e595
|
Merge branch 'soulaha' into dev
|
2022-04-03 17:02:25 -04:00 |
|
Yann Dupont 01
|
960109e3e4
|
Added SFX to entity
|
2022-04-03 17:00:42 -04:00 |
|
Soulaha Balde
|
9394a19172
|
added better keyboard inputs
|
2022-04-03 16:58:31 -04:00 |
|
Jason Durand 01
|
83cd668d52
|
Make Vampire empty color on death
|
2022-04-03 16:35:45 -04:00 |
|
Soulaha Balde
|
facb2b51fe
|
offset spawning of gladiator to avoid stacking
|
2022-04-03 16:15:24 -04:00 |
|
Jason Durand 01
|
da9eefa00e
|
Cleared off nullable warnings
|
2022-04-03 16:02:01 -04:00 |
|
Jason Durand 01
|
179a3f7d22
|
Blur fade!
|
2022-04-03 16:01:49 -04:00 |
|
Soulaha Balde
|
ef113a6a43
|
Wave size increases by x every y wave
|
2022-04-03 15:58:24 -04:00 |
|
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 |
|