270 Commits

Author SHA1 Message Date
1c761e97b8 new death text 2021-10-02 22:51:09 -04:00
7d97701bfa
Merge pull request #37 from Ewpratten/rickroll
we gottem bois
2021-10-02 19:46:21 -07:00
7eecc79f84 we gottem bois 2021-10-02 22:45:43 -04:00
251df8b0ea
Merge pull request #36 from Ewpratten/interaction_bugfixes
Interaction bugfixes
2021-10-02 19:30:15 -07:00
46bd7b1916 Fixed gravity bug 2021-10-02 22:29:54 -04:00
35f41d3e51 Fix forward colliders 2021-10-02 22:26:16 -04:00
22b93a02cf collider debugging 2021-10-02 22:17:21 -04:00
7246238aa5
Merge pull request #35 from Ewpratten/death_screen
made death screen
2021-10-02 17:51:03 -07:00
4c70d78efb
Merge branch 'master' into death_screen 2021-10-02 17:50:56 -07:00
Luna
f12816ce2f made death screen 2021-10-02 20:50:03 -04:00
ab2e64c111
Merge pull request #34 from Ewpratten/better_physics
Better physics
2021-10-02 17:48:55 -07:00
48d3b421b4 slightly less janky physics 2021-10-02 20:48:31 -04:00
d3464f0919 fix player render height 2021-10-02 20:38:40 -04:00
ad059325cd
Merge pull request #33 from Ewpratten/better_bloom
funky edge shading
2021-10-02 17:32:20 -07:00
06fd369eec funky edge shading 2021-10-02 20:32:04 -04:00
bf1852eee3
Merge pull request #32 from Ewpratten/no_loading_screen
Remove and replace some UI elements
2021-10-02 17:26:58 -07:00
44927d3afa redo a bunch of ui code 2021-10-02 20:26:28 -04:00
9b74b42554 Load new background art and how to play info 2021-10-02 19:42:22 -04:00
3370b924be border the menu screens 2021-10-02 19:18:33 -04:00
df7f80e31c
Merge pull request #30 from Ewpratten/pause_menu
Pause menu
2021-10-02 16:15:42 -07:00
74170f8876 working on redoing the loading sequence 2021-10-02 19:15:07 -04:00
8c0cdc959c
Merge pull request #29 from Ewpratten/main_menu_screen
Let the user quit
2021-10-02 16:12:21 -07:00
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
Luna
d498690298 Merge branch 'main_menu_screen' of https://github.com/Ewpratten/ludum-dare-49 into main_menu_screen 2021-10-02 19:10:30 -04:00
Luna
5c6e8fb208 added quit button 2021-10-02 19:09:26 -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
Marcelo Geldres
27abfcd149 Push Comment
just to make sure I commit and push the code
2021-10-02 18:54:46 -04:00
Luna
20d5162cf8 Co-authored-by: Evan Pratten <ewpratten@gmail.com> 2021-10-02 18:53:14 -04:00
Marcelo Geldres
9af1683801 Fixes to the Pause menu
Centering the hitbox of main menu and the hitbox of resume
2021-10-02 18:50:40 -04:00
db28c7403b debug collider rendering 2021-10-02 18:48:58 -04:00
d995480530
Merge pull request #26 from Ewpratten/master
pull origin
2021-10-02 14:50:30 -07: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