add TestCase for reparentChildren bug
Merge branch 'v3' into reparentChildren
set parent transform dirty when addChild
Undo project file changes
Merge branch 'reparentChildren' of https://github.com/darkdukey/cocos2d-x into v3_nodefix
update project
closed #4900, add TTF font to UIText
closed #4900. add comment
fix compiling fail on Linux.
Updates travis.yml, adds email notification to @Minggo and @James
Merge pull request #6718 from dumganhar/v3

Updates travis.yml, adds email notification to @Minggo and @James
Matrix::identity() -> IDENTITY

consistency with the rest of the  cocos2d API
Merge pull request #6720 from ricardoquesada/matrix_constants

Matrix::identity() -> IDENTITY
Adds simple sample for multitexturing
Merge pull request #6722 from ricardoquesada/multitexturing_fixes

Adds simple sample for multitexturing
Merge pull request #6714 from Dhilan007/v3_nodefix

Fix a bug that if a node changes parent, parent's matrix will not update to reflect this change.
Adds effectNode in ShaderTest2
Merge pull request #6723 from ricardoquesada/EffectNode

Adds effectNode in ShaderTest2
issue #4900, refactor
issue #4900, refactor