Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
delete useless function in BattleScene and Manager
add a _mass for Actor, it affects collision
Merge pull request #85 from calfjohn/master

2 commits
Add knight attack audio effects
Merge pull request #86 from RaoZiJian/master

Add knight attack audio effects
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/BattleScene.lua
	src/actors/Knight.lua