283 Commits

Author SHA1 Message Date
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
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
rsninja722
03541f1f4d diver + tiles 2021-04-23 23:36:24 -04:00
97f6af1dde
Merge pull request #6 from Ewpratten/player_orientation
Player orientation
2021-04-23 23:34:36 -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
af342d8dc6 nalgebra 2021-04-23 20:41:04 -04:00
f87cc60506 pause menu and ability to change settings 2021-04-23 19:53:13 -04:00