slime fix animation transition
Merge branch 'master' of https://github.com/fusijie/FantasyWarrior3D
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D
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
slime animations
git ignore
gitignore
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D

Conflicts:
	.buildpath
	.gitignore
Merge pull request #141 from Wu-Hao/master

slime animations
optimized piglet and dragon appear pos.
Merge branch 'master' of https://github.com/chukong/FantasyWarrior3D

Conflicts:
	frameworks/cocos2d-x/cocos/platform/android/java/project.properties
	frameworks/runtime-src/proj.android/project.properties