fixed the setter bug
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Issue #5702: Migrate Cocostudio Armature from -x v3.2 rc0
1. CCArmature
2. CCArmatureAnimation
3. CCBone
4. CCColliderDetector
5. CCDataReaderHelper
6. CCProcessBase
7. CCSpriteFrameCacheHelper
8. CCTransformHelp
9. CCTween
10. CCTweenFunction
Issue #5702: Migrate Cocostudio Armature from -x v3.2 rc0
11. CCArmatureDataManager
Issue #5702: Migrate Armature's datas and dipslay to H5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into MigrateArmature
Merge branch 'Iss5702_Armature' of http://github.com/dingpinglv/cocos2d-html5 into armture
Issue #5702: Migrate Cocostudio Armature from -x v3.2 rc0
Fix bug
Issue #5702: Migrate Cocostudio Armature from -x v3.2 rc0
Fix render bug
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop
Issue #5702: Migrate Cocostudio Armature from -x v3.2 rc0
Fix position bug
Issue #5702: Migrate Cocostudio Armature from -x v3.2 rc0
Fix position bug
Issue #5702: Migrate Cocostudio Armature from -x v3.2 rc0
Fix position bug
1. CCDataReaderHelper
2. async bug
Issue #5702: Migrate Cocostudio Armature from -x v3.2 rc0
Fixed bug
1. CCDataReaderHelper
2. CCDisplayFactory
3. CCArmatureAnimation
Issue #5702: Migrate Cocostudio Armature from -x v3.2 rc0
Missing code synchronization
Issue #5702: Migrate Cocostudio Armature from -x v3.2 rc0
Missing code synchronization
Issue #5702: Migrate Cocostudio Armature from -x v3.2 rc0
Missing code synchronization
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into develop