Commit graph

46 commits

Author SHA1 Message Date
Diego 2b53f970e5 Loading Screen added 2020-07-20 23:14:33 -05:00
Logan 64e134b6ad Merge remote-tracking branch 'origin/master' 2020-07-20 16:36:56 -05:00
Logan 2b26e3fba0 work on wands 2020-07-20 16:36:28 -05:00
Diego da494d4283 Intro finished(need polishing) 2020-07-20 16:28:05 -05:00
Logan 603b6291d0 Fixed skelly for real 2020-07-20 14:30:58 -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 e054238100 Added explosive projectile 2020-07-20 01:18:45 -05:00
Logan e71dbdfacb Wand pickups work 2020-07-20 00:28:15 -05:00
Diego 47e430cede Ogres can die 2020-07-20 00:10:29 -05:00
Logan 7faf33349c Projectiles do damage 2020-07-20 00:06:53 -05:00
Logan 1e9336a11d Added Ogre 2020-07-19 23:45:39 -05:00
Diego fce3797185 sutff 2020-07-19 23:20:47 -05:00
Logan d057391c55 Added triple wand 2020-07-19 23:16:44 -05:00
Logan e40437148a Fixed corrupted files 2020-07-19 20:06:49 -05:00
Diego 3b8d144462 Ogre addeed 2020-07-19 19:57:06 -05:00
Logan d525377e03 Energy burnout finished 2020-07-19 19:15:43 -05:00
Logan 1156886ca8 idk 2020-07-19 18:50:32 -05:00
Logan a2107b0583 Wands sorta work 2020-07-19 18:36:36 -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 1d6b2b0ecd Wands work sort of 2020-07-18 17:09:04 -05:00
Diego b2317e09c7 Skeleton works perfectly now 2020-07-18 17:07:40 -05:00
Diego ba1ba3bafc Merge remote-tracking branch 'origin/master' 2020-07-18 16:13:51 -05:00
Logan 48833be3b5 Rudimentary inventory system 2020-07-18 15:58:23 -05:00
Diego a2681ae7dc Capsule Collision 2020-07-18 12:28:07 -05:00
Logan 44bca26d88 Color pallete changes 2020-07-18 12:21:05 -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
Diego 5cb53ec360 Merge remote-tracking branch 'origin/master' 2020-07-17 19:46:37 -05:00
Logan 1741293959 Fixed my dumb mistakes 2020-07-17 19:43:30 -05:00
Diego cb945f17a0 Merge remote-tracking branch 'origin/master' 2020-07-17 19:35:04 -05:00
Diego 34ad77f31e Added more to intro and stuff 2020-07-17 19:22:17 -05:00
Logan 4e42e3eb2c UI works 2020-07-17 19:18:59 -05:00
Logan eafea3ba24 Deleted Tilte 2020-07-17 14:34:14 -05:00
Logan e0301456a7 Merge remote-tracking branch 'origin/master' 2020-07-17 14:26:05 -05:00
Diego abd5b85031 Music + Intro
added music and some introduction world part
2020-07-17 14:10:02 -05:00
Logan 8d22203f66 Wand follows player 2020-07-17 13:37:48 -05:00
Diego e216494062 Fixed Folder Layout 2020-07-17 13:36:20 -05:00
Diego 2680b65169 Titles gets its own folder 2020-07-17 13:32:34 -05:00
Logan 507ea8222f Merge remote-tracking branch 'origin/master' 2020-07-17 13:18:19 -05:00
Logan 4a0b01e275 Added layers for collision, one projectile 2020-07-17 13:15:52 -05:00
Diego 0403430010 fuck logan 2020-07-17 12:38:49 -05:00
Xterminate1818 9c3987bf21 2020-07-17 10:33:15 -05:00