Commit graph

108 commits

Author SHA1 Message Date
Logan bc8052899d Minor improvements 2020-07-23 19:47:27 -05:00
Logan 1164634ba4 Bug fixes 2020-07-23 19:08:59 -05:00
Logan 49072e724e Auto stash before merge of "master" and "origin/master" 2020-07-23 16:16:28 -05:00
Diego 38a787dd4c Merge remote-tracking branch 'origin/master' 2020-07-23 15:32:13 -05:00
Diego 6733fdbb72 Level 3 working fr 2020-07-23 15:32:05 -05:00
Logan de4d737087 Minor tweaks 2020-07-23 15:25:33 -05:00
Diego 5993949373 Auto stash before merge of "master" and "origin/master" 2020-07-23 14:55:47 -05:00
Logan 5307c54d10 Level 3 Polished 2020-07-23 14:43:42 -05:00
Diego 690f174ed3 level 3 2020-07-23 13:43:07 -05:00
Diego 20aa80d706 omgelul kek w 2020-07-23 12:25:37 -05:00
Diego c79c7fe8eb Merge remote-tracking branch 'origin/master' 2020-07-23 12:19:29 -05:00
Logan 17120f0b2e Level 2 polished 2020-07-23 12:16:10 -05:00
Diego cfca8553f9 Merge remote-tracking branch 'origin/master' 2020-07-23 11:43:28 -05:00
Logan 2ff0e9625c Music autoplays through levels 2020-07-23 11:36:28 -05:00
Diego 5eb2283e28 READ DESSCRIPTION level 2 done
So basically after level 2 or 3, i think you should add a cutscene with our dude and the wizard with him telling our dude hes doing doing good so far, and also, "Be weary, the greatest chalenge still awaits you." or something like that
2020-07-23 02:23:21 -05:00
Diego 4dde0a79b5 READ DESSCRIPTION level 2 done
So basically after level to or 3, i think you should add a cutscene with our dude and the wizard with him telling our dude hes doing doing good so far, and also, "Be weary, the greatest chalenge still awaits you." or something like that
2020-07-23 02:23:06 -05:00
Diego a84dc5f4a1 Demon work 2020-07-23 02:13:08 -05:00
Logan 013c5f0cfd Prism wand uses energy 2020-07-23 02:07:34 -05:00
Diego a9a49ba273 fart 2020-07-23 01:59:43 -05:00
Diego 68da67a4c7 Level 2 in progress 2020-07-23 01:44:41 -05:00
Logan a8c9e74d2f Wands keep between levels 2020-07-23 01:27:37 -05:00
Diego 58125eb887 Logan sucks and im better than him 2020-07-23 01:10:01 -05:00
Diego 66be998db4 Poopy
Po op e fawf koasdhjf iauondfiuopgfj nodafkmg pkalsdjfkjdsaf klajsdk;lfjas;ldjfl ksd af
2020-07-23 00:51:07 -05:00
Diego 8e9a38a3eb Merge remote-tracking branch 'origin/master' 2020-07-23 00:22:45 -05:00
Diego 4f5f0d6ab2 Merge remote-tracking branch 'origin/master' 2020-07-23 00:19:32 -05:00
Logan 469590d195 Fixed door kinda not really 2020-07-23 00:18:46 -05:00
Diego 4a266e00ab Merge remote-tracking branch 'origin/master' 2020-07-23 00:16:57 -05:00
Logan bec623832d Intro done 2020-07-22 23:57:55 -05:00
Logan 7f47cbebbc Merge remote-tracking branch 'origin/master' 2020-07-22 18:18:05 -05:00
Logan c0ea0f7921 idk stuff or something 2020-07-22 18:15:21 -05:00
Diego d4c2d49ff3 level 1a 2020-07-22 17:31:31 -05:00
Diego c6ece4fc2a fafart
f
2020-07-22 14:05:31 -05:00
Diego 2cc271ddd7 Merge remote-tracking branch 'origin/master' 2020-07-22 13:13:04 -05:00
Diego 70de3a3e75 Fart 2020-07-22 13:12:24 -05:00
Logan 14aaad52a8 Added ladder sprite 2020-07-22 00:41:29 -05:00
Diego ce42e18e72 level 1 2020-07-21 23:55:01 -05:00
Logan 9ed1eba3fb Respawn workss 2020-07-21 23:27:14 -05:00
Logan fa8cee351e Player sprite changed 2020-07-21 23:22:33 -05:00
Logan 56572e1caa Fixed charge wand not using energy 2020-07-21 20:06:39 -05:00
Logan 6b52d24e74 Fix? 2020-07-21 17:49:04 -05:00
Logan f2829a8046 Most things have sound effects 2020-07-21 15:50:32 -05:00
Diego 326bc2df93 do my work logan 2020-07-21 15:20:55 -05:00
Logan 2e71f04731 Fixed bug with phase projectile 2020-07-21 15:02:07 -05:00
Logan 343a66396b Hit animation and prism wand works with eco 2020-07-21 15:00:32 -05:00
Diego add6d2ca02 White sprite dudes thing ikd 2020-07-21 14:50:04 -05:00
Diego ab449599fa Skeleton movement and jump height fixed 2020-07-21 13:39:41 -05:00
Diego c293efbc13 Better respawn and knockback 2020-07-21 01:07:58 -05:00
Logan 99095309b8 Test 2020-07-20 23:27:28 -05:00
Logan b4b2a984e3 All projectiles work! 2020-07-20 23:24:09 -05:00
Diego 2b53f970e5 Loading Screen added 2020-07-20 23:14:33 -05:00