Commit graph

43 commits

Author SHA1 Message Date
Diego 7876dee72d Do Your magic 2020-07-24 00:51:57 -05:00
Logan f35134b7b1 Auto stash before merge of "master" and "origin/master" 2020-07-24 00:17:24 -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 2ff0e9625c Music autoplays through levels 2020-07-23 11:36:28 -05:00
Diego 4f5f0d6ab2 Merge remote-tracking branch 'origin/master' 2020-07-23 00:19:32 -05:00
Logan bec623832d Intro done 2020-07-22 23:57:55 -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
Logan fa8cee351e Player sprite changed 2020-07-21 23:22:33 -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
Logan 2b26e3fba0 work on wands 2020-07-20 16:36:28 -05:00
Logan 24778c18e1 Added door sprite 2020-07-20 15:24:31 -05:00
Logan 260372e703 Fixed skelly 2020-07-20 14:24:15 -05:00
Diego 8e22dd6671 stuffffffff 2020-07-20 14:14:34 -05:00
Logan 1e9336a11d Added Ogre 2020-07-19 23:45:39 -05:00
Logan 1fead22d11 Merge remote-tracking branch 'origin/master' 2020-07-19 17:42:06 -05:00
Diego c90373b9b9 New 1 life Ai 2020-07-19 17:19:31 -05:00
Logan 0a74ba1a45 Added projectile sprites 2020-07-19 16:11:22 -05:00
Diego 1a7fdfb310 Death Screen added 2020-07-19 11:58:12 -05:00
Logan 7d75716ddf Wand GUI actually OwOrks 2020-07-18 19:50:16 -05:00
Diego b2317e09c7 Skeleton works perfectly now 2020-07-18 17:07:40 -05:00
Logan a72ece88a5 Fix 2020-07-18 16:13:45 -05:00
Logan 48833be3b5 Rudimentary inventory system 2020-07-18 15:58:23 -05:00
Logan 30b805e007 Added boner 2020-07-18 12:35:29 -05:00
Logan a3a1faa0ab edited art 2020-07-18 11:02:40 -05:00
Diego 789bf1e33d Too much stuff 2020-07-18 02:27:01 -05:00
Logan 4e42e3eb2c UI works 2020-07-17 19:18:59 -05:00
Logan 26828da27b Limited shooting speed 2020-07-17 15:43:22 -05:00
Logan 175f64b738 Fixed projectile sprite 2020-07-17 14:39:42 -05:00
Logan 4a0b01e275 Added layers for collision, one projectile 2020-07-17 13:15:52 -05:00
Logan 3c326a1ae1 Fixed Tilemap, added projectile 2020-07-17 12:07:59 -05:00
Logan c1e5537d3c Full commit 2020-07-17 11:26:02 -05:00
Xterminate1818 f3af751a0e 2020-07-17 09:58:08 -05:00
Xterminate1818 124743f5c6 2020-07-17 00:31:51 -05:00
Xterminate1818 4c56fd43aa
Delete light.png.import 2020-07-17 00:29:59 -05:00
Xterminate1818 2c552eb208
Delete WizardM.png.import 2020-07-17 00:29:51 -05:00
Xterminate1818 01634c3b98
Delete DungeonTiles.png.import 2020-07-17 00:29:39 -05:00
Xterminate1818 01d406d8d3 2020-07-17 00:28:56 -05:00