206 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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