Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
Disable AI when piglet is invisible and enable AI as it is visible
fix audioengin debug
Merge pull request #82 from calfjohn/master

Disable AI when piglet is invisible and enable AI as it is visible
Merge pull request #83 from zaojiahua/master

fix audioengin debug
modify hurt and blood decrease
Merge pull request #84 from calfjohn/master

modify hurt and blood decrease
add dialog.
Merge branch 'master' of github.com:fusijie/FantasyWarrior3D

Conflicts:
	src/BattleScene.lua
	src/GameMaster.lua