Font atlas texture initialization delayed #19384

sbrednikhin · 2019-02-05T12:42:13Z

If you will try to create CCLabel with True Type font, enabling it's outline and change it's font size with separate commands you will create multiple textures for font atlases, one for label second for label with outline, and third for label with another font size.
Moving texture initialization from constructor and calling it later, right before usage will cause large memory economy, because even if atlases will be created they won't create textures of allocate memory for current page data.

If you will try to create CCLabel with True Type font, enabling it's outline and change it's font size with separate commands you will create multiple textures for font atlases, one for label second for label with outline, and third for label with another font size. Moving texture initialization from constructor and calling it later, right before usage will cause large memory economy, because even if atlases will be created they won't create textures of allocate memory for current page data.

minggo · 2019-02-13T05:58:31Z

It looks good to me, but i am not sure if this function will be invoked before used. @PatriceJiang please take a look.

STEVE: removed all scripting/3d/etc support previously removed * commit '0c576892132a619d2ee2fc7861ddd496a5f47001': Lua: add manual bindings for EventDispatcher::addCustomEventListener (cocos2d#19405) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19431) refine travis, don't generate binding codes for cpp only target (cocos2d#19430) remove unneeded codes (cocos2d#19421) need to generate binding codes for all targets (cocos2d#19424) Fix memory leak if invoking Texture2D::setAlphaTexture many times. (cocos2d#19400) fix header path include style (cocos2d#19395) Font atlas texture initialization delayed (cocos2d#19384) If path to file is tool long crash is possible. (cocos2d#19383) Checking, does the touch is within the height of the line, not the height of the sprite? (cocos2d#19394) [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19390) Adds Configuration::getInfoAsMap() (cocos2d#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

minggo · 2019-04-10T03:55:40Z

it is synchronized to metal-support branch in #19592

If you will try to create CCLabel with True Type font, enabling it's outline and change it's font size with separate commands you will create multiple textures for font atlases, one for label second for label with outline, and third for label with another font size. Moving texture initialization from constructor and calling it later, right before usage will cause large memory economy, because even if atlases will be created they won't create textures of allocate memory for current page data.

After movig font atlas `reinit()` (cocos2d#19384) there was indused a problem: the first display of text with a outline in the label does not update line height. This is because the atlas `reinit()` does not occur when the outline is activated. In this case, a new atlas will be created, but the line height will not be taken from it, because line height calculate in `updateContent()`. I propose line height calculating to return to the font atlas constructor.

After movig font atlas `reinit()` (#19384) there was indused a problem: the first display of text with a outline in the label does not update line height. This is because the atlas `reinit()` does not occur when the outline is activated. In this case, a new atlas will be created, but the line height will not be taken from it, because line height calculate in `updateContent()`. I propose line height calculating to return to the font atlas constructor.

* [lua android] use luajit & template cmake update (cocos2d#19239) * [lua android] use luajit & template cmake update * update external to v150 * update external to 151 * fix small type error in ScriptingCore (cocos2d#19244) * [lua-tests] fix LuaJavaBridge crash on release mode (cocos2d#19248) * [external] update to v152 (cocos2d#19247) * [external] update to v152 * luaL_reg -> luaL_Reg * [lua tests]fix evalJs 'alert' frozen (cocos2d#19249) * update CHANGELOG (cocos2d#19250) * update CHANGELOG * fix typo * fix typo 2 * [lua-tests] use math.fmod & lua downloader binding clear stack (cocos2d#19255) * [lua] add lua_downloader comments, use luaL_register * chage math.mod to math.fmod * fix stack error * [lua] remove luaL_error, which kill process (cocos2d#19257) * [vs2017] upgrade 3rd party libs to support vs2017 in release mode (cocos2d#19259) * [uibutton] fix size init order (cocos2d#19260) * increase cmake stability , remove tests/CMakeLists.txt (cocos2d#19261) * Update changelog and release note (cocos2d#19264) * add ReleaseNotes * update versoin code (cocos2d#19265) * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19267) * standardize pause & resume logic on GLSurfaceView (cocos2d#19256) * fix spritecache plist parsing issue (cocos2d#19269) * cmake win32 Precompiled header (cocos2d#19273) * Precompiled header * Fix * Precompiled header for cocos * Precompiled header jscocos2d * Ability to get low coupling inheritance (cocos2d#19276) It is necessary for flexible inheritance from the base class. * [3rd-libs] upgrade to version 154 (cocos2d#19282) * Install ninja (cocos2d#19298) * Install ninja * Fix android_cocos_new_test * update 3rd libs & console, fix file issues (cocos2d#19284) * trigger compile * update libs * update 3rd party libs version * Fix for COCOS2D_DEBUG is always 1 on Android (cocos2d#19291) Related cocos2d#19289 * revert ndk-build final target, others need it (cocos2d#19296) * Add clear request and responses method to httpclient (cocos2d#19294) * Added functionality to clear pending responses and requests in the http client * Responses and Requests now are processed in similar way * Fix for clearing the http requests * Added tests for HttpClient::clearResponseAndRequestQueue * ReFix bug: PremultipliedAlpha is not working for png (cocos2d#19138) * Ui video player new style looping input options (cocos2d#19297) * Implemented looping and disable user input for uiVideoPlayer * Fixes on how to handle sub states * Added UI Video Player Demo for Loop, style and user input enabled options * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19320) * cmake support set iOS Deployment Target for root project (cocos2d#19315) * support set ios deployment target for root project * update gitignore * refine cmake, add iOS sign config (cocos2d#19327) * refine cmake, add ios sign config * switch the interface orientations order at info.plist * refine cmake, allow developer switch Debug/Release in IDE (cocos2d#19329) * refine cmake, support multi configuration when generate Xcode/VS * docs update * cmake, update multi config condition * remove custom target property: CC_DEPEND_DLLS * cmake, adapt res copy to multi config types * move "APP_RES_DIR" up, and improve setup_cocos_app_config * move repeat comments into docs * notify user the copy file process * target_link_options isn't supported until cmake 3.13 * cmake readme update * Add Android P cutout area support (cocos2d#19286) * Add Android P cutout area support Related cocos2d#19285 * coding style fix * Update AppActivity.java Fix android build * suppress lint new api errors * update change log, "allow cleartext HTTP traffic" don't include template * Adds Configuration::getInfoAsMap() (cocos2d#19381) * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19390) * Checking, does the touch is within the height of the line, not the height of the sprite? (cocos2d#19394) * If path to file is tool long crash is possible. (cocos2d#19383) * If path to file is tool long crash is possible. If path to file is tool long crash is possible, because of chart buffer overflow. * Incorrect replacement. Using iterator is better. * Style fix * Correct naming * Font atlas texture initialization delayed (cocos2d#19384) If you will try to create CCLabel with True Type font, enabling it's outline and change it's font size with separate commands you will create multiple textures for font atlases, one for label second for label with outline, and third for label with another font size. Moving texture initialization from constructor and calling it later, right before usage will cause large memory economy, because even if atlases will be created they won't create textures of allocate memory for current page data. * fix header path include style (cocos2d#19395) * Fix memory leak if invoking Texture2D::setAlphaTexture many times. (cocos2d#19400) * need to generate binding codes for all targets (cocos2d#19424) * need to generate binding codes for all targets * all targets depend on ndk, for gen bindings * fix lack python module * remove unneeded codes (cocos2d#19421) * remove unneeded codes * remove winrt and win8.1 * fix compiling error on android * refine travis, don't generate binding codes for cpp only target (cocos2d#19430) * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19431) * Lua: add manual bindings for EventDispatcher::addCustomEventListener (cocos2d#19405) * Lua: add manual bindings for EventDispatcher::addCustomEventListener * Lua: Testcase for EventDispatcher::addCustomEventListener * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19439) * fix the member parameter:_percent is always be 0 during the update process. (cocos2d#19419) * Method to check if any IME dispatcher is active. (cocos2d#19451) Useful feature to know if any text field or custom IME dispatcher is active * [Android] fix FileUtils::listFiles with path 'assets/' (cocos2d#19457) * Getting current clearing color in Renderer Will be useful. * Tabs to spaces * Tabs to spaces * Methods of changing clearing color * Getting clearing color from Director interface * Ability to change title position * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically * Only send the ON_PERCENTAGE_CHANGED if and only if the percentage value has actually changed. * Only send the ON_PERCENTAGE_CHANGED if and only if the percentage value has actually changed. (cocos2d#19556) * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19563) * [windows] use PostMessage to replace SendMessage (cocos2d#19569) * revert threads (cocos2d#19572) * Update CCArmature.cpp (cocos2d#19579) There is an unmatched ");" in the file at line 720. * use CC_SAFE_DELETE_ARRAY instead of CC_SAFE_DELETE (cocos2d#19580) * Fix bug: can't play video in obbfile. (cocos2d#19476) * Fix bug: can't play video in obbfile. * Change check order. * fix base/CMakeLists.txt (cocos2d#19575) * fix static token array in headfile (cocos2d#19164) The token array shouldn't be static in CCPUScriptTranslator.h, otherwise including it will generate duplicate token array. * End the NS_CC properly. (cocos2d#19603) * Update UIDeprecated.cpp There is no need of this last "}". * End the NS_CC properly. Change the "}" with NS_CC_END to avoid misunderstandings. * add build test option for cmake (cocos2d#19608) * add build test option for cmake * configure build test option for cmake * 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. (cocos2d#19614) * fix outdated documentation [ci skip] (cocos2d#19618) * prefer delegate constructor over new(this) (cocos2d#19613) * rewrite parseIntegerList with better performance (cocos2d#19619) * update binding generator (cocos2d#19625) * move parseIntegerList to a free function in ccUtils, add few testcases (cocos2d#19634) * remove redundant user-defined copy constructor and destructor, (cocos2d#19636) as compiler auto-generated ones are working fine. * Changed shader data types mediump to highp to remove possible sprite joggling on some Android phones. (cocos2d#19633) * Optimize cases where loop variable is unecessarily copied in a range-for loop. (cocos2d#19637) Pass by const reference when appropriate. * Make precheader files PRIVATE, otherwise they leak to the game project (e.g. precheader.cpp visible in MyGame's Visual Studio project). * add optimization for OPPO. (cocos2d#19631) * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19644) * add clang-tidy support (cocos2d#19643) * add clang-tidy support * move clang_tidy_test up in travis yaml file so that it's run first * use dump-config to generate .clang-tidy file * use flexible way to find run-clang-tidy.py clang-tidy and run-clang-tidy.py shares common ancester directory. find the script dynamically rather than hard-coding it. * place clang-tidy check options in separate lines * clang_tidy_test target clean up * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19648) * fix FastTMXLayer with anchor point * fix FastTMXLayer does not reflect Opacity * fix Sprite update_blend_func (cocos2d#19649) * minor refactoring of AudioEngine * emplace_back accept constructor args directly * use reserve * remove superfluous null pointer check * add null pointer check * The scene stack should be cleared in a LIFO manner, which allows for releasing the allocated resources in the correct order, being last in, first out, as is the purpose of the stack. * Gradle.5.1.1 (cocos2d#19657) * gradle-5.1.1 * update bindings-generator * classpath 'com.android.tools.build:gradle:3.4.0' * enable more clang-tidy performance options (cocos2d#19656) * enable more clang-tidy performance options * fix warning: performance-type-promotion-in-math-fn prefer c++ math functions, as it handles float and double case correctly. For example, std::sin has overload for both float and double, but sin only has double argument. C++ math functions avoids unnecessary floating point type conversions. * add missing cmath headers * change log to std::log * fix concave polygon bug in DrawNode (cocos2d#19641) * add concave polygon support to DrawNode * change to cocos2d-x coding style * add the url of the code comes from * move test code to a seperate class * add new clang-tidy option (cocos2d#19670) * add new clang-tidy option * readability-container-size-empty * minor fix for UnitTest * clang-tidy: filter external directory * add comment on python regular expression [ci skip] * add new clang-tidy option (cocos2d#19682) * add new clang-tidy option * readability-delete-null-pointer * more fix for readability-delete-null-pointer * modify fdGetter (cocos2d#19671) * modify fdGetter * Check whether a music file is in the OBB file * fix twice copy lua scripts error (cocos2d#19687) * FIX ios bug : You don’t have permission to save the file “Documents_temp” The iOS side, eg:Writable directory is "**/Documents/",old code will get "**/Documents_temp/", However, due to the sandbox mechanism of iOS, you do not have the permission of this directory, so instead fixed it to "**/Documents/_temp/" * fix toupper function call * Original pointer cast does nothing, as it doesn't change signature * toupper arugment type should be unsigned char Reference: https://en.cppreference.com/w/cpp/string/byte/toupper * setPercent after initialization (cocos2d#19689) * refactor CCIMEDispatcher (cocos2d#19688) * remove superfluous destructor * use range-based for loop * correct some documentation * add new clang-tidy option (cocos2d#19698) * readability-redundant-control-flow * Fix APK not have assets folder (cocos2d#19679) * Fix APK not have assets folder * Android project: copy all res to assets folder * remove duplicate function call in cmake (cocos2d#19697) * AssureOutOfSourceBuilds() is called in module file. No need to call it in root cmake file. * fix for cocos2d#19713 (cocos2d#19714) cocos2d#19713 * add missing header * fix string append (cocos2d#19717) * add new clang-tidy option (cocos2d#19699) * readability-redundant-string-cstr * use string::append change name * fix assign nullptr to std::string (cocos2d#19615) * Support new Mali GPUs (cocos2d#19411) * Support new Mali GPUs Some new Mali GPUs use FP16 for matrix that is not precise enough. Should be FP32. Tested on Mali-T880. The same issue is described here: https://discuss.cocos2d-x.org/t/critical-issue-regarding-rendering-on-devices-with-renderer-type-mali/45568 * More convenient way to fix the shader precision. * [Change] the CC_64BITS macro to 64-bit decision. (cocos2d#19723) * fix wrong buffer type (cocos2d#19724) * new clang-tidy option: readability-string-compare (cocos2d#19742) * [Android] gradle copy resources to assets folder before `preDebug|ReleaseBuild` (cocos2d#19732) * fix get environment * update gradle.scripts * fix error * remove extract modifications * remove redundant semicolon (cocos2d#19743) * render state of technique shuold be saved in technique (cocos2d#19725) * fix (cocos2d#19749) * add clang-tidy-bugprone options (cocos2d#19750) * add clang-tidy-bugprone options * bugprone-argument-comment * bugprone-bool-pointer-implicit-conversion * bugprone-dangling-handle * bugprone-fold-init-type * bugprone-forward-declaration-namespace * enable more clang-tidy bugprone options * bugprone-forwarding-reference-overload * bugprone-inaccurate-erase, * bugprone-incorrect-roundings, * Merge 3.17.2 (cocos2d#19755) * modify engine version (cocos2d#19677) * protect empty string (cocos2d#19680) * fix twice copy lua scripts error (cocos2d#19687) (cocos2d#19691) * rename Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.* to Cocos2dxLuaJavaBridge.* (cocos2d#19694) * fix get environment (cocos2d#19690) * update release note and change log (cocos2d#19711) * [js-tests/cpp-tests] iOS: add fonts to Info.plist (cocos2d#19708) * add fonts to Info.plist * use tabs instead of spaces * fix lua-tests * Update CHANGELOG * setPercent after initialization (cocos2d#19718) * remove void arg in func delcaration and reformat (cocos2d#19758) f(void) is same as f() in C++ (but not in C), hence removing void. And reformat the code around f(void) a bit. * refactor CCBundle3DData (cocos2d#19756) * remove superfluous constructor and non-virtual destructor destructor should be trivial if it doesn't manage resource. A vector member clears itself automatically. No need to call `clear` in destructor. * refactor CCScene (cocos2d#19767) * refactor-CCScene prefer in-class initialization * in-class initialization of pointer to nullptr * Added support for saving images with non-premultiplied alpha (cocos2d#19782) * Added RenderTexture::saveToFileAsNonPMA() to save images without PMA. Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA. Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public. Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA. Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file. Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving. * [CCImage-ios.mm] Fixed indentation. * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19796) * skip shapes of 0 area in processTriangles (cocos2d#19791) * [Android]Override removeDirectory function in FileUtilsAndroid, fix "rm not found" error on OPPO ColorOS (cocos2d#19790) * Override removeDirectory function in FileUtilsAndroid，use JRE method instead of "rm -r path". Because We found that on OPPO's ColorOS, the environment variable PATH may not always correct, it could be ":/sbin" sometimes, then cause an error "rm not found", afterwards the directory could not be deleted。 * omitted variable while call removeDirectoryJNI * rename RemoveDirectory->renameDirectory obey the coding rule * rename childFile to childrenFile * more clang-tidy perf options (cocos2d#19783) * performance-move-constructor-init * performance-unnecessary-copy-initialization Disable warnings on RefPtr refcount test case. * fix return value in EditBoxImpl-linux (cocos2d#19798) also remove some redundant semicolon * refactor use const reference * android_allowBackup2 * update log_ref (cocos2d#19840) * update travis ci configuration (cocos2d#19841) * install g++6.0 in travis (cocos2d#19842) * refactor AudioEngine-Linux (cocos2d#19822) * refactor AudioEngine and AudioEngine-linux * map::erase() can handle case if key doesn't exist. * use map::iterator when it has already obtained. * mapChannelInfo[id].channel is nullptr befor resume(). Don't dereference it. * FMOD::System::release() calls close, so calling close before release is not necessary. * use std::map::insert properly. * remove unnecessary null check on _audioEngineImpl * add comment on nullptr dereference * refactor CCGeometry (cocos2d#19847) * remove redundant copy constructor and copy assignment operator * use delegate constructor to simply code * fix a documentation error * fix memory leak in CCUserDefault (cocos2d#19853) fastSet makes the Data object managing a new memory area in [bytes, bytes + size), but it doesn't releasing the old data it managed. Failure to release the old data causes memory leak. The default constructed Data manages null memory, so calling fastSet on it is fine. Because `Data ret = defaultValue;` malloc new memory, we might have better performance without it. * update oppo sdk. (cocos2d#19864) * update to 3.17.2 (cocos2d#19869) just in case developer clones repo and then uses version as a conditional..... * Speed up post build step by disabling unnecessary cmake command (cocos2d#19873) * Added RenderTexture::saveToFileAsNonPMA() to save images without PMA. Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA. Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public. Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA. Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file. Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving. * [CCImage-ios.mm] Fixed indentation. * Disabled unnecessary console output from CMake for each and every resource file being copied, which was slowing down builds when there is a large amount of resource names to print out. Simply having "copying resources..." before the process begins is sufficient. The disabled code was just commented out, so can be re-enabled for debugging purposes if required. * [JSB] Some fixes for cc.DrawNode: (cocos2d#19889) - It was using the same _drawColor field for all instances - drawSegment() was not checking the optional parameters the way web does, which led to different outcomes * clang-tidy: performance-unnecessary-value-param (cocos2d#19870) * clang-tidy: performance-unnecessary-value-param * Reference: https://releases.llvm.org/7.0.0/tools/clang/tools/extra/docs/clang-tidy/checks/performance-unnecessary-value-param.html * perfer pass by const reference If a object is passed by value and moved to new value. Prefer passing it by reference and copy it, if allowed. * Add the ability to set global Z order of physics debug draw node (cocos2d#19885) * Added RenderTexture::saveToFileAsNonPMA() to save images without PMA. Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA. Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public. Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA. Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file. Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving. * [CCImage-ios.mm] Fixed indentation. * Added the ability to set the global Z order of the debug node, since it may not be visible if utilizing global Z in objects within a scene. * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19895) * fix Wformat warnings (cocos2d#19893) * add setOptimise function for c++ (cocos2d#19882) * refactor ObjectFactory (cocos2d#19902) * remove redundant copy constructor, copy assignment operator, and destructor in TInfo. * prefer in-class member initialization. * default construct std::function, and use `default` * fix overload resolution * return early in multiple conditionals * remove unimplemented removeAll() * remove typedef that's only used in one place and in private scope * clang tidy modernize redundant void arg (cocos2d#19900) * add new clang-tidy option above * fix warnings from performance-unnecessary-value-param Reference: https://releases.llvm.org/7.0.0/tools/clang/tools/extra/docs/clang-tidy/checks/modernize-redundant-void-arg.html * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#19920) * fix ZipUtils memory-malloc succ check error. (cocos2d#19923) * fix lua arg check error. (cocos2d#19924) * Fix cocos2d-js issue: Font height was not getting calculated properly in iOS. (cocos2d#19926) * disable clang-tidy checks on script bindings code (cocos2d#19928) * Fix divide by zero in ui::Slider (cocos2d#19957) * Added RenderTexture::saveToFileAsNonPMA() to save images without PMA. Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA. Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public. Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA. Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file. Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving. * [CCImage-ios.mm] Fixed indentation. * [UISlider.cpp] Divide by 0 error if _maxPercent is equal to 0, which is an allowed value. * Small performance boost in using Mat4::operator*= instead of operator* (cocos2d#19960) This avoids creating a new temporary Mat4 transform in operator* https://github.com/cocos2d/cocos2d-x/blob/v3/cocos/math/Mat4.inl#L60 * fix android crash in special http request header (cocos2d#19899) only crash clang + c++_static * clang-tidy clang-tidy-modernize-use-emplace (cocos2d#19955) * clang-tidy clang-tidy-modernize-use-emplace * Reference: https://clang.llvm.org/extra/clang-tidy/checks/modernize-use-emplace.html * use vector.reserve * remove app from recent apps when exit (cocos2d#19961) * Update 3rd party lib references (cocos2d#19959) * Added RenderTexture::saveToFileAsNonPMA() to save images without PMA. Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA. Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public. Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA. Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file. Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving. * [CCImage-ios.mm] Fixed indentation. * Update to v3-deps-159 * refactor-CCDrawNode (cocos2d#19969) * remove unecessary intermediate temp variables * remove redundant pointer cast * remove redundant memset, as the values are assigned immediately in a for loop. * minor formatting * Revert "Small performance boost in using Mat4::operator*= instead of operator* (cocos2d#19960)" (cocos2d#19975) This reverts commit a242a79. * refactor CCDrawNode: part2 (cocos2d#19972) This commit deletes all v2xx static free functions. All these changes are contained within the file. * replace v2fzero with Vec2::ZERO * remove __v2f, as it does nothing * rename __t to v2ToTex2F to reflect what the function does * remove the rest of functions, as Vec2 already includes them as member functions * upgrade glfw to 3.3 (cocos2d#19971) * Support interface only libraries (cocos2d#19855) * Added RenderTexture::saveToFileAsNonPMA() to save images without PMA. Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA. Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public. Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA. Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file. Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving. * [CCImage-ios.mm] Fixed indentation. * Added support for interface-only libraries being linked to application via target_link_libraries. Certain library properties cannot be accessed if it is an interface only library, so we need to check if they are valid library types before accessing those properties. * Fixed formatting. * remove MainMenu.xib file. (cocos2d#19968) * remove MainMenu.xib file. * fix compile error * don't invoke super.onPause() to prevent egl context lost (cocos2d#19996) * fix v3 travis compiling error (cocos2d#20002) * in Node::enumerateChildren, searchFromParent shouldn't search from children (cocos2d#20007) * searchFromParent shouldn't search from grand children * fix RotateTo animation when angle is bigger than 360 (cocos2d#20009) * fix crash when plist filename hasn't suffix (cocos2d#19999) * [v3] add renderer performance test (cocos2d#20010) * refactor Quaternion class (cocos2d#20031) * remove redundant copy constructor and destructor * Fixing a bug in Node::enumerateChildren (cocos2d#20045) This patch fixes an issue that if both // (recursive enumeration) and .. (starting from parent node) are specified, Node::enumerateChildren does not honor the latter and starts searching from current node rather than parent node. * update deps (cocos2d#20051) * fix FastTMXLayer (cocos2d#20066) * update external (cocos2d#20068) * [bugfix] v3 Fileutils iOS isDirectory (cocos2d#20080) * use AVPlayerController instead (cocos2d#20085) * Ios webview (cocos2d#20098) * Use external-deps-163 (cocos2d#20114) * fix memory leak (cocos2d#20110) * uses the same precision for uniforms (cocos2d#20107) * fix bug that system font is not rendered correctly on macOS Catalina (cocos2d#20124) * Fix error with update line height (cocos2d#19914) After movig font atlas `reinit()` (cocos2d#19384) there was indused a problem: the first display of text with a outline in the label does not update line height. This is because the atlas `reinit()` does not occur when the outline is activated. In this case, a new atlas will be created, but the line height will not be taken from it, because line height calculate in `updateContent()`. I propose line height calculating to return to the font atlas constructor. * Fix include order for Win32. * Remove tinyxml2 from CCSaxParser implement. (cocos2d#20141) * Fix RenderTexture PMA setting (cocos2d#20143) * Added RenderTexture::saveToFileAsNonPMA() to save images without PMA. Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA. Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public. Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA. Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file. Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving. * [CCImage-ios.mm] Fixed indentation. * Corrects the PMA setting on the internal Texture2D instance created by RenderTexture. * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#20148) * set software mode will slow down performance (cocos2d#20152) * Sprite and RenderTexture blending mode set based off texture premultiplied alpha setting (cocos2d#20154) * Added RenderTexture::saveToFileAsNonPMA() to save images without PMA. Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA. Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public. Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA. Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file. Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving. * [CCImage-ios.mm] Fixed indentation. * [CCSprite.cpp] Sprite:initWithTexture() should set the blend mode depending on the texture premultiplied alpha setting. [CCRenderTexture.cpp] Sprite::setOpacityModifyRGB() is set based on the premultiplied alpha setting. * Fix for incorrect _opacityModifyRGB on non-PMA. * [CCSprite.cpp] Removed redundant code related to blending mode and opacityModifyRGB when creating a sprite with a texture. * Make luabindings framework compat with lua52 & lua53. (cocos2d#20157) * Make luabindings framework compat with lua52 & lua53. * Remove link from static lib, let user can choose which lua version hi want. * Add lua51.lib dependencies for win32. * [v3] update submodule cocos2d-console (cocos2d#20132) * [v3] update submodule cocos2d-console recompile luajit-mac with -DLUAJIT_ENABLE_GC64 * update ref * Rename cocos2d::MessageBox to cocos2d::ccMessageBox. (cocos2d#20159) * Rename cocos2d::MessageBox to cocos2d::ccMessageBox to avoid confilicit with win32 API macro 'MessageBox'. * Sync non-win32 platforms. * fix OpenGL ERROR 0x0502 cannot delete VAO 0 (cocos2d#20178) * Upgrade minizip to 1.2.0 (cocos2d#20158) * Added JS stack trace (cocos2d#20168) * Update ZipUtils.cpp (cocos2d#20192) * Update deps to 167 (cocos2d#20194) * fix text wrong warp issue (cocos2d#20225) * fix issue: TextField can not receive characters(non number or english… (cocos2d#20209) * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#20231) * PostMessage to SendMessage (cocos2d#20199) * fix issue that can not receive Chinese characters with system input m… (cocos2d#20232) * update bullet (cocos2d#20240) * add missing function (cocos2d#20250) * Revert "fix RotateTo animation when angle is bigger than 360 (cocos2d#20009)" (cocos2d#20256) This reverts commit c840544. * update Node::getTag comment (cocos2d#20255) this fixes a typo where getTag should suggest to use getName, like setTag and removeChildrenByTag does. * add default CFBundleShortVersionString value to info.plist * Unify the effect of printing multiline logs. Now all platforms will have the same lines. * Fixes so that in the web view we are able to navigate different links correctly <Deep> (cocos2d#20266) * remove extern "C" from base/base64.h for avoiding base64 function symbols conflict at linking libraries. (cocos2d#20276) * fix lua header path including error (cocos2d#20277) * fix lua header path error Include both lua header file and luajit header file may cause problem. * fix textfield issues (cocos2d#20294) * don't set glview transparent, it many cause afterimage (cocos2d#20298) * Allow game code to override BM Font parsing and support rotated font atlas textures (cocos2d#20300) * Added RenderTexture::saveToFileAsNonPMA() to save images without PMA. Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA. Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public. Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA. Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file. Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving. * [CCImage-ios.mm] Fixed indentation. * [CCFontFNT.cpp/.h] Allow game to override FNT file parsing for extended formats. [CCFontAtlas] Added flag to indicated if a texture is rotated in FontLetterDefinition. This will allow for embedding a font atlas image inside a larger image atlas that supports rotation. [CCLabel.cpp] Ensure that the rotated flag in the font letter definition is used when creating a sprite for the letter. * [CCFontFNT.h] Fixed missing include statements. * Recompile luajit (cocos2d#20306) * Recompile luajit upgrade luajit in mac & ios * target_link_options is not supported until 3.13 * update external * update exteral, luajit -fPIC * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#20312) * [iOS]Screen Time would makes App stuck sometimes (cocos2d#20313) * Screen Time would prevent UIApplicationDidBecomeActiveNotification and UIApplicationWillResignActiveNotification from being fired until reboot the iPad. * code format fix * fixed broken links, removed outdated links. (cocos2d#20318) fixed broken links, removed outdated links. * Cmake mult config (cocos2d#20317) * MINSIZEREL_RELWITHDEBINFO_Support * Remove DEBUG_MODE * Fix clang-tidy * Improve bmfont api (cocos2d#20309) * Added RenderTexture::saveToFileAsNonPMA() to save images without PMA. Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA. Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public. Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA. Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file. Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving. * [CCImage-ios.mm] Fixed indentation. * Added support for adding bitmap font atlas image sub-textures in a larger image atlas. Also supports sub-texture rotation (90 degrees to the right, which is the default of the PLIST atlas format). * [LabelTest.cpp] Updated BMFontOneAtlas test to support new BMFont label API * [CCFontFNT.cpp] Added missing include statement. * Updated LUA and JS bindings for the new BMFont code. [CCLabelBMFont] This deprecated class required some modifications to work with the manual LUA bindings. * [CCLabelBMFont] Reverted the API to the original interface since this class is deprecated. Updated JS bindings. * [LabelTest/LabelTest.cpp] Reverted usage of deprecated API. * Re-added old API for creating bitmap font labels, but prefixed them as deprecated, in order to keep backwards compatibility. * Fix for incorrect usage of variable that may be null. * Added two new label tests for BM Font labels. One tests a shared atlas with no rotated textures, and the other uses a PLIST atlas with rotated textures. Added resources for these tests. * Moved variable definitions outside of loop. * [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (cocos2d#20325) * fix issues of textfield (cocos2d#20303) * fix infinite loop * fix issue that touch event does not match If click area ouside keyboard, then engine only receive touch begin event witouth touch end or touch cancled event. * Fixing a crash in iOS 9.3.5 when we have a layer with WebView getting deallocated (cocos2d#20285) * In case of iOS 9.3.5 when we show a web view and deallocate the layer it is trying to release memory associated with WKWebView instance, but it hadn’t retained it in the first place. This results in a crash. This commit fixes that crash. * Removing the autorelease and retain parts from the WKWebView instantiation. * Changes so that we can remove the retain from the property declaration and depend only on manual retain and release of memory <Deep> * fix videoplayer crash in release mode (cocos2d#20327) (cocos2d#20330) * [v3] fix asan reported errors (cocos2d#20335) * manually maintain reference count (cocos2d#20329) (cocos2d#20337) * fix issue that can not close keyboard if using EditBox on iOS (cocos2d#20336) * close keyboard when Done is pressed (cocos2d#20341) * close keyboard when Done is pressed * Added tmx animated tile support, with test case. (cocos2d#20315) * Added tmx animated tile support, with test case. Tile animation are disabled by default, if user didn't enable it, the TMXTiledMap class will do just the same as this support not exists, no additional render resources needed. The tile animations are still rendered through SpriteBatchNode, no additional draw call needed. * changed tileset tococos own's * used cocos2dx own's tileset * changed return type of TMXLayer::getAnimTileCoord to pointer for lua api converting * deleted useless code, improved api * re-generated script binding * added CC_DLL to new classes, solved some problem posted on pull request * changed return type of getTasks to pointer * made TileAnimTask inherit form Ref * removed a fixed FIXME * added const to getTasks, deleted unneeded empty lines, re-generated script bindings * deleted empty lines in TMXXMLParser * Fix ui::Layout scissor clipping (cocos2d#20352) * Added RenderTexture::saveToFileAsNonPMA() to save images without PMA. Set the PMA parameter to true when calling initWithRawData() inside RenderTexture::newImage(), since textures are PMA. Renamed Image::premultipliedAlpha() to Image::premultiplyAlpha() to better reflect it's action, and made it public. Added Image::reversePremultipliedAlpha() to allow the reversing of the PMA. Updated CCImage-ios.mm to set the correct bitmapInfo for PMA and non-PMA images before saving a file. Updated RenderTextureTest::RenderTextureSave() to cater for non-PMA file saving. * [CCImage-ios.mm] Fixed indentation. * [UILayout.cpp] Fix for incorrect SCISSOR clipping rectangle calculation. [UILayoutTest.cpp] Test added to reproduce issue with SCISSOR clipping. * Get reference to clipping rectangle instead of a copy. * UIVideoPlayer-ios.mm regression fix. (cocos2d#20368) [UIVideoViewWrapperIos clean] shouldn't reset _videoPlayer pointer, since it is called in setUrl method and leaves instance in invalid state. Subsequent calls to play, pause, etc. end up with crash. * Fix visual studio console output (cocos2d#20357) * Fix to properly delete easingParams array (cocos2d#20374) * Fix isVariable method buffer overflow. (cocos2d#20376) Co-authored-by: Arnold <[email protected]> Co-authored-by: leda <[email protected]> Co-authored-by: CocosRobot <[email protected]> Co-authored-by: CHP <[email protected]> Co-authored-by: gestern <[email protected]> Co-authored-by: Andrew V. Belousoff <[email protected]> Co-authored-by: Benjamin Prieto <[email protected]> Co-authored-by: chongchaoyu <[email protected]> Co-authored-by: kasandko <[email protected]> Co-authored-by: sbrednikhin <[email protected]> Co-authored-by: minggo <[email protected]> Co-authored-by: James Chen <[email protected]> Co-authored-by: Jimmy Yin <[email protected]> Co-authored-by: Eric.Ding <[email protected]> Co-authored-by: RH <[email protected]> Co-authored-by: larisand <[email protected]> Co-authored-by: HALX99 <[email protected]> Co-authored-by: Xrysnow <[email protected]> Co-authored-by: Xiang.Lin <[email protected]> Co-authored-by: deflinhec <[email protected]> Co-authored-by: John <[email protected]> Co-authored-by: Ryan B <[email protected]> Co-authored-by: Ali Kämäräinen <[email protected]> Co-authored-by: kenshin <[email protected]> Co-authored-by: kacky <[email protected]> Co-authored-by: ShadowJobs <[email protected]> Co-authored-by: Alexander Huang <[email protected]> Co-authored-by: yang1500313979 <[email protected]> Co-authored-by: Pinchuk Aleksei <[email protected]> Co-authored-by: AIGRIND <[email protected]> Co-authored-by: WangHe <[email protected]> Co-authored-by: Slack-Moehrle <[email protected]> Co-authored-by: Ricardo Petrére <[email protected]> Co-authored-by: ggggamer <[email protected]> Co-authored-by: vaibhavgohel <[email protected]> Co-authored-by: TankorSmash <[email protected]> Co-authored-by: zoxin <[email protected]> Co-authored-by: coulsonwang <[email protected]> Co-authored-by: dzj0821 <[email protected]> Co-authored-by: Nhan Khong <[email protected]> Co-authored-by: Vyshnav S Deepak <[email protected]> Co-authored-by: dodo <[email protected]> Co-authored-by: Deep Shah <[email protected]> Co-authored-by: Naruto TAKAHASHI <[email protected]> Co-authored-by: DEAGS3000 <[email protected]> Co-authored-by: dave-ori <[email protected]> Co-authored-by: Saber Haj Rabiee <[email protected]>

commit d39b54d0855d2dd23f218abb705ef3088ca6ed86 Author: Steve <[email protected]> Date: Sun Jun 1 17:45:57 2025 -0600 STEVE - MERGE - unindent setPosition commit d6b7d7b3244c30b018c745e8677540490113b0cd Author: Steve <[email protected]> Date: Sun Jun 1 17:45:40 2025 -0600 STEVE - MERGE - trim trailing whitespace commit 666ed03be18d16ad73ed4e74af259dcc868890bc Author: Steve <[email protected]> Date: Sun Jun 1 17:33:43 2025 -0600 STEVE - MERGE - gitignore commit 690451c948d79bb1da325994981bc0f059bfa7a1 Author: Steve <[email protected]> Date: Fri May 30 21:24:11 2025 -0600 STEVE - gitignore commit f0ab75d3b9b44346bd0f5c5041e7ce5f01f7868d Author: Steve <[email protected]> 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 <[email protected]> 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 <[email protected]> Date: Fri May 30 20:10:31 2025 -0600 STEVE - REMOVED - unused test projects commit 505dfccf2301a00e102b1a376b4aa4fd4f9d5a2d Author: Steve <[email protected]> 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 <[email protected]> Date: Fri May 30 16:08:30 2025 -0600 STEVE - change default texture anti-aliasing to FALSE commit ced8b5307fb2ef00369235900e3efb437eeec8b6 Author: Steve <[email protected]> Date: Fri May 30 16:05:48 2025 -0600 STEVE - formatting commit c3c21177907464cc0f6175a446accdcf26ec13e8 Author: Steve <[email protected]> Date: Fri May 30 16:05:41 2025 -0600 STEVE - allow public access to lighting shader macros commit 37ca529356b1cc4cbb310561a7f4d9d46405032c Author: Steve <[email protected]> Date: Fri May 30 16:04:29 2025 -0600 STEVE - change default texture anti-aliasing to FALSE commit b38077d9dc8eb954937302ac514fa59127909019 Author: Steve <[email protected]> Date: Fri May 30 16:02:45 2025 -0600 STEVE - add setPositionZ methods commit d435606f17bea382fb645a17ba29bf7febde184c Author: Steve <[email protected]> Date: Fri May 30 15:56:06 2025 -0600 STEVE - allow public access to ListView curSelectionIndex commit d840ccd078ea306d310560cd6c1f97b7e21d607d Author: Steve Tranby <[email protected]> Date: Sun Jul 12 02:50:28 2015 -0600 STEVE - allow public access to GLFWmonitor* _monitor commit f1410ce0ab88530474f98ff769598b7aa2a3b4ec Author: gogo2464 <[email protected]> Date: Wed Nov 20 02:37:04 2024 +0100 fix typo (#20810) commit 0a895f970dacc1c7ac79c7c8a4ef8976c904a11c Author: Steve <[email protected]> Date: Wed May 28 22:02:19 2025 -0600 FIXME - null checks commit 47dcded94b97471fab74dc753f25be8e5d1958be Author: Steve <[email protected]> Date: Tue May 27 01:12:45 2025 -0600 FIXME - trying to fix audio crash with rotateBufferThread commit 1b643dde1fb6a12f7d259a1b82e16b1b593eaa7f Author: Steve <[email protected]> Date: Thu May 8 09:49:01 2025 -0600 STEVE - fix warning about unused variables and parameters (use MAYBE_UNUSED) commit ed05907362fbedce8829d041dc3f7cf557402fb1 Author: Steve <[email protected]> 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 <[email protected]> Date: Mon Oct 30 09:39:36 2023 -0600 STEVE - fix warning about implicit conversion (void* to iconv_t) commit 4a0a9886b0139905299281e5155f9471536141d3 Author: Steve <[email protected]> Date: Tue May 13 21:29:54 2025 -0500 STEVE - Android Project - .gitignore - ignore .cxx build files commit ea85052cc63934d089962dbc908cbc012920004d Author: Steve Tranby <[email protected]> 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 <[email protected]> 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 <[email protected]> Date: Thu May 8 09:48:51 2025 -0600 STEVE - iOS Project - ignore deprecated warnings using #pragma clang diagnostic commit 869d42c51c9c07bee14ab7b80eec4dc46910fe6a Author: Steve <[email protected]> Date: Mon May 5 19:43:40 2025 -0600 STEVE - iOS Project - minor update and logs before fixing deprecations commit 5fa50e4412a53982dcd2a83e34712e2efb352124 Author: Steve Tranby <[email protected]> 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 <[email protected]> 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 <[email protected]> Date: Mon May 12 23:55:10 2025 -0500 STEVE - ////--- to //--- commit dd5b8651bec347da49385ea6fac74624d26d49a7 Author: Steve Tranby <[email protected]> Date: Sat Oct 14 22:47:18 2023 -0600 STEVE - Silence OpenGL Deprecation Warnings on iOS and macOS commit 14e0aa43f6da42f9b5110956c7d7243eeca95401 Author: Steve Tranby <[email protected]> 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 <[email protected]> Date: Tue Oct 31 16:26:12 2023 -0600 NOPUSH - STEVE - fix support email (Android) commit 007e6431ee84a2262f0be90b4d25f7e4858a7506 Author: Steve Tranby <[email protected]> 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 <[email protected]> Date: Mon Oct 30 21:34:19 2023 -0600 STEVE - fix warning about implicit imprecision commit 0f89e5d3739ea52dc366a1b56a112bcaa0884597 Author: Steve Tranby <[email protected]> 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 <[email protected]> Date: Thu Jul 20 15:55:01 2023 -0600 STEVE - fix minor warnings commit 3f9fdcc066b5b47cc26a9e2fa30bc6851ccb47b4 Author: Steve Tranby <[email protected]> Date: Thu Jul 20 15:54:53 2023 -0600 STEVE - upgrade uthash.h commit 85f43e988bfe8e97da7cbf911d327e7c8051779b Author: Steve Tranby <[email protected]> Date: Thu Jul 20 15:54:06 2023 -0600 STEVE - Add some CCAssert null checks commit 1beb69b1eb65fbdc0a596141f513e500658ea5ab Author: Steve Tranby <[email protected]> Date: Tue Jan 10 00:50:27 2023 -0700 STEVE - misc minor updates commit 354d19b5ee071b731042e475cbee71d949be85b3 Author: Steve Tranby <[email protected]> Date: Mon Jan 9 14:26:50 2023 -0700 log commit 460d7e8322696ef157612c7f73b36e84dd0e5ac1 Author: Steve Tranby <[email protected]> Date: Mon Jan 9 14:26:41 2023 -0700 merge - android build commit 1a0b25ea4829277ea753a7005e95d3c86ac5c933 Author: Steve Tranby <[email protected]> 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 <[email protected]> Date: Mon Dec 5 01:08:58 2022 -0700 update xcode projects and re-enable JPG support commit b43f23cf492c4019be520994c2c55bf266bdd384 Author: Steve Tranby <[email protected]> Date: Mon Dec 5 01:08:46 2022 -0700 use snprintf for better security commit ebeedaadc2fec2d377607142752b41b740214d9f Author: Steve Tranby <[email protected]> Date: Sun Dec 4 22:08:37 2022 -0700 android update - also remove OBB expansion file support commit e67cf6ba0f9f16ffab13159104575f8cc9a5dc1c Author: Steve Tranby <[email protected]> Date: Wed May 11 05:17:21 2022 -0600 change <hr> style markers from ///// to ----- commit 5fb2bee66073c421d0b38316d86afc25aed4035e Merge: 885fcb403c cd7446f179 Author: Steve Tranby <[email protected]> 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 <[email protected]> Date: Sat Dec 18 15:03:36 2021 -0700 fix deprecated iOS alert view commit 987bd87ff142ad2b1e874caf82ba2a85b1d560f4 Author: Steve Tranby <[email protected]> Date: Sat Dec 18 15:02:57 2021 -0700 use %p instead to print out pointer address commit 225005faf863476dd284e344067e092b29282781 Author: Steve Tranby <[email protected]> Date: Sat Dec 18 15:02:42 2021 -0700 STEVE - notes commit 3372ba2bb722eb190ce00aec13f828f6ddb387de Author: Steve Tranby <[email protected]> Date: Mon Dec 28 14:42:23 2020 -0700 STASH commit a6744f2b767e9b1c1b8d21ae5e70c3ae285b8207 Author: Steve Tranby <[email protected]> Date: Fri Nov 27 12:53:51 2020 -0700 move private ivars into implementation .mm file commit d712fce44fb6b442b5ff42a43bdb48cb5ba96415 Author: Steve Tranby <[email protected]> Date: Fri Nov 27 12:53:18 2020 -0700 disable Spine framework in CMakeLists commit 7fea32b09baabaed57d4baf335580f1b2c9618d0 Author: Steve Tranby <[email protected]> Date: Fri Nov 27 12:53:05 2020 -0700 STEVE: add formatting to # compiler directives commit 569c8d99e75293939b51c230e0d8fcf0c366caac Author: Steve Tranby <[email protected]> Date: Fri Nov 27 12:52:29 2020 -0700 add cast commit 878bec741f1455bbaa4b0d32d3320e9143567a3c Author: Steve Tranby <[email protected]> Date: Fri Nov 27 12:51:48 2020 -0700 STEVE: update project to latest Xcode 12.2 commit f9ed6367b9e36ce79dc69079e5377b6c53b746ee Author: Steve Tranby <[email protected]> Date: Mon Jul 20 15:02:44 2020 -0500 Steve: fix deprecation(s) commit 21d37b5e51ef402c3fa4700fddd97140908e2bbe Author: Steve Tranby <[email protected]> Date: Sun Mar 8 00:21:40 2020 -0700 minor android project update commit 2c83f47b144c9e8b468dcc3261e840edd96c6a95 Author: Steve Tranby <[email protected]> Date: Fri Feb 28 20:55:02 2020 -0700 minor ios project update commit e8ba69ec6e3f76770b00a9f794d8dfb97694a31f Author: Steve Tranby <[email protected]> Date: Fri Feb 28 20:47:03 2020 -0700 minor fixup for MACRO: CC_UNUSED_PARAM commit c70d4ebab4080cbb8c4fbe05bfdace95f44e0ce3 Author: Steve Tranby <[email protected]> Date: Fri Feb 28 20:46:33 2020 -0700 minor update commit fb07dc686e9b649c7c1a491ff960dde57192f419 Author: Steve Tranby <[email protected]> Date: Fri Feb 28 20:46:22 2020 -0700 remove macos catalyst support commit 69af16299805f5ee785432514190dc4b9dfa357a Author: Steve Tranby <[email protected]> Date: Fri Feb 28 20:45:51 2020 -0700 update android project commit 677ff53fdf5f4b05e2ee9744673a024f355d40ef Merge: 8f4d701132 a0df0063fc Author: Steve Tranby <[email protected]> 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 <[email protected]> Date: Wed Feb 26 23:00:03 2020 -0700 minor update for previous PR #20464 fix commit 53c54f35256869db4322b81efd2255a0531d4819 Author: Steve Tranby <[email protected]> Date: Wed Feb 26 22:57:40 2020 -0700 fix up xcode projects commit c1cdc6b321072b4e342a1ae29b8611e75a9096f5 Merge: 5c3e329901 a96ff32987 Author: Steve Tranby <[email protected]> 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 <[email protected]> Date: Wed Feb 26 21:00:08 2020 -0700 STEVE: fix up build.gradle commit 7e37f152b0f2e6ce3f5232d3ad13ea78ac1bf827 Author: Steve Tranby <[email protected]> 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 <[email protected]> Date: Tue Oct 15 16:04:28 2019 -0600 Merge commit '371216629089d7a7226a4bbaa0282808f8372356' into scgamex-v3 commit a78fd8631cf0fce944257e834a0eac09257769a3 Author: Steve Tranby <[email protected]> Date: Sat Oct 12 02:34:58 2019 -0600 update cocos2d gradle versions commit 1ee5e60c9c9167f148db6073064c04a39fe54c49 Author: Steve Tranby <[email protected]> Date: Sat Oct 12 02:34:42 2019 -0600 upgrades to xcode xcschemes commit 5f48cdad92af64a1cb645f85463e6ced98e48ade Author: Steve Tranby <[email protected]> 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 <[email protected]> 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 <[email protected]> Date: Tue Sep 3 15:34:45 2019 -0600 STEVE: fix issues after merge commit c1a616d07c0c79a7d6a2d30771c6b420e8f45759 Merge: b0a01456f3 1875590f0e Author: Steve Tranby <[email protected]> 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 <[email protected]> Date: Tue Sep 3 11:56:19 2019 -0600 STEVE: fix comma -> semicolon commit ab1d65bbf3e904893f86ecbf2b08c1378e8e05ee Author: Steve Tranby <[email protected]> Date: Tue Sep 3 11:55:45 2019 -0600 Apply recommended updates to project for latest XCode commit 1fcea05023a7649b6969d6d65e9928d0aef0b5aa Author: Steve Tranby <[email protected]> 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 <[email protected]> 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 <[email protected]> Date: Thu May 16 09:18:29 2019 +0800 setPercent after initialization (#19718) commit ed5db3e2ce205b3e46df295f25ad40d2563f3dfb Author: minggo <[email protected]> Date: Wed May 15 10:20:16 2019 +0800 Update CHANGELOG commit 073823f126304aa34b263d519e0b5a76e5d7318b Author: Arnold <[email protected]> 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 <[email protected]> Date: Tue May 14 01:56:03 2019 -0700 update release note and change log (#19711) commit 7ef9bb8c77ac50de8cf52f6cd5b2031ac08061f1 Author: Arnold <[email protected]> Date: Tue May 14 09:05:25 2019 +0800 fix get environment (#19690) commit 01a10631ca23fcd149811a55d4c64b568cb1f2e7 Author: Arnold <[email protected]> Date: Tue May 14 08:59:42 2019 +0800 rename Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.* to Cocos2dxLuaJavaBridge.* (#19694) commit 2a219a8e1b4e18977687c7c76a56f96e3cb43379 Author: leda <[email protected]> Date: Fri May 10 16:34:23 2019 +0800 fix twice copy lua scripts error (#19687) (#19691) commit 8e9edf6474ac3dbc4596a5957c9db20b05f36696 Author: Arnold <[email protected]> Date: Thu May 9 10:21:05 2019 +0800 protect empty string (#19680) commit 3266a22d5a599e8c016c925d01bf1378f6399f60 Author: minggo <[email protected]> Date: Tue May 7 19:54:35 2019 -0700 modify engine version (#19677) commit 4930d155194a9d0b8ddeff7fd181d509051c7827 Merge: 3fd04f377d 5dd10214bf Author: Steve Tranby <[email protected]> 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 <[email protected]> Date: Thu Mar 28 18:53:35 2019 -0600 bump bindings-generator submodule commit 85bbea2e00937dadba2659a4b8a25a86c7d03592 Merge: 581949b982 a3a536e5af Author: Steve Tranby <[email protected]> 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 <[email protected]> Date: Thu Mar 28 18:47:01 2019 -0600 STEVE: add assert and null check commit 31f12e52d4705416356b42d8978d402b63da5fc1 Author: Steve Tranby <[email protected]> Date: Tue Mar 5 15:02:46 2019 -0700 minor cleanup commit 976995c54910d1ec0c2b3ebd956e01fdf9fe45a9 Merge: 9761254c29 f0f732cc90 Author: Steve Tranby <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Date: Wed Jan 30 05:47:59 2019 -0700 file path cache logging for debug/profiling commit 038adc7a02f89546c686a900a5b9c896b9ec7ead Author: Steve Tranby <[email protected]> Date: Wed Dec 5 03:04:08 2018 -0700 fix issue from removal of JPG commit 6e92e0ec65f12620e13e64f5632fc2c416ed4d44 Author: Steve Tranby <[email protected]> Date: Wed Dec 5 03:03:54 2018 -0700 minor sign warning commit 47b94042fe06ca4570c5f4844fd44df8e7e81457 Author: Steve Tranby <[email protected]> Date: Wed Dec 5 03:03:39 2018 -0700 fix private ivars should be in .mm commit 5878122c752e82479bee55a9b436fc435795c64d Author: Steve Tranby <[email protected]> Date: Mon Dec 3 21:08:27 2018 -0700 STEVE: fix missing ccGLStateCache.cpp from targets commit 8c88adaa74a5b862b8361660286488f6a102021e Merge: 304e29ae58 ed2eab5297 Author: Steve Tranby <[email protected]> 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 <[email protected]> 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 <[email protected]> Date: Mon Dec 3 14:26:52 2018 -0700 STEVE: removing more unused classes for build times commit 80de4dac8c28ff770b4efb1170709c43907df83a Author: Steve Tranby <[email protected]> Date: Sun Dec 2 17:48:02 2018 -0700 STEVE: removing unused classes from project, fix resulting issues commit 81c0bf6f5273c9bb8524229f9da0240238b82500 Author: Steve Tranby <[email protected]> Date: Wed Nov 28 22:14:33 2018 -0700 fix printf type mismatch commit 368c31eebbed25c0099fa537b1ec2f95c380dbf9 Merge: d08c0d1608 fde4e6387d Author: Steve Tranby <[email protected]> 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/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-29.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-40.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-50.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-57.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-72.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-76.png # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/LaunchScreenBackground.png # templates/js-template-default/res/HelloWorld.png # templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-hdpi/ic_launcher.png # templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-mdpi/ic_launcher.png # templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xhdpi/ic_launcher.png # templates/lua-template-default/frameworks/runtime-src/proj.android/app/res/mipmap-xxhdpi/ic_launcher.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-20.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-29.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-40.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-50.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/Icon-57.png # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Images.xcassets/AppIcon.appiconset/[email protected] # templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/ios/Ima…

PatriceJiang self-requested a review February 13, 2019 06:01

minggo added this to the next milestone Feb 13, 2019

PatriceJiang approved these changes Feb 13, 2019

View reviewed changes

minggo merged commit 2675f1d into cocos2d:v3 Feb 14, 2019

kasandko mentioned this pull request Jul 11, 2019

Fix error with update line height #19914

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Font atlas texture initialization delayed #19384

Font atlas texture initialization delayed #19384

Uh oh!

sbrednikhin commented Feb 5, 2019

Uh oh!

minggo commented Feb 13, 2019

Uh oh!

minggo commented Apr 10, 2019

Uh oh!

Uh oh!

Font atlas texture initialization delayed #19384

Font atlas texture initialization delayed #19384

Uh oh!

Conversation

sbrednikhin commented Feb 5, 2019

Uh oh!

minggo commented Feb 13, 2019

Uh oh!

minggo commented Apr 10, 2019

Uh oh!

Uh oh!