104 Commits

Author SHA1 Message Date
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
a68d3e8e70 lvl3 flippers
Co-authored-by: wm-c <wcmeathrel@gmail.com>
2021-04-25 09:54:23 -04:00
6c288e9178 Add flashlight
Co-authored-by: wm-c <wcmeathrel@gmail.com>
2021-04-25 09:53:56 -04:00
73ac4d25a9 lvl3 stun gun
Co-authored-by: wm-c <wcmeathrel@gmail.com>
2021-04-25 09:53:24 -04:00
c4dd17f25d Add airbag item data
Co-authored-by: wm-c <wcmeathrel@gmail.com>
2021-04-25 09:52:15 -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
3d29a971cf octobreath 2021-04-24 20:33:28 -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
f9957f57ea reverse stun animation 2021-04-24 18:58:20 -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
99e7e02d0c Better AOE animation 2021-04-24 18:32:08 -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
09b2752d78 stun check 2021-04-24 18:10:27 -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
9e0a8df259 jelly movement 2021-04-24 17:15:28 -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
43eab974b0 fix access 2021-04-24 16:39:36 -04:00
8c142d2711 Rewrite the inventory 2021-04-24 16:37:58 -04:00
ff930da034 Merge remote-tracking branch 'origin/master' into ouchies 2021-04-24 16:21:54 -04:00
22e9eda97c aoe ring math 2021-04-24 16:21:48 -04:00
eb3c508c68 color fishies! 2021-04-24 16:07:47 -04:00
b51de3b815 working on aoe 2021-04-24 16:03:07 -04:00
rsninja722
b7ee555b89 Merge remote-tracking branch 'origin/master' into boids 2021-04-24 16:02:57 -04:00
rsninja722
b6bcdad88c boids 2021-04-24 16:02:46 -04:00
79bae68f71 Merge remote-tracking branch 'origin/player_cleanup' into ouchies 2021-04-24 15:47:19 -04:00
7d06fcb6d1 more cleanup 2021-04-24 15:46:28 -04:00
e6726916a6 extracting player code 2021-04-24 15:40:17 -04:00