110 Commits

Author SHA1 Message Date
Yann Dupont 01
4a11d0bae9 Merge branch 'dev' into yann 2022-04-03 23:47:18 -04:00
Soulaha Balde
04c9f0d8d1 Merge branch 'soulaha' into dev 2022-04-03 23:41:15 -04:00
Soulaha Balde
39ea03875e Added new light monster, made skeleton heavy 2022-04-03 23:32:37 -04:00
Yann Dupont 01
6c1ee20282 Minion bar cursor 2022-04-03 23:29:47 -04:00
Soulaha Balde
972d62398d Added regular knight sprites 2022-04-03 22:37:38 -04:00
Jason Durand 01
ad25e11cf7 Use new fonts on menu buttons 2022-04-03 22:08:06 -04:00
Soulaha Balde
05401f88e8 Changed Player Sprite to wizard 2022-04-03 22:00:45 -04:00
Jason Durand 01
081f9ff086 Fullscreen mode dropdown 2022-04-03 21:40:15 -04:00
Jason Durand 01
9451309526 Cleaned option flow 2022-04-03 21:14:58 -04:00
Jason Durand 01
9a4eaea61d Use new font on title 2022-04-03 20:26:41 -04:00
Jason Durand 01
87189cd124 Only randomize title if high score > 0 2022-04-03 20:17:45 -04:00
Jason Durand 01
5ed2045b30 Added rumble on screen shake and suck 2022-04-03 19:53:43 -04:00
Yann Dupont 01
cf81f1c621 Merge branch 'dev' into yann 2022-04-03 18:59:44 -04:00
Yann Dupont 01
f863312652 Update prefabs 2022-04-03 18:59:30 -04:00
Soulaha Balde
67de6189a1 Merge branch 'soulaha' into dev 2022-04-03 18:55:24 -04:00
Soulaha Balde
9d51ed4cfd Arena can spawn diff gladiators w/ x ratio each 2022-04-03 18:33:50 -04:00
Yann Dupont 01
aa54cee86d Music placeholder 2022-04-03 18:24:10 -04:00
Yann Dupont 01
4a4c95d302 Jump/land SFX 2022-04-03 18:07:43 -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
Jason Durand 01
5bd494aaca Integrated SampleScene 2022-04-03 16:55:30 -04:00
Jason Durand 01
c421fe3aef Merge remote-tracking branch 'origin/dev' into jason 2022-04-03 16:52:20 -04:00
Jason Durand 01
442daa924c Tweaked arena colliders 2022-04-03 16:46:23 -04:00
Jason Durand 01
83cd668d52 Make Vampire empty color on death 2022-04-03 16:35:45 -04:00
Yann Dupont 01
b08d297b76 Merge dev 2022-04-03 16:28:55 -04:00
Jason Durand 01
179a3f7d22 Blur fade! 2022-04-03 16:01:49 -04:00
Soulaha Balde
b60ff1ca91 Merge branch 'soulaha' into dev 2022-04-03 15:29:12 -04:00
Soulaha Balde
e2ef01755a Health bar different color for monster/gladiator 2022-04-03 15:26:26 -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
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
Yann Dupont 01
ee04f3f959 SFX imported 2022-04-03 14:45:39 -04:00
Jason Durand 01
e015e467e9 Replaced circle collider by flat capsule 2022-04-03 14:19:32 -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
fb0ddc76ea Forgot to hook up quit game 2022-04-03 13:36:08 -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
3d2396966b Entities drop shadows 2022-04-03 11:00:07 -04:00
Yann Dupont 01
6be7beb09a Lights 2022-04-03 10:46:00 -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
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
Jason Durand 01
4afbbeb4f1 Merge remote-tracking branch 'origin/dev' into jason 2022-04-03 00:26:47 -04:00