155 Commits

Author SHA1 Message Date
Yann Dupont 01
a346efc487 Remove free summon from safe zone 2022-04-04 11:43:47 -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
04c9f0d8d1 Merge branch 'soulaha' into dev 2022-04-03 23:41:15 -04:00
Yann Dupont 01
6c1ee20282 Minion bar cursor 2022-04-03 23:29:47 -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
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
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
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
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
83cd668d52 Make Vampire empty color on death 2022-04-03 16:35:45 -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
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