|
|
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 |
|
|
|
b73ba2cf0e
|
the cave renders
|
2021-04-24 14:10:49 -04:00 |
|
rsninja722
|
6fd77dffcf
|
Merge remote-tracking branch 'origin/master' into boids
|
2021-04-24 13:59:31 -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 |
|
|
|
360dd59ca9
|
Merge remote-tracking branch 'origin/assets' into cave_rendering
|
2021-04-24 13:34:55 -04:00 |
|
|
|
b0a8869805
|
Add credits to the pause menu
|
2021-04-24 13:31:34 -04:00 |
|
|
|
5abedb7762
|
Rename everything
|
2021-04-24 13:28:19 -04:00 |
|
rsninja722
|
4f09f8e6e6
|
Merge remote-tracking branch 'origin/master' into assets
|
2021-04-24 13:25:31 -04:00 |
|
rsninja722
|
f49b15ddb1
|
cave
|
2021-04-24 13:25:03 -04:00 |
|
|
|
dc110c9bfe
|
fix profiler name
|
2021-04-24 13:20:47 -04:00 |
|
|
|
0f243e6917
|
properly handle currency
|
2021-04-24 13:19:34 -04:00 |
|
|
|
e739553cbc
|
Merge pull request #14 from Ewpratten/player_texturing
Player animations!
|
2021-04-24 13:11:41 -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 |
|
|
|
3d4cf226b6
|
Merge remote-tracking branch 'origin/assets' into player_texturing
|
2021-04-24 12:40:21 -04:00 |
|
|
|
c0ad24029a
|
working on animaiton
|
2021-04-24 12:39:53 -04:00 |
|
rsninja722
|
cee7188dbe
|
more
|
2021-04-24 12:37:35 -04:00 |
|
|
|
bda405af20
|
Merge pull request #13 from Ewpratten/scal-ing
resizing everything
|
2021-04-24 12:20:27 -04:00 |
|
|
|
09c776ba3f
|
resizing everything
|
2021-04-24 12:16:38 -04:00 |
|
|
|
12ed150a17
|
Merge pull request #12 from Ewpratten/fish
Fish
|
2021-04-24 11:38:36 -04:00 |
|
|
|
0ba15dc738
|
Merge remote-tracking branch 'origin/master' into fish
|
2021-04-24 11:38:12 -04:00 |
|
|
|
877a5ba448
|
fish pickup
|
2021-04-24 11:37:17 -04:00 |
|
|
|
e3b523ecc1
|
fish movement
|
2021-04-24 11:34:19 -04:00 |
|
|
|
a0735b774b
|
triangle fish
|
2021-04-24 11:17:34 -04:00 |
|
|
|
08c401e97a
|
Merge pull request #11 from Ewpratten/gamestate_saving
Game progress
|
2021-04-24 10:15:01 -04:00 |
|
|
|
dd843e7a3f
|
Game progress
|
2021-04-24 10:14:45 -04:00 |
|
|
|
556a9696cc
|
Merge pull request #8 from Ewpratten/ingame_hud
Ingame hud
|
2021-04-24 09:52:57 -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 |
|
