ludum-dare-49

evan/ludum-dare-49

Archived

Fork 0

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

9d03f78029

Update puffin_viewer requirement from 0.6 to 0.8 dependabot/cargo/puffin_viewer-0.8 dependabot[bot] 2021-10-29 20:19:39 +00:00
9430b45b55

Update tracing-subscriber requirement from 0.2 to 0.3 dependabot/cargo/tracing-subscriber-0.3 dependabot[bot] 2021-10-25 20:23:23 +00:00
ff860c8bbb

Update puffin_http requirement from 0.6 to 0.7 dependabot/cargo/puffin_http-0.7 dependabot[bot] 2021-10-12 20:20:56 +00:00
1a944e8a57

Update puffin requirement from 0.9 to 0.10 dependabot/cargo/puffin-0.10 dependabot[bot] 2021-10-12 20:20:37 +00:00
9f66e7f563 reviews master Evan Pratten 2021-10-11 13:19:20 -04:00
0546453fa2

Merge pull request #78 from Ewpratten/space-to-reset Evan Pratten 2021-10-06 08:59:31 -07:00
f39dfab057 press space to reset on death screen space-to-reset Luna 2021-10-06 02:01:35 -04:00
10ca740496 shhhh r1 Evan Pratten 2021-10-04 17:46:32 -04:00
afbde30951

Merge pull request #77 from Ewpratten/levels pt1 Evan Pratten 2021-10-04 14:14:18 -07:00
8e34905727

Merge branch 'master' into levels levels Evan Pratten 2021-10-04 14:14:09 -07:00
f8f1e5ad56 Merge branch 'screen_zoom' of github.com:Ewpratten/ludum-dare-49 into screen_zoom screen_zoom Evan Pratten 2021-10-04 17:13:03 -04:00
77d4799aa4 fate Evan Pratten 2021-10-04 17:12:57 -04:00
cfcfcdf04d Merge branch 'levels' of https://github.com/Ewpratten/ludum-dare-49 into levels Marcelo Geldres 2021-10-04 17:09:54 -04:00
a6e86067ac Last Level Kill Zone Added Marcelo Geldres 2021-10-04 17:09:41 -04:00
eade0b52c9

Merge pull request #76 from Ewpratten/levels Evan Pratten 2021-10-04 14:05:22 -07:00
0341c93b53

Merge branch 'master' into levels Evan Pratten 2021-10-04 14:05:12 -07:00
2524e114f1 Level 3 done and Good to go Marcelo Geldres 2021-10-04 17:03:12 -04:00
2a172def02

Merge pull request #75 from Ewpratten/screen_zoom Evan Pratten 2021-10-04 13:50:37 -07:00
8a64bf6f21

Merge branch 'master' into screen_zoom Evan Pratten 2021-10-04 13:50:27 -07:00
3197bdc2bc level 4 Evan Pratten 2021-10-04 16:50:01 -04:00
e677f0c1be Bug Fix Marcelo Geldres 2021-10-04 16:16:42 -04:00
b37499a084

Merge pull request #74 from Ewpratten/screen_zoom Evan Pratten 2021-10-04 13:10:17 -07:00
4fa1384f95 Fix the zoom absurdity Evan Pratten 2021-10-04 16:09:57 -04:00
593c041938 Merge branch 'levels' of https://github.com/Ewpratten/ludum-dare-49 into levels Marcelo Geldres 2021-10-04 16:01:44 -04:00
e4f8a12b8b Level 2 is good to go Marcelo Geldres 2021-10-04 16:01:28 -04:00
a1feeb9f82

Merge pull request #72 from Ewpratten/levels Evan Pratten 2021-10-04 12:38:00 -07:00
482dac08b9

Merge branch 'master' into levels Evan Pratten 2021-10-04 12:37:54 -07:00
8f8f877b6c

Merge pull request #73 from Ewpratten/new_bgs Evan Pratten 2021-10-04 12:37:36 -07:00
6b2cea2201 Add the new backgrounds new_bgs Evan Pratten 2021-10-04 15:35:13 -04:00
e0cc6068da Merge branch 'levels' of https://github.com/Ewpratten/ludum-dare-49 into levels Marcelo Geldres 2021-10-04 15:28:21 -04:00
08bb93c3bf Level 0 and 1 with the "Peel" Marcelo Geldres 2021-10-04 15:27:21 -04:00
84ac0c3edb fix some data storage issues Evan Pratten 2021-10-04 15:14:49 -04:00
6ec25e5211

Merge pull request #70 from Ewpratten/levels Evan Pratten 2021-10-04 11:51:53 -07:00
26396ce7db Fix some merge issues levels_merge_2 Evan Pratten 2021-10-04 14:50:55 -04:00
8b158cfa75 Merge branch 'levels' into levels_merge_2 Evan Pratten 2021-10-04 14:46:21 -04:00
eec97ffb53 README Evan Pratten 2021-10-04 14:38:18 -04:00
f2b18e8986 Game image Evan Pratten 2021-10-04 14:20:10 -04:00
b1dc4645b0

Merge pull request #71 from Ewpratten/sound Evan Pratten 2021-10-04 09:54:21 -07:00
4a068fc45d Merge branch 'levels' of https://github.com/Ewpratten/ludum-dare-49 into levels Marcelo Geldres 2021-10-04 12:44:42 -04:00
d07a991150 New Map Fully implemented Marcelo Geldres 2021-10-04 12:44:38 -04:00
c49c2fa8c4 button make sound now :) sound Luna 2021-10-04 11:47:40 -04:00
50cc805ed2

Merge branch 'master' into levels Evan Pratten 2021-10-04 08:24:06 -07:00
dd16a0debc

Merge pull request #69 from Ewpratten/level-select-title Evan Pratten 2021-10-04 08:23:40 -07:00
cabf1ad7a5

Merge branch 'master' into level-select-title level-select-title Evan Pratten 2021-10-04 08:23:13 -07:00
8211161f54 Organizational Corrections and Creation of new folder Marcelo Geldres 2021-10-04 08:22:57 -04:00
5449b3aced 4th Level aded withouth skins Marcelo Geldres 2021-10-04 07:47:47 -04:00
201ad92f74 3rd Level aded Marcelo Geldres 2021-10-04 06:22:57 -04:00
e7a3722cfb Asset adding for Map Creation Marcelo Geldres 2021-10-04 04:10:54 -04:00
210847204d fix level select title Luna 2021-10-04 01:41:41 -04:00
f153ac3735

Merge pull request #68 from Ewpratten/levels Evan Pratten 2021-10-03 22:41:29 -07:00
beedf7d336

Merge branch 'master' into levels Evan Pratten 2021-10-03 22:41:21 -07:00
aefba5a0da aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa asdf Evan Pratten 2021-10-04 01:39:29 -04:00
b1caf434fb zone kil Evan Pratten 2021-10-04 01:27:34 -04:00
b82cc7e99e level2 Evan Pratten 2021-10-04 01:26:46 -04:00
59d54a18d6 lvl nums Evan Pratten 2021-10-04 01:23:48 -04:00
f1eb8c54f8 reorg levels level_fix Evan Pratten 2021-10-04 01:20:04 -04:00
9735e6c260 Merge branch 'levels' of https://github.com/Ewpratten/ludum-dare-49 into levels Marcelo Geldres 2021-10-04 01:11:50 -04:00
1f8ca262d2 Level_3 Marcelo Geldres 2021-10-04 01:11:42 -04:00
2ce9927bdd

Merge pull request #66 from Ewpratten/cheater_detection Evan Pratten 2021-10-03 22:08:06 -07:00
276126bef6

Merge branch 'master' into cheater_detection cheater_detection Evan Pratten 2021-10-03 22:07:44 -07:00
348c928859 no cheating, get good Luna 2021-10-04 01:07:02 -04:00
c6fa61cc12

Merge pull request #65 from Ewpratten/appear_fix Evan Pratten 2021-10-03 22:01:14 -07:00
a7265e0994 fix block dist detection appear_fix Evan Pratten 2021-10-04 01:00:31 -04:00
191c5ea0c6 Changes in the photoshop file Marcelo Geldres 2021-10-04 00:52:43 -04:00
eebfe8ec94 new levels Evan Pratten 2021-10-04 00:31:53 -04:00
4819fba9ab

Merge pull request #64 from Ewpratten/levels Evan Pratten 2021-10-03 21:24:20 -07:00
bb7b267896

Merge branch 'master' into levels Evan Pratten 2021-10-03 21:23:59 -07:00
c7412689be

Merge pull request #63 from Ewpratten/next_level_screen_buttons Evan Pratten 2021-10-03 21:23:20 -07:00
0b6babb970

Merge branch 'master' into next_level_screen_buttons next_level_screen_buttons Evan Pratten 2021-10-03 21:23:13 -07:00
9f367d39fb New level uploaded Marcelo Geldres 2021-10-04 00:21:16 -04:00
cfd9c77697 8 Evan Pratten 2021-10-03 23:54:12 -04:00
8f2bda6561 james Evan Pratten 2021-10-03 23:53:18 -04:00
b4661a93a6 jj Evan Pratten 2021-10-03 23:48:01 -04:00
b51728ad1d Added level select button Luna 2021-10-03 23:36:43 -04:00
7be250f5b0

Merge pull request #62 from Ewpratten/i_hardly_know_her Evan Pratten 2021-10-03 18:43:10 -07:00
a94e71c7ca it might work!? i_hardly_know_her Evan Pratten 2021-10-03 21:42:46 -04:00
9108f27b3d

Merge pull request #60 from Ewpratten/timer-fix Evan Pratten 2021-10-03 17:44:36 -07:00
bc4a9befc1

Merge branch 'master' into timer-fix timer-fix Evan Pratten 2021-10-03 17:44:29 -07:00
5879f55b68

Merge pull request #61 from Ewpratten/ouchie_blocks Evan Pratten 2021-10-03 17:25:36 -07:00
61b72e903d add kill boxes ouchie_blocks Evan Pratten 2021-10-03 20:25:06 -04:00
8dded8c4ba fixed timer Luna 2021-10-03 20:21:18 -04:00
67995833b1 Hitboxes in 3rd level added Marcelo Geldres 2021-10-03 19:11:00 -04:00
15922e985f Partial Creation of Level 3 Marcelo Geldres 2021-10-03 18:04:23 -04:00
dea7984e2e

Merge pull request #59 from Ewpratten/titles Evan Pratten 2021-10-03 13:21:11 -07:00
92852a720e

Merge branch 'master' into titles titles Evan Pratten 2021-10-03 13:21:04 -07:00
f287e638c0 glitchy titles go brrrr Luna 2021-10-03 16:19:01 -04:00
cd61e63d55

Merge pull request #58 from Ewpratten/level-select-screen Evan Pratten 2021-10-03 13:18:32 -07:00
2ec02bba0d

Merge branch 'master' into level-select-screen level-select-screen Evan Pratten 2021-10-03 13:18:22 -07:00
dae003b916 Select dem levelz Evan Pratten 2021-10-03 16:17:42 -04:00
f732e7f3ae Merge branch 'master' into level-select-screen Evan Pratten 2021-10-03 16:14:50 -04:00
30e900dcfd make level select extendable Evan Pratten 2021-10-03 16:14:36 -04:00
109b04fcb9 created level select screen Luna 2021-10-03 15:58:24 -04:00
31182e7b6d

Merge pull request #57 from Ewpratten/master Evan Pratten 2021-10-03 12:39:37 -07:00
dcdbf48200

Merge pull request #56 from Ewpratten/tiled2 Evan Pratten 2021-10-03 12:39:14 -07:00
8709f57fb6 Add basic tiled support tiled2 Evan Pratten 2021-10-03 15:38:52 -04:00
f469c70b25 fix character positioning Evan Pratten 2021-10-03 14:53:37 -04:00
f3eb6e985d

Merge pull request #55 from Ewpratten/levels_update_img Evan Pratten 2021-10-03 11:51:39 -07:00
3830ef7b7e

Merge branch 'master' into levels_update_img levels_update_img Evan Pratten 2021-10-03 11:51:29 -07:00
e2a93b0232

Merge pull request #53 from Ewpratten/display-best-times Evan Pratten 2021-10-03 11:50:52 -07:00
770c763037

Merge branch 'master' into display-best-times display-best-times Evan Pratten 2021-10-03 11:50:42 -07:00