modify CCFileUtils, export getFileData
first commit
Merge branch 'master' of code.csdn.net:liaoyulei01/quick-cocos2d-x
merge dualface/develop
fix CCBone.setArmature bug, from https://github.com/cocos2d/cocos2d-x/commit/af754bfe5d1b28b072ec14ed5ffc1900f06a7e95; export CCBone.removeDisplay
add connectMovementEventSignal to CCArmature; export to lua
export connectMovementEventSignal to lua, it is the action status for armature
Merge remote-tracking branch 'remotes/dualface/develop' into zrong
update compile_scripts tool
update compile_scripts tool
uncompress ZIP in memory buffer
move xxtea.c to cocos2dx/support
load encrypted scripts
update proj.mac
update proj.ios
update framework
Merge remote-tracking branch 'remotes/dualface/develop' into develop
update samples/CoinFlip
update player
fix CCControl:setOpacity(), setColor()