283 Commits

Author SHA1 Message Date
0c4928b892 dark png 2021-04-24 21:45:54 -04:00
dcbe3eab2e
Merge pull request #22 from Ewpratten/darkness
darkness is taking over
2021-04-24 21:16:14 -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
ff36b1c2c3
Merge pull request #21 from Ewpratten/octopus
Octopus logic
2021-04-24 20:35:34 -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
561bb5abf5
Merge pull request #20 from Ewpratten/ouchies
Add jellyfish as an enemy
2021-04-24 19:03:58 -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
0659780b3d load stunned animation 2021-04-24 18:46:13 -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
fd8385eec1 Merge remote-tracking branch 'origin/assets' into ouchies 2021-04-24 17:16:16 -04:00
9e0a8df259 jelly movement 2021-04-24 17:15:28 -04:00
0aef4804fd jelly animation 2021-04-24 17:12:40 -04:00
rsninja722
a453d16d1d jelly enemy 2021-04-24 17:08:17 -04:00
rsninja722
43c383ed70 Merge branch 'master' into assets 2021-04-24 17:07:51 -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
5be5d00c86
Merge pull request #18 from Ewpratten/boids
Boids
2021-04-24 16:04:45 -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
ffe4d7f824 base 2021-04-24 15:27:00 -04:00
1d9f49eb34
Merge pull request #16 from Ewpratten/cave_rendering
Cave rendering
2021-04-24 15:07:28 -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
66a965511e collider loading 2021-04-24 14:27:41 -04:00