Merge commit 'fde4e6387d6e6e19badb41c8ba2aa365045b68ec' into scgamex-v3

STEVE: - removed js/lua stuff * commit 'fde4e6387d6e6e19badb41c8ba2aa365045b68ec': (35 commits) [js tests] add index, simplify (cocos2d#19218) update cocos console (cocos2d#19216) [js interval tests] use labelBMFont instead of labelTTF, improve preformance (cocos2d#19215) [lua test]FontTest resize page (cocos2d#19213) [lua test]Extensions scroll pos error (cocos2d#19214) cpp-tests/Bugs add titles & lua bugs/1174 decrease loop count (cocos2d#19205) [cpp-tests] improve items location of part cases (cocos2d#19210) [cmake] fix iOS xcode property setting failed (cocos2d#19208) Node:Particle3D effects abnormal, texture incorrect (cocos2d#19204) [js-tests mac/Android] Extensions Test-> Websocket->Send text, fix cafile (cocos2d#19202) [cpp-test] DownloaderTest url expires (cocos2d#19203) [android tests] setup project name in AndroidStudio dashboard (cocos2d#19200) [lua test-android]WebViewTest button overlapping (cocos2d#19201) [cpp-test mac] 19：Extension->4SocketIOTest->Open SocketIO Endpoint crashfix (cocos2d#19199) [cpp test-Android、mac]46：Node：Sprite3D->25 crash (cocos2d#19198) [cpp test-Android]20：FileUtils/2 change title (cocos2d#19197) [cpp test-windows]46/26 clear mode crash (cocos2d#19195) [js-test win32]XMLHttpRequest gzip deflate & fix xcode project include paths (cocos2d#19194) [js-test] Chipmunk Tests/ Chipmunk Release Tests crash fix (cocos2d#19193) Fix crash in cocos2dx-JS if garbage collection runs between Touchstart and TouchEnd events. (cocos2d#19191) ... # Conflicts: # build/cocos2d_tests.xcodeproj/project.pbxproj # cocos/2d/CCSpriteFrameCache.cpp # cocos/platform/CCFileUtils.cpp # cocos/platform/CCGLView.h # cocos/platform/android/CCFileUtils-android.cpp # cocos/platform/desktop/CCGLViewImpl-desktop.h # cocos/platform/mac/CCApplication-mac.mm # cocos/scripting/js-bindings/manual/ScriptingCore.cpp # cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp # cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.h # cocos/scripting/lua-bindings/auto/api/Label.lua # cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.cpp # cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp # cocos/scripting/lua-bindings/script/cocos2d/Cocos2d.lua # templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-hdpi/ic_launcher.png # templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-mdpi/ic_launcher.png # templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xhdpi/ic_launcher.png # templates/js-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-20.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-29.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-40.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-50.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-57.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-72.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-76.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/LaunchScreenBackground.png # templates/js-template-default/res/HelloWorld.png # templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-hdpi/ic_launcher.png # templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-mdpi/ic_launcher.png # templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xhdpi/ic_launcher.png # templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-20.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-29.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-40.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-50.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-57.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-72.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-76.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/LaunchScreenBackground.png # templates/lua-template-default/res/HelloWorld.png # tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp # tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h # tests/game-controller-test/Resources/ipad/A.png # tests/game-controller-test/Resources/ipad/B.png # tests/game-controller-test/Resources/ipad/CloseNormal.png # tests/game-controller-test/Resources/ipad/CloseSelected.png # tests/game-controller-test/Resources/ipad/L1.png # tests/game-controller-test/Resources/ipad/L2.png # tests/game-controller-test/Resources/ipad/R1.png # tests/game-controller-test/Resources/ipad/R2.png # tests/game-controller-test/Resources/ipad/X.png # tests/game-controller-test/Resources/ipad/Y.png # tests/game-controller-test/Resources/ipad/controller-1.png # tests/game-controller-test/Resources/ipad/controller-2.png # tests/game-controller-test/Resources/ipad/dPad.png # tests/game-controller-test/Resources/ipad/dpad-key.png # tests/game-controller-test/Resources/ipad/joystick.png # tests/game-controller-test/Resources/ipadhd/A.png # tests/game-controller-test/Resources/ipadhd/B.png # tests/game-controller-test/Resources/ipadhd/CloseNormal.png # tests/game-controller-test/Resources/ipadhd/CloseSelected.png # tests/game-controller-test/Resources/ipadhd/L1.png # tests/game-controller-test/Resources/ipadhd/L2.png # tests/game-controller-test/Resources/ipadhd/R1.png # tests/game-controller-test/Resources/ipadhd/R2.png # tests/game-controller-test/Resources/ipadhd/X.png # tests/game-controller-test/Resources/ipadhd/Y.png # tests/game-controller-test/Resources/ipadhd/controller-1.png # tests/game-controller-test/Resources/ipadhd/controller-2.png # tests/game-controller-test/Resources/ipadhd/dPad.png # tests/game-controller-test/Resources/ipadhd/joystick.png # tests/game-controller-test/Resources/iphone/CloseNormal.png # tests/game-controller-test/Resources/iphone/CloseSelected.png # tests/game-controller-test/proj.ios/[email protected] # tests/game-controller-test/proj.ios/[email protected] # tests/game-controller-test/proj.ios/[email protected] # tests/game-controller-test/proj.ios/Default.png # tests/game-controller-test/proj.ios/[email protected] # tests/game-controller-test/proj.ios/Icon-100.png # tests/game-controller-test/proj.ios/Icon-114.png # tests/game-controller-test/proj.ios/Icon-120.png # tests/game-controller-test/proj.ios/Icon-144.png # tests/game-controller-test/proj.ios/Icon-152.png # tests/game-controller-test/proj.ios/Icon-40.png # tests/game-controller-test/proj.ios/Icon-57.png # tests/game-controller-test/proj.ios/Icon-58.png # tests/game-controller-test/proj.ios/Icon-72.png # tests/game-controller-test/proj.ios/Icon-76.png # tests/game-controller-test/proj.ios/Icon-80.png # tests/js-tests/project/Classes/js_DrawNode3D_bindings.cpp # tests/js-tests/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png # tests/js-tests/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png # tests/js-tests/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png # tests/js-tests/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png # tests/js-tests/project/proj.android/settings.gradle # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-20.png # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-29.png # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-40.png # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-50.png # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-57.png # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-72.png # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-76.png # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/[email protected] # tests/js-tests/project/proj.ios/LaunchScreenBackground.png # tests/js-tests/resjs/ccb/animated-grossini.png # tests/js-tests/resjs/ccb/btn-a-0.png # tests/js-tests/resjs/ccb/btn-a-1.png # tests/js-tests/resjs/ccb/btn-a-2.png # tests/js-tests/resjs/ccb/btn-b-0.png # tests/js-tests/resjs/ccb/btn-b-1.png # tests/js-tests/resjs/ccb/btn-b-2.png # tests/js-tests/resjs/ccb/btn-back-0.png # tests/js-tests/resjs/ccb/btn-back-1.png # tests/js-tests/resjs/ccb/btn-test-0.png # tests/js-tests/resjs/ccb/btn-test-1.png # tests/js-tests/resjs/ccb/btn-test-2.png # tests/js-tests/resjs/ccb/burst.png # tests/js-tests/resjs/ccb/ccbParticleStars.png # tests/js-tests/resjs/ccb/grossini-generic.png # tests/js-tests/resjs/ccb/jungle-left.png # tests/js-tests/resjs/ccb/jungle-right.png # tests/js-tests/resjs/ccb/jungle.png # tests/js-tests/resjs/ccb/logo-icon.png # tests/js-tests/resjs/ccb/logo.png # tests/js-tests/resjs/ccb/markerfelt24shadow.png # tests/js-tests/resjs/ccb/particle-fire.png # tests/js-tests/resjs/ccb/particle-smoke.png # tests/js-tests/resjs/ccb/particle-snow.png # tests/js-tests/resjs/ccb/particle-stars.png # tests/js-tests/resjs/ccb/scale-9-demo.png # tests/js-tests/src/ChipmunkTest/ChipmunkTest.js # tests/js-tests/src/ExtensionsTest/NetworkTest/WebSocketTest.js # tests/js-tests/src/IntervalTest/IntervalTest.js # tests/js-tests/src/tests-main.js # tests/lua-empty-test/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png # tests/lua-empty-test/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png # tests/lua-empty-test/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png # tests/lua-empty-test/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png # tests/lua-empty-test/project/proj.android/settings.gradle # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-20.png # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-29.png # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-40.png # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-50.png # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-57.png # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-72.png # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-76.png # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/[email protected] # tests/lua-empty-test/project/proj.ios/LaunchScreenBackground.png # tests/lua-empty-test/project/proj.mac/main.cpp # tests/lua-empty-test/res/crop.png # tests/lua-empty-test/res/dog.png # tests/lua-empty-test/res/land.png # tests/lua-empty-test/res/menu1.png # tests/lua-empty-test/res/menu2.png # tests/lua-game-controller-test/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png # tests/lua-game-controller-test/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png # tests/lua-game-controller-test/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png # tests/lua-game-controller-test/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png # tests/lua-game-controller-test/project/proj.android/settings.gradle # tests/lua-game-controller-test/project/proj.ios/[email protected] # tests/lua-game-controller-test/project/proj.ios/[email protected] # tests/lua-game-controller-test/project/proj.ios/[email protected] # tests/lua-game-controller-test/project/proj.ios/Default.png # tests/lua-game-controller-test/project/proj.ios/[email protected] # tests/lua-game-controller-test/project/proj.ios/Icon-114.png # tests/lua-game-controller-test/project/proj.ios/Icon-120.png # tests/lua-game-controller-test/project/proj.ios/Icon-144.png # tests/lua-game-controller-test/project/proj.ios/Icon-152.png # tests/lua-game-controller-test/project/proj.ios/Icon-57.png # tests/lua-game-controller-test/project/proj.ios/Icon-72.png # tests/lua-game-controller-test/project/proj.ios/Icon-76.png # tests/lua-tests/project/proj.android/app/res/mipmap-hdpi/ic_launcher.png # tests/lua-tests/project/proj.android/app/res/mipmap-mdpi/ic_launcher.png # tests/lua-tests/project/proj.android/app/res/mipmap-xhdpi/ic_launcher.png # tests/lua-tests/project/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png # tests/lua-tests/project/proj.android/settings.gradle # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-20.png # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-29.png # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-40.png # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-50.png # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-57.png # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-72.png # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-76.png # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/[email protected] # tests/lua-tests/project/proj.ios_mac/ios/LaunchScreenBackground.png # tests/lua-tests/res/cocosbuilderRes/ccb/animated-grossini.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-a-0.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-a-1.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-a-2.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-b-0.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-b-1.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-b-2.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-back-0.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-back-1.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-test-0.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-test-1.png # tests/lua-tests/res/cocosbuilderRes/ccb/btn-test-2.png # tests/lua-tests/res/cocosbuilderRes/ccb/burst.png # tests/lua-tests/res/cocosbuilderRes/ccb/ccbParticleStars.png # tests/lua-tests/res/cocosbuilderRes/ccb/grossini-generic.png # tests/lua-tests/res/cocosbuilderRes/ccb/jungle-left.png # tests/lua-tests/res/cocosbuilderRes/ccb/jungle-right.png # tests/lua-tests/res/cocosbuilderRes/ccb/jungle.png # tests/lua-tests/res/cocosbuilderRes/ccb/logo-icon.png # tests/lua-tests/res/cocosbuilderRes/ccb/logo.png # tests/lua-tests/res/cocosbuilderRes/ccb/markerfelt24shadow.png # tests/lua-tests/res/cocosbuilderRes/ccb/particle-fire.png # tests/lua-tests/res/cocosbuilderRes/ccb/particle-smoke.png # tests/lua-tests/res/cocosbuilderRes/ccb/particle-snow.png # tests/lua-tests/res/cocosbuilderRes/ccb/particle-stars.png # tests/lua-tests/res/cocosbuilderRes/ccb/scale-9-demo.png # tests/lua-tests/src/BugsTest/BugsTest.lua # tests/lua-tests/src/ExtensionTest/ExtensionTest.lua # tests/lua-tests/src/FontTest/FontTest.lua # tests/lua-tests/src/WebViewTest/WebViewTest.lua # tests/lua-tests/src/mainMenu.lua # tests/performance-tests/Resources/CloseNormal.png # tests/performance-tests/Resources/CloseSelected.png # tests/performance-tests/Resources/Images/PlanetCute-1024x1024.png # tests/performance-tests/Resources/Images/b1.png # tests/performance-tests/Resources/Images/b2.png # tests/performance-tests/Resources/Images/close.png # tests/performance-tests/Resources/Images/f1.png # tests/performance-tests/Resources/Images/f2.png # tests/performance-tests/Resources/Images/fire.png # tests/performance-tests/Resources/Images/grossini.png # tests/performance-tests/Resources/Images/grossini_dance_01.png # tests/performance-tests/Resources/Images/grossini_dance_02.png # tests/performance-tests/Resources/Images/grossini_dance_03.png # tests/performance-tests/Resources/Images/grossini_dance_04.png # tests/performance-tests/Resources/Images/grossini_dance_05.png # tests/performance-tests/Resources/Images/grossini_dance_06.png # tests/performance-tests/Resources/Images/grossini_dance_07.png # tests/performance-tests/Resources/Images/grossini_dance_08.png # tests/performance-tests/Resources/Images/grossini_dance_09.png # tests/performance-tests/Resources/Images/grossini_dance_10.png # tests/performance-tests/Resources/Images/grossini_dance_11.png # tests/performance-tests/Resources/Images/grossini_dance_12.png # tests/performance-tests/Resources/Images/grossini_dance_13.png # tests/performance-tests/Resources/Images/grossini_dance_14.png # tests/performance-tests/Resources/Images/grossini_dance_atlas.png # tests/performance-tests/Resources/Images/grossini_polygon.png # tests/performance-tests/Resources/Images/grossini_quad.png # tests/performance-tests/Resources/Images/grossinis_sister1.png # tests/performance-tests/Resources/Images/grossinis_sister1_sp.png # tests/performance-tests/Resources/Images/grossinis_sister2.png # tests/performance-tests/Resources/Images/grossinis_sister2_sp.png # tests/performance-tests/Resources/Images/landscape-1024x1024.png # tests/performance-tests/Resources/Images/r1.png # tests/performance-tests/Resources/Images/r2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-0-7.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-1-7.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-2-7.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-3-7.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-4-7.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-5-7.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-6-7.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-0.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-1.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-2.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-3.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-4.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-5.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-6.png # tests/performance-tests/Resources/Images/sprites_test/sprite-7-7.png # tests/performance-tests/Resources/Images/spritesheet1.png # tests/performance-tests/Resources/Images/test_image.png # tests/performance-tests/Resources/Images/texture1024x1024.png # tests/performance-tests/Resources/Images/texture512x512.png # tests/performance-tests/Resources/Particle3D/textures/crate6.png # tests/performance-tests/Resources/Particle3D/textures/interpolate.png # tests/performance-tests/Resources/Particle3D/textures/mp_fire_02_2x2.png # tests/performance-tests/Resources/Particle3D/textures/pu_barrel_01.png # tests/performance-tests/Resources/Particle3D/textures/pu_barrel_02.png # tests/performance-tests/Resources/Particle3D/textures/pu_bbal.png # tests/performance-tests/Resources/Particle3D/textures/pu_beam_01.png # tests/performance-tests/Resources/Particle3D/textures/pu_beam_02.png # tests/performance-tests/Resources/Particle3D/textures/pu_circle.png # tests/performance-tests/Resources/Particle3D/textures/pu_dirt_256x512.png # tests/performance-tests/Resources/Particle3D/textures/pu_dot_03_64x64.png # tests/performance-tests/Resources/Particle3D/textures/pu_fire_01_64x64.png # tests/performance-tests/Resources/Particle3D/textures/pu_flame.png # tests/performance-tests/Resources/Particle3D/textures/pu_flare.png # tests/performance-tests/Resources/Particle3D/textures/pu_flare_12_256x256.png # tests/performance-tests/Resources/Particle3D/textures/pu_green_ball.png # tests/performance-tests/Resources/Particle3D/textures/pu_hart.png # tests/performance-tests/Resources/Particle3D/textures/pu_lightning_20x64.png # tests/performance-tests/Resources/Particle3D/textures/pu_nucleus.png # tests/performance-tests/Resources/Particle3D/textures/pu_rain.png # tests/performance-tests/Resources/Particle3D/textures/pu_rain_01.png # tests/performance-tests/Resources/Particle3D/textures/pu_ribbontrail.png # tests/performance-tests/Resources/Particle3D/textures/pu_sand_336x330.png # tests/performance-tests/Resources/Particle3D/textures/pu_smoke_02_128x128.png # tests/performance-tests/Resources/Particle3D/textures/pu_smoke_brown_336x330.png # tests/performance-tests/Resources/Particle3D/textures/pump_atlas_smoke.png # tests/performance-tests/Resources/Particle3D/textures/pump_biohazzard.png # tests/performance-tests/Resources/Particle3D/textures/pump_bubble.png # tests/performance-tests/Resources/Particle3D/textures/pump_bubble_blurred.png # tests/performance-tests/Resources/Particle3D/textures/pump_celticknot.png # tests/performance-tests/Resources/Particle3D/textures/pump_dirt_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_dirt_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_flame_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_flame_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_flame_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_flame_04.png # tests/performance-tests/Resources/Particle3D/textures/pump_flare_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_flare_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_flare_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_flare_04.png # tests/performance-tests/Resources/Particle3D/textures/pump_flare_05.png # tests/performance-tests/Resources/Particle3D/textures/pump_flare_06.png # tests/performance-tests/Resources/Particle3D/textures/pump_genesis_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_genesis_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_hourglass.png # tests/performance-tests/Resources/Particle3D/textures/pump_leave.png # tests/performance-tests/Resources/Particle3D/textures/pump_lightning_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_lightning_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_lightning_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_lightning_04.png # tests/performance-tests/Resources/Particle3D/textures/pump_mcdxiiiv.png # tests/performance-tests/Resources/Particle3D/textures/pump_metal_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_metal_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_mmviii.png # tests/performance-tests/Resources/Particle3D/textures/pump_pentagram_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_pentagram_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_ring_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_ring_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_ring_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_ring_04.png # tests/performance-tests/Resources/Particle3D/textures/pump_ring_05.png # tests/performance-tests/Resources/Particle3D/textures/pump_smoke_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_smoke_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_smoke_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_smoke_04.png # tests/performance-tests/Resources/Particle3D/textures/pump_smoke_05.png # tests/performance-tests/Resources/Particle3D/textures/pump_smoke_06.png # tests/performance-tests/Resources/Particle3D/textures/pump_smoke_07.png # tests/performance-tests/Resources/Particle3D/textures/pump_snow_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_spark_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_star_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_star_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_star_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_star_04.png # tests/performance-tests/Resources/Particle3D/textures/pump_star_05.png # tests/performance-tests/Resources/Particle3D/textures/pump_streak_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_streak_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_streak_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_streak_04.png # tests/performance-tests/Resources/Particle3D/textures/pump_swirl_01.png # tests/performance-tests/Resources/Particle3D/textures/pump_swirl_02.png # tests/performance-tests/Resources/Particle3D/textures/pump_swirl_03.png # tests/performance-tests/Resources/Particle3D/textures/pump_watch.png # tests/performance-tests/Resources/Particle3D/textures/weaponTrail.png # tests/performance-tests/Resources/TileMaps/iso-test.png # tests/performance-tests/Resources/TileMaps/iso-test2.png # tests/performance-tests/Resources/fonts/bitmapFontTest3.png # tests/performance-tests/Resources/fps_images.png # tests/performance-tests/proj.ios/[email protected] # tests/performance-tests/proj.ios/[email protected] # tests/performance-tests/proj.ios/[email protected] # tests/performance-tests/proj.ios/Default.png # tests/performance-tests/proj.ios/[email protected] # tests/performance-tests/proj.ios/Icon-100.png # tests/performance-tests/proj.ios/Icon-114.png # tests/performance-tests/proj.ios/Icon-120.png # tests/performance-tests/proj.ios/Icon-144.png # tests/performance-tests/proj.ios/Icon-152.png # tests/performance-tests/proj.ios/Icon-29.png # tests/performance-tests/proj.ios/Icon-40.png # tests/performance-tests/proj.ios/Icon-50.png # tests/performance-tests/proj.ios/Icon-57.png # tests/performance-tests/proj.ios/Icon-58.png # tests/performance-tests/proj.ios/Icon-72.png # tests/performance-tests/proj.ios/Icon-76.png # tests/performance-tests/proj.ios/Icon-80.png # tools/cocos2d-console
stevetranby · Nov 29, 2018 · 368c31e · 368c31e
2 parents d08c0d1 + fde4e63
commit 368c31e
Show file tree

Hide file tree

Showing 987 changed files with 402 additions and 187 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,77 @@
+cocos2d-x-3.17.1 Nov.19 2018
+
+[REFINE]        Renderer: remove ccGLStateCache
+[REFINE]        Renderer: properly reduce clear buffer times to save energy
+[REFINE]        Engine: improve the reuse logic of sprite frames cache
+[REFINE]        Engine: add `GLView::setCursor` for desktop platforms
+[REFINE]        Engine: add methods to change icons for desktop platforms
+[REFINE]        UI: improve iPhone X home indicator handling behavior
+[REFINE]        UI: add line spacing support for system font on iOS and Android
+[REFINE]        UI: add support for pressed and disabled image in EditBox
+[REFINE]        UI: shrink extra label text if too long, prevent label too long crash
+[REFINE]        LUA: add binding code for cocos2d::Downloader
+[REFINE]        Android: add supporting SafeArea for most edge screens devices
+[REFINE]        Android: change default value of PROP_BUILD_TYPE from ndk-build to CMake
+[REFINE]        Android: update project config to gradle 4.6, sdk 28, android gradle plugin 3.1.0
+[REFINE]        Android: add ability to not stop music on game start in android
+[REFINE]        Windows: refine CCDevice-win32 BitmapDC
+[REFINE]        Windows: improve binary folder structure, copy resources to "Resources/" folder
+[REFINE]        Action: add ui::LoadingBar support to Progress actions
+[REFINE]        Network: support multiple parameters in SocketIO emit/send method
+[REFINE]        FileUtils: improve thread safety (use single recursive_mutex)
+[REFINE]        FileUitils: add getFileSize impl for Windows
+[REFINE]        FileUtils: add listFiles impl for Android and Windows platform
+[REFINE]        CMake: improve libraries link, compile options config
+[REFINE]        CMake: remove un-elegant prebuilt feature at internal cmake build scripts
+[REFINE]        3rd: upgrade libwebsockets to 2.4.2 with libuv enabled
+[REFINE]        3rd: improve cmake build scripts for external libs
+[REFINE]        Tests: add websocket latency test
+[REFINE]        Tests: add download multi task test case
+[REFINE]        cocos console: disable "gen-libs" command
+[REFINE]        Others: add another xbox 360 configuration
+[REFINE]        Others: remove ANT_ROOT env check on setup.py
+[REFINE]        Others: improve cmake tests in travis CI scripts
+
+[FIX]           Renderer: handle opengl recreate event for CameraBackgroundDepthBrush
+[FIX]           Renderer: fix some EVENT_RENDERER_RECREATED problem
+[FIX]           Engine: fix the last update time was not corrected if next delta time was zeroed 
+[FIX]           Engine: be safe to handle operator= in CCData
+[FIX]           Engine: aviod reading outside of the buffer when print log
+[FIX]           Engine: avoid duplicate find action when already found
+[FIX]           Engine: prevent free _bytes when src and dest are identical in CCData
+[FIX]           Engine: fix Console::loop() consumes 100% of CPU usage
+[FIX]           Engine: fix Action doesn't work when follow Node added PhysicsBody
+[FIX]           UI: fix locate image path relative to tsx file error in TiledMap
+[FIX]           UI: fix several bugs with button's title, include memory leak
+[FIX]           UI: fix LabelLetter::isVisible always return false
+[FIX]           UI: fix not support sprite frame when ignoreContentAdaptWithSize is false
+[FIX]           UI: fix out of range access in Label 
+[FIX]           UI: fix Widget::getAncestorWidget error
+[FIX]           UI: fix "known incorrect sRGB profile" by mogrify convert png format
+[FIX]           UI: fix iOS editbox EndAction wrong when single line mode (UITextField)
+[FIX]           UI: Fix for Label and UIRichEdit text trailing space trimming
+[FIX]           Audio: fix AudioEngine rotateBufferThread crash on iOS
+[FIX]           Audio: add extra init checks in pcm audio service, avoid crash in PcmAudioService 
+[FIX]           Audio: fix AVAudioSessionErrorCodeCannotStartPlaying error may occur on Apple
+[FIX]           Audio: fix background music may resumes even the application is on the background on Android
+[FIX]           Network: fix memory leaks in WebSocket
+[FIX]           Network: fix websocket memory zereoing size error
+[FIX]           Network: fix https downloader timeout on win/mac
+[FIX]           Network: fix "cc.loader.load" convert url error
+[FIX]           iOS: fix project build warnings in Xcode
+[FIX]           iOS: fix crash when saving gray colorspace image
+[FIX]           Android: shorten C++ build path, reduce long path error on Windows
+[FIX]           Android: keep cocos2dx activity at task root by mark "singleTask" in manifest
+[FIX]           Android: fix crash caused by JNIEnv null pointer in getStringUTFCharsJNI function
+[FIX]           Android: use 'Binary names' style on JNI for ClassLoader.loadClass
+[FIX]           Action: fix repeat CallFunc for some times, may never stop
+[FIX]           Physics: fix PhysicsJointMotor setRate and getRate Bad Access Crash
+[FIX]           FileUtils: fix removeDirectory() failure on win32
+[FIX]           FileUtils: let getContents return an error code when the filename is a directory
+[FIX]           FileUtils: let isFileExistInternal return false when folder as parameter on Linux
+[FIX]           CMake: fix project name always be "TemplateCpp" when create a new project
+[FIX]           Tests: fix auto test stop in cpp-tests project
+
 cocos2d-x-3.17 May.21 2018
 
 [HIGHLIGHT]     Android: support Android Studio 3.0, NDK 16

diff --git a/cmake/Modules/CocosBuildHelpers.cmake b/cmake/Modules/CocosBuildHelpers.cmake
@@ -45,25 +45,18 @@ function(cocos_mark_multi_resources res_out)
     set(${res_out} ${tmp_file_list} PARENT_SCOPE)
 endfunction()
 
-# get `cocos_target` depend all dlls, save the result in `all_depend_dlls_out`
-function(get_target_depends_ext_dlls cocos_target all_depend_dlls_out)
-    set(all_depend_ext_dlls)
+# get all linked libraries including transitive ones, recursive
+function(search_depend_libs_recursive cocos_target all_depends_out)
+    set(all_depends_inner)
     set(targets_prepare_search ${cocos_target})
-    # targets_prepare_search, target need find ext libs
-    set(have_searched_targets)
-    set(need_search_targets)
     while(true)
         foreach(tmp_target ${targets_prepare_search})
             get_target_property(tmp_depend_libs ${tmp_target} LINK_LIBRARIES)
             list(REMOVE_ITEM targets_prepare_search ${tmp_target})
-            # target itself use_cocos_pkg
             list(APPEND tmp_depend_libs ${tmp_target})
             foreach(depend_lib ${tmp_depend_libs})
                 if(TARGET ${depend_lib})
-                    get_target_property(tmp_dlls ${depend_lib} CC_DEPEND_DLLS)
-                    if(tmp_dlls)
-                        list(APPEND all_depend_ext_dlls ${tmp_dlls})
-                    endif()
+                    list(APPEND all_depends_inner ${depend_lib})
                     if(NOT (depend_lib STREQUAL tmp_target))
                         list(APPEND targets_prepare_search ${depend_lib})
                     endif()
@@ -75,6 +68,23 @@ function(get_target_depends_ext_dlls cocos_target all_depend_dlls_out)
             break()
         endif()
     endwhile(true)
+    set(${all_depends_out} ${all_depends_inner} PARENT_SCOPE)
+endfunction()
+
+# get `cocos_target` depend all dlls, save the result in `all_depend_dlls_out`
+function(get_target_depends_ext_dlls cocos_target all_depend_dlls_out)
+
+    set(depend_libs)
+    set(all_depend_ext_dlls)
+    search_depend_libs_recursive(${cocos_target} depend_libs)
+    foreach(depend_lib ${depend_libs})
+        if(TARGET ${depend_lib})
+            get_target_property(tmp_dlls ${depend_lib} CC_DEPEND_DLLS)
+            if(tmp_dlls)
+                list(APPEND all_depend_ext_dlls ${tmp_dlls})
+            endif()
+        endif()
+    endforeach()
 
     set(${all_depend_dlls_out} ${all_depend_ext_dlls} PARENT_SCOPE)
 endfunction()
@@ -231,26 +241,18 @@ macro(cocos_pak_xcode cocos_target)
     set(MACOSX_BUNDLE_LONG_VERSION_STRING ${COCOS_APP_LONG_VERSION_STRING})
     set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${COCOS_APP_SHORT_VERSION_STRING})
 
-    message("cocos package: ${cocos_target}, plist file: ${COCOS_APP_INFO_PLIST}")
+    message(STATUS "cocos package: ${cocos_target}, plist file: ${COCOS_APP_INFO_PLIST}")
 
    cocos_config_app_xcode_property(${cocos_target})
 endmacro()
 
 # set Xcode property for application, include all depend target
 macro(cocos_config_app_xcode_property cocos_app)
-    cocos_config_target_xcode_property(${cocos_app})
-    # for example, cocos_target: cpp-tests link engine_lib: cocos2d
-    get_target_property(engine_libs ${cocos_app} LINK_LIBRARIES)
-    foreach(engine_lib ${engine_libs})
-        if(TARGET ${engine_lib})
-            cocos_config_target_xcode_property(${engine_lib})
-            # for example, engine_lib: cocos2d link external_lib: flatbuffers
-            get_target_property(external_libs ${engine_lib} LINK_LIBRARIES)
-            foreach(external_lib ${external_libs})
-                if(TARGET ${external_lib})
-                    cocos_config_target_xcode_property(${external_lib})
-                endif()
-            endforeach()
+    set(depend_libs)
+    search_depend_libs_recursive(${cocos_app} depend_libs)
+    foreach(depend_lib ${depend_libs})
+        if(TARGET ${depend_lib})
+            cocos_config_target_xcode_property(${depend_lib})
         endif()
     endforeach()
 endmacro()

diff --git a/cmake/Modules/CocosBuildSet.cmake b/cmake/Modules/CocosBuildSet.cmake
@@ -10,6 +10,10 @@ set(CMAKE_DEBUG_TARGET_PROPERTIES
 # some useful variables for every one cocos project
 set(ENGINE_BINARY_PATH ${PROJECT_BINARY_DIR}/engine)
 
+if(CMAKE_TOOLCHAIN_FILE)
+    message(STATUS "using toolchain file:" ${CMAKE_TOOLCHAIN_FILE})
+endif()
+
 message(STATUS "PROJECT_NAME:" ${PROJECT_NAME})
 message(STATUS "PROJECT_SOURCE_DIR:" ${PROJECT_SOURCE_DIR})
 message(STATUS "COCOS2DX_ROOT_PATH:" ${COCOS2DX_ROOT_PATH})

diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp
@@ -677,6 +677,13 @@ void Label::setString(const std::string& text)
         {
             _utf32Text  = utf32String;
         }
+
+        CCASSERT(_utf32Text.length() <= CC_LABEL_MAX_LENGTH, "Length of text should be less then 16384");
+        if (_utf32Text.length() > CC_LABEL_MAX_LENGTH)
+        {
+            cocos2d::log("Error: Label text is too long %d > %d and it will be truncated!", _utf32Text.length(), CC_LABEL_MAX_LENGTH);
+            _utf32Text = _utf32Text.substr(0, CC_LABEL_MAX_LENGTH);
+        }
     }
 }
 

diff --git a/cocos/2d/CCLabel.h b/cocos/2d/CCLabel.h
@@ -559,7 +559,7 @@ class CC_DLL Label : public Node, public LabelProtocol, public BlendProtocol
      
      @warning Not support system font.
      @return the type of label
-     @since v3.18.0
+     @since v3.17.1
      */
     LabelType getLabelType() const { return _currentLabelType; }
 

diff --git a/cocos/2d/CCLayer.cpp b/cocos/2d/CCLayer.cpp
@@ -620,13 +620,13 @@ void LayerColor::onDraw(const Mat4& transform, uint32_t /*flags*/)
     getGLProgram()->use();
     getGLProgram()->setUniformsForBuiltins(transform);
 
-    glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION);
-    glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR);
-
     //
     // Attributes
     //
     glBindBuffer(GL_ARRAY_BUFFER, 0);
+    glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION);
+    glDisableVertexAttribArray(GLProgram::VERTEX_ATTRIB_TEX_COORD);
+    glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_COLOR);
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, 0, _noMVPVertices);
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_COLOR, 4, GL_FLOAT, GL_FALSE, 0, _squareColors);
 

diff --git a/cocos/2d/CCMotionStreak.cpp b/cocos/2d/CCMotionStreak.cpp
@@ -390,6 +390,12 @@ void MotionStreak::onDraw(const Mat4 &transform, uint32_t /*flags*/)
 
     glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, _texture->getName());
+    auto alphaTexID = _texture->getAlphaTextureName();
+    if (alphaTexID > 0)
+    {
+        glActiveTexture(GL_TEXTURE0 + 1);
+        glBindTexture(GL_TEXTURE_2D, alphaTexID);
+    }
 
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, 0, _vertices);
     glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, _texCoords);

diff --git a/cocos/2d/CCProgressTimer.cpp b/cocos/2d/CCProgressTimer.cpp
@@ -519,6 +519,12 @@ void ProgressTimer::onDraw(const Mat4 &transform, uint32_t /*flags*/)
 
     glActiveTexture(GL_TEXTURE0);
     glBindTexture(GL_TEXTURE_2D, _sprite->getTexture()->getName());
+    auto alphaTexID = _sprite->getTexture()->getAlphaTextureName();
+    if (alphaTexID > 0)
+    {
+        glActiveTexture(GL_TEXTURE0 + 1);
+        glBindTexture(GL_TEXTURE_2D, alphaTexID);
+    }
 
     glVertexAttribPointer( GLProgram::VERTEX_ATTRIB_POSITION, 2, GL_FLOAT, GL_FALSE, sizeof(_vertexData[0]) , &_vertexData[0].vertices);
     glVertexAttribPointer( GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, sizeof(_vertexData[0]), &_vertexData[0].texCoords);