rsninja722
|
0abe049061
|
Merge remote-tracking branch 'origin/master' into assets
|
2021-04-26 20:02:46 -04:00 |
|
rsninja722
|
1401094b13
|
balancing
|
2021-04-26 19:51:49 -04:00 |
|
wm-c
|
6c22f05a30
|
Merge branch 'master' into push-mob
|
2021-04-26 18:25:39 -04:00 |
|
wm-c
|
67899182a4
|
Pufferfish added
|
2021-04-26 18:24:16 -04:00 |
|
rsninja722
|
ce2e028c72
|
balancing, stated audio
|
2021-04-26 17:16:43 -04:00 |
|
wm-c
|
1494b188c8
|
Merge branch 'assets' into push-mob
|
2021-04-26 16:28:56 -04:00 |
|
wm-c
|
b765513075
|
Expanding pufferfish
|
2021-04-26 16:23:33 -04:00 |
|
rsninja722
|
0a69b80b34
|
pufferfish, started real map
|
2021-04-26 14:51:37 -04:00 |
|
rsninja722
|
eb49b08bab
|
added velocity with friction, translucent shop back
|
2021-04-26 13:26:58 -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
|
c8da93bfdb
|
added whirlpool
|
2021-04-25 20:18:11 -04:00 |
|
|
5e1ae73b2b
|
more warning removal
|
2021-04-25 19:12: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 |
|
|
c5a2877efd
|
suck air bubble animation
|
2021-04-24 20:07:19 -04:00 |
|
|
54ff1c7931
|
finished stun system
|
2021-04-24 18:54:23 -04:00 |
|
|
e8317e0619
|
Merge remote-tracking branch 'origin/movement_tweaks' into ouchies
|
2021-04-24 18:11:45 -04:00 |
|
rsninja722
|
e7ac70074c
|
no more stuck
|
2021-04-24 17:33:53 -04:00 |
|
|
c0d147681b
|
handle attacking the jellyfish
|
2021-04-24 17:06:13 -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 |
|
|
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 |
|
|
8b260be5b7
|
Proper colliders
|
2021-04-24 15:07:04 -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 |
|
|
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 |
|
|
b4e74a5694
|
Move James's changes to new file
Co-authored-by: rsninja722 <jnick722547@gmail.com>
|
2021-04-24 09:49:39 -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 |
|