44 Commits

Author SHA1 Message Date
wm-c
c59e6434c1 items now purchasable 2021-04-24 22:52:40 -04:00
wm-c
69efde83a8 changed structs 2021-04-24 18:19:00 -04:00
wm-c
7a481421f6 Merge branch 'ouchies' into shop 2021-04-24 16:51:03 -04:00
8db5ff65ec flipper logic 2021-04-24 16:46:06 -04:00
wm-c
315a487cdf Merge branch 'ouchies' into shop 2021-04-24 16:40:58 -04:00
wm-c
eedc1c5966 added buying 2021-04-24 16:35:52 -04:00
wm-c
f77a8755b8 Merge branch 'master' into shop 2021-04-24 16:35:37 -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
wm-c
2628c0d740 Pretty hacky but still a wip 2021-04-24 15:18:39 -04:00
8b260be5b7 Proper colliders 2021-04-24 15:07:04 -04:00
wm-c
2844e5ac0b setup shop structure 2021-04-24 15:05:44 -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
d52af77a47 collider debugging 2021-04-24 14:47:31 -04:00
b73ba2cf0e the cave renders 2021-04-24 14:10:49 -04:00
ef90e1ce66 fishy fish 2021-04-24 13:59:08 -04:00
3f08d7e93f color block 2021-04-24 13:50:42 -04:00
07acb6335b world rendering 2021-04-24 13:40:23 -04:00
0f243e6917 properly handle currency 2021-04-24 13:19:34 -04:00
9cac7f83da animated chr 2021-04-24 13:11:02 -04:00
c8028fa313 Merge remote-tracking branch 'origin/master' into player_texturing 2021-04-24 12:48:34 -04:00
f97ff9dec4 animation 2021-04-24 12:48:22 -04:00
09c776ba3f resizing everything 2021-04-24 12:16:38 -04:00
a0735b774b triangle fish 2021-04-24 11:17:34 -04:00
b4e74a5694 Move James's changes to new file
Co-authored-by: rsninja722 <jnick722547@gmail.com>
2021-04-24 09:49:39 -04:00
e9cf3e0718 Merge remote-tracking branch 'origin/smooth_turning' into ingame_hud 2021-04-24 09:45:09 -04:00
7836d5e889 improved boost logic and hud 2021-04-24 09:43:38 -04:00
68f90199a7 finish player logic 2021-04-24 09:23:57 -04:00
6469a36c56 Real boost logic 2021-04-24 09:18:09 -04:00
fa9bc120e3 Add breath and boost hud 2021-04-24 09:10:14 -04:00
bfef2269e8 Some quick reorg of ingame logic 2021-04-24 08:46:10 -04:00
fe1df618c0 coloriing 2021-04-24 08:40:36 -04:00
8d6b088232 Add progress slider 2021-04-24 00:15:21 -04:00
rsninja722
e5a5fb86dc forgot comments 2021-04-24 00:09:36 -04:00
rsninja722
1c34ba9058 turns smoother 2021-04-24 00:06:37 -04:00
bd24162fbd Adding hud data 2021-04-23 23:56:11 -04:00
79cf3e7274 Basic movement 2021-04-23 23:34:07 -04:00
40b7421f24 camera lock 2021-04-23 22:59:37 -04:00
50634c7516 update for will 2021-04-23 22:54:04 -04:00
534c9bd800 player rendering 2021-04-23 22:39:43 -04:00
51fc8adac1 Begining player rendering
Co-authored-by: William Meathrel <wcmeathrel@gmail.com>
Co-authored-by: Catarina Burghi <catarinaburghi@users.noreply.github.com>
2021-04-23 22:39:28 -04:00
c551f0be0a load in the game logo placeholder 2021-04-23 12:29:30 -04:00