Commit Graph

Select branches

Hide Pull Requests

appear_fix

arrows

asdf

better_bloom

better_physics

cheater_detection

collider_fixes

crt_shading

death_screen

dependabot/cargo/puffin-0.10

dependabot/cargo/puffin_http-0.7

dependabot/cargo/puffin_viewer-0.8

dependabot/cargo/tracing-subscriber-0.3

discord_presence

display-best-times

i_hardly_know_her

interaction_bugfixes

level-select-screen

level-select-title

level/proc-gen-prototype

level/tiled

level_fix

level_test

level_timing

levels

levels_merge_2

levels_update_img

main_menu_screen

master

menu_upgrades

new_bgs

new_player

next_level_screen

next_level_screen_buttons

no_loading_screen

ouchie_blocks

pause_menu

player_physics

rickroll

screen_zoom

sound

sound_design

space-to-reset

tiled2

timer-fix

titles

win_game

win_screen

wonky_blocks

world/base_gfx

world_timer

#17

#19

#20

#21

#22

#23

#24

#26

#27

#28

#29

#30

#32

#33

#34

#35

#36

#37

#38

#39

#40

#41

#42

#44

#45

#46

#49

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#60

#61

#62

#63

#64

#65

#66

#68

#69

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#79

#8

#80

#81

#81

#82

#82

#83

#83

pt1

r1

Mono Color

• 31a14b8e4e
  Merge pull request #54 from Ewpratten/levels_update_img Evan Pratten 2021-10-03 11:50:13 -07:00
• 3b5e55f738 demo tiling Evan Pratten 2021-10-03 14:49:47 -04:00
• 39992befd1 added glitchy effect to title Luna 2021-10-03 14:43:44 -04:00
• 41eda20b38 Merge branch 'master' into levels_update_img Evan Pratten 2021-10-03 14:42:54 -04:00
• 18799b6ffd
  Merge pull request #52 from Ewpratten/new_player Evan Pratten 2021-10-03 11:30:39 -07:00
• 466984588e fix player collider new_player Evan Pratten 2021-10-03 14:30:20 -04:00
• 0d5be8759a new character asset Evan Pratten 2021-10-03 14:25:34 -04:00
• 97644246aa
  Merge pull request #51 from Ewpratten/display-best-times Evan Pratten 2021-10-03 11:19:46 -07:00
• a338523b23 fix sound Luna 2021-10-03 14:18:39 -04:00
• c77ee2c9bf
  Merge pull request #50 from Ewpratten/master Evan Pratten 2021-10-03 11:11:29 -07:00
• 075084cbdf
  Merge branch 'display-best-times' into master Evan Pratten 2021-10-03 11:10:48 -07:00
• 776e190d30 display best times Luna 2021-10-03 14:08:39 -04:00
• 876235007f
  Merge pull request #49 from Ewpratten/sound_design Evan Pratten 2021-10-03 11:07:40 -07:00
• dc284adbd8 Add button sounds sound_design Evan Pratten 2021-10-03 14:07:23 -04:00
• 17c5015e33 Hitboxes of level 2 Marcelo Geldres 2021-10-03 14:06:25 -04:00
• d640e48996 Add the game soundtrack Evan Pratten 2021-10-03 13:46:08 -04:00
• 82eb78e06c Add emilia's insta Evan Pratten 2021-10-03 13:05:21 -04:00
• 511f82e101 Maps Updated Marcelo Geldres 2021-10-03 12:57:09 -04:00
• 0bc3361e05 Update platforms.png Marcelo Geldres 2021-10-03 12:38:42 -04:00
• 8a911eaacf
  Merge pull request #46 from Ewpratten/world_timer Evan Pratten 2021-10-03 09:28:53 -07:00
• 2bfdc35ab3 implement the rest of the level timers world_timer Evan Pratten 2021-10-03 12:28:34 -04:00
• b0d841bb70 New Level Created (2) Marcelo Geldres 2021-10-03 12:27:22 -04:00
• 17049c7fa9 rm savegame Evan Pratten 2021-10-03 12:15:44 -04:00
• 583ece9c12 Loading and saving time data Evan Pratten 2021-10-03 12:12:06 -04:00
• 7f8b24e328
  Merge pull request #45 from Ewpratten/menu_upgrades Evan Pratten 2021-10-03 08:51:43 -07:00
• fe42b962f0 menu thingies menu_upgrades Evan Pratten 2021-10-03 11:51:25 -04:00
• f549cab250 persist level timer Evan Pratten 2021-10-03 11:26:07 -04:00
• f77373df62 Add kori's instagram Evan Pratten 2021-10-03 11:02:42 -04:00
• 78b10a077f more credits Evan Pratten 2021-10-03 10:52:20 -04:00
• 2f0b2dbceb Add more to the credits Evan Pratten 2021-10-03 10:43:55 -04:00
• a70c886d74
  Merge pull request #44 from Ewpratten/level_test Evan Pratten 2021-10-03 07:37:38 -07:00
• 7f02d09e13 Add a test level and fix a ton of bugs level_test Evan Pratten 2021-10-03 10:37:16 -04:00
• 71513ab501 rpc and stuff Evan Pratten 2021-10-03 10:29:20 -04:00
• 80c27ddc7e img Evan Pratten 2021-10-03 00:48:40 -04:00
• 2774335596 colliders Evan Pratten 2021-10-03 00:47:52 -04:00
• 986fcca851 Working on lvl0 Evan Pratten 2021-10-03 00:42:55 -04:00
• 075c0b4886
  Merge pull request #42 from Ewpratten/win_game Evan Pratten 2021-10-02 21:13:36 -07:00
• 9c9e339d7f
  Merge branch 'master' into win_game win_game Evan Pratten 2021-10-02 21:12:57 -07:00
• 38e9ed5fb4
  Merge pull request #41 from Ewpratten/arrows Evan Pratten 2021-10-02 21:12:47 -07:00
• 72a8b85ca5
  Merge branch 'master' into arrows arrows Evan Pratten 2021-10-02 21:12:40 -07:00
• 52b9cdd9b9 Let the user win the game Evan Pratten 2021-10-03 00:12:18 -04:00
• 81c3fa7078 disable vsync Evan Pratten 2021-10-03 00:01:40 -04:00
• 69dfbf24d6 added arrows to menu buttons >:( Luna 2021-10-02 23:50:29 -04:00
• 1351fcd537
  Merge pull request #40 from Ewpratten/wonky_blocks Evan Pratten 2021-10-02 20:49:30 -07:00
• e690f3dde5
  Merge branch 'master' into wonky_blocks wonky_blocks Evan Pratten 2021-10-02 20:49:13 -07:00
• f53dc8122e Add appearing and disappearing boxes Evan Pratten 2021-10-02 23:48:30 -04:00
• 0c96c1ac35
  Merge pull request #39 from Ewpratten/next_level_screen Evan Pratten 2021-10-02 20:39:12 -07:00
• 27db69441f
  Merge branch 'master' into next_level_screen next_level_screen Evan Pratten 2021-10-02 20:39:06 -07:00
• e61f67ee30 eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee Evan Pratten 2021-10-02 23:38:28 -04:00
• f31a32c7ec Appearing platforms Evan Pratten 2021-10-02 23:36:30 -04:00
• 00ffc23e81 created next level screen Luna 2021-10-02 23:31:48 -04:00
• cdb8b8dd83 Add fall through floor checks Evan Pratten 2021-10-02 23:11:26 -04:00
• 82c5836cfc Merge branch 'master' of github.com:Ewpratten/ludum-dare-49 Evan Pratten 2021-10-02 23:06:34 -04:00
• 7bd62b15da add level swith controls to mpsc Evan Pratten 2021-10-02 23:06:29 -04:00
• 23892fe7d2
  Merge pull request #38 from Ewpratten/win_screen Evan Pratten 2021-10-02 20:04:59 -07:00
• 50125401d5
  Merge branch 'master' into win_screen win_screen Evan Pratten 2021-10-02 20:04:00 -07:00
• fccb47491a created win screen Luna 2021-10-02 23:00:59 -04:00
• 1c761e97b8 new death text Evan Pratten 2021-10-02 22:51:09 -04:00
• 7d97701bfa
  Merge pull request #37 from Ewpratten/rickroll Evan Pratten 2021-10-02 19:46:21 -07:00
• 7eecc79f84 we gottem bois rickroll Evan Pratten 2021-10-02 22:45:43 -04:00
• 251df8b0ea
  Merge pull request #36 from Ewpratten/interaction_bugfixes Evan Pratten 2021-10-02 19:30:15 -07:00
• 46bd7b1916 Fixed gravity bug interaction_bugfixes Evan Pratten 2021-10-02 22:29:54 -04:00
• 35f41d3e51 Fix forward colliders Evan Pratten 2021-10-02 22:26:16 -04:00
• 22b93a02cf collider debugging Evan Pratten 2021-10-02 22:17:21 -04:00
• 7246238aa5
  Merge pull request #35 from Ewpratten/death_screen Evan Pratten 2021-10-02 17:51:03 -07:00
• 4c70d78efb
  Merge branch 'master' into death_screen death_screen Evan Pratten 2021-10-02 17:50:56 -07:00
• f12816ce2f made death screen Luna 2021-10-02 20:50:03 -04:00
• ab2e64c111
  Merge pull request #34 from Ewpratten/better_physics Evan Pratten 2021-10-02 17:48:55 -07:00
• 48d3b421b4 slightly less janky physics better_physics Evan Pratten 2021-10-02 20:48:31 -04:00
• d3464f0919 fix player render height Evan Pratten 2021-10-02 20:38:40 -04:00
• ad059325cd
  Merge pull request #33 from Ewpratten/better_bloom Evan Pratten 2021-10-02 17:32:20 -07:00
• 06fd369eec funky edge shading better_bloom Evan Pratten 2021-10-02 20:32:04 -04:00
• bf1852eee3
  Merge pull request #32 from Ewpratten/no_loading_screen Evan Pratten 2021-10-02 17:26:58 -07:00
• 44927d3afa redo a bunch of ui code no_loading_screen Evan Pratten 2021-10-02 20:26:28 -04:00
• 0d4d149b0b init branch level_timing Carter T 2021-10-02 20:06:05 -04:00
• 9b74b42554 Load new background art and how to play info Evan Pratten 2021-10-02 19:42:22 -04:00
• 3370b924be border the menu screens Evan Pratten 2021-10-02 19:18:33 -04:00
• df7f80e31c
  Merge pull request #30 from Ewpratten/pause_menu Evan Pratten 2021-10-02 16:15:42 -07:00
• 74170f8876 working on redoing the loading sequence Evan Pratten 2021-10-02 19:15:07 -04:00
• 8c0cdc959c
  Merge pull request #29 from Ewpratten/main_menu_screen Evan Pratten 2021-10-02 16:12:21 -07:00
• 921b6dba80
  Merge pull request #28 from Ewpratten/collider_fixes Evan Pratten 2021-10-02 16:11:56 -07:00
• 3bc21a4a3a Add death collider_fixes Evan Pratten 2021-10-02 19:11:32 -04:00
• d498690298 Merge branch 'main_menu_screen' of https://github.com/Ewpratten/ludum-dare-49 into main_menu_screen main_menu_screen Luna 2021-10-02 19:10:30 -04:00
• 5c6e8fb208 added quit button Luna 2021-10-02 19:09:26 -04:00
• 166428ae88 Merge branch 'master' into collider_fixes Evan Pratten 2021-10-02 19:00:38 -04:00
• c4a4c27b4c
  Merge pull request #27 from Ewpratten/main_menu_screen Evan Pratten 2021-10-02 15:58:26 -07:00
• 42ff4cd7e3 Fix mutability error Evan Pratten 2021-10-02 18:58:13 -04:00
• c7ee45d0b7
  Merge branch 'master' into main_menu_screen Evan Pratten 2021-10-02 15:56:55 -07:00
• 3b70a36e88 bg rendering Evan Pratten 2021-10-02 18:55:38 -04:00
• 27abfcd149 Push Comment pause_menu Marcelo Geldres 2021-10-02 18:54:46 -04:00
• 20d5162cf8 Co-authored-by: Evan Pratten <ewpratten@gmail.com> Luna 2021-10-02 18:53:14 -04:00
• 9af1683801 Fixes to the Pause menu Marcelo Geldres 2021-10-02 18:50:40 -04:00
• db28c7403b debug collider rendering Evan Pratten 2021-10-02 18:48:58 -04:00
• d995480530
  Merge pull request #26 from Ewpratten/master Evan Pratten 2021-10-02 14:50:30 -07:00
• c988944e3d Give the game a name Evan Pratten 2021-10-02 17:41:02 -04:00
• 2c6ef49060
  Merge pull request #24 from Ewpratten/discord_presence Evan Pratten 2021-10-02 14:31:59 -07:00
• b2cda7b7f7 Add discord presence updating discord_presence Evan Pratten 2021-10-02 17:31:17 -04:00
• e0b63f20a1 Add a small logo Evan Pratten 2021-10-02 17:11:01 -04:00
• 5f6d21eeb3
  Merge pull request #23 from Ewpratten/pause_menu Evan Pratten 2021-10-02 14:05:00 -07:00
• bd5659cbaa Some small touch-ups Evan Pratten 2021-10-02 17:04:52 -04:00