7 commits

Author	SHA1	Message	Date
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	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	a2107b0583	Wands sorta work	2020-07-19 18:36:36 -05:00