Rhaylith
diff --git a/Diff for: ‎.appveyor.yml
+3-2 b/Diff for: ‎.appveyor.yml
+3-2
diff --git a/Diff for: ‎.clang-tidy
+33 b/Diff for: ‎.clang-tidy
+33
diff --git a/Diff for: ‎.gitignore
+17 b/Diff for: ‎.gitignore
+17
diff --git a/Diff for: ‎.travis.yml
+61-11 b/Diff for: ‎.travis.yml
+61-11
diff --git a/Diff for: ‎CHANGELOG
+108-1 b/Diff for: ‎CHANGELOG
+108-1
diff --git a/Diff for: ‎CMakeLists.txt
+18-5 b/Diff for: ‎CMakeLists.txt
+18-5
@@ -8,9 +8,10 @@ environment:
   PYTHON_VERSION: "2.7.13"
   PYTHON_ARCH: "32"
   matrix:
-    - build_type: windows32_cocos_new_test
-    - build_type: windows32
+    - build_type: windows32_cmake_test
+    - build_type: windows32_sln_test
     - build_type: android_cpp_tests
+    - build_type: android_lua_tests
 #    - build_type: android_cocos_new_test
 #    - build_type: android_cpp_empty_test
 #    - build_type: android_gen_libs
 
@@ -0,0 +1,33 @@
+---
+Checks: >
+  -*,
+  performance-faster-string-find,
+  performance-for-range-copy,
+  performance-implicit-conversion-in-loop,
+  performance-inefficient-algorithm,
+  performance-inefficient-vector-operation,
+  performance-move-const-arg,
+  performance-move-constructor-init,
+  performance-type-promotion-in-math-fn,
+  performance-unnecessary-copy-initialization,
+  performance-unnecessary-value-param,
+  readability-container-size-empty,
+  readability-delete-null-pointer,
+  readability-redundant-control-flow,
+  readability-redundant-string-cstr,
+  readability-string-compare,
+  bugprone-argument-comment,
+  bugprone-bool-pointer-implicit-conversion,
+  bugprone-dangling-handle,
+  bugprone-fold-init-type,
+  bugprone-forward-declaration-namespace,
+  bugprone-forwarding-reference-overload,
+  bugprone-inaccurate-erase,
+  bugprone-incorrect-roundings,
+  modernize-redundant-void-arg,
+  modernize-use-emplace,
+
+WarningsAsErrors: '*'
+HeaderFilterRegex: '/(?!external)/.*'
+AnalyzeTemporaryDtors: false
+FormatStyle:     none
@@ -166,3 +166,20 @@ tests/lua-tests/project/proj.tizen/res/
 *-build/
 # Ignore the CLion build folder, such as cmake-build-debug
 cmake-build-*/
+.vs
+cmake_build*
+
+# tmp android build files
+cocos/platform/android/libcocos2dx/.project
+tests/lua-tests/project/proj.android/.project
+tests/lua-tests/project/proj.android/app/.project
+tests/*/proj.android/.settings/org.eclipse.buildship.core.prefs
+tests/*/project/proj.android/.settings/org.eclipse.buildship.core.prefs
+
+# tmp folder for temp usage
+tmp/
+temp/
+
+# external libs zip
+*.zip
+**/simulator/
@@ -2,6 +2,7 @@ matrix:
   include:
     # linux
     - os: linux
+      dist: xenial
       env: 
         - BUILD_TARGET=linux 
         - GEN_BINDING_AND_COCOSFILE=true
@@ -10,46 +11,92 @@ matrix:
         - secure: M5lyDs0qai15mWHzJdkh0WPfVJJmVZu6SWtYULxatukGPXVwoQvmEtYAwAW+iz6aM+tXksQ/mk6nW5L8UFbHm+n6yrsa5bZU9sGXjilPE8p8bLFYDmIbPRazU+E6pBP3J2CDoAm0XnWkiYQ8feTxKTo6ysLnHAEjyaHTw0+Q1GM=
       sudo: required
       language: cpp
+    # clang-tidy
+    - os: linux
+      dist: xenial
+      env: BUILD_TARGET=linux_clang_tidy
+      language: cpp
+      sudo: required
     # mac_cmake
     - os: osx
       env: BUILD_TARGET=mac_cmake
       language: cpp
-      osx_image: xcode8.3
+      osx_image: xcode9.3
       sudo: required
     # iOS_cmake
     - os: osx
       env: BUILD_TARGET=ios_cmake
       language: cpp
-      osx_image: xcode8.3
+      osx_image: xcode9.3
+      sudo: required
+    # android ndk-build
+    - os: linux
+      dist: xenial
+      env: BUILD_TARGET=android_cpp_ndk-build
+      language: android
       sudo: required
-    # android
+    # android_lua ndk-build
     - os: linux
-      env: BUILD_TARGET=android
+      dist: xenial
+      env: BUILD_TARGET=android_lua_ndk-build
       language: android
       sudo: required
-    # android_lua
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-6
+    # android cmake
     - os: linux
-      env: BUILD_TARGET=android_lua
+      dist: xenial
+      env: BUILD_TARGET=android_cpp_cmake
       language: android
       sudo: required
+    # android_lua cmake
+    - os: linux
+      dist: xenial
+      env: BUILD_TARGET=android_lua_cmake
+      language: android
+      sudo: required
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-6
+    # android_js cmake
+    - os: linux
+      dist: xenial
+      env: BUILD_TARGET=android_js_cmake
+      language: android
+      sudo: required
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-6
     # mac
     - os: osx
       env: BUILD_TARGET=mac
       language: cpp
-      osx_image: xcode8.3
+      osx_image: xcode9.3
       sudo: required
     # iOS
     - os: osx
       env: BUILD_TARGET=ios
       language: cpp
-      osx_image: xcode8.3
+      osx_image: xcode9.3
       sudo: required
     - os: linux
-      env: BUILD_TARGET=android_cocos_new_test
-      language: cpp
+      dist: xenial
+      env: BUILD_TARGET=android_cocos_new_cpp_test
+      language: android
       sudo: required
     - os: linux
-      env: BUILD_TARGET=linux_cocos_new_test
+      dist: xenial
+      env: BUILD_TARGET=linux_cocos_new_lua_test
       language: cpp
       sudo: required
 
@@ -58,6 +105,9 @@ script:
 before_install:
 - tools/travis-scripts/before-install.sh
 
+jdk:
+  - oraclejdk8
+
 cache:
   bundler: true
 
 
@@ -1,3 +1,110 @@
+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
+[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
+[REFINE]        Engine: improve the reuse logic of sprite frames cache
+[REFINE]        Engine: add `GLView::setCursor` for desktop platforms
+[REFINE]        Engine: add methods to change icons for desktop platforms
+[REFINE]        UI: improve iPhone X home indicator handling behavior
+[REFINE]        UI: add line spacing support for system font on iOS and Android
+[REFINE]        UI: add support for pressed and disabled image in EditBox
+[REFINE]        UI: shrink extra label text if too long, prevent label too long crash
+[REFINE]        LUA: add binding code for cocos2d::Downloader
+[REFINE]        Android: add supporting SafeArea for most edge screens devices
+[REFINE]        Android: change default value of PROP_BUILD_TYPE from ndk-build to CMake
+[REFINE]        Android: update project config to gradle 4.6, sdk 28, android gradle plugin 3.1.0
+[REFINE]        Android: add ability to not stop music on game start in android
+[REFINE]        Windows: refine CCDevice-win32 BitmapDC
+[REFINE]        Windows: improve binary folder structure, copy resources to "Resources/" folder
+[REFINE]        Action: add ui::LoadingBar support to Progress actions
+[REFINE]        Network: support multiple parameters in SocketIO emit/send method
+[REFINE]        FileUtils: improve thread safety (use single recursive_mutex)
+[REFINE]        FileUtils: add getFileSize impl for Windows
+[REFINE]        FileUtils: add listFiles impl for Android and Windows platform
+[REFINE]        FileUtils: exact fullPathForDirectory from fullPathForFilename, fullPathForFilename should not accept directory
+[REFINE]        CMake: improve libraries link, compile options config
+[REFINE]        CMake: remove un-elegant prebuilt feature at internal cmake build scripts
+[REFINE]        3rd: upgrade libwebsockets to 2.4.2 with libuv enabled
+[REFINE]        3rd: improve cmake build scripts for external libs
+[REFINE]        3rd: upgrade luajit to 2.1.0-beta3, fix random crash in Android release mode
+[REFINE]        3rd: external/lua/lua is not referenced in cmake and it will be removed in the near future
+[REFINE]        Tests: add websocket latency test
+[REFINE]        Tests: add download multi task test case
+[REFINE]        Tests: improve part test cases UI shows
+[REFINE]        cocos console: disable "gen-libs" command
+[REFINE]        Others: add another xbox 360 configuration
+[REFINE]        Others: remove ANT_ROOT env check on setup.py
+[REFINE]        Others: improve cmake tests in travis CI scripts
+
+[FIX]           Renderer: handle opengl recreate event for CameraBackgroundDepthBrush
+[FIX]           Renderer: fix some EVENT_RENDERER_RECREATED problem
+[FIX]           Engine: fix the last update time was not corrected if next delta time was zeroed 
+[FIX]           Engine: be safe to handle operator= in CCData
+[FIX]           Engine: aviod reading outside of the buffer when print log
+[FIX]           Engine: avoid duplicate find action when already found
+[FIX]           Engine: prevent free _bytes when src and dest are identical in CCData
+[FIX]           Engine: fix Console::loop() consumes 100% of CPU usage
+[FIX]           Engine: fix Action doesn't work when follow Node added PhysicsBody
+[FIX]           UI: fix locate image path relative to tsx file error in TiledMap
+[FIX]           UI: fix several bugs with button's title, include memory leak
+[FIX]           UI: fix LabelLetter::isVisible always return false
+[FIX]           UI: fix not support sprite frame when ignoreContentAdaptWithSize is false
+[FIX]           UI: fix out of range access in Label 
+[FIX]           UI: fix Widget::getAncestorWidget error
+[FIX]           UI: fix iOS editbox EndAction wrong when single line mode (UITextField)
+[FIX]           UI: Fix for Label and UIRichEdit text trailing space trimming
+[FXI]           JavaScript: fix crash if garbage collection runs between TouchStart and TouchEnd event
+[FIX]           Audio: fix AudioEngine rotateBufferThread crash on iOS
+[FIX]           Audio: add extra init checks in pcm audio service, avoid crash in PcmAudioService 
+[FIX]           Audio: fix AVAudioSessionErrorCodeCannotStartPlaying error may occur on Apple
+[FIX]           Audio: fix background music may resumes even the application is on the background on Android
+[FIX]           Audio: fix AudioCache* holding invalid pointer value
+[FIX]           Network: fix memory leaks in WebSocket
+[FIX]           Network: fix websocket memory zereoing size error
+[FIX]           Network: fix https downloader timeout on win/mac
+[FIX]           Network: fix "cc.loader.load" convert url error
+[FIX]           iOS: fix project build warnings in Xcode
+[FIX]           iOS: fix crash when saving gray colorspace image
+[FIX]           iOS: `js/lua tests` fix double free issue on app exits. 
+[FIX]           Android: shorten C++ build path, reduce long path error on Windows
+[FIX]           Android: keep cocos2dx activity at task root by mark "singleTask" in manifest
+[FIX]           Android: fix crash caused by JNIEnv null pointer in getStringUTFCharsJNI function
+[FIX]           Android: use 'Binary names' style on JNI for ClassLoader.loadClass
+[FIX]           Android: allow cleartext HTTP traffic by default for all tests project
+[FIX]           Windows: Support VS2017 in release mode
+[FIX]           Action: fix repeat CallFunc for some times, may never stop
+[FIX]           Physics: fix PhysicsJointMotor setRate and getRate Bad Access Crash
+[FIX]           FileUtils: fix removeDirectory() failure on win32
+[FIX]           FileUtils: let getContents return an error code when the filename is a directory
+[FIX]           FileUtils: let isFileExistInternal return false when folder as parameter on Linux
+[FIX]           LUA: performance drop bug introduced in 3.17
+[FIX]           CMake: fix project name always be "TemplateCpp" when create a new project
+[FIX]           Tests: fix auto test stop in cpp-tests project
+[FIX]           cocos console: do uninstall only when that app is installed for android
+
 cocos2d-x-3.17 May.21 2018
 
 [HIGHLIGHT]     Android: support Android Studio 3.0, NDK 16
@@ -1164,7 +1271,7 @@ cocos2d-x-3.7rc0  July.1 2015
     [NEW]           C++: Added ActionFloat
     [NEW]           C++: Supported physical keyboard on WinRT
     [NEW]           FileUtils: checked filename case characters on windows
-    [NEW]           FileUitls: added supporting loading files that which file path include utf-8 characters
+    [NEW]           FileUtils: added supporting loading files that which file path include utf-8 characters
     [NEW]           PhysicsShape: added sensor property
     [NEW]           Sprite: used triangle command
     [NEW]           3d: Added `getFarPlane` and `getNearPlane` in `Camera` class
 
@@ -26,23 +26,36 @@
 
 # build engine library and all tests
 
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.6)
 
 project(Cocos2d-x)
 
 # cocos2dx root path
 set(COCOS2DX_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR})
 set(CMAKE_MODULE_PATH ${COCOS2DX_ROOT_PATH}/cmake/Modules/)
 
+# prevent in-source-build
+include(PreventInSourceBuilds)
+
 # works before build libcocos2d
 include(CocosBuildSet)
 
+# build options
+option(BUILD_TESTS "Build tests" ON)
+
 # default tests include lua, js test project, so we set those option on to build libs
 set(BUILD_LUA_LIBS ON)
 set(BUILD_JS_LIBS ON)
 
-if(NOT USE_COCOS_PREBUILT)
-    add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos ${ENGINE_BINARY_PATH}/cocos/core)
+add_subdirectory(${COCOS2DX_ROOT_PATH}/cocos ${ENGINE_BINARY_PATH}/cocos/core)
+
+# prevent tests project to build "cocos2d-x/cocos" again
+set(BUILD_ENGINE_DONE ON)
+# add engine all tests project
+if (BUILD_TESTS)
+  add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/cpp-empty-test ${ENGINE_BINARY_PATH}/tests/cpp-empty-test)
+  add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/cpp-tests ${ENGINE_BINARY_PATH}/tests/cpp-tests)
+  add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/js-tests/project ${ENGINE_BINARY_PATH}/tests/js-tests)
+  add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/lua-empty-test/project ${ENGINE_BINARY_PATH}/tests/lua-empty-test)
+  add_subdirectory(${COCOS2DX_ROOT_PATH}/tests/lua-tests/project ${ENGINE_BINARY_PATH}/tests/lua-test)
 endif()
-add_subdirectory(${COCOS2DX_ROOT_PATH}/tests ${ENGINE_BINARY_PATH}/tests)
-