no use JoinThread
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
show detail class & function name on conversion error
Merge branch 'more_details_for_conversion_error_msg' of https://github.com/edwardzhou/cocos2d-x into v3_conversion
Reset Webscoket
Add more useful tip for error log
Update bindings-generator submodule
fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments.
replace sprintf with snprintf
Update CCFontAtlasCache.cpp
[FIX]: make sure parent is visible before handling touch
Merge pull request #7556 from Dhilan007/v3

fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments.
[ci skip]
Add more useful tip for error log
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_conversion
Add more useful tip for error log
minor fix of RichText