270 Commits

Author SHA1 Message Date
Marcelo Geldres
1f8ca262d2 Level_3 2021-10-04 01:11:42 -04:00
2ce9927bdd
Merge pull request #66 from Ewpratten/cheater_detection
no cheating, get good
2021-10-03 22:08:06 -07:00
276126bef6
Merge branch 'master' into cheater_detection 2021-10-03 22:07:44 -07:00
Luna
348c928859 no cheating, get good 2021-10-04 01:07:02 -04:00
c6fa61cc12
Merge pull request #65 from Ewpratten/appear_fix
fix block dist detection
2021-10-03 22:01:14 -07:00
a7265e0994 fix block dist detection 2021-10-04 01:00:31 -04:00
Marcelo Geldres
191c5ea0c6 Changes in the photoshop file 2021-10-04 00:52:43 -04:00
eebfe8ec94 new levels 2021-10-04 00:31:53 -04:00
4819fba9ab
Merge pull request #64 from Ewpratten/levels
Levels
2021-10-03 21:24:20 -07:00
bb7b267896
Merge branch 'master' into levels 2021-10-03 21:23:59 -07:00
c7412689be
Merge pull request #63 from Ewpratten/next_level_screen_buttons
Added level select button
2021-10-03 21:23:20 -07:00
0b6babb970
Merge branch 'master' into next_level_screen_buttons 2021-10-03 21:23:13 -07:00
Marcelo Geldres
9f367d39fb New level uploaded
Some bugs to fix later.
As of now 3 working levels
2021-10-04 00:21:16 -04:00
cfd9c77697 8 2021-10-03 23:54:12 -04:00
8f2bda6561 james 2021-10-03 23:53:18 -04:00
b4661a93a6 jj 2021-10-03 23:48:01 -04:00
Luna
b51728ad1d Added level select button 2021-10-03 23:36:43 -04:00
7be250f5b0
Merge pull request #62 from Ewpratten/i_hardly_know_her
it might work!?
2021-10-03 18:43:10 -07:00
a94e71c7ca it might work!? 2021-10-03 21:42:46 -04:00
9108f27b3d
Merge pull request #60 from Ewpratten/timer-fix
fixed timer
2021-10-03 17:44:36 -07:00
bc4a9befc1
Merge branch 'master' into timer-fix 2021-10-03 17:44:29 -07:00
5879f55b68
Merge pull request #61 from Ewpratten/ouchie_blocks
add kill boxes
2021-10-03 17:25:36 -07:00
61b72e903d add kill boxes 2021-10-03 20:25:06 -04:00
Luna
8dded8c4ba fixed timer 2021-10-03 20:21:18 -04:00
Marcelo Geldres
67995833b1 Hitboxes in 3rd level added 2021-10-03 19:11:00 -04:00
Marcelo Geldres
15922e985f Partial Creation of Level 3
It appears as level 2 as the first level technically is level 0.
2021-10-03 18:04:23 -04:00
dea7984e2e
Merge pull request #59 from Ewpratten/titles
glitchy titles go brrrr
2021-10-03 13:21:11 -07:00
92852a720e
Merge branch 'master' into titles 2021-10-03 13:21:04 -07:00
Luna
f287e638c0 glitchy titles go brrrr 2021-10-03 16:19:01 -04:00
cd61e63d55
Merge pull request #58 from Ewpratten/level-select-screen
Level select screen
2021-10-03 13:18:32 -07:00
2ec02bba0d
Merge branch 'master' into level-select-screen 2021-10-03 13:18:22 -07:00
dae003b916 Select dem levelz 2021-10-03 16:17:42 -04:00
f732e7f3ae Merge branch 'master' into level-select-screen 2021-10-03 16:14:50 -04:00
30e900dcfd make level select extendable 2021-10-03 16:14:36 -04:00
Luna
109b04fcb9 created level select screen 2021-10-03 15:58:24 -04:00
31182e7b6d
Merge pull request #57 from Ewpratten/master
Pull up to date
2021-10-03 12:39:37 -07:00
dcdbf48200
Merge pull request #56 from Ewpratten/tiled2
Add basic tiled support
2021-10-03 12:39:14 -07:00
8709f57fb6 Add basic tiled support 2021-10-03 15:38:52 -04:00
f469c70b25 fix character positioning 2021-10-03 14:53:37 -04:00
f3eb6e985d
Merge pull request #55 from Ewpratten/levels_update_img
WIP new level 1
2021-10-03 11:51:39 -07:00
3830ef7b7e
Merge branch 'master' into levels_update_img 2021-10-03 11:51:29 -07:00
e2a93b0232
Merge pull request #53 from Ewpratten/display-best-times
added glitchy effect to title
2021-10-03 11:50:52 -07:00
770c763037
Merge branch 'master' into display-best-times 2021-10-03 11:50:42 -07:00
31a14b8e4e
Merge pull request #54 from Ewpratten/levels_update_img
Levels update img
2021-10-03 11:50:13 -07:00
3b5e55f738 demo tiling 2021-10-03 14:49:47 -04:00
Luna
39992befd1 added glitchy effect to title 2021-10-03 14:43:44 -04:00
41eda20b38 Merge branch 'master' into levels_update_img 2021-10-03 14:42:54 -04:00
18799b6ffd
Merge pull request #52 from Ewpratten/new_player
New player animation
2021-10-03 11:30:39 -07:00
466984588e fix player collider 2021-10-03 14:30:20 -04:00
0d5be8759a new character asset 2021-10-03 14:25:34 -04:00