86 Commits

Author SHA1 Message Date
2d6d1f3629 air bag impl 2021-04-25 13:28:34 -04:00
da3b52e395 Add flipper logic 2021-04-25 13:25:05 -04:00
53b3a33b4e Store tooltips 2021-04-25 13:15:05 -04:00
1abc80be64 placeholder item rendering 2021-04-25 13:06:48 -04:00
7979295f7a Add world resetting and state saving 2021-04-25 12:39:10 -04:00
7dac0bbfd1 user can now buy items! 2021-04-25 12:23:46 -04:00
a88cae2875 buy button 2021-04-25 11:55:35 -04:00
82d5b336c6 Full game navigation 2021-04-25 11:51:38 -04:00
289befc802 much improved item buy button rendering 2021-04-25 11:45:54 -04:00
5bb8261119 Item wrapper 2021-04-25 11:37:53 -04:00
0d862760bd item trait 2021-04-25 11:26:25 -04:00
198edc6556 more items 2021-04-25 11:17:48 -04:00
ad5d6bc1ab background image 2021-04-25 11:12:37 -04:00
3a2caecfff working on buy buttons 2021-04-25 11:09:38 -04:00
010ad7ce26 move shop file 2021-04-25 10:42:03 -04:00
fa7040f626 Shop screen layout 2021-04-25 10:38:41 -04:00
eff489d9ff Adding UI boxes 2021-04-25 10:33:11 -04:00
83aaa01133 button 2021-04-25 10:18:23 -04:00
1bc5aa966d improved menu navigation 2021-04-25 10:05:35 -04:00
bed3f407d6 tmp disable shop code 2021-04-25 10:01:02 -04:00
2a24d45cce Pull in shop logic
Co-authored-by: wm-c <wcmeathrel@gmail.com>
2021-04-25 09:58:43 -04:00
7452803ba9 Create a base screen for the shop 2021-04-25 09:49:16 -04:00
8b15d8fcaf Better darkness logic 2021-04-25 09:33:32 -04:00
f67b654088 proper background rendering with scale 2021-04-25 09:23:31 -04:00
43bcfe8623 darkness is taking over 2021-04-24 21:15:57 -04:00
d972238574 Main menu button fixes 2021-04-24 20:49:35 -04:00
c5a2877efd suck air bubble animation 2021-04-24 20:07:19 -04:00
cf342aa932 octopus movement 2021-04-24 19:39:09 -04:00
1585521fe3 background gradient 2021-04-24 19:09:28 -04:00
81126975a1 fix fish render layer 2021-04-24 19:02:03 -04:00
54ff1c7931 finished stun system 2021-04-24 18:54:23 -04:00
9148235383 jelly can stun player 2021-04-24 18:45:13 -04:00
9493baedf5 stun the jellyfish 2021-04-24 18:28:27 -04:00
e8317e0619 Merge remote-tracking branch 'origin/movement_tweaks' into ouchies 2021-04-24 18:11:45 -04:00
rsninja722
e7ac70074c no more stuck 2021-04-24 17:33:53 -04:00
707543cf55 jelly 2021-04-24 17:26:47 -04:00
0aef4804fd jelly animation 2021-04-24 17:12:40 -04:00
c0d147681b handle attacking the jellyfish 2021-04-24 17:06:13 -04:00
a3d79a5ebc jellyfish rendering 2021-04-24 17:02:37 -04:00
296d5fff8f checking for stun gun use 2021-04-24 16:48:16 -04:00
8db5ff65ec flipper logic 2021-04-24 16:46:06 -04:00
22e9eda97c aoe ring math 2021-04-24 16:21:48 -04:00
b51de3b815 working on aoe 2021-04-24 16:03:07 -04:00
e6726916a6 extracting player code 2021-04-24 15:40:17 -04:00
8b260be5b7 Proper colliders 2021-04-24 15:07:04 -04:00
ab0fe7b693 Merge remote-tracking branch 'origin/master' into cave_rendering 2021-04-24 14:51:07 -04:00
02d6743023 fix collider debug rendering 2021-04-24 14:51:00 -04:00
5ff8e61b6e
Merge pull request #15 from Ewpratten/pause_credits
Add credits to the pause menu
2021-04-24 14:48:12 -04:00
d52af77a47 collider debugging 2021-04-24 14:47:31 -04:00
b73ba2cf0e the cave renders 2021-04-24 14:10:49 -04:00