change armature version
change ColliderFilter param type
change ColliderFilter param type
fixed alpha effect
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
1.add TEST_EASING
2.add play serveral movement function
3.update TEST_COLLIDER_DETECTOR
4.fixed movement event
issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into toluaerror
fixed create PhysicsSprite
issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
closed #3162: fix indent.
fix collider Synchronization
closed #3162: add RGBAProtocol, NodeRGBA and LayerRGBA back and deprecate them
fix2d compling warning
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
issue #3162: Add layer cascade color and cascade opacity test, fix bugs
issue #3162: delete duplicate functions.
issue #3162: add updateColor function to Label and delete duplicate functions.
add class GridNode