93 Commits

Author SHA1 Message Date
921b6dba80
Merge pull request #28 from Ewpratten/collider_fixes
Make the player die a lot
2021-10-02 16:11:56 -07:00
3bc21a4a3a Add death 2021-10-02 19:11:32 -04:00
166428ae88 Merge branch 'master' into collider_fixes 2021-10-02 19:00:38 -04:00
c4a4c27b4c
Merge pull request #27 from Ewpratten/main_menu_screen
Add the main menu
2021-10-02 15:58:26 -07:00
42ff4cd7e3 Fix mutability error 2021-10-02 18:58:13 -04:00
c7ee45d0b7
Merge branch 'master' into main_menu_screen 2021-10-02 15:56:55 -07:00
3b70a36e88 bg rendering 2021-10-02 18:55:38 -04:00
Luna
20d5162cf8 Co-authored-by: Evan Pratten <ewpratten@gmail.com> 2021-10-02 18:53:14 -04:00
db28c7403b debug collider rendering 2021-10-02 18:48:58 -04:00
c988944e3d Give the game a name 2021-10-02 17:41:02 -04:00
2c6ef49060
Merge pull request #24 from Ewpratten/discord_presence
Make the game properly report itself under discord RPC
2021-10-02 14:31:59 -07:00
b2cda7b7f7 Add discord presence updating 2021-10-02 17:31:17 -04:00
e0b63f20a1 Add a small logo 2021-10-02 17:11:01 -04:00
5f6d21eeb3
Merge pull request #23 from Ewpratten/pause_menu
Add the Pause menu
2021-10-02 14:05:00 -07:00
bd5659cbaa Some small touch-ups 2021-10-02 17:04:52 -04:00
b96d9e4ef4
Merge branch 'master' into pause_menu 2021-10-02 14:00:06 -07:00
Marcelo Geldres
3e027f0259 Pause Menu
Pause Menu with the features of Resuming the game and going back to the main menu.
2021-10-02 16:56:26 -04:00
c1a7125f34
Merge pull request #22 from Ewpratten/levels
Add POC level system [wip]
2021-10-02 13:54:26 -07:00
f1e10be5da Very basic collisions with the world (janky) 2021-10-02 16:53:50 -04:00
Marcelo Geldres
bd1ae248f5 Pause Button
Pause button and screen work
2021-10-02 16:53:08 -04:00
a76dd7de72 world map rendering 2021-10-02 15:57:25 -04:00
59ed004bb1
Merge pull request #21 from Ewpratten/world/base_gfx
fix player sprites
2021-10-02 12:02:07 -07:00
67803212be fix player sprites 2021-10-02 15:01:23 -04:00
84b4d48850
Merge pull request #20 from Ewpratten/world/base_gfx
Add a background testing texture, and fix the player's many bugs
2021-10-02 11:48:54 -07:00
4b8818c29e fix double-jump bug 2021-10-02 14:48:06 -04:00
50414ee26e Fix wonky physics issues 2021-10-02 14:44:06 -04:00
f53daafa09 basic bg texturing 2021-10-02 09:51:22 -04:00
2b95cbb3b3 working on texture tiles 2021-10-02 09:06:06 -04:00
17fdb4252e
Merge pull request #19 from Ewpratten/player_physics
Implement the Player
2021-10-02 05:43:07 -07:00
6927da2f16 fix carter's name 2021-10-02 08:42:56 -04:00
a8fe8ac85c spea 2021-10-01 23:02:38 -04:00
a0cb49edf2 puffin stuffin 2021-10-01 23:00:40 -04:00
21272ba5d6 cleanup of animation 2021-10-01 22:56:16 -04:00
6ef9655a2b player texture and animation 2021-10-01 22:46:09 -04:00
f1c341fdbc bloom shading 2021-10-01 20:41:23 -04:00
4cb192730d mid-progress 2021-10-01 20:37:14 -04:00
9c2d636703 colors 2021-10-01 20:26:57 -04:00
28ea07bed9 colors and stuff 2021-10-01 20:26:52 -04:00
fa452c8350 Added the floor 2021-10-01 20:11:27 -04:00
26406b97ba Quick skip loading screen 2021-10-01 19:47:32 -04:00
f221aef192 un-fuck physics 2021-10-01 19:27:21 -04:00
2b471bd8d4 Add the character in the most basic form
Co-authored-by: Carter Tomlenovich <cartertom@tuta.io>
2021-10-01 19:27:10 -04:00
bb2a62fcb9
Merge pull request #8 from Ewpratten/crt_shading
Implement a basic CRT shader
2021-10-01 09:20:24 -07:00
8379fd2973 Disable CRT mode 2021-10-01 12:19:29 -04:00
8ace32102b Implemented CRT shader 2021-10-01 12:19:08 -04:00
d70d183861 testing out latest log hook code 2021-10-01 10:33:19 -04:00
df6425c306 move logging hooks out to raylib itself 2021-09-30 16:36:02 -04:00
b650083bcb slightly edit log output 2021-09-30 15:57:26 -04:00
dd8047f6fd Hooked in to raylib's logger 2021-09-30 15:52:57 -04:00
5add6e1c65 Rendering game version on screen 2021-09-30 12:50:08 -04:00