Commit graph

115 commits

Author SHA1 Message Date
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 a58e3fa0c8 Merge remote-tracking branch 'origin/master' 2020-07-18 02:26:48 -05:00
Logan 39157a605e Retextured UI 2020-07-18 00:07:44 -05:00
Diego 96672e7ba6 Merge remote-tracking branch 'origin/master' 2020-07-17 20:13:37 -05:00
Logan 706de868fe Updates global player position 2020-07-17 20:10:42 -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
Logan 95140d071d a 2020-07-17 19:30:27 -05:00
Diego 34ad77f31e Added more to intro and stuff 2020-07-17 19:22:17 -05:00
Diego cbcf197af8 Merge remote-tracking branch 'origin/master' 2020-07-17 19:21:44 -05:00
Logan 16d34ece7d Merge remote-tracking branch 'origin/master' 2020-07-17 19:19:59 -05:00
Logan 4e42e3eb2c UI works 2020-07-17 19:18:59 -05:00
Logan f64ace3402 Wands will autoshoot when button is held 2020-07-17 16:24:04 -05:00
Diego acf3a81687 Merge remote-tracking branch 'origin/master' 2020-07-17 16:07:53 -05:00
Logan 26828da27b Limited shooting speed 2020-07-17 15:43:22 -05:00
Logan e60c141d18 Faster Bulletss 2020-07-17 15:31:11 -05:00
Diego 790f764802 Merge remote-tracking branch 'origin/master' 2020-07-17 15:27:18 -05:00
Logan 25f984c213 Player shoots at mouse 2020-07-17 15:21:22 -05:00
Logan 175f64b738 Fixed projectile sprite 2020-07-17 14:39:42 -05:00
Diego 88e776ca6e fart3 2020-07-17 14:37:22 -05:00
Logan 6c81eb5942 Merge remote-tracking branch 'origin/master' 2020-07-17 14:35:28 -05:00
Diego 8de72a3ac4 fart3 2020-07-17 14:37:02 -05:00
Diego c08ae1133c fart 2020-07-17 14:35:49 -05:00
Logan eafea3ba24 Deleted Tilte 2020-07-17 14:34:14 -05:00
Logan 6a2d2015b4 Merge remote-tracking branch 'origin/master' 2020-07-17 14:33:18 -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 35518183f8 FIXED FOR REAL 2020-07-17 13:37:32 -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
Diego 3c4c5ef5ed Added Starting text
can be used for like an introduction or controls and ui and stsuff
2020-07-17 13:30:12 -05:00
Logan bfe7e36c02 Merge remote-tracking branch 'origin/master' 2020-07-17 13:25:37 -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 df90ba13bf Title Screen Actually working 2020-07-17 12:57:09 -05:00
Diego cea752ab6c Title Screen 2020-07-17 12:44:16 -05:00
Diego 5b63c146f9 Merge remote-tracking branch 'origin/master' 2020-07-17 12:42:08 -05:00
Diego 216037ebbc fuck logan more 2020-07-17 12:41:45 -05:00
Diego 0403430010 fuck logan 2020-07-17 12:38:49 -05:00
Logan 3610524eab Changed player collision to capsule 2020-07-17 12:38:33 -05:00
Logan 375fc092e5 Test Level 2020-07-17 12:19:51 -05:00
Logan 7f002f4978 Deleted test level 2020-07-17 12:12:22 -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 d87f1a7a68 Bounded Camera 2020-07-17 11:03:22 -05:00