185 Commits

Author SHA1 Message Date
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
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
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
97644246aa
Merge pull request #51 from Ewpratten/display-best-times
Fix a sound bug
2021-10-03 11:19:46 -07:00
Luna
a338523b23 fix sound 2021-10-03 14:18:39 -04:00
c77ee2c9bf
Merge pull request #50 from Ewpratten/master
update to master
2021-10-03 11:11:29 -07:00
075084cbdf
Merge branch 'display-best-times' into master 2021-10-03 11:10:48 -07:00
Luna
776e190d30 display best times 2021-10-03 14:08:39 -04:00
876235007f
Merge pull request #49 from Ewpratten/sound_design
Sound design
2021-10-03 11:07:40 -07:00
dc284adbd8 Add button sounds 2021-10-03 14:07:23 -04:00
Marcelo Geldres
17c5015e33 Hitboxes of level 2 2021-10-03 14:06:25 -04:00
d640e48996 Add the game soundtrack 2021-10-03 13:46:08 -04:00
82eb78e06c Add emilia's insta 2021-10-03 13:05:21 -04:00
Marcelo Geldres
511f82e101 Maps Updated 2021-10-03 12:57:09 -04:00
Marcelo Geldres
0bc3361e05 Update platforms.png 2021-10-03 12:38:42 -04:00
8a911eaacf
Merge pull request #46 from Ewpratten/world_timer
World timer
2021-10-03 09:28:53 -07:00
2bfdc35ab3 implement the rest of the level timers
Co-authored-by: Luna <LuS404@users.noreply.github.com>
2021-10-03 12:28:34 -04:00
Marcelo Geldres
b0d841bb70 New Level Created (2)
Clone of the first one, To be edited
2021-10-03 12:27:22 -04:00
17049c7fa9 rm savegame 2021-10-03 12:15:44 -04:00
583ece9c12 Loading and saving time data
Co-authored-by: Luna <LuS404@users.noreply.github.com>
2021-10-03 12:12:06 -04:00
7f8b24e328
Merge pull request #45 from Ewpratten/menu_upgrades
menu thingies
2021-10-03 08:51:43 -07:00
fe42b962f0 menu thingies 2021-10-03 11:51:25 -04:00
f549cab250 persist level timer 2021-10-03 11:26:07 -04:00
f77373df62 Add kori's instagram 2021-10-03 11:02:42 -04:00
78b10a077f more credits 2021-10-03 10:52:20 -04:00
2f0b2dbceb Add more to the credits 2021-10-03 10:43:55 -04:00
a70c886d74
Merge pull request #44 from Ewpratten/level_test
Add a test level
2021-10-03 07:37:38 -07:00
7f02d09e13 Add a test level and fix a ton of bugs 2021-10-03 10:37:16 -04:00
71513ab501 rpc and stuff 2021-10-03 10:29:20 -04:00
80c27ddc7e img 2021-10-03 00:48:40 -04:00
2774335596 colliders 2021-10-03 00:47:52 -04:00
986fcca851 Working on lvl0 2021-10-03 00:42:55 -04:00
075c0b4886
Merge pull request #42 from Ewpratten/win_game
Let the user win the game
2021-10-02 21:13:36 -07:00
9c9e339d7f
Merge branch 'master' into win_game 2021-10-02 21:12:57 -07:00
38e9ed5fb4
Merge pull request #41 from Ewpratten/arrows
added arrows to menu buttons >:(
2021-10-02 21:12:47 -07:00
72a8b85ca5
Merge branch 'master' into arrows 2021-10-02 21:12:40 -07:00
52b9cdd9b9 Let the user win the game 2021-10-03 00:12:18 -04:00
81c3fa7078 disable vsync 2021-10-03 00:01:40 -04:00