Commit Graph

Select branches

Hide Pull Requests

assets

backgrounds

boids

bouncy_player

cave_rendering

darkness

fish

fish_fix

follow_cam

gamestate_saving

ingame_hud

item_impl

master

movement

movement_tweaks

octopus

octopus_asset

ouchies

outofbreathscreen

pause_credits

player_cleanup

player_orientation

player_texturing

profiling

push-mob

readme

reduce_warnings

rename

scal-ing

shader2

shaders

shop

shop2

shop_tooltip

smooth_turning

suck-monster

tech_demo

whirlpooltweaks

#11

#12

#13

#14

#15

#16

#17

#18

#19

#20

#21

#22

#23

#26

#27

#28

#29

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#40

#41

#42

#43

#44

#45

#46

#47

#48

#6

#7

#8

#9

0.0.0-alpha0

v1.0.0

Mono Color

• 79bae68f71 Merge remote-tracking branch 'origin/player_cleanup' into ouchies Evan Pratten 2021-04-24 15:47:19 -04:00
• 7d06fcb6d1 more cleanup player_cleanup Evan Pratten 2021-04-24 15:46:28 -04:00
• e6726916a6 extracting player code Evan Pratten 2021-04-24 15:40:17 -04:00
• ffe4d7f824 base Evan Pratten 2021-04-24 15:27:00 -04:00
• 2628c0d740 Pretty hacky but still a wip wm-c 2021-04-24 15:18:39 -04:00
• 1d9f49eb34
  Merge pull request #16 from Ewpratten/cave_rendering Evan Pratten 2021-04-24 15:07:28 -04:00
• 8b260be5b7 Proper colliders cave_rendering Evan Pratten 2021-04-24 15:07:04 -04:00
• 2844e5ac0b setup shop structure wm-c 2021-04-24 15:05:44 -04:00
• ab0fe7b693 Merge remote-tracking branch 'origin/master' into cave_rendering Evan Pratten 2021-04-24 14:51:07 -04:00
• 02d6743023 fix collider debug rendering Evan Pratten 2021-04-24 14:51:00 -04:00
• 5ff8e61b6e
  Merge pull request #15 from Ewpratten/pause_credits Evan Pratten 2021-04-24 14:48:12 -04:00
• d52af77a47 collider debugging Evan Pratten 2021-04-24 14:47:31 -04:00
• 66a965511e collider loading Evan Pratten 2021-04-24 14:27:41 -04:00
• b73ba2cf0e the cave renders Evan Pratten 2021-04-24 14:10:49 -04:00
• 6fd77dffcf Merge remote-tracking branch 'origin/master' into boids rsninja722 2021-04-24 13:59:31 -04:00
• ef90e1ce66 fishy fish Evan Pratten 2021-04-24 13:59:08 -04:00
• 3f08d7e93f color block Evan Pratten 2021-04-24 13:50:42 -04:00
• 07acb6335b world rendering Evan Pratten 2021-04-24 13:40:23 -04:00
• 360dd59ca9 Merge remote-tracking branch 'origin/assets' into cave_rendering Evan Pratten 2021-04-24 13:34:55 -04:00
• b0a8869805 Add credits to the pause menu pause_credits Evan Pratten 2021-04-24 13:31:34 -04:00
• 5abedb7762 Rename everything Evan Pratten 2021-04-24 13:28:19 -04:00
• 4f09f8e6e6 Merge remote-tracking branch 'origin/master' into assets rsninja722 2021-04-24 13:25:31 -04:00
• f49b15ddb1 cave rsninja722 2021-04-24 13:25:03 -04:00
• dc110c9bfe fix profiler name Evan Pratten 2021-04-24 13:20:47 -04:00
• 0f243e6917 properly handle currency Evan Pratten 2021-04-24 13:19:34 -04:00
• e739553cbc
  Merge pull request #14 from Ewpratten/player_texturing Evan Pratten 2021-04-24 13:11:41 -04:00
• 9cac7f83da animated chr player_texturing Evan Pratten 2021-04-24 13:11:02 -04:00
• c8028fa313 Merge remote-tracking branch 'origin/master' into player_texturing Evan Pratten 2021-04-24 12:48:34 -04:00
• f97ff9dec4 animation Evan Pratten 2021-04-24 12:48:22 -04:00
• 3d4cf226b6 Merge remote-tracking branch 'origin/assets' into player_texturing Evan Pratten 2021-04-24 12:40:21 -04:00
• c0ad24029a working on animaiton Evan Pratten 2021-04-24 12:39:53 -04:00
• cee7188dbe more rsninja722 2021-04-24 12:37:35 -04:00
• bda405af20
  Merge pull request #13 from Ewpratten/scal-ing Evan Pratten 2021-04-24 12:20:27 -04:00
• 09c776ba3f resizing everything scal-ing Evan Pratten 2021-04-24 12:16:38 -04:00
• 12ed150a17
  Merge pull request #12 from Ewpratten/fish Evan Pratten 2021-04-24 11:38:36 -04:00
• 0ba15dc738 Merge remote-tracking branch 'origin/master' into fish fish Evan Pratten 2021-04-24 11:38:12 -04:00
• 877a5ba448 fish pickup Evan Pratten 2021-04-24 11:37:17 -04:00
• e3b523ecc1 fish movement Evan Pratten 2021-04-24 11:34:19 -04:00
• a0735b774b triangle fish Evan Pratten 2021-04-24 11:17:34 -04:00
• 08c401e97a
  Merge pull request #11 from Ewpratten/gamestate_saving Evan Pratten 2021-04-24 10:15:01 -04:00
• dd843e7a3f Game progress gamestate_saving Evan Pratten 2021-04-24 10:14:45 -04:00
• 556a9696cc
  Merge pull request #8 from Ewpratten/ingame_hud Evan Pratten 2021-04-24 09:52:57 -04:00
• b4e74a5694 Move James's changes to new file ingame_hud Evan Pratten 2021-04-24 09:49:39 -04:00
• e9cf3e0718 Merge remote-tracking branch 'origin/smooth_turning' into ingame_hud Evan Pratten 2021-04-24 09:45:09 -04:00
• 7836d5e889 improved boost logic and hud Evan Pratten 2021-04-24 09:43:38 -04:00
• 68f90199a7 finish player logic Evan Pratten 2021-04-24 09:23:57 -04:00
• 6469a36c56 Real boost logic Evan Pratten 2021-04-24 09:18:09 -04:00
• fa9bc120e3 Add breath and boost hud Evan Pratten 2021-04-24 09:10:14 -04:00
• bfef2269e8 Some quick reorg of ingame logic Evan Pratten 2021-04-24 08:46:10 -04:00
• fe1df618c0 coloriing Evan Pratten 2021-04-24 08:40:36 -04:00
• 8d6b088232 Add progress slider Evan Pratten 2021-04-24 00:15:21 -04:00
• e5a5fb86dc forgot comments smooth_turning rsninja722 2021-04-24 00:09:36 -04:00
• 1c34ba9058 turns smoother rsninja722 2021-04-24 00:06:37 -04:00
• a0ddc81585 fixed oscillation at distance movement wm-c 2021-04-24 00:00:10 -04:00
• bd24162fbd Adding hud data Evan Pratten 2021-04-23 23:56:11 -04:00
• 03541f1f4d diver + tiles rsninja722 2021-04-23 23:36:24 -04:00
• 97f6af1dde
  Merge pull request #6 from Ewpratten/player_orientation Evan Pratten 2021-04-23 23:34:36 -04:00
• 79cf3e7274 Basic movement player_orientation Evan Pratten 2021-04-23 23:34:07 -04:00
• 40b7421f24 camera lock follow_cam Evan Pratten 2021-04-23 22:59:37 -04:00
• 50634c7516 update for will Evan Pratten 2021-04-23 22:54:04 -04:00
• 534c9bd800 player rendering Evan Pratten 2021-04-23 22:39:43 -04:00
• 51fc8adac1 Begining player rendering Evan Pratten 2021-04-23 22:39:28 -04:00
• af342d8dc6 nalgebra Evan Pratten 2021-04-23 20:41:04 -04:00
• f87cc60506 pause menu and ability to change settings Evan Pratten 2021-04-23 19:53:13 -04:00
• 64bfd6fbe6 debugging and more screens Evan Pratten 2021-04-23 18:57:30 -04:00
• c551f0be0a load in the game logo placeholder Evan Pratten 2021-04-23 12:29:30 -04:00
• ac5bd2c790 Debug warning on loading screen Evan Pratten 2021-04-23 11:58:46 -04:00
• 0d8572c892 working on loading screen system Evan Pratten 2021-04-23 11:47:19 -04:00
• b176144c8d profiling and code cleanup Evan Pratten 2021-04-23 10:34:42 -04:00
• abcd1ebb0b badges Evan Pratten 2021-04-22 15:38:52 -04:00
• c7eaa7b067 More readme data Evan Pratten 2021-04-22 15:34:10 -04:00
• 8d45f3ea15 SerialStudio instructions Evan Pratten 2021-04-22 15:28:08 -04:00
• 3b6b3adf64 clean out assets folder Evan Pratten 2021-04-22 15:23:18 -04:00
• 63a4c8bc02 fix zip rule profiling Evan Pratten 2021-04-22 15:22:32 -04:00
• 63f6ee2fde no zips Evan Pratten 2021-04-22 15:22:20 -04:00
• 5d0992852f rm zip Evan Pratten 2021-04-22 15:22:13 -04:00
• 410c6cc567 Add serialstudio support to the game Evan Pratten 2021-04-22 15:16:30 -04:00
• 01ee2d5dcf Set up a code template for tomorrow Evan Pratten 2021-04-22 10:44:28 -04:00
• dfcd5c5e99 some pre-jam reorg tech_demo Evan Pratten 2021-04-22 10:32:43 -04:00
• 0861a84777 vscode configuration Evan Pratten 2021-04-22 10:22:23 -04:00
• 1d3f158706 resources Evan Pratten 2021-04-07 14:49:38 -04:00
• 8672c4c141 always build Evan Pratten 2021-04-07 11:56:47 -04:00
• dafb102624 improve release flow Evan Pratten 2021-04-07 11:56:23 -04:00
• e135a75937 Fix some publishing issues Evan Pratten 2021-04-06 19:21:29 -04:00
• 4d152e071e rm test png Evan Pratten 2021-04-06 15:53:21 -04:00
• 3fc9c306f3 tech demo Evan Pratten 2021-04-06 15:53:06 -04:00
• 839b3ae704 some small fixes 0.0.0-alpha0 Evan Pratten 2021-04-06 11:07:39 -04:00
• 408ccafd5a CI scripts Evan Pratten 2021-04-06 11:02:32 -04:00
• 6cc33f7a6f cross compile scripts Evan Pratten 2021-04-06 10:48:07 -04:00
• f7d8765ddb cargo init Evan Pratten 2021-04-06 09:43:52 -04:00
• 01194f8f14 clear settings Evan Pratten 2021-04-06 09:40:28 -04:00
• 74e7cab996 clean out gradle Evan Pratten 2021-04-06 09:40:06 -04:00
• 29b355f4f5 reconfig gamej Evan Pratten 2021-04-05 14:42:20 -04:00
• f100d2332a more setup Evan Pratten 2021-04-05 14:30:59 -04:00
• 1b176c43f2 Set up GameJ and Jstate support Evan Pratten 2021-04-05 14:24:41 -04:00
• 287957f987 Init gradle Evan Pratten 2021-04-05 14:17:55 -04:00
• b7228bef4b
  Initial commit Evan Pratten 2021-04-05 12:14:15 -04:00