253 Commits

Author SHA1 Message Date
rsninja722
eed8f324af enemies placed, suck range decreased 2021-04-26 15:20:47 -04:00
rsninja722
0a69b80b34 pufferfish, started real map 2021-04-26 14:51:37 -04:00
rsninja722
53a746c551 Merge branch 'master' into assets 2021-04-26 13:59:55 -04:00
rsninja722
3fbb50f985
Merge pull request #44 from Ewpratten/whirlpooltweaks
added velocity with friction, translucent shop back
2021-04-26 13:59:25 -04:00
rsninja722
eb49b08bab added velocity with friction, translucent shop back 2021-04-26 13:26:58 -04:00
6b77476d09 remove useless audio update 2021-04-26 12:35:54 -04:00
f9091fbce2 fix segfault on quit 2021-04-26 12:35:12 -04:00
3da8bb06ed
Merge pull request #43 from Ewpratten/suck-monster
Suck monster
2021-04-25 21:36:26 -04:00
wm-c
3c1d56a46b Added comments 2021-04-25 20:58:34 -04:00
wm-c
3007f96ca4 Whirlpools have spirites 2021-04-25 20:49:48 -04:00
wm-c
1928d0d292 Merge branch 'master' into suck-monster 2021-04-25 20:49:30 -04:00
wm-c
dfeb6dfbf7 Merge branch 'assets' into suck-monster 2021-04-25 20:20:09 -04:00
wm-c
c8da93bfdb added whirlpool 2021-04-25 20:18:11 -04:00
rsninja722
0c9005939c some sounds 2021-04-25 19:53:44 -04:00
a32c20fdee
Merge pull request #42 from Ewpratten/reduce_warnings
Wrangle warnings, and speed up compile time
2021-04-25 19:47:29 -04:00
e4ae9b18b3 Clean up deps 2021-04-25 19:22:46 -04:00
d729ae811e Reset title 2021-04-25 19:16:10 -04:00
733839ca10 clean up the rest of the files 2021-04-25 19:15:02 -04:00
5e1ae73b2b more warning removal 2021-04-25 19:12:37 -04:00
7edfe6f132 clean root ingame 2021-04-25 19:09:28 -04:00
068c8be089 rm complexanimation 2021-04-25 19:08:42 -04:00
8c8d0ab595 Clean jellyfish 2021-04-25 19:08:16 -04:00
602f600379 clean octopus 2021-04-25 19:07:48 -04:00
fdb93c03fd clean unused code for fish 2021-04-25 19:07:10 -04:00
rsninja722
b24c09fde3 whirlpool (rotate texture in code) 2021-04-25 18:40:54 -04:00
rsninja722
a8884757f5 Merge remote-tracking branch 'origin/master' into assets 2021-04-25 18:39:53 -04:00
a74ba44e77
Merge pull request #41 from Ewpratten/shader2
Wave shading
2021-04-25 18:27:33 -04:00
2758d0de55 make the waves less wavy 2021-04-25 18:27:05 -04:00
5497d8e279 Only load shader memory location once 2021-04-25 18:22:55 -04:00
dbc620aa03 Big fancy shaders 2021-04-25 18:15:45 -04:00
86603bf729 pixelate the wave shader 2021-04-25 17:57:34 -04:00
07d678ffba working on wavs 2021-04-25 17:25:48 -04:00
d2a14ce650
Merge pull request #40 from Ewpratten/assets
Background
2021-04-25 17:08:37 -04:00
rsninja722
0b1cd6c678 Merge remote-tracking branch 'origin/assets' into assets 2021-04-25 17:07:16 -04:00
rsninja722
b85c61d532 cave background 2021-04-25 17:07:04 -04:00
e759e0ddbe fix transponder positioning 2021-04-25 16:48:55 -04:00
2014ad42c8
Merge pull request #39 from Ewpratten/assets
Assets
2021-04-25 16:38:12 -04:00
wm-c
ed70f6ac8c Merge branch 'master' into assets 2021-04-25 16:28:22 -04:00
wm-c
8411b60c5c Added transponder 2021-04-25 16:27:07 -04:00
rsninja722
5f2ad0b87c Merge branch 'master' into assets 2021-04-25 16:25:55 -04:00
b954e79287
Merge pull request #37 from Ewpratten/assets
Assets
2021-04-25 16:21:36 -04:00
4adadbe8cd
Merge pull request #38 from Ewpratten/readme
Readme
2021-04-25 16:19:38 -04:00
fcf8226f65 templating 2021-04-25 16:17:09 -04:00
1ec856e1f5 badge urls 2021-04-25 16:13:38 -04:00
22dc823f17 Badges 2021-04-25 16:12:37 -04:00
afe9d64c2f readme image 2021-04-25 16:09:38 -04:00
wm-c
f1a071f5da Merge branch 'master' into assets 2021-04-25 16:06:50 -04:00
623b6dbad3 Rename the game 2021-04-25 16:06:25 -04:00
wm-c
41c1ba7774 Merge branch 'assets' of github.com:Ewpratten/ludum-dare-48 into assets 2021-04-25 16:05:48 -04:00
wm-c
e11686fbe0 added item assests 2021-04-25 16:05:38 -04:00