233 Commits

Author SHA1 Message Date
Jason Durand 01
60b2e598c8 Added basic edit mode test 2022-04-12 20:44:59 -04:00
Jason Durand 01
3abe9a46dd Added basic playmode test 2022-04-12 20:22:26 -04:00
Jason Durand 01
c1f9edfaee Moved Prefabs to Resources folder 2022-04-12 19:59:21 -04:00
Jason Durand 01
56376cdbee (Accidentally?) Adding linux toolchain 2022-04-12 19:06:05 -04:00
Soulaha Balde
37fe0935fb Merge branch 'dev' of https://bitbucket.clubconjure.com/scm/cegj/ludumdare50 into dev 2022-04-04 17:31:14 -04:00
Soulaha Balde
12962c6a22 Typo on help txt
Keyboard inputs helper were small
2022-04-04 17:31:01 -04:00
Yann Dupont 01
9bdb6c5a14 Fix help button no sound 2022-04-04 15:59:50 -04:00
Soulaha Balde
bbadb24387 Merge branch 'soulaha' into dev 2022-04-04 15:35:59 -04:00
Soulaha Balde
7db451108c Amount of variant gladiators follow max wave size 2022-04-04 15:27:21 -04:00
Soulaha Balde
cbf2873c3d Make it clearer wich button is selected 2022-04-04 13:50:54 -04:00
Yann Dupont 01
783f402051 Tweak waves stats 2022-04-04 13:47:24 -04:00
Soulaha Balde
ffb176f8e1 Added tutorial for switching monster 2022-04-04 13:30:42 -04:00
Yann Dupont 01
db575d3178 Tweak stats 2022-04-04 13:05:32 -04:00
Yann Dupont 01
a346efc487 Remove free summon from safe zone 2022-04-04 11:43:47 -04:00
Yann Dupont 01
15cd1d8d9a Menu SFX 2022-04-04 11:39:55 -04:00
Soulaha Balde
2c5909ff97 Merge branch 'soulaha' into dev 2022-04-04 02:29:02 -04:00
Soulaha Balde
8a2cd99e5c Added help menu 2022-04-04 02:26:58 -04:00
Jason Durand 01
b40f0567c4 Pull request #18: Hide safe zone prompt when not appropriate
Merge in CEGJ/ludumdare50 from jason to dev

* commit '1811f3621f7c4db414344087c9c48a4a12944cb3':
  Hide safe zone prompt when not appropriate
2022-04-04 05:49:46 +00:00
Jason Durand 01
1811f3621f Hide safe zone prompt when not appropriate 2022-04-04 01:49:17 -04:00
Yann Dupont 01
d3ecdce23f Merge branch 'dev' into yann 2022-04-04 01:20:49 -04:00
Yann Dupont 01
c396d1b839 New music test 2022-04-04 01:20:30 -04:00
Jason Durand 01
89cb1c8492 Pull request #17: Removed joystick min strength + can throw far
Merge in CEGJ/ludumdare50 from jason to dev

* commit '91961f662281010516c7c634980364ba5998bd74':
  Removed joystick min strength + can throw far
2022-04-04 05:17:52 +00:00
Jason Durand 01
91961f6622 Merge remote-tracking branch 'origin/dev' into jason
# Conflicts:
#	Assets/Scripts/PlayerMovement.cs
2022-04-04 01:16:28 -04:00
Jason Durand 01
01bdce2e81 Removed joystick min strength + can throw far 2022-04-04 01:15:02 -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