From 3266a22d5a599e8c016c925d01bf1378f6399f60 Mon Sep 17 00:00:00 2001 From: minggo Date: Tue, 7 May 2019 19:54:35 -0700 Subject: [PATCH 1/9] modify engine version (#19677) --- cocos/cocos2d.cpp | 2 +- cocos/cocos2d.h | 2 +- docs/doxygen.config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cocos/cocos2d.cpp b/cocos/cocos2d.cpp index b89ac9785922..6927faea0d7f 100644 --- a/cocos/cocos2d.cpp +++ b/cocos/cocos2d.cpp @@ -32,7 +32,7 @@ NS_CC_BEGIN CC_DLL const char* cocos2dVersion() { - return "cocos2d-x-3.17.1"; + return "cocos2d-x-3.17.2"; } NS_CC_END diff --git a/cocos/cocos2d.h b/cocos/cocos2d.h index 84bca472f29f..f10912b97a28 100644 --- a/cocos/cocos2d.h +++ b/cocos/cocos2d.h @@ -31,7 +31,7 @@ THE SOFTWARE. // 0x00 HI ME LO // 00 03 08 00 -#define COCOS2D_VERSION 0x00031701 +#define COCOS2D_VERSION 0x00031702 // // all cocos2d include files diff --git a/docs/doxygen.config b/docs/doxygen.config index 11b8260a254d..1a111610ab5e 100644 --- a/docs/doxygen.config +++ b/docs/doxygen.config @@ -38,7 +38,7 @@ PROJECT_NAME = Cocos2d-x # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = v3.17.1 +PROJECT_NUMBER = v3.17.2 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a From 8e9edf6474ac3dbc4596a5957c9db20b05f36696 Mon Sep 17 00:00:00 2001 From: Arnold <40414978+PatriceJiang@users.noreply.github.com> Date: Thu, 9 May 2019 10:21:05 +0800 Subject: [PATCH 2/9] protect empty string (#19680) --- cocos/platform/CCFileUtils.cpp | 2 +- tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cocos/platform/CCFileUtils.cpp b/cocos/platform/CCFileUtils.cpp index 3106bcfce2b2..a8508d6b169c 100644 --- a/cocos/platform/CCFileUtils.cpp +++ b/cocos/platform/CCFileUtils.cpp @@ -1518,7 +1518,7 @@ std::vector FileUtils::listFiles(const std::string& dirPath) const { std::vector files; std::string fullpath = fullPathForDirectory(dirPath); - if (isDirectoryExist(fullpath)) + if (!fullpath.empty() && isDirectoryExist(fullpath)) { tinydir_dir dir; std::string fullpathstr = fullpath; diff --git a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp index 7384d1c4b8ef..629a0c19414a 100644 --- a/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp +++ b/tests/cpp-tests/Classes/FileUtilsTest/FileUtilsTest.cpp @@ -1465,7 +1465,7 @@ void TestIsFileExistRejectFolder::onEnter() auto isDirectory = FileUtils::getInstance()->isDirectoryExist("NavMesh/maps"); char cntBuffer[200] = { 0 }; - snprintf(cntBuffer, 200, "isDir: %s, isFile: %s, %s", isDirectory ? "true": "false" , exists ? "true" : "false", exists ? "failure!" : "ok!" ); + snprintf(cntBuffer, 200, "isDir: %s, isFile: %s", isDirectory ? "true": "false" , exists ? "true" : "false"); cntLabel->setString(cntBuffer); } From 2a219a8e1b4e18977687c7c76a56f96e3cb43379 Mon Sep 17 00:00:00 2001 From: leda Date: Fri, 10 May 2019 16:34:23 +0800 Subject: [PATCH 3/9] fix twice copy lua scripts error (#19687) (#19691) --- templates/lua-template-default/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/templates/lua-template-default/CMakeLists.txt b/templates/lua-template-default/CMakeLists.txt index bccaa3385157..d57cff21a373 100644 --- a/templates/lua-template-default/CMakeLists.txt +++ b/templates/lua-template-default/CMakeLists.txt @@ -42,13 +42,9 @@ set(res_res_folders set(res_src_folders "${CMAKE_CURRENT_SOURCE_DIR}/src" ) -set(res_script_folders - "${COCOS2DX_ROOT_PATH}/cocos/scripting/lua-bindings/script" - ) if(APPLE OR VS) cocos_mark_multi_resources(res_res RES_TO "Resources/res" FOLDERS ${res_res_folders}) cocos_mark_multi_resources(res_src RES_TO "Resources/src" FOLDERS ${res_src_folders}) - cocos_mark_multi_resources(res_script RES_TO "Resources/src/cocos" FOLDERS ${res_script_folders}) set(cc_common_res ${res_res} ${res_src} ${res_script}) endif() @@ -171,5 +167,4 @@ if(LINUX OR WINDOWS) set(APP_RES_DIR "$/Resources") cocos_copy_target_res(${APP_NAME} COPY_TO ${APP_RES_DIR}/res FOLDERS ${res_res_folders}) cocos_copy_target_res(${APP_NAME} COPY_TO ${APP_RES_DIR}/src FOLDERS ${res_src_folders}) - cocos_copy_target_res(${APP_NAME} COPY_TO ${APP_RES_DIR}/src/cocos FOLDERS ${res_script_folders}) endif() From 01a10631ca23fcd149811a55d4c64b568cb1f2e7 Mon Sep 17 00:00:00 2001 From: Arnold <40414978+PatriceJiang@users.noreply.github.com> Date: Tue, 14 May 2019 08:59:42 +0800 Subject: [PATCH 4/9] rename Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.* to Cocos2dxLuaJavaBridge.* (#19694) --- ...ib_Cocos2dxLuaJavaBridge.cpp => Cocos2dxLuaJavaBridge.cpp} | 2 +- ...dx_lib_Cocos2dxLuaJavaBridge.h => Cocos2dxLuaJavaBridge.h} | 0 cocos/scripting/lua-bindings/proj.android/Android.mk | 2 +- cocos/scripting/lua-bindings/proj.android/CMakeLists.txt | 2 +- templates/cocos2dx_files.json | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) rename cocos/scripting/lua-bindings/manual/platform/android/jni/{Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp => Cocos2dxLuaJavaBridge.cpp} (96%) rename cocos/scripting/lua-bindings/manual/platform/android/jni/{Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h => Cocos2dxLuaJavaBridge.h} (100%) diff --git a/cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp b/cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp similarity index 96% rename from cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp rename to cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp index 1e936ac860f1..4050cc1f1ce4 100644 --- a/cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp +++ b/cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp @@ -23,7 +23,7 @@ ****************************************************************************/ -#include "scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h" +#include "scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.h" #include diff --git a/cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h b/cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.h similarity index 100% rename from cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h rename to cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.h diff --git a/cocos/scripting/lua-bindings/proj.android/Android.mk b/cocos/scripting/lua-bindings/proj.android/Android.mk index 2ef2b81e1d4f..06ad2fad43d7 100644 --- a/cocos/scripting/lua-bindings/proj.android/Android.mk +++ b/cocos/scripting/lua-bindings/proj.android/Android.mk @@ -9,7 +9,7 @@ LOCAL_MODULE_FILENAME := libluaccandroid LOCAL_ARM_MODE := arm LOCAL_SRC_FILES := ../manual/platform/android/CCLuaJavaBridge.cpp \ - ../manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp + ../manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../.. \ $(LOCAL_PATH)/../manual \ diff --git a/cocos/scripting/lua-bindings/proj.android/CMakeLists.txt b/cocos/scripting/lua-bindings/proj.android/CMakeLists.txt index 5206af046cdf..19560eb8f8be 100644 --- a/cocos/scripting/lua-bindings/proj.android/CMakeLists.txt +++ b/cocos/scripting/lua-bindings/proj.android/CMakeLists.txt @@ -7,7 +7,7 @@ project(${target_name}) set(${target_name}_src ../manual/platform/android/CCLuaJavaBridge.cpp - ../manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp + ../manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp ) add_library(${target_name} STATIC diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index e04e2205e7f9..78ea0532b957 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -5517,8 +5517,8 @@ "cocos/scripting/lua-bindings/manual/physics3d/lua_cocos2dx_physics3d_manual.h", "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/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp", - "cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.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/platform/ios/CCLuaObjcBridge.h", "cocos/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.mm", "cocos/scripting/lua-bindings/manual/spine/LuaSkeletonAnimation.cpp", From 7ef9bb8c77ac50de8cf52f6cd5b2031ac08061f1 Mon Sep 17 00:00:00 2001 From: Arnold <40414978+PatriceJiang@users.noreply.github.com> Date: Tue, 14 May 2019 09:05:25 +0800 Subject: [PATCH 5/9] fix get environment (#19690) --- .gitignore | 1 + .../runtime-src/proj.android/app/get_environment.sh | 11 +++++++++-- .../runtime-src/proj.android/app/get_environment.sh | 11 +++++++++-- .../project/proj.android/app/get_environment.sh | 11 +++++++++-- .../project/proj.android/app/build.gradle | 10 +++++++++- .../project/proj.android/app/get_environment.sh | 11 +++++++++-- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- tools/cocos2d-console | 2 +- 8 files changed, 49 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 8ab2dcda3246..31b95ac76e50 100644 --- a/.gitignore +++ b/.gitignore @@ -182,3 +182,4 @@ temp/ # external libs zip *.zip +**/simulator/ \ No newline at end of file diff --git a/templates/js-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh b/templates/js-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh index 102f7247e70a..61ce03524ccb 100755 --- a/templates/js-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh +++ b/templates/js-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh @@ -1,4 +1,11 @@ #!/bin/bash -source ~/.bash_profile -echo $COCOS_CONSOLE_ROOT \ No newline at end of file +if [ -f $HOME/.bashrc ]; then + source $HOME/.bashrc +fi + +if [ -f $HOME/.bash_profile ]; then + source $HOME/.bash_profile +fi + +echo $COCOS_CONSOLE_ROOT diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh index 102f7247e70a..61ce03524ccb 100755 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/app/get_environment.sh @@ -1,4 +1,11 @@ #!/bin/bash -source ~/.bash_profile -echo $COCOS_CONSOLE_ROOT \ No newline at end of file +if [ -f $HOME/.bashrc ]; then + source $HOME/.bashrc +fi + +if [ -f $HOME/.bash_profile ]; then + source $HOME/.bash_profile +fi + +echo $COCOS_CONSOLE_ROOT diff --git a/tests/js-tests/project/proj.android/app/get_environment.sh b/tests/js-tests/project/proj.android/app/get_environment.sh index 102f7247e70a..61ce03524ccb 100755 --- a/tests/js-tests/project/proj.android/app/get_environment.sh +++ b/tests/js-tests/project/proj.android/app/get_environment.sh @@ -1,4 +1,11 @@ #!/bin/bash -source ~/.bash_profile -echo $COCOS_CONSOLE_ROOT \ No newline at end of file +if [ -f $HOME/.bashrc ]; then + source $HOME/.bashrc +fi + +if [ -f $HOME/.bash_profile ]; then + source $HOME/.bash_profile +fi + +echo $COCOS_CONSOLE_ROOT diff --git a/tests/lua-empty-test/project/proj.android/app/build.gradle b/tests/lua-empty-test/project/proj.android/app/build.gradle index 0c04b6c252ff..002a1af553b9 100644 --- a/tests/lua-empty-test/project/proj.android/app/build.gradle +++ b/tests/lua-empty-test/project/proj.android/app/build.gradle @@ -114,11 +114,19 @@ def getCocosCommandPath() { return 'cocos.bat' } else { + + def env_console_path = System.getenv("COCOS_CONSOLE_ROOT") + + if (env_console_path != null && !env_console_path.trim().isEmpty()) { + return new File(env_console_path.trim() + '/cocos').absolutePath + } + // on unix like system, can not get environments variables easily // so run a shell script to get environment variable sets by cocos2d-x setup.py new ByteArrayOutputStream().withStream { os -> def result = exec { - executable = project.file('get_environment.sh') + executable = "/bin/bash" + args = [ "-i", project.file('get_environment.sh')] standardOutput = os } ext.console_path = os.toString().trim() diff --git a/tests/lua-empty-test/project/proj.android/app/get_environment.sh b/tests/lua-empty-test/project/proj.android/app/get_environment.sh index 102f7247e70a..61ce03524ccb 100755 --- a/tests/lua-empty-test/project/proj.android/app/get_environment.sh +++ b/tests/lua-empty-test/project/proj.android/app/get_environment.sh @@ -1,4 +1,11 @@ #!/bin/bash -source ~/.bash_profile -echo $COCOS_CONSOLE_ROOT \ No newline at end of file +if [ -f $HOME/.bashrc ]; then + source $HOME/.bashrc +fi + +if [ -f $HOME/.bash_profile ]; then + source $HOME/.bash_profile +fi + +echo $COCOS_CONSOLE_ROOT diff --git a/tests/lua-empty-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties b/tests/lua-empty-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties index ab7338f669d1..ea5c40f809ea 100644 --- a/tests/lua-empty-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties +++ b/tests/lua-empty-test/project/proj.android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Mar 14 17:47:54 CST 2017 +#Fri May 10 15:15:29 CST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip diff --git a/tools/cocos2d-console b/tools/cocos2d-console index 643f423415c6..2eb407382b0b 160000 --- a/tools/cocos2d-console +++ b/tools/cocos2d-console @@ -1 +1 @@ -Subproject commit 643f423415c62a1b610549323c4bf5499683baab +Subproject commit 2eb407382b0bb42096e30a8a3759e5ae9fe2072f From a8019eb82762ffb44285d2991db6921e40f6cc72 Mon Sep 17 00:00:00 2001 From: minggo Date: Tue, 14 May 2019 01:56:03 -0700 Subject: [PATCH 6/9] update release note and change log (#19711) --- CHANGELOG | 24 ++++++++++++++++++++++++ docs/RELEASE_NOTES.md | 22 ++++++++-------------- docs/RELEASE_NOTES_CN.md | 22 ++++++++-------------- 3 files changed, 40 insertions(+), 28 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 81211847fd39..7890e9ba36e1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,27 @@ +cocos2d-x-3.17.2 ?? + +[NEW] Network: added clear requests and responses method to httpclient +[NEW] UI: VideoPlayer added ability to enable/disable looping, resonding user input +[NEW] UI: VideoPlayer added function to set style +[NEW] IMEDispacher: added a function to check if any IME dispatcher is active +[NEW] Renderer: add a function to get current clearing color +[NEW] Lua: added binding codes for `EventDispathcer::addCustomEventListener()` + +[REFINE] Android: added optimization codes for OPPO devcies +[REFINE] Network: improved websocket traces +[REFINE] Android: supported Android P cutout area +[REFINE] FontAtlas: font atlas texture initialization delayed +[REFINE] LOG: CCLOG may block thread on windows + +[FIX] FileUtils:fixed a bug that `listFiles()` can not work correctly if the file path starts with `assets/` on Android +[FIX] AssetsManager: fixed a bug that `_percent` is always be 0 during the update process +[FIX] Texture2D: fixed memory leak if `Texture2D::setAlphaTexture()` is invoked many times +[FIX] FontAtlasCache: avoided crash if a file path is too long +[FIX] Audio: fixed crash on iOS +[FIX] UI: VideoPlayer could not play video in obb file on Android +[FIX] SpriteFrame: fixed performance issue in parsing plist files +[FIX] 3rd: unzip failed to uncompress files + cocos2d-x-3.17.1 Nov.19 2018 [REFINE] Renderer: properly reduce clear buffer times to save energy diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md index d9ae53f2ea88..7d2c5d4770a4 100644 --- a/docs/RELEASE_NOTES.md +++ b/docs/RELEASE_NOTES.md @@ -2,26 +2,20 @@ **Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* -- [Cocos2d-x 3.17.1 Release Notes](#cocos2d-x-3171-release-notes) +- [Cocos2d-x 3.17.2 Release Notes](#cocos2d-x-3172-release-notes) - [Highlights](#highlights) -# Cocos2d-x 3.17.1 Release Notes # +# Cocos2d-x 3.17.2 Release Notes # -The 3.17.1 release focuses on bug fixing. +Version 3.17.2 focuses on bugs fixing and performance opimization on OPPO devices. ## Highlights -- Fix Lua loading performance drop bug introduced in 3.17 -- Renderer limit glClear invoke times, reduce power consuming -- optimize CMake script，fix some linking issues -- Android use CMake as default PROP_BUILD_TYPE value -- Android upgrade Gradle to 4.6, SDK 28, android gradle plugin 3.1.0 -- upgrade LuaJIT to 2.1.0-beta3, fix random crash in 3.17 Lua release mode -- upgrade libwebsockets to 2.4.2 -- FileUtils provide thread-safe implementation and add missing cross-platform interfaces -- limit Labels text length to fix render error -- add Downloader binding to Lua +- Performance optimization on OPPO devices +- Fixed bug that`FileUtils::listFiles()` can not work correctly if the file path starts with `assets/` on Android +- Fixed crash caused by Audio on iOS +- Fixed bug that `VideoPlayer` can not play video in obb file on Android -This release contains more than 45 bugs fixed and 34 misc improvements, please refer to [ChangeLog](https://github.com/cocos2d/cocos2d-x/blob/v3/CHANGELOG) +More detail change log please refer to [ChangeLog](https://github.com/cocos2d/cocos2d-x/blob/v3/CHANGELOG). diff --git a/docs/RELEASE_NOTES_CN.md b/docs/RELEASE_NOTES_CN.md index eef109506d61..ce7673ca70d0 100644 --- a/docs/RELEASE_NOTES_CN.md +++ b/docs/RELEASE_NOTES_CN.md @@ -2,26 +2,20 @@ **Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* -- [Cocos2d-x 3.17.1 Release Notes](#cocos2d-x-3171-release-notes) +- [Cocos2d-x 3.17.2 Release Notes](#cocos2d-x-3172-release-notes) - [版本变动](#%E7%89%88%E6%9C%AC%E5%8F%98%E5%8A%A8) -# Cocos2d-x 3.17.1 Release Notes # +# Cocos2d-x 3.17.2 Release Notes # -Cocos2d-x 3.17.1 侧重于稳定性的提升, 已有问题的修复。 +Cocos2d-x 3.17.2 侧重于稳定性的提升, 已有问题的修复和针对 OPPO 手机的性能优化。 ## 版本变动 -- 修复 3.17 引入的 Lua 加载性能下降的 BUG -- 减少渲染中 glClear 的调用次数，降低电量消耗 -- CMake 脚本优化，解决存在的链接问题 -- Android 默认启用 CMake 方式编译 -- Android 升级 Gradle 到 4.6, SDK 28, plugin 3.1.0 -- 升级 LuaJIT 到 2.1.0-beta3，修复 3.17 Lua 项目的闪退问题 -- 升级 libwebsockets 到 2.4.2 -- FileUtils 内部加锁，增加线程安全，完善接口实现 -- 限制 Label 长度，避免绘制错误 -- 增加 Downloader 的 Lua 绑定 +- 针对 OPPO 手机的性能优化 +- 修复 bug：在安卓设备，当文件路径开头为 `assets/` 时， `FileUtils::listFiles()` 无法正常工作 +- 修复了 Audio 在 iOS 设备上的崩溃问题 +- 修复了在安卓设备， `VideoPlayer` 无法播放 OBB 包里的视频文件的问题 -当前版本包含 45 项 bugs 修复和 34 项小改进，不再列举，请参考 [ChangeLog](https://github.com/cocos2d/cocos2d-x/blob/v3/CHANGELOG)。 +详细的改动请参考 [ChangeLog](https://github.com/cocos2d/cocos2d-x/blob/v3/CHANGELOG)。 From 073823f126304aa34b263d519e0b5a76e5d7318b Mon Sep 17 00:00:00 2001 From: Arnold <40414978+PatriceJiang@users.noreply.github.com> Date: Wed, 15 May 2019 09:29:02 +0800 Subject: [PATCH 7/9] [js-tests/cpp-tests] iOS: add fonts to Info.plist (#19708) * add fonts to Info.plist * use tabs instead of spaces * fix lua-tests --- tests/cpp-tests/proj.ios/Info.plist | 22 ++++++++++++++--- tests/js-tests/project/proj.ios/Info.plist | 24 ++++++++++++++----- .../project/proj.ios_mac/ios/Info.plist | 22 ++++++++++++++--- 3 files changed, 56 insertions(+), 12 deletions(-) diff --git a/tests/cpp-tests/proj.ios/Info.plist b/tests/cpp-tests/proj.ios/Info.plist index b15773f0abb4..d37cb5be7cca 100644 --- a/tests/cpp-tests/proj.ios/Info.plist +++ b/tests/cpp-tests/proj.ios/Info.plist @@ -33,12 +33,28 @@ UIAppFonts - fonts/A Damn Mess.ttf - fonts/Abberancy.ttf + fonts/American Typewriter.ttf fonts/Abduction.ttf + fonts/ThonburiBold.ttf + fonts/Fingerpop.ttf fonts/Paint Boy.ttf - fonts/Schwarzwald.ttf + fonts/A Damn Mess.ttf + fonts/Schwarzwald Regular.ttf + fonts/Courier New.ttf + fonts/Japanese.ttf + fonts/xingkai-incomplete.ttf + fonts/arial.ttf fonts/Scissor Cuts.ttf + fonts/FingerpopGap.ttf + fonts/NotoEmoji-Regular.ttf + fonts/Marker Felt.ttf + fonts/Schwarzwald.ttf + fonts/cyril.ttf + fonts/tahoma.ttf + fonts/HKYuanMini.ttf + fonts/cyrillic.ttf + fonts/Abberancy.ttf + fonts/Thonburi.ttf UILaunchStoryboardName LaunchScreen diff --git a/tests/js-tests/project/proj.ios/Info.plist b/tests/js-tests/project/proj.ios/Info.plist index 0cfc150f0fe3..6d3c439ed653 100644 --- a/tests/js-tests/project/proj.ios/Info.plist +++ b/tests/js-tests/project/proj.ios/Info.plist @@ -55,18 +55,30 @@ UIAppFonts - res/fonts/A Damn Mess.ttf - res/fonts/Abberancy.ttf - res/fonts/Abduction.ttf + res/ccb/comic andy.ttf res/fonts/American Typewriter.ttf - res/fonts/Courier New.ttf - res/fonts/Marker Felt.ttf + res/fonts/Abduction.ttf + res/fonts/ThonburiBold.ttf + res/fonts/Fingerpop.ttf res/fonts/Paint Boy.ttf + res/fonts/A Damn Mess.ttf res/fonts/Schwarzwald Regular.ttf + res/fonts/Courier New.ttf + res/fonts/Japanese.ttf + res/fonts/xingkai-incomplete.ttf + res/fonts/arial.ttf res/fonts/Scissor Cuts.ttf + res/fonts/FingerpopGap.ttf + res/fonts/NotoEmoji-Regular.ttf + res/fonts/Marker Felt.ttf + res/fonts/Schwarzwald.ttf + res/fonts/cyril.ttf res/fonts/tahoma.ttf + res/fonts/HKYuanMini.ttf + res/fonts/cyrillic.ttf + res/fonts/Abberancy.ttf res/fonts/Thonburi.ttf - res/fonts/ThonburiBold.ttf + res/resjs/ccb/comic andy.ttf UILaunchStoryboardName LaunchScreen diff --git a/tests/lua-tests/project/proj.ios_mac/ios/Info.plist b/tests/lua-tests/project/proj.ios_mac/ios/Info.plist index ffa014088562..9b2e4694a918 100644 --- a/tests/lua-tests/project/proj.ios_mac/ios/Info.plist +++ b/tests/lua-tests/project/proj.ios_mac/ios/Info.plist @@ -42,12 +42,28 @@ UIAppFonts - fonts/A Damn Mess.ttf - fonts/Abberancy.ttf + fonts/American Typewriter.ttf fonts/Abduction.ttf + fonts/ThonburiBold.ttf + fonts/Fingerpop.ttf fonts/Paint Boy.ttf - fonts/Schwarzwald.ttf + fonts/A Damn Mess.ttf + fonts/Schwarzwald Regular.ttf + fonts/Courier New.ttf + fonts/Japanese.ttf + fonts/xingkai-incomplete.ttf + fonts/arial.ttf fonts/Scissor Cuts.ttf + fonts/FingerpopGap.ttf + fonts/NotoEmoji-Regular.ttf + fonts/Marker Felt.ttf + fonts/Schwarzwald.ttf + fonts/cyril.ttf + fonts/tahoma.ttf + fonts/HKYuanMini.ttf + fonts/cyrillic.ttf + fonts/Abberancy.ttf + fonts/Thonburi.ttf UILaunchStoryboardName LaunchScreen From ed5db3e2ce205b3e46df295f25ad40d2563f3dfb Mon Sep 17 00:00:00 2001 From: minggo Date: Wed, 15 May 2019 10:20:16 +0800 Subject: [PATCH 8/9] Update CHANGELOG --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 7890e9ba36e1..a89b95ccdb12 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -cocos2d-x-3.17.2 ?? +cocos2d-x-3.17.2 May.21 2019 [NEW] Network: added clear requests and responses method to httpclient [NEW] UI: VideoPlayer added ability to enable/disable looping, resonding user input From 1528ea01d2749b4ef65e97f79cffa6135fe13c4d Mon Sep 17 00:00:00 2001 From: Arnold <40414978+PatriceJiang@users.noreply.github.com> Date: Thu, 16 May 2019 09:18:29 +0800 Subject: [PATCH 9/9] setPercent after initialization (#19718) --- .../Classes/SpritePolygonTest/SpritePolygonTest.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/cpp-tests/Classes/SpritePolygonTest/SpritePolygonTest.cpp b/tests/cpp-tests/Classes/SpritePolygonTest/SpritePolygonTest.cpp index 6d8cfd97421b..61df91b1089f 100644 --- a/tests/cpp-tests/Classes/SpritePolygonTest/SpritePolygonTest.cpp +++ b/tests/cpp-tests/Classes/SpritePolygonTest/SpritePolygonTest.cpp @@ -297,15 +297,16 @@ void SpritePolygonTestSlider::initSliders() slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", ""); slider->loadProgressBarTexture("cocosui/sliderProgress.png"); slider->setPosition(Vec2(vsize.width/2, vsize.height/4)); - - slider->addEventListener(CC_CALLBACK_2(SpritePolygonTestSlider::changeEpsilon, this)); - slider->setPercent((int)(sqrtf(1.0f/19.0f)*100)); - + auto ttfConfig = TTFConfig("fonts/arial.ttf", 8); _epsilonLabel = Label::createWithTTF(ttfConfig, "Epsilon: 2.0"); addChild(_epsilonLabel); _epsilonLabel->setPosition(Vec2(vsize.width/2, vsize.height/4 + 15)); addChild(slider); + + slider->addEventListener(CC_CALLBACK_2(SpritePolygonTestSlider::changeEpsilon, this)); + slider->setPercent((int)(sqrtf(1.0f/19.0f)*100)); + } void SpritePolygonTestSlider::makeSprites(const std::string* list, const int count, const float y)