moved actor to its own folder
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
add dialog.
Merge branch 'master' of github.com:fusijie/FantasyWarrior3D

Conflicts:
	src/BattleScene.lua
	src/GameMaster.lua
hacked engine so 2d stuff reads depth only
merge with fusijie/master --amend
updated AI
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/GameMaster.lua
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/BattleScene.lua
	src/actors/Knight.lua
Merge pull request #87 from Wu-Hao/master

1022
fixed  a bug in attackEffect