Commit graph

194 commits

Author SHA1 Message Date
Logan 87dfe3974f Final i think 2020-07-24 02:21:43 -05:00
Logan 3a8db1ea12 Merge remote-tracking branch 'origin/master' 2020-07-24 02:11:44 -05:00
Diego 1b57512bc1 Credits done 2020-07-24 02:14:12 -05:00
Logan 72b62bf84f Final stage finished 2020-07-24 02:06:29 -05:00
Logan 7b13a97367 Merge remote-tracking branch 'origin/master' 2020-07-24 02:06:12 -05:00
Diego 53b4a42652 Credits done 2020-07-24 01:27:07 -05:00
Diego 7876dee72d Do Your magic 2020-07-24 00:51:57 -05:00
Logan c2e1086003 Merge remote-tracking branch 'origin/master' 2020-07-24 00:49:37 -05:00
Diego 5230e30b53 Merge remote-tracking branch 'origin/master' 2020-07-24 00:34:42 -05:00
Diego 644519b4bd psuh 2020-07-24 00:34:01 -05:00
Logan 1fa3ca45ab Merge remote-tracking branch 'origin/master' 2020-07-24 00:33:38 -05:00
Logan b751f77b3d Explosive damage lowered 2020-07-24 00:31:18 -05:00
Logan a9613561d3 Merge branch 'master' into origin/master 2020-07-24 00:17:30 -05:00
Logan f35134b7b1 Auto stash before merge of "master" and "origin/master" 2020-07-24 00:17:24 -05:00
Diego b738fd2d9f Stage 4 done 2020-07-23 23:41:06 -05:00
Diego 12ebcdbaab Merge remote-tracking branch 'origin/master' 2020-07-23 23:04:48 -05:00
Diego 3cbee20d2f fart 2020-07-23 23:04:24 -05:00
Logan f5cfe87aef Doors work 2020-07-23 23:00:24 -05:00
Diego c3043f1a7e Auto stash before merge of "master" and "origin/master" 2020-07-23 22:39:50 -05:00
Logan 4e28f95b28 Tweaks 2020-07-23 22:36:21 -05:00
Logan c9f0facf0e Black text in UI 2020-07-23 19:52:58 -05:00
Diego c75d3128db cool 2020-07-23 19:53:16 -05:00
Diego d9974e54cf Better improvments 2020-07-23 19:51:49 -05:00
Logan bc8052899d Minor improvements 2020-07-23 19:47:27 -05:00
Logan 7a61f3fc89 Locked fps 2020-07-23 19:15:39 -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 2fa13779ab skele 2020-07-23 16:16:29 -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