Commit graph

141 commits

Author SHA1 Message Date
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 527d7c520e Merge remote-tracking branch 'origin/master' 2020-07-19 18:49:40 -05:00
Diego d9983f3601 Health assigned to ai 2020-07-19 18:48:36 -05:00
Logan f6b0bfb720 Removed prints and added projectile collision 2020-07-19 18:48:23 -05:00
Logan a1f807687a Fixed wands for real 2020-07-19 18:43:58 -05:00
Diego 09243dad4d stuff 2020-07-19 18:39:59 -05:00
Logan a2107b0583 Wands sorta work 2020-07-19 18:36:36 -05:00
Logan 8fc51732d8 Merge remote-tracking branch 'origin/master' 2020-07-19 18:36:16 -05:00
Diego fd22a155cf Enemies dont chases from accross the map, only close 2020-07-19 17:58:40 -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 936389ac70 character not invisible 2020-07-18 19:50:51 -05:00
Logan 7d75716ddf Wand GUI actually OwOrks 2020-07-18 19:50:16 -05:00
Logan c9c38d74e1 Auto stash before merge of "master" and "origin/master" 2020-07-18 18:52:15 -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 b675495c6e Merge remote-tracking branch 'origin/master' 2020-07-18 16:16:37 -05:00
Diego ba1ba3bafc Merge remote-tracking branch 'origin/master' 2020-07-18 16:13:51 -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
Diego 809909545a Merge remote-tracking branch 'origin/master' 2020-07-18 12:40:18 -05:00
Logan 30b805e007 Added boner 2020-07-18 12:35:29 -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 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