Skip to content

[cpp test-Android]20：FileUtils/2 change title #19197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Nov 22, 2018
Merged

[cpp test-Android]20：FileUtils/2 change title #19197

merged 1 commit into from
Nov 22, 2018

Conversation

@PatriceJiang
Copy link
Contributor

No description provided.

@PatriceJiang PatriceJiang merged commit 772c8fc into cocos2d:3.17.1 Nov 22, 2018
@PatriceJiang PatriceJiang added this to the 3.17.1 milestone Nov 22, 2018
stevetranby added a commit to stevetranby/cocos2d-x that referenced this pull request Dec 3, 2018
@stevetranby
Merge commit 'fde4e6387d6e6e19badb41c8ba2aa365045b68ec' into scgamex-v3
368c31e 
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/Icon-20@2x.png #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-20@3x.png #	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/Icon-29@2x.png #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png #	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/Icon-40@2x.png #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png #	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/Icon-50@2x.png #	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/Icon-57@2x.png #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png #	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/Icon-72@2x.png #	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/Icon-76@2x.png #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png #	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/Icon-20@2x.png #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-20@3x.png #	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/Icon-29@2x.png #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png #	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/Icon-40@2x.png #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png #	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/Icon-50@2x.png #	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/Icon-57@2x.png #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png #	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/Icon-72@2x.png #	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/Icon-76@2x.png #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png #	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/Default-568h@2x.png #	tests/game-controller-test/proj.ios/Default-667h@2x.png #	tests/game-controller-test/proj.ios/Default-736h@3x.png #	tests/game-controller-test/proj.ios/Default.png #	tests/game-controller-test/proj.ios/Default@2x.png #	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/Icon-20@2x.png #	tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-20@3x.png #	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/Icon-29@2x.png #	tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-29@3x.png #	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/Icon-40@2x.png #	tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-40@3x.png #	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/Icon-50@2x.png #	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/Icon-57@2x.png #	tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-60@2x.png #	tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-60@3x.png #	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/Icon-72@2x.png #	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/Icon-76@2x.png #	tests/js-tests/project/proj.ios/Images.xcassets/AppIcon-js-tests.appiconset/Icon-83.5@2x.png #	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/Icon-20@2x.png #	tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-20@3x.png #	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/Icon-29@2x.png #	tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-29@3x.png #	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/Icon-40@2x.png #	tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-40@3x.png #	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/Icon-50@2x.png #	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/Icon-57@2x.png #	tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-60@2x.png #	tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-60@3x.png #	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/Icon-72@2x.png #	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/Icon-76@2x.png #	tests/lua-empty-test/project/proj.ios/Images.xcassets/AppIcon-lua-empty-test.appiconset/Icon-83.5@2x.png #	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/Default-568h@2x.png #	tests/lua-game-controller-test/project/proj.ios/Default-667h@2x.png #	tests/lua-game-controller-test/project/proj.ios/Default-736h@3x.png #	tests/lua-game-controller-test/project/proj.ios/Default.png #	tests/lua-game-controller-test/project/proj.ios/Default@2x.png #	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/Icon-20@2x.png #	tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-20@3x.png #	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/Icon-29@2x.png #	tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-29@3x.png #	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/Icon-40@2x.png #	tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-40@3x.png #	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/Icon-50@2x.png #	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/Icon-57@2x.png #	tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-60@2x.png #	tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-60@3x.png #	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/Icon-72@2x.png #	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/Icon-76@2x.png #	tests/lua-tests/project/proj.ios_mac/ios/Images.xcassets/AppIcon-lua-tests.appiconset/Icon-83.5@2x.png #	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/Default-568h@2x.png #	tests/performance-tests/proj.ios/Default-667h@2x.png #	tests/performance-tests/proj.ios/Default-736h@3x.png #	tests/performance-tests/proj.ios/Default.png #	tests/performance-tests/proj.ios/Default@2x.png #	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
@PatriceJiang PatriceJiang deleted the fix_x26469 branch December 25, 2018 04:07
drelaptop pushed a commit to drelaptop/cocos2d-x that referenced this pull request Jan 17, 2019
@PatriceJiang @drelaptop
[cpp test-Android]20：FileUtils/2 change title (cocos2d#19197)
68b20ac
minggo pushed a commit to minggo/cocos2d-x that referenced this pull request Jan 18, 2019
@drelaptop
AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
f519920 
* review cpp-tests, and fix part issues on start auto test * sync png format fix: Node:Particle3D abnormal texture effects cocos2d#19204 * fix cpp-tests SpritePolygon crash, wrong png format (cocos2d#19170) * fix wrong png convert format from sRGB to Gray * erase plist index if all frames was erased * test_A8.png have I8 format, fix it * [CCSpriteCache] allow re-add plist & add testcase (cocos2d#19175) * allow re-add plist & add testcase * remove comments/rename method/update testcase * fix isSpriteFramesWithFileLoaded & add testcase * remove used variable * remove unused variable * fix double free issues when js/lua-tests exit on iOS (cocos2d#19236) * disable part cases, AutoTest works without crash on mac * update cocos2dx files json, to test cocos new next * fix spritecache plist parsing issue (cocos2d#19269) * [linux] Fix FileUtils::getContents with folder (cocos2d#19157) * fix FileUtils::getContents on linux/mac * use stat.st_mode * simplify * [CCFileUtils] win32 getFileSize (cocos2d#19176) * win32 getFileSize * fix stat * [cpp test-Android]20：FileUtils/2 change title (cocos2d#19197) * sync cocos2d#19200 * sync cocos2d#19231 * [android lua] improve performance of lua loader (cocos2d#19234) * [lua] improve performance of lua loader * remove cache fix * Revert "fix spritecache plist parsing issue (cocos2d#19269)" This reverts commit f3a85ec. * remove win32 project files ref in template.json * add metal framework lnk ref into cpp template * test on iOS, and disable part cases * alBufferData instead of alBufferDataStatic for small audio file on Apple (cocos2d#19227) * changes AudioCache to use alBufferData instead of alBufferDataStatic (also makes test 19 faster to trigger openal bugs faster) The original problem: CrashIfClientProvidedBogusAudioBufferList cocos2d#18948 is not happening anymore, but there's still a not very frequent issue that makes OpenAL crash with a call stack like this. AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList It happes more frequently when the device is "cold", which means after half an hour of not using the device (locked). I could not find the actual source code for iOS OpenAL, so I used the macOS versions: https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html They seem to use CAGuard.h to make sure the dead buffer list has no threading issues. I'm worried because the CAGuard code I found has macos and win32 define but no iOS, so I'm not sure. I guess the iOS version is different and has the guard. I could not find a place in the code that's unprotected by the locks except the InitializeBufferMap() which should not be called more than once from cocos, and there's a workaround in AudioEngine-impl for it. I reduced the occurence of the CleanUpDeadBufferList crash by moving the guard in ~AudioCache to cover the alDeleteBuffers call. * remove hack method "setTimeout" on audio * AutoTest works on iOS * support set ios deployment target for root project * enable all texture2d cases, since Jiang have fixed
minggo pushed a commit that referenced this pull request Jan 18, 2019
metal support for cocos2d-x (#19305)
8d9bd92 
* remove deprecated files * remove some deprecated codes * remove more deprecated codes * remove ui deprecated codes * remove more deprecated codes * remove deprecated codes in ccmenuitem * remove more deprecated codes in ui * remove more deprecated codes in ui * remove more deprecated codes in ui * remove more deprecated codes * remove more deprecated codes * remove more deprecated codes * remove vr related codes and ignore some modules * remove allocator * remove some config * 【Feature】add back-end project file * [Feature] add back-end file * add pipeline descriptor and shader cache * [Feature] support sprite for backend * [Feature] remove unneeded code * [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture * [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture * [Feature] remove macro define to .cpp file * [Feature] add log info * [Feature] add PipelineDescriptor for TriangleCommand * [Feature] add PipelineDescriptor object as member of TriangleCommand * [Feature] add getPipelineDescriptor method * add renderbackend * complete pipeline descriptor * [Feature] add viewport in RenderCommand * set viewport when rendrering * [Feature] occur error when using RendererBackend, to be fixed. * a workaround to fix black screen on macOS 10.14 (#19090) * add rendererbackend init function * fix typo * [Feature] modify testFile * [BugFix] modify shader path * [Feature] set default viewport * fix projection * [Feature] modify log info * [BugFix] change viewport data type to int * [BugFix] add BindGroup to PipelienDescriptor * [BugFix] change a_position to vec3 in sprite.vert * [BugFix] set vertexLayout according to V3F_C4B_T2F structure * [Feature] revert a_position to vec4 * [Feature] renderer should not use gl codes directly * [Feature] it's better not use default value parameter * fix depth test setting * rendererbackend -> renderer * clear color and depth at begin * add metal backend * metal support normalized attribute * simplify codes * update external * add render pass desctriptor in pipeline descriptor * fix warnings * fix crash and memeory leak * refactor Texture2D * put pipeline descriptor into render command * simplify codes * [Feature] update Sprite * fix crash when closing app * [Feature] update SpriteBatchNode and TextureAtlas * support render texture(not finish) * [Feature] remove unused code * make tests work on mac * fix download-deps path error * make tests work on iOS * [Feature] support ttf under normal label effect * refactor triangle command processing * let renderer handle more common commands * refactor backend * make render texture work * [Feature] refactor backend for GL * [Feature]Renaming to make it easy to understand * [Feature] change warp mode to CLAMP_TO_EDGE * fix ghost * simplify visit render queue logic * support progress timer without rial mode * support partcile system * Feature/update label (#149) * [BugFix] fix compile error * [Feature] support outline effect in ios * [Feature] add shader file * [BugFix] fix begin and end RenderPass * [Feature] update CustomCommand * [Feature] revert project.pbxproj * [Feature] simplify codes * [BugFix] pack AI88 to RGBA8888 only when outline enable * [Feature] support shadow effect in Label * [Feature] support BMFont * [Feature] support glow effect * [Feature] simplify shader files * LabelAtlas work * handle blend function correctly * support tile map * don't share buffer in metal * alloc buffer size as needed * support more tilemap * Merge branch 'minggo/metal-support' into feature/updateLabel * minggo/metal-support: support tile map handle blend function correctly LabelAtlas work Feature/update label (#149) support partcile system # Conflicts: #	cocos/2d/CCLabel.cpp #	cocos/2d/CCSprite.cpp #	cocos/2d/CCSpriteBatchNode.cpp #	cocos/renderer/CCQuadCommand.cpp #	cocos/renderer/CCQuadCommand.h * render texture work without saving file * use global viewport * grid3d works * remove grabber * tiled3d works * [BugFix] fix label bug * [Feature] add updateSubData for buffer * [Feature] remove setVertexCount * support depth test * add callback command * [Feature] add UITest * [Feature] update UITest * [Feature] remove unneeded codes * fix custom command issue * fix layer color blend issue * [BugFix] fix iOS compile error * [Feature] remove unneeded codes * [Feature] fix updateVertexBuffer * layerradial works * add draw test back * fix batch issue * fix compiling error * [BugFix] support ETC1 * [BugFix] get the correct pipelineDescriptor * [BugFix] skip draw when backendTexture nullptr * clipping node support * [Feature] add shader files * fix stencil issue in metal * [Feature] update UILayoutTest * [BugFix] skip drawing when vertexCount is zero * refactor renderer * add set global z order for stencil manager commands * fix warnings caused by type * remove viewport in render command * [Feature] fix warnings caused by type * [BugFix] clear vertexCount and indexCount for CustomComand when needed * [Feature] update clear for CustomCommand * ios use metal * fix viewport issue * fix LayerColorGradient crash * [cmake] transport to android and windows (#160) * save point 1 * compile on windows * run on android * revert useless change * android set CC_ENABLE_CACHE_TEXTURE_DATA to 1 * add initGlew * fix android crash * add TODO new-renderer * review update * revert onGLFWWindowPosCallback * fix android compiling error * Impl progress radial (#162) * progresstimer add radial impl * default drawType to element * dec invoke times of createVertexBuffer (#163) * support depth/stencil format for gl backend * simplify progress timer codes * support motionstreak, effect is wrong * fix motionstreak issue * [Feature] update Scissor Test (#161) * [Feature] update Scissor Test * [Feature] update ScissorTest * [Feature] rename function * [Feature] get constant reference if needed * [Feature] show render status (#164) * improve performance * fix depth state * fill error that triangle vertex/index number bigger than buffer * fix compiline error in release mode * fix buffer conflict between CPU and GPU on iOS/macOS * Renderer refactor (#165) * use one vertes/index buffer with opengl * fix error on windows * custom command support index format config * CCLayer: compact vertex data structure * update comment * fix doc * support fast tilemap * pass index format instead * fix some wrong effect * fix render texture error * fix texture per-element size * fix texture format error * BlendFunc type refactor, GLenum -> backend::BlendFactor (#167) * BlendFunc use backend::BlendFactor as inner field * update comments * use int to replace GLenum * update xcode project fiel * rename to GLBlendConst * add ccConstants.h * update xcode project file * update copyright * remove primitive command * remove CCPrimitive.cpp/.h * remove deprecated files * remove unneeded files * remove multiple view support * remove multiple view support * remove the usage of frame buffer in camera * director don't use frame buffer * remove FrameBuffer * remove BatchCommand * add some api reference * add physics2d back * fix crash when close app on mac * improve render texture * fix rendertexture issue * fix rendertexture issue * simplify codes * CMake support for mac & ios (#169) * update cmake * fix compile error * update 3rd libs version * remove CCThread.h/.cpp * remove ccthread * use audio engine to implement simple audio engine * remove unneeded codes * remove deprecated codes * remove winrt macro * remove CC_USE_WIC * set partcile blend function in more elegant way * remove unneeded codes * remove unneeded codes * cmake works on windows * update project setting * improve performance * GLFloat -> float * sync v3 cmake improvements into metal-support (#172) * pick: modern cmake, compile definitions improvement (#19139) * modern cmake, use target_compile_definitions partly * simplify macro define, remove USE_* * modern cmake, macro define * add physics 2d macro define into ccConfig.h * remove USE_CHIPMUNK macro in build.gradle * remove CocosSelectModule.cmake * shrink useless define * simplify compile options config, re-add if necessary * update external for tmp CI test * un-quote target_compile_options value * add "-g" parameter only when debug mode * keep single build type when generator Xcode & VS projecy * update external for tmp CI tes * add static_cast<char>(-1), fix -Wc++11-narrowing * simplify win32 compile define * not modify code, only improve compile options # Conflicts: #	.gitignore #	cmake/Modules/CocosConfigDepend.cmake #	cocos/CMakeLists.txt #	external/config.json #	tests/cpp-tests/CMakeLists.txt * modern cmake, improve cmake_compiler_flags (#19145) * cmake_compiler_flags * Fix typo * Fix typo2 * Remove chanages from Android.mk * correct lua template cmake build (#19149) * don't add -Wno-deprecated into jsb target * correct lua template cmake build * fix win32 lua template compile error * prevent cmake in-source-build friendly (#19151) * pick: Copy resources to "Resources/" on win32 like in linux configuration * add "/Z7" for cpp-tests on windows * [cmake] fix iOS xcode property setting failed (#19208) * fix iOS xcode property setting failed * use search_depend_libs_recursive at dlls collect * fix typo * [cmake] add find_host_library into iOS toolchain file (#19230) * pick: [lua android] use luajit & template cmake update (#19239) * increase cmake stability , remove tests/CMakeLists.txt (#19261) * cmake win32 Precompiled header (#19273) * Precompiled header * Fix * Precompiled header for cocos * Precompiled header jscocos2d * Fix for COCOS2D_DEBUG is always 1 on Android (#19291) Related #19289 * little build fix, tests cpp-tests works on mac * sync v3 build related codes into metal-support (#173) * strict initialization for std::array * remove proj.win32 project configs * modern cmake, cmake_cleanup_remove_unused_variables (#19146) * Switch travis CI to xenial (#19207) * Switch travis CI to xenial * Remove language: android * Set language: cpp * Fix java problem * Update sdkmanager * Fix sdkmanger * next sdkmanager fix * Remove xenial from android * revert to sdk-tools-{system}-3859397 * Remove linux cmake install * Update before-install.sh * Update .travis.yml * Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212) * Simplify install-deps-linux.sh * Cleanup * pick: install ninja * update cocos2d-console submodule * for metal-support alpha release, we only test cpp * add HelloCpp into project(Cocos2d-x) for tmp test * update extenal metal-support-4 * update uniform setting * [Feature] update BindGroup * [Feature] empty-test * [Feature] cpp-test * [Feature] fix GL compiler error * [Feature] fix GL crash * [Feature] empty-test * [Feature] cpp-tests * [feature] improve frameRate * [feature] fix opengl compile error * [feature] fix opengl compile error * [BugFix] fix compute maxLocation error * [Feature] update setting unifrom * [Feature] fix namespace * [Feature] remove unneeded code * [Bugfix] fix project file * [Feature] update review * [texture2d] impl texture format support (#175) * texture update * update * update texture * commit * compile on windows * ddd * rename * rename methods * no crash * save gl * save * save * rename * move out pixel format convert functions * metal crash * update * update android * support gles compressed texture format * support more compress format * add more conversion methods * ss * save * update conversion methods * add PVRTC format support * reformat * add marco linux * fix GL marcro * pvrtc supported only by ios 8.0+ * remove unused cmake * revert change * refactor Texture2D::initWithData * fix conversion log * refactor Texture2D::initWithData * remove some OpenGL constants for PVRTC * add todo * fix typo * AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174) * review cpp-tests, and fix part issues on start auto test * sync png format fix: Node:Particle3D abnormal texture effects #19204 * fix cpp-tests SpritePolygon crash, wrong png format (#19170) * fix wrong png convert format from sRGB to Gray * erase plist index if all frames was erased * test_A8.png have I8 format, fix it * [CCSpriteCache] allow re-add plist & add testcase (#19175) * allow re-add plist & add testcase * remove comments/rename method/update testcase * fix isSpriteFramesWithFileLoaded & add testcase * remove used variable * remove unused variable * fix double free issues when js/lua-tests exit on iOS (#19236) * disable part cases, AutoTest works without crash on mac * update cocos2dx files json, to test cocos new next * fix spritecache plist parsing issue (#19269) * [linux] Fix FileUtils::getContents with folder (#19157) * fix FileUtils::getContents on linux/mac * use stat.st_mode * simplify * [CCFileUtils] win32 getFileSize (#19176) * win32 getFileSize * fix stat * [cpp test-Android]20：FileUtils/2 change title (#19197) * sync #19200 * sync #19231 * [android lua] improve performance of lua loader (#19234) * [lua] improve performance of lua loader * remove cache fix * Revert "fix spritecache plist parsing issue (#19269)" This reverts commit f3a85ec. * remove win32 project files ref in template.json * add metal framework lnk ref into cpp template * test on iOS, and disable part cases * alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227) * changes AudioCache to use alBufferData instead of alBufferDataStatic (also makes test 19 faster to trigger openal bugs faster) The original problem: CrashIfClientProvidedBogusAudioBufferList #18948 is not happening anymore, but there's still a not very frequent issue that makes OpenAL crash with a call stack like this. AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList It happes more frequently when the device is "cold", which means after half an hour of not using the device (locked). I could not find the actual source code for iOS OpenAL, so I used the macOS versions: https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html They seem to use CAGuard.h to make sure the dead buffer list has no threading issues. I'm worried because the CAGuard code I found has macos and win32 define but no iOS, so I'm not sure. I guess the iOS version is different and has the guard. I could not find a place in the code that's unprotected by the locks except the InitializeBufferMap() which should not be called more than once from cocos, and there's a workaround in AudioEngine-impl for it. I reduced the occurence of the CleanUpDeadBufferList crash by moving the guard in ~AudioCache to cover the alDeleteBuffers call. * remove hack method "setTimeout" on audio * AutoTest works on iOS * support set ios deployment target for root project * enable all texture2d cases, since Jiang have fixed * add CCTextureUtils to xcode project file (#176) * add leak cases for SpriteFrameCache (#177) * re-add SpriteFrameCache cases * update template file json * Update SpriteFrameCacheTest.cpp * fix compiling error
huangwei1024 pushed a commit to huangwei1024/cocos2d-x that referenced this pull request Jun 20, 2019
@PatriceJiang @huangwei1024
[cpp test-Android]20：FileUtils/2 change title (cocos2d#19197)
36fb452
stevetranby pushed a commit to stevetranby/cocos2d-x that referenced this pull request Jun 1, 2025
Squashed commit of the following:
5136932 
commit d39b54d0855d2dd23f218abb705ef3088ca6ed86 Author: Steve <steve@alumni.colostate.edu> Date: Sun Jun 1 17:45:57 2025 -0600 STEVE - MERGE - unindent setPosition commit d6b7d7b3244c30b018c745e8677540490113b0cd Author: Steve <steve@alumni.colostate.edu> Date: Sun Jun 1 17:45:40 2025 -0600 STEVE - MERGE - trim trailing whitespace commit 666ed03be18d16ad73ed4e74af259dcc868890bc Author: Steve <steve@alumni.colostate.edu> Date: Sun Jun 1 17:33:43 2025 -0600 STEVE - MERGE - gitignore commit 690451c948d79bb1da325994981bc0f059bfa7a1 Author: Steve <steve@alumni.colostate.edu> Date: Fri May 30 21:24:11 2025 -0600 STEVE - gitignore commit f0ab75d3b9b44346bd0f5c5041e7ce5f01f7868d Author: Steve <steve@alumni.colostate.edu> Date: Fri May 30 20:25:33 2025 -0600 STEVE - Shader code improvements (rename to match code, higher precision for less jitter - TODO: add pixel art shader upscaler) commit c125ba9e1bdb922e7ac2bddaf3b19ca375807cc3 Author: Steve <steve@alumni.colostate.edu> Date: Fri May 30 20:21:41 2025 -0600 STEVE - REMOVED - Removed unused libraries from cpp-test project and code that references them commit 5752cc44576d51db1b4386380e0194aee1081c5d Author: Steve <steve@alumni.colostate.edu> Date: Fri May 30 20:10:31 2025 -0600 STEVE - REMOVED - unused test projects commit 505dfccf2301a00e102b1a376b4aa4fd4f9d5a2d Author: Steve <steve@alumni.colostate.edu> Date: Fri May 30 16:09:52 2025 -0600 STEVE - expanded depth buffer to avoid clipping sprites too close or far commit ffae238b49741cc94a063d61e41e59eb7dcba1aa Author: Steve <steve@alumni.colostate.edu> Date: Fri May 30 16:08:30 2025 -0600 STEVE - change default texture anti-aliasing to FALSE commit ced8b5307fb2ef00369235900e3efb437eeec8b6 Author: Steve <steve@alumni.colostate.edu> Date: Fri May 30 16:05:48 2025 -0600 STEVE - formatting commit c3c21177907464cc0f6175a446accdcf26ec13e8 Author: Steve <steve@alumni.colostate.edu> Date: Fri May 30 16:05:41 2025 -0600 STEVE - allow public access to lighting shader macros commit 37ca529356b1cc4cbb310561a7f4d9d46405032c Author: Steve <steve@alumni.colostate.edu> Date: Fri May 30 16:04:29 2025 -0600 STEVE - change default texture anti-aliasing to FALSE commit b38077d9dc8eb954937302ac514fa59127909019 Author: Steve <steve@alumni.colostate.edu> Date: Fri May 30 16:02:45 2025 -0600 STEVE - add setPositionZ methods commit d435606f17bea382fb645a17ba29bf7febde184c Author: Steve <steve@alumni.colostate.edu> Date: Fri May 30 15:56:06 2025 -0600 STEVE - allow public access to ListView curSelectionIndex commit d840ccd078ea306d310560cd6c1f97b7e21d607d Author: Steve Tranby <stevetranby@gmail.com> Date: Sun Jul 12 02:50:28 2015 -0600 STEVE - allow public access to GLFWmonitor* _monitor commit f1410ce0ab88530474f98ff769598b7aa2a3b4ec Author: gogo2464 <57051187+gogo2464@users.noreply.github.com> Date: Wed Nov 20 02:37:04 2024 +0100 fix typo (#20810) commit 0a895f970dacc1c7ac79c7c8a4ef8976c904a11c Author: Steve <stevetranby@gmail.com> Date: Wed May 28 22:02:19 2025 -0600 FIXME - null checks commit 47dcded94b97471fab74dc753f25be8e5d1958be Author: Steve <steve@alumni.colostate.edu> Date: Tue May 27 01:12:45 2025 -0600 FIXME - trying to fix audio crash with rotateBufferThread commit 1b643dde1fb6a12f7d259a1b82e16b1b593eaa7f Author: Steve <steve@alumni.colostate.edu> Date: Thu May 8 09:49:01 2025 -0600 STEVE - fix warning about unused variables and parameters (use MAYBE_UNUSED) commit ed05907362fbedce8829d041dc3f7cf557402fb1 Author: Steve <steve@alumni.colostate.edu> Date: Wed Apr 30 18:49:04 2025 -0600 STEVE - fix warning about sprintf by using stringstream and StringUtils::format (we don't use MD5/SHA1 digest hashing where it requires high performance) commit 1bba949bb6d7fba42b46b39de942707f80dc9f7a Author: Steve Tranby <stevetranby@gmail.com> Date: Mon Oct 30 09:39:36 2023 -0600 STEVE - fix warning about implicit conversion (void* to iconv_t) commit 4a0a9886b0139905299281e5155f9471536141d3 Author: Steve <stevetranby@gmail.com> Date: Tue May 13 21:29:54 2025 -0500 STEVE - Android Project - .gitignore - ignore .cxx build files commit ea85052cc63934d089962dbc908cbc012920004d Author: Steve Tranby <stevetranby@gmail.com> Date: Fri May 10 00:19:14 2024 -0600 STEVE - Android Project - increase API and NDK versions and specify specific tools - increase API (min: 21, target: 35) and NDK version (27.x) - specify specific tools (35.0.1) - unwrap if condition check for API version < minSDK - rename rect to safeRect commit a9783e1bff1f5737692b71ba4a94617d27a52584 Author: Steve <steve@alumni.colostate.edu> Date: Thu May 8 09:47:57 2025 -0600 STEVE - iOS and Android - completion handler for openURL (iOS version now uses async) commit 17afb8cea6eff12accd91aa6d8001bbdfb8c891e Author: Steve <steve@alumni.colostate.edu> Date: Thu May 8 09:48:51 2025 -0600 STEVE - iOS Project - ignore deprecated warnings using #pragma clang diagnostic commit 869d42c51c9c07bee14ab7b80eec4dc46910fe6a Author: Steve <steve@alumni.colostate.edu> Date: Mon May 5 19:43:40 2025 -0600 STEVE - iOS Project - minor update and logs before fixing deprecations commit 5fa50e4412a53982dcd2a83e34712e2efb352124 Author: Steve Tranby <stevetranby@gmail.com> Date: Wed Nov 1 11:33:17 2023 -0600 STEVE - iOS Project - supported OS is now iOS 15+ and macOS 10.13+ - update iOS project to Xcode 16.4 (including some of the automated recommendations) - update deploy targets to iOS 15.6 and macOS 10.13 - silence OpenGL deprecated warnings (build setting compile flag 'GL_SILENCE_DEPRECATION') - silence OpenAL deprecated warnings (override #define OPENAL_DEPRECATED) - remove CLANG_CXX_LIBRARY build setting (libc++ is standard since Xcode 13) commit db86fed9328f56e17d46e5b8bd98699045397605 Author: Steve <steve@alumni.colostate.edu> Date: Tue Apr 8 00:39:19 2025 -0600 STEVE - Comments about unsigned vs int for tile GID parsing, but may not be needed now that it's working correctly 10 years later commit 72b0e06d2b16e100320afff553e6e968b3d19ec0 Author: Steve <stevetranby@gmail.com> Date: Mon May 12 23:55:10 2025 -0500 STEVE - ////--- to //--- commit dd5b8651bec347da49385ea6fac74624d26d49a7 Author: Steve Tranby <stevetranby@gmail.com> Date: Sat Oct 14 22:47:18 2023 -0600 STEVE - Silence OpenGL Deprecation Warnings on iOS and macOS commit 14e0aa43f6da42f9b5110956c7d7243eeca95401 Author: Steve Tranby <stevetranby@gmail.com> Date: Tue Jan 10 00:50:15 2023 -0700 NOPUSH - STEVE - WIP - changes to shaders to provide texture's size (and removed unused samplers 2 & 3) commit a9ac3d00282b0f66daa70ef8ab79dcdafbf7c6a6 Author: Steve Tranby <stevetranby@gmail.com> Date: Tue Oct 31 16:26:12 2023 -0600 NOPUSH - STEVE - fix support email (Android) commit 007e6431ee84a2262f0be90b4d25f7e4858a7506 Author: Steve Tranby <stevetranby@gmail.com> Date: Thu Jul 20 15:55:21 2023 -0600 Update Android Project - target API 33, NDK 26.x, and bump tools commit 9e96eb2fc7ce41588d23dfa6015a9dcb88728c2d Author: Steve Tranby <stevetranby@gmail.com> Date: Mon Oct 30 21:34:19 2023 -0600 STEVE - fix warning about implicit imprecision commit 0f89e5d3739ea52dc366a1b56a112bcaa0884597 Author: Steve Tranby <stevetranby@gmail.com> Date: Mon Oct 30 21:34:06 2023 -0600 STEVE - fix warning - tautology (self referential) is always true at compile time commit 58d9ffebe469307acaa48273078fc219139159e1 Author: Steve Tranby <stevetranby@gmail.com> Date: Thu Jul 20 15:55:01 2023 -0600 STEVE - fix minor warnings commit 3f9fdcc066b5b47cc26a9e2fa30bc6851ccb47b4 Author: Steve Tranby <stevetranby@gmail.com> Date: Thu Jul 20 15:54:53 2023 -0600 STEVE - upgrade uthash.h commit 85f43e988bfe8e97da7cbf911d327e7c8051779b Author: Steve Tranby <stevetranby@gmail.com> Date: Thu Jul 20 15:54:06 2023 -0600 STEVE - Add some CCAssert null checks commit 1beb69b1eb65fbdc0a596141f513e500658ea5ab Author: Steve Tranby <stevetranby@gmail.com> Date: Tue Jan 10 00:50:27 2023 -0700 STEVE - misc minor updates commit 354d19b5ee071b731042e475cbee71d949be85b3 Author: Steve Tranby <stevetranby@gmail.com> Date: Mon Jan 9 14:26:50 2023 -0700 log commit 460d7e8322696ef157612c7f73b36e84dd0e5ac1 Author: Steve Tranby <stevetranby@gmail.com> Date: Mon Jan 9 14:26:41 2023 -0700 merge - android build commit 1a0b25ea4829277ea753a7005e95d3c86ac5c933 Author: Steve Tranby <stevetranby@gmail.com> Date: Mon Jan 9 14:26:32 2023 -0700 merge - ios project update - revert to 9.3 target using xcode 13 commit 0bf3cb8cdf1b457f21883b92d7415b7f8ea9cbc4 Author: Steve Tranby <stevetranby@gmail.com> Date: Mon Dec 5 01:08:58 2022 -0700 update xcode projects and re-enable JPG support commit b43f23cf492c4019be520994c2c55bf266bdd384 Author: Steve Tranby <stevetranby@gmail.com> Date: Mon Dec 5 01:08:46 2022 -0700 use snprintf for better security commit ebeedaadc2fec2d377607142752b41b740214d9f Author: Steve Tranby <stevetranby@gmail.com> Date: Sun Dec 4 22:08:37 2022 -0700 android update - also remove OBB expansion file support commit e67cf6ba0f9f16ffab13159104575f8cc9a5dc1c Author: Steve Tranby <stevetranby@gmail.com> Date: Wed May 11 05:17:21 2022 -0600 change <hr> style markers from ///// to ----- commit 5fb2bee66073c421d0b38316d86afc25aed4035e Merge: 885fcb403c cd7446f179 Author: Steve Tranby <stevetranby@gmail.com> Date: Fri May 6 20:49:07 2022 -0600 Merge commit 'cd7446f17956d73041f9b33b37b4c747c6bc1993' into scgamex-v3 * commit 'cd7446f17956d73041f9b33b37b4c747c6bc1993': Create pch for all platforms V3 (#20705) Fix mac build V3 (#20703) Setup github actions for V3 (#20701) Support python 2 and 3 (#20698) Update CCPlatformConfig.h (#20693) # Conflicts: #	cocos/audio/mac/CDAudioManager.m #	cocos/audio/mac/CDXMacOSXSupport.h #	cocos/scripting/js-bindings/CMakeLists.txt commit 885fcb403c86eb6c2cfac75c9a506fec78c79eec Author: Steve Tranby <stevetranby@gmail.com> Date: Sat Dec 18 15:03:36 2021 -0700 fix deprecated iOS alert view commit 987bd87ff142ad2b1e874caf82ba2a85b1d560f4 Author: Steve Tranby <stevetranby@gmail.com> Date: Sat Dec 18 15:02:57 2021 -0700 use %p instead to print out pointer address commit 225005faf863476dd284e344067e092b29282781 Author: Steve Tranby <stevetranby@gmail.com> Date: Sat Dec 18 15:02:42 2021 -0700 STEVE - notes commit 3372ba2bb722eb190ce00aec13f828f6ddb387de Author: Steve Tranby <stevetranby@gmail.com> Date: Mon Dec 28 14:42:23 2020 -0700 STASH commit a6744f2b767e9b1c1b8d21ae5e70c3ae285b8207 Author: Steve Tranby <stevetranby@gmail.com> Date: Fri Nov 27 12:53:51 2020 -0700 move private ivars into implementation .mm file commit d712fce44fb6b442b5ff42a43bdb48cb5ba96415 Author: Steve Tranby <stevetranby@gmail.com> Date: Fri Nov 27 12:53:18 2020 -0700 disable Spine framework in CMakeLists commit 7fea32b09baabaed57d4baf335580f1b2c9618d0 Author: Steve Tranby <stevetranby@gmail.com> Date: Fri Nov 27 12:53:05 2020 -0700 STEVE: add formatting to # compiler directives commit 569c8d99e75293939b51c230e0d8fcf0c366caac Author: Steve Tranby <stevetranby@gmail.com> Date: Fri Nov 27 12:52:29 2020 -0700 add cast commit 878bec741f1455bbaa4b0d32d3320e9143567a3c Author: Steve Tranby <stevetranby@gmail.com> Date: Fri Nov 27 12:51:48 2020 -0700 STEVE: update project to latest Xcode 12.2 commit f9ed6367b9e36ce79dc69079e5377b6c53b746ee Author: Steve Tranby <stevetranby@gmail.com> Date: Mon Jul 20 15:02:44 2020 -0500 Steve: fix deprecation(s) commit 21d37b5e51ef402c3fa4700fddd97140908e2bbe Author: Steve Tranby <stevetranby@gmail.com> Date: Sun Mar 8 00:21:40 2020 -0700 minor android project update commit 2c83f47b144c9e8b468dcc3261e840edd96c6a95 Author: Steve Tranby <stevetranby@gmail.com> Date: Fri Feb 28 20:55:02 2020 -0700 minor ios project update commit e8ba69ec6e3f76770b00a9f794d8dfb97694a31f Author: Steve Tranby <stevetranby@gmail.com> Date: Fri Feb 28 20:47:03 2020 -0700 minor fixup for MACRO: CC_UNUSED_PARAM commit c70d4ebab4080cbb8c4fbe05bfdace95f44e0ce3 Author: Steve Tranby <stevetranby@gmail.com> Date: Fri Feb 28 20:46:33 2020 -0700 minor update commit fb07dc686e9b649c7c1a491ff960dde57192f419 Author: Steve Tranby <stevetranby@gmail.com> Date: Fri Feb 28 20:46:22 2020 -0700 remove macos catalyst support commit 69af16299805f5ee785432514190dc4b9dfa357a Author: Steve Tranby <stevetranby@gmail.com> Date: Fri Feb 28 20:45:51 2020 -0700 update android project commit 677ff53fdf5f4b05e2ee9744673a024f355d40ef Merge: 8f4d701132 a0df0063fc Author: Steve Tranby <stevetranby@gmail.com> Date: Mon Dec 28 14:44:15 2020 -0700 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into scgamex-v3-not-pushed-merge-first commit 8f4d7011321d9dd53e9bfc599cbf66619e7b008a Author: Steve Tranby <stevetranby@gmail.com> Date: Wed Feb 26 23:00:03 2020 -0700 minor update for previous PR #20464 fix commit 53c54f35256869db4322b81efd2255a0531d4819 Author: Steve Tranby <stevetranby@gmail.com> Date: Wed Feb 26 22:57:40 2020 -0700 fix up xcode projects commit c1cdc6b321072b4e342a1ae29b8611e75a9096f5 Merge: 5c3e329901 a96ff32987 Author: Steve Tranby <stevetranby@gmail.com> Date: Wed Feb 26 21:17:40 2020 -0700 Merge commit 'a96ff32987dd676ad064b09e7dbf71a615dceb9d' into scgamex-v3 STEVE: - fix conflicts - removed JS/Lua stuff not using # Conflicts: #	build/cocos2d_libs.xcodeproj/project.pbxproj #	cocos/2d/CCTMXXMLParser.cpp #	cocos/base/CCConsole.cpp #	cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxActivity.java #	cocos/platform/ios/CCEAGLView-ios.h #	cocos/platform/ios/CCEAGLView-ios.mm #	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp #	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp #	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp #	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp #	cocos/ui/UILayout.cpp #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm #	templates/lua-template-default/CMakeLists.txt #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Info.plist #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/RootViewController.mm #	templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj #	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.cpp #	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UILayoutTest/UILayoutTest.h #	tests/game-controller-test/proj.ios/AppController.mm #	tests/game-controller-test/proj.ios/Info.plist #	tests/game-controller-test/proj.ios/RootViewController.mm #	tests/js-tests/project/proj.ios/AppController.mm #	tests/js-tests/project/proj.ios/Info.plist #	tests/js-tests/project/proj.ios/RootViewController.mm #	tests/lua-empty-test/project/CMakeLists.txt #	tests/lua-empty-test/project/proj.ios/AppController.mm #	tests/lua-empty-test/project/proj.ios/Info.plist #	tests/lua-empty-test/project/proj.ios/RootViewController.mm #	tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj #	tests/lua-game-controller-test/project/proj.ios/AppController.mm #	tests/lua-game-controller-test/project/proj.ios/Info.plist #	tests/lua-game-controller-test/project/proj.ios/RootViewController.mm #	tests/lua-tests/project/CMakeLists.txt #	tests/lua-tests/project/proj.ios_mac/ios/AppController.mm #	tests/lua-tests/project/proj.ios_mac/ios/Info.plist #	tests/lua-tests/project/proj.ios_mac/ios/RootViewController.mm #	tests/performance-tests/proj.ios/AppController.mm #	tests/performance-tests/proj.ios/Info.plist #	tests/performance-tests/proj.ios/RootViewController.mm #	tools/cocos2d-console commit 5c3e32990136a2bb37a68e33c2e00dad05c0bd26 Author: Steve Tranby <stevetranby@gmail.com> Date: Wed Feb 26 21:00:08 2020 -0700 STEVE: fix up build.gradle commit 7e37f152b0f2e6ce3f5232d3ad13ea78ac1bf827 Author: Steve Tranby <stevetranby@gmail.com> Date: Thu Oct 17 11:34:49 2019 -0600 STEVE: fix header due to not using header maps commit dbddde3b668c4bbe1c3ef9378fa94f7b6e4c1dc6 Merge: a78fd8631c 3712166290 Author: Steve Tranby <stevetranby@gmail.com> Date: Tue Oct 15 16:04:28 2019 -0600 Merge commit '371216629089d7a7226a4bbaa0282808f8372356' into scgamex-v3 commit a78fd8631cf0fce944257e834a0eac09257769a3 Author: Steve Tranby <stevetranby@gmail.com> Date: Sat Oct 12 02:34:58 2019 -0600 update cocos2d gradle versions commit 1ee5e60c9c9167f148db6073064c04a39fe54c49 Author: Steve Tranby <stevetranby@gmail.com> Date: Sat Oct 12 02:34:42 2019 -0600 upgrades to xcode xcschemes commit 5f48cdad92af64a1cb645f85463e6ced98e48ade Author: Steve Tranby <stevetranby@gmail.com> Date: Sat Oct 12 02:34:21 2019 -0600 ignore warning of deprecated function (still exists in cocos2d repo) commit 0003c6ec503d64f3da4533a200f662761deb21cb Merge: 8df66361bd cc57e2f076 Author: Steve Tranby <stevetranby@gmail.com> Date: Sat Oct 5 16:43:16 2019 -0600 Merge commit 'cc57e2f076b63f122c7cecaae80b226e4ac280bf' into scgamex-v3 - reset project.pbxproj (to STEVE local) - fix a few conflicts, no issues - deleted lua/js stuff # Conflicts: #	build/cocos2d_tests.xcodeproj/project.pbxproj #	cocos/platform/CCSAXParser.cpp #	cocos/renderer/CCTexture2D.cpp #	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp #	cocos/scripting/js-bindings/manual/ScriptingCore.cpp #	cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp #	cocos/scripting/lua-bindings/manual/tolua_fix.h #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj #	templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj #	tests/lua-empty-test/project/proj.win32/lua-empty-test.vcxproj #	tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj #	tools/cocos2d-console commit 8df66361bd27b4e00fbee06252f5cb8d5148434f Author: Steve Tranby <stevetranby@gmail.com> Date: Tue Sep 3 15:34:45 2019 -0600 STEVE: fix issues after merge commit c1a616d07c0c79a7d6a2d30771c6b420e8f45759 Merge: b0a01456f3 1875590f0e Author: Steve Tranby <stevetranby@gmail.com> Date: Tue Sep 3 15:22:19 2019 -0600 STEVE: Merge remote-tracking branch 'origin/v3' into scgamex-v3 STEVE: removed js/lua/scripting/etc as usual, fixed up some minor conflicts # Conflicts: #	build/cocos2d_tests.xcodeproj/project.pbxproj #	cocos/audio/linux/SimpleAudioEngine.cpp #	cocos/deprecated/CCDeprecated.h #	cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp #	cocos/editor-support/spine/Bone.c #	cocos/editor-support/spine/Json.h #	cocos/math/CCGeometry.h #	cocos/navmesh/CCNavMesh.cpp #	cocos/physics/CCPhysicsWorld.cpp #	cocos/physics/CCPhysicsWorld.h #	cocos/physics3d/CCPhysics3D.cpp #	cocos/platform/CCGLView.h #	cocos/platform/CCImage.cpp #	cocos/platform/CCImage.h #	cocos/platform/android/CCFileUtils-android.cpp #	cocos/scripting/js-bindings/CMakeLists.txt #	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp #	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp #	cocos/scripting/js-bindings/manual/3d/jsb_cocos2dx_3d_manual.cpp #	cocos/scripting/js-bindings/manual/ScriptingCore.cpp #	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp #	cocos/scripting/js-bindings/manual/cocostudio/jsb_cocos2dx_studio_manual.cpp #	cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp #	cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp #	cocos/scripting/js-bindings/manual/js_bindings_core.cpp #	cocos/scripting/js-bindings/manual/jsb_helper.h #	cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp #	cocos/scripting/js-bindings/manual/network/jsb_socketio.cpp #	cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp #	cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h #	cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h #	cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.cpp #	cocos/scripting/js-bindings/script/jsb_cocos2d.js #	cocos/scripting/js-bindings/script/jsb_create_apis.js #	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp #	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp #	cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.cpp #	cocos/scripting/lua-bindings/auto/lua_cocos2dx_physics_auto.hpp #	cocos/scripting/lua-bindings/manual/CCLuaBridge.cpp #	cocos/scripting/lua-bindings/manual/CCLuaBridge.h #	cocos/scripting/lua-bindings/manual/CCLuaEngine.cpp #	cocos/scripting/lua-bindings/manual/CCLuaEngine.h #	cocos/scripting/lua-bindings/manual/CCLuaStack.cpp #	cocos/scripting/lua-bindings/manual/CCLuaStack.h #	cocos/scripting/lua-bindings/manual/CCLuaValue.cpp #	cocos/scripting/lua-bindings/manual/CCLuaValue.h #	cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.cpp #	cocos/scripting/lua-bindings/manual/cocos2d/LuaScriptHandlerMgr.h #	cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp #	cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_physics_manual.cpp #	cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_coco_studio_manual.cpp #	cocos/scripting/lua-bindings/manual/network/lua_xml_http_request.cpp #	cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.cpp #	cocos/scripting/lua-bindings/manual/platform/android/CCLuaJavaBridge.h #	cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp #	cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.h #	cocos/scripting/lua-bindings/manual/spine/lua_cocos2dx_spine_manual.cpp #	cocos/scripting/lua-bindings/proj.android/Android.mk #	cocos/scripting/lua-bindings/proj.android/CMakeLists.txt #	extensions/GUI/CCScrollView/CCScrollView.h #	extensions/Particle3D/CCParticle3DAffector.h #	extensions/Particle3D/CCParticle3DEmitter.h #	extensions/Particle3D/CCParticle3DRender.cpp #	extensions/Particle3D/CCParticleSystem3D.h #	extensions/Particle3D/PU/CCPUAffector.h #	extensions/Particle3D/PU/CCPUAffectorTranslator.h #	extensions/Particle3D/PU/CCPUBeamRender.cpp #	extensions/Particle3D/PU/CCPUBeamRender.h #	extensions/Particle3D/PU/CCPUBehaviour.cpp #	extensions/Particle3D/PU/CCPUBehaviour.h #	extensions/Particle3D/PU/CCPUBillboardChain.cpp #	extensions/Particle3D/PU/CCPUBillboardChain.h #	extensions/Particle3D/PU/CCPUBoxCollider.cpp #	extensions/Particle3D/PU/CCPUBoxEmitter.cpp #	extensions/Particle3D/PU/CCPUBoxEmitter.h #	extensions/Particle3D/PU/CCPUCircleEmitter.cpp #	extensions/Particle3D/PU/CCPUCircleEmitter.h #	extensions/Particle3D/PU/CCPUCollisionAvoidanceAffector.cpp #	extensions/Particle3D/PU/CCPUDoAffectorEventHandler.cpp #	extensions/Particle3D/PU/CCPUDoAffectorEventHandler.h #	extensions/Particle3D/PU/CCPUDoEnableComponentEventHandler.cpp #	extensions/Particle3D/PU/CCPUDoEnableComponentEventHandler.h #	extensions/Particle3D/PU/CCPUDoExpireEventHandler.h #	extensions/Particle3D/PU/CCPUDoFreezeEventHandler.h #	extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.cpp #	extensions/Particle3D/PU/CCPUDoPlacementParticleEventHandler.h #	extensions/Particle3D/PU/CCPUDoScaleEventHandler.cpp #	extensions/Particle3D/PU/CCPUDoScaleEventHandler.h #	extensions/Particle3D/PU/CCPUDoStopSystemEventHandler.h #	extensions/Particle3D/PU/CCPUDynamicAttribute.cpp #	extensions/Particle3D/PU/CCPUDynamicAttribute.h #	extensions/Particle3D/PU/CCPUEmitter.cpp #	extensions/Particle3D/PU/CCPUEmitter.h #	extensions/Particle3D/PU/CCPUEventHandler.cpp #	extensions/Particle3D/PU/CCPUEventHandler.h #	extensions/Particle3D/PU/CCPUEventHandlerTranslator.h #	extensions/Particle3D/PU/CCPUForceField.cpp #	extensions/Particle3D/PU/CCPUForceField.h #	extensions/Particle3D/PU/CCPUForceFieldAffector.cpp #	extensions/Particle3D/PU/CCPUForceFieldAffector.h #	extensions/Particle3D/PU/CCPUGeometryRotator.cpp #	extensions/Particle3D/PU/CCPUGeometryRotator.h #	extensions/Particle3D/PU/CCPUGravityAffector.cpp #	extensions/Particle3D/PU/CCPUGravityAffector.h #	extensions/Particle3D/PU/CCPUInterParticleCollider.cpp #	extensions/Particle3D/PU/CCPUInterParticleCollider.h #	extensions/Particle3D/PU/CCPUJetAffector.cpp #	extensions/Particle3D/PU/CCPUJetAffector.h #	extensions/Particle3D/PU/CCPULineAffector.cpp #	extensions/Particle3D/PU/CCPULineAffector.h #	extensions/Particle3D/PU/CCPULineEmitter.cpp #	extensions/Particle3D/PU/CCPULineEmitter.h #	extensions/Particle3D/PU/CCPULinearForceAffector.h #	extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.cpp #	extensions/Particle3D/PU/CCPUMeshSurfaceEmitter.h #	extensions/Particle3D/PU/CCPUNoise.cpp #	extensions/Particle3D/PU/CCPUNoise.h #	extensions/Particle3D/PU/CCPUObserver.cpp #	extensions/Particle3D/PU/CCPUObserver.h #	extensions/Particle3D/PU/CCPUObserverTranslator.h #	extensions/Particle3D/PU/CCPUOnClearObserver.cpp #	extensions/Particle3D/PU/CCPUOnClearObserver.h #	extensions/Particle3D/PU/CCPUOnCollisionObserver.h #	extensions/Particle3D/PU/CCPUOnCountObserver.cpp #	extensions/Particle3D/PU/CCPUOnCountObserver.h #	extensions/Particle3D/PU/CCPUOnEmissionObserver.h #	extensions/Particle3D/PU/CCPUOnEventFlagObserver.cpp #	extensions/Particle3D/PU/CCPUOnEventFlagObserver.h #	extensions/Particle3D/PU/CCPUOnExpireObserver.h #	extensions/Particle3D/PU/CCPUOnPositionObserver.cpp #	extensions/Particle3D/PU/CCPUOnPositionObserver.h #	extensions/Particle3D/PU/CCPUOnQuotaObserver.h #	extensions/Particle3D/PU/CCPUOnRandomObserver.cpp #	extensions/Particle3D/PU/CCPUOnRandomObserver.h #	extensions/Particle3D/PU/CCPUOnTimeObserver.cpp #	extensions/Particle3D/PU/CCPUOnTimeObserver.h #	extensions/Particle3D/PU/CCPUOnVelocityObserver.cpp #	extensions/Particle3D/PU/CCPUOnVelocityObserver.h #	extensions/Particle3D/PU/CCPUParticleFollower.cpp #	extensions/Particle3D/PU/CCPUParticleFollower.h #	extensions/Particle3D/PU/CCPUParticleSystem3D.cpp #	extensions/Particle3D/PU/CCPUParticleSystem3D.h #	extensions/Particle3D/PU/CCPUPathFollower.cpp #	extensions/Particle3D/PU/CCPUPathFollower.h #	extensions/Particle3D/PU/CCPUPlane.cpp #	extensions/Particle3D/PU/CCPUPlane.h #	extensions/Particle3D/PU/CCPUPlaneCollider.cpp #	extensions/Particle3D/PU/CCPUPlaneCollider.h #	extensions/Particle3D/PU/CCPUPointEmitter.cpp #	extensions/Particle3D/PU/CCPUPointEmitter.h #	extensions/Particle3D/PU/CCPUPositionEmitter.cpp #	extensions/Particle3D/PU/CCPUPositionEmitter.h #	extensions/Particle3D/PU/CCPURandomiser.cpp #	extensions/Particle3D/PU/CCPURandomiser.h #	extensions/Particle3D/PU/CCPURender.h #	extensions/Particle3D/PU/CCPURibbonTrail.cpp #	extensions/Particle3D/PU/CCPURibbonTrail.h #	extensions/Particle3D/PU/CCPURibbonTrailRender.cpp #	extensions/Particle3D/PU/CCPURibbonTrailRender.h #	extensions/Particle3D/PU/CCPUScaleAffector.cpp #	extensions/Particle3D/PU/CCPUScaleAffector.h #	extensions/Particle3D/PU/CCPUScaleVelocityAffector.cpp #	extensions/Particle3D/PU/CCPUScaleVelocityAffector.h #	extensions/Particle3D/PU/CCPUScriptLexer.cpp #	extensions/Particle3D/PU/CCPUScriptParser.cpp #	extensions/Particle3D/PU/CCPUScriptTranslator.cpp #	extensions/Particle3D/PU/CCPUSimpleSpline.cpp #	extensions/Particle3D/PU/CCPUSimpleSpline.h #	extensions/Particle3D/PU/CCPUSineForceAffector.cpp #	extensions/Particle3D/PU/CCPUSineForceAffector.h #	extensions/Particle3D/PU/CCPUSlaveEmitter.cpp #	extensions/Particle3D/PU/CCPUSlaveEmitter.h #	extensions/Particle3D/PU/CCPUSphere.h #	extensions/Particle3D/PU/CCPUSphereCollider.cpp #	extensions/Particle3D/PU/CCPUSphereCollider.h #	extensions/Particle3D/PU/CCPUSphereSurfaceEmitter.cpp #	extensions/Particle3D/PU/CCPUSphereSurfaceEmitter.h #	extensions/Particle3D/PU/CCPUTextureAnimator.cpp #	extensions/Particle3D/PU/CCPUTextureAnimator.h #	extensions/Particle3D/PU/CCPUTextureRotator.cpp #	extensions/Particle3D/PU/CCPUTextureRotator.h #	extensions/Particle3D/PU/CCPUTranslateManager.h #	extensions/Particle3D/PU/CCPUVelocityMatchingAffector.cpp #	extensions/Particle3D/PU/CCPUVelocityMatchingAffector.h #	extensions/Particle3D/PU/CCPUVertexEmitter.cpp #	extensions/Particle3D/PU/CCPUVertexEmitter.h #	extensions/Particle3D/PU/CCPUVortexAffector.cpp #	extensions/Particle3D/PU/CCPUVortexAffector.h #	extensions/assets-manager/AssetsManager.h #	templates/js-template-default/frameworks/runtime-src/proj.android/app/build.gradle #	templates/js-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh #	templates/js-template-default/frameworks/runtime-src/proj.android/build.gradle #	templates/js-template-default/frameworks/runtime-src/proj.android/gradle/wrapper/gradle-wrapper.properties #	templates/lua-template-default/CMakeLists.txt #	templates/lua-template-default/frameworks/runtime-src/proj.android/app/build.gradle #	templates/lua-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh #	templates/lua-template-default/frameworks/runtime-src/proj.android/build.gradle #	templates/lua-template-default/frameworks/runtime-src/proj.android/gradle/wrapper/gradle-wrapper.properties #	templates/lua-template-default/frameworks/runtime-src/proj.win32/SimulatorWin.cpp #	tests/cpp-empty-test/proj.android/app/build.gradle #	tests/cpp-empty-test/proj.android/build.gradle #	tests/cpp-empty-test/proj.android/gradle/wrapper/gradle-wrapper.properties #	tests/cpp-tests/Classes/Box2DTestBed/Box2dView.cpp #	tests/cpp-tests/Classes/Box2DTestBed/GLES-Render.cpp #	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp #	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h #	tests/cpp-tests/Classes/CocosDenshionTest/CocosDenshionTest.cpp #	tests/cpp-tests/Classes/NavMeshTest/NavMeshTest.cpp #	tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.cpp #	tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp #	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp #	tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp #	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp #	tests/js-tests/project/CMakeLists.txt #	tests/js-tests/project/Classes/js_Effect3D_bindings.cpp #	tests/js-tests/project/proj.android/app/build.gradle #	tests/js-tests/project/proj.android/app/get_environment.sh #	tests/js-tests/project/proj.android/build.gradle #	tests/js-tests/project/proj.android/gradle/wrapper/gradle-wrapper.properties #	tests/js-tests/project/proj.ios/Info.plist #	tests/lua-empty-test/project/CMakeLists.txt #	tests/lua-empty-test/project/Classes/AppDelegate.cpp #	tests/lua-empty-test/project/proj.android/app/build.gradle #	tests/lua-empty-test/project/proj.android/app/get_environment.sh #	tests/lua-empty-test/project/proj.android/build.gradle #	tests/lua-empty-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties #	tests/lua-game-controller-test/project/proj.android/app/build.gradle #	tests/lua-game-controller-test/project/proj.android/build.gradle #	tests/lua-game-controller-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties #	tests/lua-tests/project/CMakeLists.txt #	tests/lua-tests/project/Classes/lua_test_bindings.cpp #	tests/lua-tests/project/proj.android/app/build.gradle #	tests/lua-tests/project/proj.android/build.gradle #	tests/lua-tests/project/proj.android/gradle/wrapper/gradle-wrapper.properties #	tests/lua-tests/project/proj.ios_mac/ios/Info.plist #	tests/performance-tests/Classes/tests/PerformanceAllocTest.cpp #	tools/cocos2d-console commit b0a01456f3264942e5a2b17379bdc0ab46da4aae Author: Steve Tranby <stevetranby@gmail.com> Date: Tue Sep 3 11:56:19 2019 -0600 STEVE: fix comma -> semicolon commit ab1d65bbf3e904893f86ecbf2b08c1378e8e05ee Author: Steve Tranby <stevetranby@gmail.com> Date: Tue Sep 3 11:55:45 2019 -0600 Apply recommended updates to project for latest XCode commit 1fcea05023a7649b6969d6d65e9928d0aef0b5aa Author: Steve Tranby <stevetranby@gmail.com> Date: Fri Jul 19 22:03:36 2019 -0600 Android remove js, lua, and audio libs among others commit 86a88116271f4b0077eda00a09a3d3914ce86b16 Merge: 4930d15519 1528ea01d2 Author: Steve Tranby <stevetranby@gmail.com> Date: Sun Jun 2 23:07:40 2019 -0600 Merge commit '1528ea01d2749b4ef65e97f79cffa6135fe13c4d' into scgamex-v3 submodule: cocos-console (kept at scgame_v3) * commit '1528ea01d2749b4ef65e97f79cffa6135fe13c4d': setPercent after initialization (#19718) Update CHANGELOG [js-tests/cpp-tests] iOS: add fonts to Info.plist (#19708) update release note and change log (#19711) fix get environment (#19690) rename Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.* to Cocos2dxLuaJavaBridge.* (#19694) fix twice copy lua scripts error (#19687) (#19691) protect empty string (#19680) modify engine version (#19677) fix Sprite update_blend_func (#19649) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19648) add clang-tidy support (#19643) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19644) add optimization for OPPO. (#19631) Optimize cases where loop variable is unecessarily copied in a range-for loop. (#19637) # Conflicts: #	cocos/physics/CCPhysicsJoint.cpp #	cocos/platform/android/javaactivity-android.cpp #	cocos/scripting/js-bindings/manual/js_manual_conversions.cpp #	cocos/scripting/lua-bindings/manual/physics3d/lua_cocos2dx_physics3d_manual.cpp #	cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp #	cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.h #	cocos/scripting/lua-bindings/proj.android/Android.mk #	cocos/scripting/lua-bindings/proj.android/CMakeLists.txt #	extensions/Particle3D/PU/CCPURibbonTrailRender.cpp #	extensions/Particle3D/PU/CCPUScriptCompiler.cpp #	templates/js-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh #	templates/js-template-default/frameworks/runtime-src/proj.android/app/proguard-rules.pro #	templates/lua-template-default/CMakeLists.txt #	templates/lua-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh #	templates/lua-template-default/frameworks/runtime-src/proj.android/app/proguard-rules.pro #	tests/js-tests/project/proj.android/app/get_environment.sh #	tests/js-tests/project/proj.android/app/proguard-rules.pro #	tests/js-tests/project/proj.ios/Info.plist #	tests/lua-empty-test/project/proj.android/app/build.gradle #	tests/lua-empty-test/project/proj.android/app/get_environment.sh #	tests/lua-empty-test/project/proj.android/app/proguard-rules.pro #	tests/lua-empty-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties #	tests/lua-game-controller-test/project/proj.android/app/proguard-rules.pro #	tests/lua-tests/project/Classes/lua_test_bindings.cpp #	tests/lua-tests/project/proj.android/app/proguard-rules.pro #	tests/lua-tests/project/proj.ios_mac/ios/Info.plist #	tools/cocos2d-console commit 1528ea01d2749b4ef65e97f79cffa6135fe13c4d Author: Arnold <40414978+PatriceJiang@users.noreply.github.com> Date: Thu May 16 09:18:29 2019 +0800 setPercent after initialization (#19718) commit ed5db3e2ce205b3e46df295f25ad40d2563f3dfb Author: minggo <nudtzxm@gmail.com> Date: Wed May 15 10:20:16 2019 +0800 Update CHANGELOG commit 073823f126304aa34b263d519e0b5a76e5d7318b Author: Arnold <40414978+PatriceJiang@users.noreply.github.com> Date: Wed May 15 09:29:02 2019 +0800 [js-tests/cpp-tests] iOS: add fonts to Info.plist (#19708) * add fonts to Info.plist * use tabs instead of spaces * fix lua-tests commit a8019eb82762ffb44285d2991db6921e40f6cc72 Author: minggo <nudtzxm@gmail.com> Date: Tue May 14 01:56:03 2019 -0700 update release note and change log (#19711) commit 7ef9bb8c77ac50de8cf52f6cd5b2031ac08061f1 Author: Arnold <40414978+PatriceJiang@users.noreply.github.com> Date: Tue May 14 09:05:25 2019 +0800 fix get environment (#19690) commit 01a10631ca23fcd149811a55d4c64b568cb1f2e7 Author: Arnold <40414978+PatriceJiang@users.noreply.github.com> Date: Tue May 14 08:59:42 2019 +0800 rename Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.* to Cocos2dxLuaJavaBridge.* (#19694) commit 2a219a8e1b4e18977687c7c76a56f96e3cb43379 Author: leda <li_cheng_zhe@163.com> Date: Fri May 10 16:34:23 2019 +0800 fix twice copy lua scripts error (#19687) (#19691) commit 8e9edf6474ac3dbc4596a5957c9db20b05f36696 Author: Arnold <40414978+PatriceJiang@users.noreply.github.com> Date: Thu May 9 10:21:05 2019 +0800 protect empty string (#19680) commit 3266a22d5a599e8c016c925d01bf1378f6399f60 Author: minggo <nudtzxm@gmail.com> Date: Tue May 7 19:54:35 2019 -0700 modify engine version (#19677) commit 4930d155194a9d0b8ddeff7fd181d509051c7827 Merge: 3fd04f377d 5dd10214bf Author: Steve Tranby <stevetranby@gmail.com> Date: Thu Apr 25 22:17:55 2019 -0600 Merge commit '5dd10214bfb878bda131e2c988ea2bd2eb2829a1' into scgamex-v3 * commit '5dd10214bfb878bda131e2c988ea2bd2eb2829a1': Changed shader data types mediump to highp to remove possible sprite joggling on some Android phones. (#19633) remove redundant user-defined copy constructor and destructor, (#19636) move parseIntegerList to a free function in ccUtils, add few testcases (#19634) update binding generator (#19625) rewrite parseIntegerList with better performance (#19619) prefer delegate constructor over new(this) (#19613) fix outdated documentation [ci skip] (#19618) Optimize calls to std::string::find() and friends when the needle passed is a single character string literal. The character literal overload is more efficient. (#19614) add build test option for cmake (#19608) End the NS_CC properly. (#19603) fix static token array in headfile (#19164) fix base/CMakeLists.txt (#19575) Fix bug: can't play video in obbfile. (#19476) use CC_SAFE_DELETE_ARRAY instead of CC_SAFE_DELETE (#19580) Update CCArmature.cpp (#19579) revert threads (#19572) [windows] use PostMessage to replace SendMessage (#19569) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19563) Only send the ON_PERCENTAGE_CHANGED if and only if the percentage value has actually changed. (#19556) # Conflicts: #	cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_ui_auto_api.js #	cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp #	cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp #	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp #	cocos/scripting/js-bindings/manual/cocosbuilder/js_bindings_ccbreader.cpp #	cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp #	cocos/scripting/lua-bindings/auto/api/Slider.lua #	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.cpp #	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp #	cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp #	cocos/scripting/lua-bindings/manual/network/lua_xml_http_request.cpp #	extensions/Particle3D/PU/CCPUParticleSystem3D.cpp #	extensions/Particle3D/PU/CCPURendererTranslator.cpp #	extensions/Particle3D/PU/CCPUScriptTranslator.cpp #	extensions/Particle3D/PU/CCPUScriptTranslator.h commit 3fd04f377d0309926f4c79223ba8109d14ff58eb Author: Steve Tranby <stevetranby@gmail.com> Date: Thu Mar 28 18:53:35 2019 -0600 bump bindings-generator submodule commit 85bbea2e00937dadba2659a4b8a25a86c7d03592 Merge: 581949b982 a3a536e5af Author: Steve Tranby <stevetranby@gmail.com> Date: Thu Mar 28 18:50:25 2019 -0600 Merge commit 'a3a536e5af08e87d742ec2f01732d77c0589aa11' into scgamex-v3 * commit 'a3a536e5af08e87d742ec2f01732d77c0589aa11': [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically Ability to change title position Getting clearing color from Director interface Methods of changing clearing color Tabs to spaces Tabs to spaces Getting current clearing color in Renderer # Conflicts: #	cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js #	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp #	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp #	cocos/scripting/lua-bindings/auto/api/Director.lua #	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp #	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp commit 581949b98291e31c6f9c2820e9c55308876bbafe Author: Steve Tranby <stevetranby@gmail.com> Date: Thu Mar 28 18:47:01 2019 -0600 STEVE: add assert and null check commit 31f12e52d4705416356b42d8978d402b63da5fc1 Author: Steve Tranby <stevetranby@gmail.com> Date: Tue Mar 5 15:02:46 2019 -0700 minor cleanup commit 976995c54910d1ec0c2b3ebd956e01fdf9fe45a9 Merge: 9761254c29 f0f732cc90 Author: Steve Tranby <stevetranby@gmail.com> Date: Tue Mar 5 15:01:15 2019 -0700 Merge commit 'f0f732cc90c0ac18cbe2e4644f69c2bbfcc6a2bd' into HEAD * commit 'f0f732cc90c0ac18cbe2e4644f69c2bbfcc6a2bd': [Android] fix FileUtils::listFiles with path 'assets/' (#19457) Method to check if any IME dispatcher is active. (#19451) fix the member parameter:_percent is always be 0 during the update process. (#19419) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19439) # Conflicts: #	cocos/scripting/lua-bindings/auto/api/EventDispatcher.lua #	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp commit 9761254c29b2ef765cb0df30b2cf7d0087a5c4ed Merge: 43dab73e5b 0c57689213 Author: Steve Tranby <stevetranby@gmail.com> Date: Tue Feb 26 19:45:56 2019 -0700 Merge commit '0c576892132a619d2ee2fc7861ddd496a5f47001' into scgamex-v3 STEVE: removed all scripting/3d/etc support previously removed * commit '0c576892132a619d2ee2fc7861ddd496a5f47001': Lua: add manual bindings for EventDispatcher::addCustomEventListener (#19405) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19431) refine travis, don't generate binding codes for cpp only target (#19430) remove unneeded codes (#19421) need to generate binding codes for all targets (#19424) Fix memory leak if invoking Texture2D::setAlphaTexture many times. (#19400) fix header path include style (#19395) Font atlas texture initialization delayed (#19384) If path to file is tool long crash is possible. (#19383) Checking, does the touch is within the height of the line, not the height of the sprite? (#19394) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19390) Adds Configuration::getInfoAsMap() (#19381) # Conflicts: #	build/cocos2d_libs.xcodeproj/project.pbxproj #	build/cocos2d_tests.xcodeproj/project.pbxproj #	cocos/2d/CCTextFieldTTF.cpp #	cocos/editor-support/spine/Animation.c #	cocos/editor-support/spine/Animation.h #	cocos/editor-support/spine/AnimationState.c #	cocos/editor-support/spine/AnimationState.h #	cocos/editor-support/spine/AnimationStateData.c #	cocos/editor-support/spine/AnimationStateData.h #	cocos/editor-support/spine/Array.c #	cocos/editor-support/spine/Array.h #	cocos/editor-support/spine/Atlas.c #	cocos/editor-support/spine/Atlas.h #	cocos/editor-support/spine/AtlasAttachmentLoader.c #	cocos/editor-support/spine/AtlasAttachmentLoader.h #	cocos/editor-support/spine/Attachment.c #	cocos/editor-support/spine/Attachment.h #	cocos/editor-support/spine/AttachmentLoader.c #	cocos/editor-support/spine/AttachmentLoader.h #	cocos/editor-support/spine/AttachmentVertices.cpp #	cocos/editor-support/spine/Bone.c #	cocos/editor-support/spine/Bone.h #	cocos/editor-support/spine/BoneData.c #	cocos/editor-support/spine/BoneData.h #	cocos/editor-support/spine/BoundingBoxAttachment.c #	cocos/editor-support/spine/BoundingBoxAttachment.h #	cocos/editor-support/spine/ClippingAttachment.c #	cocos/editor-support/spine/ClippingAttachment.h #	cocos/editor-support/spine/Cocos2dAttachmentLoader.cpp #	cocos/editor-support/spine/Cocos2dAttachmentLoader.h #	cocos/editor-support/spine/Color.c #	cocos/editor-support/spine/Color.h #	cocos/editor-support/spine/Event.c #	cocos/editor-support/spine/Event.h #	cocos/editor-support/spine/EventData.c #	cocos/editor-support/spine/EventData.h #	cocos/editor-support/spine/IkConstraint.c #	cocos/editor-support/spine/IkConstraint.h #	cocos/editor-support/spine/IkConstraintData.c #	cocos/editor-support/spine/IkConstraintData.h #	cocos/editor-support/spine/Json.c #	cocos/editor-support/spine/MeshAttachment.c #	cocos/editor-support/spine/MeshAttachment.h #	cocos/editor-support/spine/PathAttachment.c #	cocos/editor-support/spine/PathAttachment.h #	cocos/editor-support/spine/PathConstraint.c #	cocos/editor-support/spine/PathConstraint.h #	cocos/editor-support/spine/PathConstraintData.c #	cocos/editor-support/spine/PathConstraintData.h #	cocos/editor-support/spine/PointAttachment.c #	cocos/editor-support/spine/PointAttachment.h #	cocos/editor-support/spine/RegionAttachment.c #	cocos/editor-support/spine/RegionAttachment.h #	cocos/editor-support/spine/Skeleton.c #	cocos/editor-support/spine/Skeleton.h #	cocos/editor-support/spine/SkeletonAnimation.cpp #	cocos/editor-support/spine/SkeletonAnimation.h #	cocos/editor-support/spine/SkeletonBatch.cpp #	cocos/editor-support/spine/SkeletonBatch.h #	cocos/editor-support/spine/SkeletonBinary.c #	cocos/editor-support/spine/SkeletonBinary.h #	cocos/editor-support/spine/SkeletonBounds.c #	cocos/editor-support/spine/SkeletonBounds.h #	cocos/editor-support/spine/SkeletonClipping.c #	cocos/editor-support/spine/SkeletonClipping.h #	cocos/editor-support/spine/SkeletonData.c #	cocos/editor-support/spine/SkeletonData.h #	cocos/editor-support/spine/SkeletonJson.c #	cocos/editor-support/spine/SkeletonJson.h #	cocos/editor-support/spine/SkeletonRenderer.cpp #	cocos/editor-support/spine/SkeletonRenderer.h #	cocos/editor-support/spine/SkeletonTwoColorBatch.cpp #	cocos/editor-support/spine/SkeletonTwoColorBatch.h #	cocos/editor-support/spine/Skin.c #	cocos/editor-support/spine/Skin.h #	cocos/editor-support/spine/Slot.c #	cocos/editor-support/spine/Slot.h #	cocos/editor-support/spine/SlotData.c #	cocos/editor-support/spine/SlotData.h #	cocos/editor-support/spine/TransformConstraint.c #	cocos/editor-support/spine/TransformConstraint.h #	cocos/editor-support/spine/TransformConstraintData.c #	cocos/editor-support/spine/TransformConstraintData.h #	cocos/editor-support/spine/Triangulator.c #	cocos/editor-support/spine/Triangulator.h #	cocos/editor-support/spine/VertexAttachment.c #	cocos/editor-support/spine/VertexAttachment.h #	cocos/editor-support/spine/VertexEffect.c #	cocos/editor-support/spine/VertexEffect.h #	cocos/editor-support/spine/extension.c #	cocos/editor-support/spine/extension.h #	cocos/editor-support/spine/spine-cocos2dx.cpp #	cocos/editor-support/spine/spine-cocos2dx.h #	cocos/editor-support/spine/spine.h #	cocos/platform/winrt/CCGLViewImpl-winrt.h #	cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js #	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp #	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp #	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj #	cocos/scripting/lua-bindings/auto/api/Application.lua #	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp #	cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp #	cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj #	tests/cpp-tests/Classes/Box2DTestBed/Test.h #	tests/cpp-tests/Classes/MaterialSystemTest/MaterialSystemTest.cpp #	tests/cpp-tests/Classes/Scene3DTest/Scene3DTest.cpp #	tests/cpp-tests/Classes/SpineTest/SpineTest.h #	tests/lua-tests/src/NewEventDispatcherTest/NewEventDispatcherTest.lua commit 43dab73e5b257f29102d85a7aa1b27daa2243a6d Merge: a8972806c0 8fc3b7b406 Author: Steve Tranby <stevetranby@gmail.com> Date: Wed Jan 30 11:09:53 2019 -0700 Merge commit '8fc3b7b4064b107d85c15a4895d08e9ad335b5a8' into scgamex-v3 * commit '8fc3b7b4064b107d85c15a4895d08e9ad335b5a8': (43 commits) update change log, "allow cleartext HTTP traffic" don't include template Add Android P cutout area support (#19286) refine cmake, allow developer switch Debug/Release in IDE (#19329) refine cmake, add iOS sign config (#19327) cmake support set iOS Deployment Target for root project (#19315) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19320) Ui video player new style looping input options (#19297) ReFix bug: PremultipliedAlpha is not working for png (#19138) Add clear request and responses method to httpclient (#19294) revert ndk-build final target, others need it (#19296) Fix for COCOS2D_DEBUG is always 1 on Android (#19291) update 3rd libs & console, fix file issues (#19284) Install ninja (#19298) [3rd-libs] upgrade to version 154 (#19282) Ability to get low coupling inheritance (#19276) cmake win32 Precompiled header (#19273) fix spritecache plist parsing issue (#19269) standardize pause & resume logic on GLSurfaceView (#19256) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#19267) update versoin code (#19265) ... # Conflicts: #	cocos/network/WebSocket.cpp #	cocos/platform/android/CCFileUtils-android.cpp #	cocos/scripting/js-bindings/CMakeLists.txt #	cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_experimental_video_auto_api.js #	cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.cpp #	cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp #	cocos/scripting/js-bindings/manual/ScriptingCore.cpp #	cocos/scripting/lua-bindings/auto/api/VideoPlayer.lua #	cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.cpp #	cocos/scripting/lua-bindings/auto/lua_cocos2dx_experimental_video_auto.hpp #	cocos/scripting/lua-bindings/manual/CCLuaStack.cpp #	cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp #	cocos/scripting/lua-bindings/proj.android/CMakeLists.txt #	templates/js-template-default/CMakeLists.txt #	templates/js-template-default/frameworks/runtime-src/Classes/AppDelegate.cpp #	templates/js-template-default/frameworks/runtime-src/proj.android/app/jni/Android.mk #	templates/lua-template-default/CMakeLists.txt #	templates/lua-template-default/frameworks/runtime-src/proj.android/app/jni/Android.mk #	tests/game-controller-test/Classes/GameControllerTest.cpp #	tests/js-tests/project/CMakeLists.txt #	tests/js-tests/project/Classes/AppDelegate.cpp #	tests/js-tests/project/proj.android/app/AndroidManifest.xml #	tests/js-tests/src/tests-main.js #	tests/lua-empty-test/project/CMakeLists.txt #	tests/lua-empty-test/project/Classes/AppDelegate.cpp #	tests/lua-empty-test/project/proj.android/app/AndroidManifest.xml #	tests/lua-game-controller-test/project/Classes/AppDelegate.cpp #	tests/lua-game-controller-test/project/proj.android/app/AndroidManifest.xml #	tests/lua-tests/project/CMakeLists.txt #	tests/lua-tests/project/proj.android/app/AndroidManifest.xml #	tests/lua-tests/project/proj.android/app/proguard-rules.pro #	tests/lua-tests/src/EffectsTest/EffectsTest.lua #	tests/lua-tests/src/ParticleTest/ParticleTest.lua #	tests/lua-tests/src/SpriteTest/SpriteTest.lua #	tests/lua-tests/src/TransitionsTest/TransitionsTest.lua #	tests/lua-tests/src/WebViewTest/WebViewTest.lua #	tests/lua-tests/src/mainMenu.lua #	tests/performance-tests/Classes/tests/BaseTest.cpp #	tools/cocos2d-console commit a8972806c0a012899e2a550af6b6c98a5ecac5aa Author: Steve Tranby <stevetranby@gmail.com> Date: Wed Jan 30 05:47:59 2019 -0700 file path cache logging for debug/profiling commit 038adc7a02f89546c686a900a5b9c896b9ec7ead Author: Steve Tranby <stevetranby@gmail.com> Date: Wed Dec 5 03:04:08 2018 -0700 fix issue from removal of JPG commit 6e92e0ec65f12620e13e64f5632fc2c416ed4d44 Author: Steve Tranby <stevetranby@gmail.com> Date: Wed Dec 5 03:03:54 2018 -0700 minor sign warning commit 47b94042fe06ca4570c5f4844fd44df8e7e81457 Author: Steve Tranby <stevetranby@gmail.com> Date: Wed Dec 5 03:03:39 2018 -0700 fix private ivars should be in .mm commit 5878122c752e82479bee55a9b436fc435795c64d Author: Steve Tranby <stevetranby@gmail.com> Date: Mon Dec 3 21:08:27 2018 -0700 STEVE: fix missing ccGLStateCache.cpp from targets commit 8c88adaa74a5b862b8361660286488f6a102021e Merge: 304e29ae58 ed2eab5297 Author: Steve Tranby <stevetranby@gmail.com> Date: Mon Dec 3 14:33:56 2018 -0700 Merge commit 'ed2eab52973eb614e14f6680b9c0bbd315b017a5' into scgamex-v3 * commit 'ed2eab52973eb614e14f6680b9c0bbd315b017a5': Fix animation duration calculation (#19221) Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212) Switch travis CI to xenial (#19207) add testcase for lua downloader binding (#19182) # Conflicts: #	tests/lua-tests/src/mainMenu.lua commit 304e29ae583f0e92f58b5820ad99ba5729b7a72c Merge: 8af4e3b93e 7faf5cfacc Author: Steve Tranby <stevetranby@gmail.com> Date: Mon Dec 3 14:33:22 2018 -0700 Merge commit '7faf5cfacc516a014bf1586ce653574a97ec7788' into scgamex-v3 STEVE: removed anything that was previously removed js/lua/etc * commit '7faf5cfacc516a014bf1586ce653574a97ec7788': [cpp test]fix SequenceAction count error (#19222) [cpp-test ios]Extensions/WebSocketTest/add CA for binary test (#19220) 3d touch works on iPhone6s+, not only (#19217) remove item in changelog Revert "Remove ccglstatecache (#19013)" Revert "fix crash of cclayercolor and fix some other error logic (#19177)" # Conflicts: #	build/cocos2d_libs.xcodeproj/project.pbxproj #	cocos/deprecated/CCDeprecated.h #	cocos/editor-support/spine/SkeletonTwoColorBatch.cpp #	cocos/navmesh/CCNavMeshDebugDraw.cpp #	cocos/physics3d/CCPhysics3DDebugDrawer.cpp #	cocos/platform/android/CCFileUtils-android.cpp #	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp #	cocos/scripting/lua-bindings/manual/cocos2d/LuaOpengl.cpp #	cocos/vr/CCVRGenericRenderer.cpp #	tests/cpp-tests/Classes/Box2DTestBed/Box2dView.cpp #	tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp #	tests/js-tests/project/Classes/js_DrawNode3D_bindings.cpp #	tests/lua-empty-test/project/proj.mac/main.cpp #	tests/lua-tests/project/Classes/lua_test_bindings.cpp commit 8af4e3b93e1528699e2fdf38aa585215b0e07ebf Author: Steve Tranby <stevetranby@gmail.com> Date: Mon Dec 3 14:26:52 2018 -0700 STEVE: removing more unused classes for build times commit 80de4dac8c28ff770b4efb1170709c43907df83a Author: Steve Tranby <stevetranby@gmail.com> Date: Sun Dec 2 17:48:02 2018 -0700 STEVE: removing unused classes from project, fix resulting issues commit 81c0bf6f5273c9bb8524229f9da0240238b82500 Author: Steve Tranby <stevetranby@gmail.com> Date: Wed Nov 28 22:14:33 2018 -0700 fix printf type mismatch commit 368c31eebbed25c0099fa537b1ec2f95c380dbf9 Merge: d08c0d1608 fde4e6387d Author: Steve Tranby <stevetranby@gmail.com> Date: Wed Nov 28 21:43:55 2018 -0700 Merge commit 'fde4e6387d6e6e19badb41c8ba2aa365045b68ec' into scgamex-v3 STEVE: - removed js/lua stuff * commit 'fde4e6387d6e6e19badb41c8ba2aa365045b68ec': (35 commits) [js tests] add index, simplify (#19218) update cocos console (#19216) [js interval tests] use labelBMFont instead of labelTTF, improve preformance (#19215) [lua test]FontTest resize page (#19213) [lua test]Extensions scroll pos error (#19214) cpp-tests/Bugs add titles & lua bugs/1174 decrease loop count (#19205) [cpp-tests] improve items location of part cases (#19210) [cmake] fix iOS xcode property setting failed (#19208) Node:Particle3D effects abnormal, texture incorrect (#19204) [js-tests mac/Android] Extensions Test-> Websocket->Send text, fix cafile (#19202) [cpp-test] DownloaderTest url expires (#19203) [android tests] setup project name in AndroidStudio dashboard (#19200) [lua test-android]WebViewTest button overlapping (#19201) [cpp-test mac] 19：Extension->4SocketIOTest->Open SocketIO Endpoint crashfix (#19199) [cpp test-Android、mac]46：Node：Sprite3D->25 crash (#19198) [cpp test-Android]20：FileUtils/2 change title (#19197) [cpp test-windows]46/26 clear mode crash (#19195) [js-test win32]XMLHttpRequest gzip deflate & fix xcode project include paths (#19194) [js-test] Chipmunk Tests/ Chipmunk Release Tests crash fix (#19193) Fix crash in cocos2dx-JS if garbage collection runs between Touchstart and TouchEnd events. (#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/Icon-20@2x.png #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-20@3x.png #	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/Icon-29@2x.png #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png #	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/Icon-40@2x.png #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png #	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/Icon-50@2x.png #	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/Icon-57@2x.png #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png #	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/Icon-72@2x.png #	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/Icon-76@2x.png #	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-83.5@2x.png #	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/Icon-20@2x.png #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-20@3x.png #	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/Icon-29@2x.png #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png #	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/Icon-40@2x.png #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png #	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/Icon-50@2x.png #	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/Icon-57@2x.png #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png #	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Ima…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

1 participant

@PatriceJiang