178 Commits

Author SHA1 Message Date
Yann Dupont 01
e43d36b6dd Menu SFX 2022-04-03 18:56:58 -04:00
Yann Dupont 01
46e1d0e05b Screenshake 2022-04-03 18:43:27 -04:00
Yann Dupont 01
3fefb5278f Merge branch 'dev' into yann 2022-04-03 18:31:38 -04:00
Jason Durand 01
92f796f284 Pull request #13: Jason
Merge in CEGJ/ludumdare50 from jason to dev

* commit '45f76762fb8bacdb06d99cc2bb60c48dad0ba2b4':
  Very simple high score
  Only start spawning when starting gameplay
2022-04-03 22:27:39 +00: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
Yann Dupont 01
aa54cee86d Music placeholder 2022-04-03 18:24:10 -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
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
10114b268a Pull request #12: Jason
Merge in CEGJ/ludumdare50 from jason to dev

* commit '5bd494aaca9537d8bbab12f588aa2885d1394bd8':
  Integrated SampleScene
  Tweaked arena colliders
  Make Vampire empty color on death
  Cleared off nullable warnings
  Blur fade!
2022-04-03 20:56:01 +00: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
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
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
577fbcbfe4 Pull request #11: Jason
Merge in CEGJ/ludumdare50 from jason to dev

* commit '20d5e2c41154660ec1aa124b9c9f9060908aec5d':
  Add minion icon on selector bar
  Check IsTargetable in FindTarget
  Added GameFlowState change update to kill velocity
  Replaced circle collider by flat capsule
  Sped up cam zoom and started when entering safe zone
  Fixed minion cooldown starting half way in build
2022-04-03 19:21:26 +00: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
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
c2f414ac03 Fixed minion cooldown starting half way in build 2022-04-03 13:49:44 -04:00
Jason Durand 01
49e9a157a7 Pull request #10: Jason
Merge in CEGJ/ludumdare50 from jason to dev

* commit 'fb0ddc76eaeddec773b26acda7e38994fb9792c6':
  Forgot to hook up quit game
  Integrated SampleScene
  Pause menu!
  Added start button to pause game
  Fixed throwing minions without direction
2022-04-03 17:36:34 +00: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