Commit graph

116 commits

Author SHA1 Message Date
Logan 99095309b8 Test 2020-07-20 23:27:28 -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 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 24778c18e1 Added door sprite 2020-07-20 15:24:31 -05:00
Logan 11f5d50964 Cleaned up skeleton script 2020-07-20 15:06:03 -05:00
Logan 6e2bc0c01d Added UI selection boxes 2020-07-20 14:59:31 -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 35c7efcc74 Merge remote-tracking branch 'origin/master' 2020-07-20 00:34:29 -05:00
Logan 0c425a3272 Fixed charge wand 2020-07-20 00:34:25 -05:00
Diego 7c6acd0a29 Intro 2020-07-20 00:31:33 -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 071e816c95 Doubled energy, cleaned up UI 2020-07-19 23:06:56 -05:00
Logan e40437148a Fixed corrupted files 2020-07-19 20:06:49 -05:00
Logan 3012e72613 bruh 2020-07-19 19:57:34 -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 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