fix pointlight
Add new models
Merge pull request #47 from calfjohn/master

fixed two bug
merge with fusijie/master and fix pointlight
Merge pull request #48 from RaoZiJian/master

Add new models
Merge pull request #49 from zaojiahua/master

merge with fusijie/master and fix pointlight
implemented ranged collider, added more feature to attackmanager
add feature to attackcommand
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/Actor.lua
	src/AttackCommand.lua
	src/Mage.lua
Merge pull request #50 from Wu-Hao/master

implemented ranged collider, added more feature to attackmanager
dropblood finish
Merge pull request #51 from zaojiahua/master

dropblood finish
Piglet test
Merge pull request #52 from RaoZiJian/master

Piglet test
1020
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D

Conflicts:
	src/BattleScene.lua
using pig model
Merge pull request #53 from Wu-Hao/master

1020
restore runtime related.
Add new res