add slime and show slime to GM.
completed GM framework.
Merge branch 'master' of github.com:fusijie/FantasyWarrior3D
slime fix animation transition
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
add angry function for special attack
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D

Conflicts:
	src/BattleFieldUI.lua
Merge pull request #137 from calfjohn/master

add angry function for special attack
Merge pull request #138 from zaojiahua/master

show dialog when bosss appear
fixed a bug
update GM.
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D

Conflicts:
	src/GameMaster.lua
	src/GlobalVariables.lua
Merge pull request #139 from fusijie/master

update GM.
The angry value should turn to  ZERO as the hero is dead
ignore build directory
Merge pull request #140 from calfjohn/master

2 commits
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
slime animations
git ignore