Cascade slide ball's opacity and the Slider's
Also cascade the colours
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
fixed crash cause by incorrect font name.
fix LabelAtlas constructor to CC_CONSTRUCTOR_ACCESS
use CC_CONSTRUCTOR_ACCESS in ParallaxNode
protected -> CC_CONSTRUCTOR_ACCESS
add editbox ended event
Merge branch 'v3-newaudio' of D:\github_repository\cocosNew into v3
Add getter and setter for TextColor to Text Widget
Remove update of content size as it won't change
Add missing space in function definition
reuse file utils when resolving video path (ios)
SubMesh and Attachment
Correct some typos/mistakes in declarations
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Fix iOS VideoPlayer memory leak.
add

SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
add

SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
spaces