200 Commits

Author SHA1 Message Date
9bd4cb4122
Merge pull request #36 from Ewpratten/octopus_asset
Octopus asset
2021-04-25 15:45:02 -04:00
b332f7ffb8 animate octopus 2021-04-25 15:44:42 -04:00
2fec1a9765 Merge remote-tracking branch 'origin/assets' into octopus_asset 2021-04-25 15:36:50 -04:00
dda941ba3a
Merge pull request #35 from Ewpratten/shaders
Use a pixel shader
2021-04-25 15:32:11 -04:00
1534883d78 Pixel shading 2021-04-25 15:31:02 -04:00
rsninja722
a4448775a7 octopus 2021-04-25 15:22:39 -04:00
a5614c54b2
Merge pull request #34 from Ewpratten/outofbreathscreen
added win screen
2021-04-25 15:14:44 -04:00
25c98de3ba fix pause menu graphics 2021-04-25 15:13:29 -04:00
d985cb2fad fix texture trait 2021-04-25 15:10:42 -04:00
be91f70053 blooooom 2021-04-25 15:06:27 -04:00
810ebc72e1 Rendering with shaders 2021-04-25 14:47:33 -04:00
rsninja722
bc8d03a261 Merge remote-tracking branch 'origin/master' into assets 2021-04-25 14:38:43 -04:00
rsninja722
ccfa199f13 items + transponder 2021-04-25 14:38:29 -04:00
e1d9100613 stop player from wasting money 2021-04-25 14:30:18 -04:00
wm-c
74ba0ffab9 Merge branch 'master' into outofbreathscreen 2021-04-25 14:27:28 -04:00
wm-c
e809f9838e added win screen 2021-04-25 14:24:17 -04:00
8e8cf7bf4c raylib logo 2021-04-25 13:51:41 -04:00
10949850f6
Merge pull request #32 from Ewpratten/assets
Assets
2021-04-25 13:48:34 -04:00
c91d82080a
Merge pull request #33 from Ewpratten/backgrounds
add backgrounds to menus
2021-04-25 13:48:17 -04:00
319405e761 add backgrounds to menus 2021-04-25 13:48:00 -04:00
rsninja722
3b9eebbb3c fish fix, less js 2021-04-25 13:45:50 -04:00
2f1a275465
Merge pull request #31 from Ewpratten/outofbreathscreen
Death screen added
2021-04-25 13:43:55 -04:00
846b75d6e5 Merge remote-tracking branch 'origin/master' into outofbreathscreen 2021-04-25 13:43:35 -04:00
wm-c
fcaeee4877 Death screen added 2021-04-25 13:37:23 -04:00
rsninja722
c5f716cca1 Merge branch 'master' into assets 2021-04-25 13:36:58 -04:00
c207966b75
Merge pull request #30 from Ewpratten/fish_fix
Fish fix
2021-04-25 13:34:29 -04:00
50baf53b9e fix fish direction 2021-04-25 13:33:10 -04:00
e7cd020666 Merge remote-tracking branch 'origin/assets' into fish_fix 2021-04-25 13:30:17 -04:00
c4fec8c835 Merge remote-tracking branch 'origin/master' into fish_fix 2021-04-25 13:29:29 -04:00
021e597747
Merge pull request #29 from Ewpratten/item_impl
Implement items
2021-04-25 13:28:59 -04:00
rsninja722
67d76dab08 fish?? 2021-04-25 13:28:37 -04:00
2d6d1f3629 air bag impl 2021-04-25 13:28:34 -04:00
da3b52e395 Add flipper logic 2021-04-25 13:25:05 -04:00
97449cbc44
Merge pull request #28 from Ewpratten/shop_tooltip
tooltips in the shop
2021-04-25 13:20:19 -04:00
rsninja722
b1a1b2e105 fish? 2021-04-25 13:15:06 -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
5d019bf39f
Merge pull request #27 from Ewpratten/shop2
Merge shop code with master, while doing a bunch of UI updates
2021-04-25 12:45:06 -04:00
cc4affdbd1 remove player extra coins 2021-04-25 12:39:53 -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
560329fa2b Merge remote-tracking branch 'origin/assets' into shop2 2021-04-25 11:10:01 -04:00
3a2caecfff working on buy buttons 2021-04-25 11:09:38 -04:00