Merge branch 'java-style' of https://github.com/minggo/cocos2d-x into v3-game
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-game
fixed frame event
Replace #include "tinyxml2/tinyxml2.h" to #include "tinyxml2.h" in new cocostudio code. This should fix build with cmake when USE_PREBUILT_LIBS=NO. Because FindTinyXML2.cmake find tinyxml2.h header (without prefix dir). And some systems install tinyxml2 includes without special directory.
Also this inclusion style match other existing files such as cocos/platform/CCFileUtils.cpp
Hide tinyxml2 from user visible header.
Fix couple of warnings. Make forward declarations to match to real declarations.
add space for readable
Fixed content size of Label is incorrect after sets empty string.
Merge pull request #9495 from vovkasm/pull/fix-tinyxml-usage

Fix usage of tinyxml2 in cocostudio code
Merge pull request #9497 from Dhilan007/v3-game

Fixed content size of Label is incorrect after sets empty string.
[ci skip] Update CHANGELOG
Merge pull request #9486 from 2youyouo2/v3_EventFrame

fixed frame event
Merge pull request #9458 from natural-law/v3

Solve the environment conflict with Cocos.
Merge branch 'v3' of github.com:natural-law/cocos2d-x; branch 'v3' of github.com:cocos2d/cocos2d-x into v3