Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
154 commits
Select commit Hold shift + click to select a range
54f377f
iPhone X home indicator handling (#19132)
mars3142 Oct 31, 2018
18a14fb
Fix bug: Not support sprite frame when ignoreContentAdaptWithSize is …
sense-zzz-time Oct 31, 2018
b372ce3
Bugfix for aviod reading outside of the buffer. (#19098)
balmerdx Oct 31, 2018
89e75ee
add line spacing support for system font on iOS and Android (#18993)
summerinsects Nov 2, 2018
0e966a7
Add `GLView::setCursor` for desktop platforms (#19129)
filipe-lemos Nov 5, 2018
1fda31b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Nov 5, 2018
2a095c1
modern cmake, compile definitions improvement (#19139)
drelaptop Nov 6, 2018
4315f56
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Nov 6, 2018
e5b77ad
add ui::LoadingBar support to Progress actions (#18748)
tankorsmash Nov 6, 2018
bb54367
modern cmake, improve cmake_compiler_flags (#19145)
crazyhappygame Nov 7, 2018
e328313
refine CCDevice-win32 BitmapDC (#19144)
summerinsects Nov 7, 2018
89cf910
modern cmake, cmake_cleanup_remove_unused_variables (#19146)
crazyhappygame Nov 7, 2018
304703f
correct lua template cmake build (#19149)
drelaptop Nov 8, 2018
581c201
UIButton fix setTitleLabel memleaks (#19148)
PatriceJiang Nov 8, 2018
77ae57e
prevent cmake in-source-build friendly (#19151)
drelaptop Nov 8, 2018
e63e00f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Nov 8, 2018
bb32eee
make code more clean and make comment more clear (#19155)
Nov 9, 2018
2e76641
Action::Repeat fix NaN error (#19158)
PatriceJiang Nov 12, 2018
8a142cb
Copy resources to "Resources/" on win32 like in linux configuration (…
crazyhappygame Nov 12, 2018
dc14250
[TiledMap] locate image path relative to tsx file (#19147)
PatriceJiang Nov 13, 2018
ae61f8f
go on, Copy resources to "Resources/" on win32 (#19166)
drelaptop Nov 13, 2018
387e1a7
update cocos cmd, disable "gen-libs" (#19167)
drelaptop Nov 14, 2018
aa52eee
[linux] Fix FileUtils::getContents with folder (#19157)
PatriceJiang Nov 15, 2018
ec05612
remove assertions
Nov 15, 2018
1d44c9a
Merge pull request #19172 from PatriceJiang/ccdata_remove_assertions
PatriceJiang Nov 15, 2018
8ebf713
fix cpp-tests SpritePolygon crash, wrong png format (#19170)
drelaptop Nov 16, 2018
1fe3c17
a workaround to fix black screen on macOS 10.14 (#19090)
drelaptop Nov 16, 2018
d0d1f67
[CCLabel] trucate label text if too long (#19174)
PatriceJiang Nov 16, 2018
1bd2f55
[CCFileUtils] win32 getFileSize (#19176)
PatriceJiang Nov 16, 2018
30daf5d
fix crash of cclayercolor and fix some other error logic (#19177)
Nov 19, 2018
8be2937
add change log for coming 3.17.1 release (#19173)
drelaptop Nov 19, 2018
99b86b8
modify changelog release data to current (#19180)
drelaptop Nov 19, 2018
dc7aaf0
[CCSpriteCache] allow re-add plist & add testcase (#19175)
PatriceJiang Nov 19, 2018
d608871
modify version code to 3.17.1 (#19181)
drelaptop Nov 19, 2018
f68ce4b
fix changlog title version error (#19183)
crazyhappygame Nov 19, 2018
653feef
add testcase for lua downloader binding (#19182)
PatriceJiang Nov 19, 2018
e54fd82
add testcase for lua downloader binding (#19182) (#19186)
PatriceJiang Nov 19, 2018
5391b94
[js] add index for js testcases (#19184)
PatriceJiang Nov 20, 2018
f2c669f
[lua] add numeric index for testcases list (#19190)
PatriceJiang Nov 21, 2018
feb26a6
Fix crash in cocos2dx-JS if garbage collection runs between Touchstar…
vaibhavgohel Nov 21, 2018
d5a1a9a
[js-test] Chipmunk Tests/ Chipmunk Release Tests crash fix (#19193)
PatriceJiang Nov 21, 2018
6730fd0
[js-test win32]XMLHttpRequest gzip deflate & fix xcode project inclu…
PatriceJiang Nov 21, 2018
4fea33e
[cpp test-windows]46/26 clear mode crash (#19195)
PatriceJiang Nov 21, 2018
772c8fc
[cpp test-Android]20:FileUtils/2 change title (#19197)
PatriceJiang Nov 22, 2018
356d0f2
[cpp test-Android、mac]46:Node:Sprite3D->25 crash (#19198)
PatriceJiang Nov 22, 2018
1a0bddf
[cpp-test mac] 19:Extension->4SocketIOTest->Open SocketIO Endpoint cr…
PatriceJiang Nov 22, 2018
21fcb18
[lua test-android]WebViewTest button overlapping (#19201)
PatriceJiang Nov 22, 2018
52b8f08
[android tests] setup project name in AndroidStudio dashboard (#19200)
PatriceJiang Nov 22, 2018
c0e362f
[cpp-test] DownloaderTest url expires (#19203)
PatriceJiang Nov 23, 2018
cfd297a
[js-tests mac/Android] Extensions Test-> Websocket->Send text, fix ca…
PatriceJiang Nov 23, 2018
5590809
Node:Particle3D effects abnormal, texture incorrect (#19204)
PatriceJiang Nov 23, 2018
41d0474
[cmake] fix iOS xcode property setting failed (#19208)
drelaptop Nov 27, 2018
bcb1f48
Switch travis CI to xenial (#19207)
crazyhappygame Nov 27, 2018
8cfeafe
[cpp-tests] improve items location of part cases (#19210)
drelaptop Nov 28, 2018
9cd2f40
cpp-tests/Bugs add titles & lua bugs/1174 decrease loop count (#19205)
PatriceJiang Nov 28, 2018
03dd8d9
Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
crazyhappygame Nov 28, 2018
73e9475
[lua test]Extensions scroll pos error (#19214)
PatriceJiang Nov 28, 2018
41b3369
[lua test]FontTest resize page (#19213)
PatriceJiang Nov 28, 2018
ef0756b
[js interval tests] use labelBMFont instead of labelTTF, improve pref…
PatriceJiang Nov 28, 2018
099daaf
update cocos console (#19216)
drelaptop Nov 28, 2018
fde4e63
[js tests] add index, simplify (#19218)
PatriceJiang Nov 29, 2018
9ad2545
Revert "fix crash of cclayercolor and fix some other error logic (#19…
drelaptop Nov 29, 2018
669b3af
Revert "Remove ccglstatecache (#19013)"
drelaptop Nov 29, 2018
ea354c7
remove item in changelog
drelaptop Nov 29, 2018
c716638
Merge pull request #19219 from drelaptop/3.17.1-revert-ccglstate
drelaptop Nov 29, 2018
2ce26fb
3d touch works on iPhone6s+, not only (#19217)
drelaptop Nov 29, 2018
df18dd8
[cpp-test ios]Extensions/WebSocketTest/add CA for binary test (#19220)
PatriceJiang Nov 30, 2018
ed2eab5
Fix animation duration calculation (#19221)
zeeker999 Nov 30, 2018
7faf5cf
[cpp test]fix SequenceAction count error (#19222)
PatriceJiang Nov 30, 2018
45898bc
[js-tests] prevent frequently click 'Main Menu' button, load main sce…
PatriceJiang Dec 5, 2018
60eb6db
Merge pull request #19229 from cocos2d/3.17.1
drelaptop Dec 5, 2018
95319e9
[android/cpp test]Unit Test/9 neon32 release mode crash (#19224)
PatriceJiang Dec 7, 2018
53d8b68
[cpp-tests] Fileutils performance issue fix (#19231)
PatriceJiang Dec 7, 2018
d111072
[android lua] improve performance of lua loader (#19234)
PatriceJiang Dec 10, 2018
0f3e086
Improve websocket traces (#19235)
Dimon4eg Dec 10, 2018
fe25aee
alBufferData instead of alBufferDataStatic for small audio file on Ap…
drelaptop Dec 10, 2018
d8b838b
[cmake] add find_host_library into iOS toolchain file (#19230)
drelaptop Dec 10, 2018
035b59a
modify changelog for 3.17.1 release (#19226)
drelaptop Dec 10, 2018
3a85020
fix double free issues when js/lua-tests exit on iOS (#19236)
drelaptop Dec 11, 2018
6d5a4ea
[android] all test projects use cleartext (#19237)
PatriceJiang Dec 11, 2018
0364151
prevent player hold invalid AudioCache* pointer (#19240)
drelaptop Dec 11, 2018
b047926
[lua android] use luajit & template cmake update (#19239)
PatriceJiang Dec 12, 2018
b01bb0c
fix small type error in ScriptingCore (#19244)
drelaptop Dec 12, 2018
0aade7d
[lua-tests] fix LuaJavaBridge crash on release mode (#19248)
PatriceJiang Dec 14, 2018
3dc3473
[external] update to v152 (#19247)
PatriceJiang Dec 14, 2018
4f5bfea
[lua tests]fix evalJs 'alert' frozen (#19249)
PatriceJiang Dec 15, 2018
90d2bbf
update CHANGELOG (#19250)
PatriceJiang Dec 18, 2018
8bfc9a4
[lua-tests] use math.fmod & lua downloader binding clear stack (#19…
PatriceJiang Dec 19, 2018
8d5c1d4
[lua] remove luaL_error, which kill process (#19257)
PatriceJiang Dec 21, 2018
451d913
[vs2017] upgrade 3rd party libs to support vs2017 in release mode (#1…
PatriceJiang Dec 21, 2018
c6224d1
[uibutton] fix size init order (#19260)
PatriceJiang Dec 24, 2018
b136b56
increase cmake stability , remove tests/CMakeLists.txt (#19261)
drelaptop Dec 24, 2018
cc6ffbd
Update changelog and release note (#19264)
PatriceJiang Dec 25, 2018
fea0b04
update versoin code (#19265)
PatriceJiang Dec 25, 2018
9bd7732
Merge pull request #19266 from cocos2d/3.17.1
drelaptop Dec 25, 2018
00cad6c
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Dec 25, 2018
c9e4cb2
standardize pause & resume logic on GLSurfaceView (#19256)
drelaptop Dec 26, 2018
9fadf4e
fix spritecache plist parsing issue (#19269)
PatriceJiang Dec 26, 2018
403deed
cmake win32 Precompiled header (#19273)
crazyhappygame Jan 1, 2019
2941200
Ability to get low coupling inheritance (#19276)
gestern Jan 4, 2019
9f424e2
[3rd-libs] upgrade to version 154 (#19282)
PatriceJiang Jan 9, 2019
2d319be
Install ninja (#19298)
crazyhappygame Jan 15, 2019
941f579
update 3rd libs & console, fix file issues (#19284)
PatriceJiang Jan 15, 2019
3c3964c
Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
formatCvt Jan 16, 2019
f29d107
revert ndk-build final target, others need it (#19296)
drelaptop Jan 16, 2019
ccb5d81
Add clear request and responses method to httpclient (#19294)
benjaprieto Jan 16, 2019
8978825
ReFix bug: PremultipliedAlpha is not working for png (#19138)
sense-zzz-time Jan 16, 2019
6259d5d
Ui video player new style looping input options (#19297)
benjaprieto Jan 18, 2019
a109a5d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Jan 18, 2019
55b6d3a
cmake support set iOS Deployment Target for root project (#19315)
drelaptop Jan 18, 2019
ac539b1
refine cmake, add iOS sign config (#19327)
drelaptop Jan 21, 2019
e71ef82
refine cmake, allow developer switch Debug/Release in IDE (#19329)
drelaptop Jan 22, 2019
c1acc20
Add Android P cutout area support (#19286)
formatCvt Jan 29, 2019
8fc3b7b
update change log, "allow cleartext HTTP traffic" don't include template
drelaptop Jan 29, 2019
d8382c1
Adds Configuration::getInfoAsMap() (#19381)
gestern Feb 13, 2019
9011e84
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Feb 13, 2019
378e3cd
Checking, does the touch is within the height of the line, not the he…
kasandko Feb 14, 2019
17704df
If path to file is tool long crash is possible. (#19383)
sbrednikhin Feb 14, 2019
2675f1d
Font atlas texture initialization delayed (#19384)
sbrednikhin Feb 14, 2019
4db6353
fix header path include style (#19395)
Feb 14, 2019
fa3ab72
Fix memory leak if invoking Texture2D::setAlphaTexture many times. (#…
dumganhar Feb 18, 2019
d9a3493
need to generate binding codes for all targets (#19424)
drelaptop Feb 22, 2019
0e996a9
remove unneeded codes (#19421)
Feb 25, 2019
d7212ea
refine travis, don't generate binding codes for cpp only target (#19430)
drelaptop Feb 25, 2019
eda0c24
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Feb 26, 2019
0c57689
Lua: add manual bindings for EventDispatcher::addCustomEventListener …
turgenevivan Feb 27, 2019
6b2f160
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Feb 27, 2019
9483182
fix the member parameter:_percent is always be 0 during the update pr…
EricDDK Feb 27, 2019
d3e6727
Method to check if any IME dispatcher is active. (#19451)
sbrednikhin Mar 1, 2019
f0f732c
[Android] fix FileUtils::listFiles with path 'assets/' (#19457)
PatriceJiang Mar 4, 2019
80c6a69
Getting current clearing color in Renderer
sbrednikhin Mar 15, 2019
7634d12
Merge pull request #19518 from sbrednikhin/patch-1
Mar 18, 2019
7dbd0d5
Tabs to spaces
sbrednikhin Mar 18, 2019
e5fa917
Tabs to spaces
sbrednikhin Mar 18, 2019
66dbafe
Methods of changing clearing color
sbrednikhin Mar 18, 2019
9caa7b2
Getting clearing color from Director interface
sbrednikhin Mar 18, 2019
b9ff3dd
Ability to change title position
gestern Mar 19, 2019
b16292a
Merge pull request #19520 from sbrednikhin/v3
Mar 19, 2019
d8787b4
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Mar 19, 2019
a19fae8
Merge pull request #19525 from CocosRobot/update_lua_bindings_1552959478
Mar 19, 2019
a3a536e
Merge pull request #19524 from gestern/patch-1
Mar 19, 2019
78a8b2b
Only send the ON_PERCENTAGE_CHANGED if and only if the percentage val…
rh101 Apr 1, 2019
56abd88
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json au…
CocosRobot Apr 1, 2019
a837ed7
[windows] use PostMessage to replace SendMessage (#19569)
PatriceJiang Apr 3, 2019
14d1ffe
revert threads (#19572)
PatriceJiang Apr 4, 2019
5dedc9d
Update CCArmature.cpp (#19579)
larisand Apr 8, 2019
d71ae3f
use CC_SAFE_DELETE_ARRAY instead of CC_SAFE_DELETE (#19580)
Apr 8, 2019
fc6a6db
Fix bug: can't play video in obbfile. (#19476)
halx99 Apr 10, 2019
b1e4a17
fix base/CMakeLists.txt (#19575)
Xrysnow Apr 10, 2019
f8fb981
fix static token array in headfile (#19164)
iDings Apr 10, 2019
1b1a1a4
End the NS_CC properly. (#19603)
larisand Apr 15, 2019
b1e4a16
add build test option for cmake (#19608)
deflinhec Apr 17, 2019
d5021cf
Optimize calls to std::string::find() and friends when the needle pas…
JohnCoconut Apr 18, 2019
28e8a64
rewrite parseIntegerList with better performance
JohnCoconut Apr 18, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,17 @@ tests/lua-tests/project/proj.tizen/res/
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
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ matrix:
include:
# linux
- os: linux
dist: xenial
env:
- BUILD_TARGET=linux
- GEN_BINDING_AND_COCOSFILE=true
Expand All @@ -24,7 +25,7 @@ matrix:
sudo: required
# android ndk-build
- os: linux
env: BUILD_TARGET=android_ndk-build
env: BUILD_TARGET=android_cpp_ndk-build
language: android
sudo: required
# android_lua ndk-build
Expand All @@ -34,7 +35,7 @@ matrix:
sudo: required
# android cmake
- os: linux
env: BUILD_TARGET=android_cmake
env: BUILD_TARGET=android_cpp_cmake
language: android
sudo: required
# android_lua cmake
Expand All @@ -60,11 +61,12 @@ matrix:
osx_image: xcode9.3
sudo: required
- os: linux
env: BUILD_TARGET=android_cocos_new_test
language: cpp
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

Expand Down
85 changes: 84 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,86 @@
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
Expand Down Expand Up @@ -1164,7 +1247,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
Expand Down
22 changes: 18 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,29 @@ project(Cocos2d-x)
set(COCOS2DX_ROOT_PATH ${CMAKE_CURRENT_SOURCE_DIR})
set(CMAKE_MODULE_PATH ${COCOS2DX_ROOT_PATH}/cmake/Modules/)

# prevent in-source-build
include(PreventInSourceBuilds)
AssureOutOfSourceBuilds()

# 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)

24 changes: 20 additions & 4 deletions build/cocos2d_libs.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2048,6 +2048,7 @@
507B3B4B1C31BDD30067B53E /* CCBillBoard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B60C5BD219AC68B10056FBDE /* CCBillBoard.cpp */; };
507B3B4C1C31BDD30067B53E /* Particle3DReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18956BB01A9DFBFD006E9155 /* Particle3DReader.cpp */; };
507B3B4D1C31BDD30067B53E /* CCSprite3DMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15AE180319AAD2F700C27E9E /* CCSprite3DMaterial.cpp */; };
507B3B4E1C31BDD30067B53E /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD701925AB4100A911A9 /* ccGLStateCache.cpp */; };
507B3B501C31BDD30067B53E /* CCPUDoEnableComponentEventHandlerTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B665E1021AA80A6500DDB1C5 /* CCPUDoEnableComponentEventHandlerTranslator.cpp */; };
507B3B511C31BDD30067B53E /* CCTransition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A5701D8180BCB8C0088DEC7 /* CCTransition.cpp */; };
507B3B531C31BDD30067B53E /* CCEventAssetsManagerEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15B3707019EE414C00ABE682 /* CCEventAssetsManagerEx.cpp */; };
Expand Down Expand Up @@ -2532,6 +2533,7 @@
507B3DEB1C31BDD30067B53E /* CCActionPageTurn3D.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A57005A180BC5A10088DEC7 /* CCActionPageTurn3D.h */; };
507B3DEC1C31BDD30067B53E /* UIHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9F518CF08D000240AA3 /* UIHelper.h */; };
507B3DED1C31BDD30067B53E /* CCNavMeshUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = B677B0C81B18492D006762CB /* CCNavMeshUtils.h */; };
507B3DEE1C31BDD30067B53E /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD711925AB4100A911A9 /* ccGLStateCache.h */; };
507B3DEF1C31BDD30067B53E /* CCPUBaseForceAffector.h in Headers */ = {isa = PBXBuildFile; fileRef = B665E0DB1AA80A6500DDB1C5 /* CCPUBaseForceAffector.h */; };
507B3DF01C31BDD30067B53E /* CCPUNoise.h in Headers */ = {isa = PBXBuildFile; fileRef = B665E1591AA80A6500DDB1C5 /* CCPUNoise.h */; };
507B3DF11C31BDD30067B53E /* CocosGUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 2905F9EA18CF08D000240AA3 /* CocosGUI.h */; };
Expand Down Expand Up @@ -3220,6 +3222,10 @@
50ABBD981925AB4100A911A9 /* CCGLProgramStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD6E1925AB4100A911A9 /* CCGLProgramStateCache.cpp */; };
50ABBD991925AB4100A911A9 /* CCGLProgramStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD6F1925AB4100A911A9 /* CCGLProgramStateCache.h */; };
50ABBD9A1925AB4100A911A9 /* CCGLProgramStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD6F1925AB4100A911A9 /* CCGLProgramStateCache.h */; };
50ABBD9B1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD701925AB4100A911A9 /* ccGLStateCache.cpp */; };
50ABBD9C1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD701925AB4100A911A9 /* ccGLStateCache.cpp */; };
50ABBD9D1925AB4100A911A9 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD711925AB4100A911A9 /* ccGLStateCache.h */; };
50ABBD9E1925AB4100A911A9 /* ccGLStateCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD711925AB4100A911A9 /* ccGLStateCache.h */; };
50ABBD9F1925AB4100A911A9 /* CCGroupCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD721925AB4100A911A9 /* CCGroupCommand.cpp */; };
50ABBDA01925AB4100A911A9 /* CCGroupCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 50ABBD721925AB4100A911A9 /* CCGroupCommand.cpp */; };
50ABBDA11925AB4100A911A9 /* CCGroupCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ABBD731925AB4100A911A9 /* CCGroupCommand.h */; };
Expand Down Expand Up @@ -5394,6 +5400,8 @@
50ABBD6D1925AB4100A911A9 /* CCGLProgramState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramState.h; sourceTree = "<group>"; };
50ABBD6E1925AB4100A911A9 /* CCGLProgramStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGLProgramStateCache.cpp; sourceTree = "<group>"; };
50ABBD6F1925AB4100A911A9 /* CCGLProgramStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGLProgramStateCache.h; sourceTree = "<group>"; };
50ABBD701925AB4100A911A9 /* ccGLStateCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ccGLStateCache.cpp; sourceTree = "<group>"; };
50ABBD711925AB4100A911A9 /* ccGLStateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ccGLStateCache.h; sourceTree = "<group>"; };
50ABBD721925AB4100A911A9 /* CCGroupCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCGroupCommand.cpp; sourceTree = "<group>"; };
50ABBD731925AB4100A911A9 /* CCGroupCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCGroupCommand.h; sourceTree = "<group>"; };
50ABBD741925AB4100A911A9 /* CCQuadCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCQuadCommand.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -7988,6 +7996,8 @@
50ABBD6D1925AB4100A911A9 /* CCGLProgramState.h */,
50ABBD6E1925AB4100A911A9 /* CCGLProgramStateCache.cpp */,
50ABBD6F1925AB4100A911A9 /* CCGLProgramStateCache.h */,
50ABBD701925AB4100A911A9 /* ccGLStateCache.cpp */,
50ABBD711925AB4100A911A9 /* ccGLStateCache.h */,
50ABBD721925AB4100A911A9 /* CCGroupCommand.cpp */,
50ABBD731925AB4100A911A9 /* CCGroupCommand.h */,
B29594B21926D5EC003EEF37 /* CCMeshCommand.cpp */,
Expand Down Expand Up @@ -9782,6 +9792,7 @@
B665E2641AA80A6500DDB1C5 /* CCPUDoExpireEventHandler.h in Headers */,
1A40D1091E8E56C6002E363A /* allocators.h in Headers */,
50864CE21C7BC1B100B3BAB1 /* cpVect.h in Headers */,
50ABBD9D1925AB4100A911A9 /* ccGLStateCache.h in Headers */,
B665E3241AA80A6500DDB1C5 /* CCPUOnCollisionObserver.h in Headers */,
50ABBEB91925AB6F00A911A9 /* ccUTF8.h in Headers */,
15AE191A19AAD35000C27E9E /* CCSSceneReader.h in Headers */,
Expand Down Expand Up @@ -10058,6 +10069,7 @@
5020A1D91D49912500E80C72 /* RegionAttachment.h in Headers */,
507B3DEC1C31BDD30067B53E /* UIHelper.h in Headers */,
507B3DED1C31BDD30067B53E /* CCNavMeshUtils.h in Headers */,
507B3DEE1C31BDD30067B53E /* ccGLStateCache.h in Headers */,
507B3DEF1C31BDD30067B53E /* CCPUBaseForceAffector.h in Headers */,
507B3DF01C31BDD30067B53E /* CCPUNoise.h in Headers */,
507B3DF11C31BDD30067B53E /* CocosGUI.h in Headers */,
Expand Down Expand Up @@ -10870,6 +10882,7 @@
1A570088180BC5A10088DEC7 /* CCActionPageTurn3D.h in Headers */,
15AE1B9319AADA9A00C27E9E /* UIHelper.h in Headers */,
B677B0DC1B18492D006762CB /* CCNavMeshUtils.h in Headers */,
50ABBD9E1925AB4100A911A9 /* ccGLStateCache.h in Headers */,
B665E2111AA80A6500DDB1C5 /* CCPUBaseForceAffector.h in Headers */,
B665E30D1AA80A6500DDB1C5 /* CCPUNoise.h in Headers */,
15AE1B9619AADA9A00C27E9E /* CocosGUI.h in Headers */,
Expand Down Expand Up @@ -12150,6 +12163,7 @@
D0FD03531A3B51AA00825BB5 /* CCAllocatorGlobalNewDelete.cpp in Sources */,
B6DD2FE51B04825B00E47F5F /* DetourPathQueue.cpp in Sources */,
B665E39A1AA80A6500DDB1C5 /* CCPUPointEmitterTranslator.cpp in Sources */,
50ABBD9B1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */,
15AE188119AAD33D00C27E9E /* CCBReader.cpp in Sources */,
501216A01AC473AD009A4BEA /* CCMaterial.cpp in Sources */,
50ABBDB91925AB4100A911A9 /* CCTextureAtlas.cpp in Sources */,
Expand Down Expand Up @@ -12560,6 +12574,7 @@
507B3B4B1C31BDD30067B53E /* CCBillBoard.cpp in Sources */,
507B3B4C1C31BDD30067B53E /* Particle3DReader.cpp in Sources */,
507B3B4D1C31BDD30067B53E /* CCSprite3DMaterial.cpp in Sources */,
507B3B4E1C31BDD30067B53E /* ccGLStateCache.cpp in Sources */,
507B3B501C31BDD30067B53E /* CCPUDoEnableComponentEventHandlerTranslator.cpp in Sources */,
507B3B511C31BDD30067B53E /* CCTransition.cpp in Sources */,
507B3B531C31BDD30067B53E /* CCEventAssetsManagerEx.cpp in Sources */,
Expand Down Expand Up @@ -13228,6 +13243,7 @@
B60C5BD519AC68B10056FBDE /* CCBillBoard.cpp in Sources */,
18956BB31A9DFBFD006E9155 /* Particle3DReader.cpp in Sources */,
15AE184519AAD2F700C27E9E /* CCSprite3DMaterial.cpp in Sources */,
50ABBD9C1925AB4100A911A9 /* ccGLStateCache.cpp in Sources */,
B665E25F1AA80A6500DDB1C5 /* CCPUDoEnableComponentEventHandlerTranslator.cpp in Sources */,
1A5701E7180BCB8C0088DEC7 /* CCTransition.cpp in Sources */,
15B3707D19EE414C00ABE682 /* CCEventAssetsManagerEx.cpp in Sources */,
Expand Down Expand Up @@ -13702,7 +13718,7 @@
1551A34D158F2AB200E66CFE /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
EXECUTABLE_EXTENSION = a;
Expand Down Expand Up @@ -13743,7 +13759,7 @@
1551A34E158F2AB200E66CFE /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
COMBINE_HIDPI_IMAGES = YES;
EXECUTABLE_EXTENSION = a;
Expand Down Expand Up @@ -13856,7 +13872,7 @@
A07A4D621783777C0073F6A7 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
ENABLE_BITCODE = NO;
EXECUTABLE_PREFIX = "";
Expand Down Expand Up @@ -13893,7 +13909,7 @@
A07A4D631783777C0073F6A7 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_WEAK = YES;
ENABLE_BITCODE = NO;
EXECUTABLE_PREFIX = "";
Expand Down
Loading