trying to fix the orb rotate math
pausing work on this for now, i've tried everything
asd
blinkstrike fixed, almost done with shield breaker, just need to adjust force
shieldbreaker done
added a lot of terrain masks to fix abilities
asd
merging from home
fucked
fucked1
Revert "fucked"

This reverts commit ce0ffbd18c7dbb6cc07bf96b882c618572a955be.
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/dranelol/CMPS427

Conflicts:
	Assets/Prefabs/Persistant/GameManager.prefab
	Assets/Prefabs/Persistant/MobaCamera.prefab
Revert "Merge branch 'master' of https://github.com/dranelol/CMPS427"

This reverts commit 2050f5d554094a87f14ec2d5144028b1e6558e68.
u
bg
t
Merged Bullshit
yea ok
Updated a few things