fix water, made spikes prettier
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
Mage special effects
Merge pull request #95 from RaoZiJian/master

Add grey shader
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/actors/Actor.lua
	src/actors/Mage.lua
Add grey shader when die
Merge pull request #96 from Wu-Hao/master

finished mage FX
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D