210 Commits

Author SHA1 Message Date
Yann Dupont 01
c396d1b839 New music test 2022-04-04 01:20:30 -04:00
Yann Dupont 01
41dc2c2fe0 Fix keep sucking when dead 2022-04-03 23:55:16 -04:00
Yann Dupont 01
4a11d0bae9 Merge branch 'dev' into yann 2022-04-03 23:47:18 -04:00
Soulaha Balde
b75c58e5ca Correct playerAnimationController 2022-04-03 23:46:10 -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
03ba87bd03 Pull request #16: Use new fonts on menu buttons
Merge in CEGJ/ludumdare50 from jason to dev

* commit 'f3fa553fd0387aa70abd9eaf689cdef32d77dc1f':
  Use new fonts on menu buttons
2022-04-04 02:08:57 +00:00
Jason Durand 01
f3fa553fd0 Merge remote-tracking branch 'origin/dev' into jason 2022-04-03 22:08:17 -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
26336ce98b Pull request #15: Jason
Merge in CEGJ/ludumdare50 from jason to dev

* commit '2000f0859cab64285e9002fcd1dca94bc31fae44':
  Fullscreen mode dropdown
  Set window resizable
  Cleaned option flow
  Use new font on title
  Fixed buttons not choosable via controller
  Only randomize title if high score > 0
2022-04-04 01:41:36 +00:00
Jason Durand 01
2000f0859c Merge remote-tracking branch 'origin/dev' into jason 2022-04-03 21:40:23 -04:00
Jason Durand 01
081f9ff086 Fullscreen mode dropdown 2022-04-03 21:40:15 -04:00
Jason Durand 01
c7c2d51262 Set window resizable 2022-04-03 21:15:26 -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
1e48a07b1b Fixed buttons not choosable via controller 2022-04-03 20:20:11 -04:00
Jason Durand 01
87189cd124 Only randomize title if high score > 0 2022-04-03 20:17:45 -04:00
Jason Durand 01
cec2ab48fb Pull request #14: Jason
Merge in CEGJ/ludumdare50 from jason to dev

* commit '8e0d1874dc8a7e351227fe9b9b3248b3dfed83f6':
  Don't screen shake when throwing minion
  Can get attack rumble while sucking?
  Added rumble on screen shake and suck
  Cleared nullable warnings
2022-04-04 00:11:29 +00:00
Jason Durand 01
8e0d1874dc Don't screen shake when throwing minion 2022-04-03 20:09:07 -04:00
Soulaha Balde
7dd16ab4c3 Merge branch 'dev' into soulaha 2022-04-03 20:08:47 -04:00
Jason Durand 01
f4ee5d0de1 Can get attack rumble while sucking? 2022-04-03 20:06:24 -04:00
Soulaha Balde
63a63c4225 Stop velocity on enter death state 2022-04-03 19:59:29 -04:00
Jason Durand 01
5ed2045b30 Added rumble on screen shake and suck 2022-04-03 19:53:43 -04:00
Jason Durand 01
8ef8b304c0 Cleared nullable warnings 2022-04-03 19:03:14 -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
Yann Dupont 01
e43d36b6dd Menu SFX 2022-04-03 18:56:58 -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
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
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
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