ebdae8c2da
use different separator on different platforms and make path length short ( #17542 )
2017-03-17 11:54:36 +08:00
a1772418b1
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17524 )
2017-03-16 14:16:56 +08:00
f0061c3ddc
[ci skip] Improve js template and update web ref ( #17510 )
...
* Improve js templates
* Update web ref
2017-03-16 09:42:51 +08:00
87b4d7d54d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17507 )
2017-03-15 16:23:50 +08:00
0eec73ba43
Bindings fix and assets manger ex fix ( #17115 )
...
* Fix custom event being discard during event emission
* Fix tilemap black line issue
* Fix auto bindings config
* Adapt websocket to new memory model
* Improve cocos2d_specifics code stability
* Fix issue with get_or_create_js_object function
* Improve memory usage in function wrapper invocation
* Use JS Function bind to avoid memory tracking issues
* Support size parameter to collect total byte size before update process
* Fix download resuming issue on Android
* Remove temporary assets when temporary manifest is invalid or out of date
* Use version compare handle to compare manifests versions
* Support max concurrent tasks setting & download verify callback
* Add Manifest::Asset conversion
* Avoid crash caused by wrappers
* Sync implementation of tested and published AssetsManagerEx from Cocos Creator
* Fix linux compilation issues
2017-03-15 16:09:02 +08:00
010a724149
Solve the error when building Android Studio project. ( #17504 )
2017-03-15 15:45:50 +08:00
fd74e4d6aa
update build tool version and gradle version ( #17499 )
...
after this PR, can see 3rd party cpp files in Android Studio
2017-03-15 09:56:20 +08:00
769f7830f0
Improve the AndroidStudio configurations of tests & templates ( #17495 )
...
* Improve the AndroidStudio configuration of test projects to fit the new implementation of cocos compile.
* Improve the AndroidStudio configuration of templates to fit the new implementation of cocos compile.
2017-03-14 13:41:28 +08:00
b8edb47abb
[ci skip][win32] Updates lua template ( #17493 )
2017-03-14 11:57:41 +08:00
4f6340c919
[win32] Updates template project configuration files. ( #17491 )
...
* [win32] Updates template project configruation files.
* [win32] Re-adds libcurl.lib for cpp template.
2017-03-14 11:17:15 +08:00
0536f6dc74
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17458 )
2017-03-07 14:34:39 +08:00
06f2d415f7
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17392 )
2017-02-22 11:38:58 +08:00
5ae8a95c6f
[ci skip]make all tests and template support Android Studio ( #17389 )
...
* make all tests and template support Android Studio
* use grable 2.2.3
2017-02-21 17:58:30 +08:00
d14f4270aa
Use ndk-build with Android Studio. ( #15676 )
...
* Use ndk-build integration in Android Studio.
* Update build.gradle
* Update build.gradle
* Update build.gradle
2017-02-20 11:14:36 +08:00
126c983ca9
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17375 )
2017-02-17 10:17:46 +08:00
59a15ac1e4
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17366 )
2017-02-14 16:04:59 +08:00
d07794052f
Update license to 2017 ( #17362 )
...
* Typo: CopyRight -> Copyright
* Copyright update: chukong-inc.com -> Chukong Technologies Inc.
* [js files] Copyright update: 2014 -> 2014-2017
* [cpp files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2015 -> 2015-2017
* [js files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2016 -> 2016-2017
* Copyright update: 2013 -> 2013-2017
* Copyright update: 201?-201? -> 201?-2017
* License year fixes.
* Liscene year fix in CCRay.cpp
* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
1baad6b962
Fix tizen compilation issue ( #17341 )
...
* fix tizen compile issue
* enable websocket test on tizen
* change application id of tizen projects
* improve cpp-tests websockets
* update template app id of tizen
* fix tizen cpp-tests in release mode
* update 3rd deps version
* bump external version to 123
2017-02-13 17:59:48 +08:00
62e759b9a1
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17350 )
2017-02-13 15:36:30 +08:00
671861c710
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17322 )
2017-02-08 13:57:29 +08:00
3d51645d3d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17319 )
2017-02-08 10:42:18 +08:00
9381152ef1
removed support for Windows 8.1 store and phone ( #17311 )
2017-02-08 09:46:47 +08:00
eab9cb6060
Included the directories such that the extension classes work out of the box in Linux ( #17259 )
2017-02-04 10:43:44 +08:00
ca28af0113
Fixed variable order in initializer lists ( #17274 )
2017-02-04 10:33:58 +08:00
1bc016b354
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17232 )
2017-01-19 14:15:08 +08:00
5d41d3c65e
add cocos/editor-support into search path ( #17137 )
2017-01-10 11:57:01 +08:00
69217f0e8b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-01-05 01:40:38 +00:00
f63fad3e27
Merge branch 'v3.14' into merge-v314
2017-01-04 09:49:22 +08:00
7950719e83
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-12-29 02:31:01 +00:00
b57db96f09
don't use Layer ( #17048 )
2016-12-21 13:49:59 +08:00
035aab2e1c
Make COCOS2D_DEBUG span throughout libcocos2d in Linux ( #17033 )
...
CCASSERT and other macros that are affected by COCOS2D_DEBUG will now be
properly defined for debugging builds in Linux.
2016-12-20 09:32:51 +08:00
e2100ce88c
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16950 )
2016-12-02 14:47:45 +08:00
8791794f39
updated for v3.14 ( #16942 )
2016-12-01 10:37:04 +08:00
1e1ac655b1
fixes for iOS 7 and earlier ( #16879 )
...
* initialize Director::_invalid on first init
* fix: Setting the GLView should be done after creating the RootViewController
* restore 2016 copyright on templates/cpp-template-default/proj.ios_mac/ios/AppController
* remove old iOS js and lua templates
* copy actual iOS templates from cpp to js and lua
2016-11-23 09:28:34 +08:00
ab8a119df2
Add NDEBUG for template Xcode project ( #10825 )
...
Android and other projects include NDEBUG already
templates/cpp-template-default/proj.android/jni/Application.mk: APP_CPPFLAGS += -DNDEBUG
templates/cpp-template-default/proj.win32/HelloCpp.vcxproj: <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECUR
templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj: <PreprocessorDefinitions>CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions)</Preprocess
templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj: <PreprocessorDefinitions>CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions)</Preprocess
templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Application.mk: APP_CPPFLAGS += -DNDEBUG
templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj: NDEBUG,
templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj: <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;GLFW
templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj: <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj: <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2016-11-09 11:26:28 +08:00
2d18d703a0
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16810 )
2016-11-04 14:07:25 +08:00
3b87e46280
Support compile & run project on Tizen by cocos command. ( #16783 )
...
* Add config files for build engine source code on tizen.
* Add config files for cpp-empty-test on tizen.
* Add missing files.
* Add config files for cpp-tests on tizen.
* Add Tizen config files for lua-bindings.
* Add Tizen config files for lua-empty-test.
* Solve the error when build lua-empty-test for Tizen.
* Add Tizen config files for lua-tests.
* Solve the error when build lua-tests for Tizen.
* Add tizen config files for templates.
* Update submodule cocos2d-console.
2016-11-02 17:41:26 +08:00
23ff5fc51f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16676 )
2016-10-11 11:40:11 -07:00
56e0e6f741
correct search path ( #16660 )
2016-10-08 14:44:18 +08:00
c046257efc
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16630 )
2016-09-30 09:44:34 +08:00
a6f3773aef
Luajit ( #16620 )
...
* update console
* load lua according architecture
* install android-13 in travis
2016-09-28 16:19:20 +08:00
84a102edf8
merge v3.13.1 back to v3
2016-09-15 10:08:28 +08:00
c6f6952258
added missing COCOS2D_DEBUG=1 to debug preprocessor defines ( #16551 )
2016-09-12 09:48:56 +08:00
937525a4de
prevent restarting activity on some events ( #16525 )
2016-09-06 16:12:49 +08:00
93322eb728
Fixes lua template in release mode. ( #16501 )
2016-09-05 10:02:42 +08:00
b6536e8d9f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16499 )
2016-09-02 10:44:55 +08:00
e33aa63226
[AUTO][ci skip]: updating cocos2dx_files.json
2016-08-30 09:20:13 +00:00
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
6d7140d4af
[AUTO][ci skip]: updating cocos2dx_files.json ( #16439 )
2016-08-24 17:47:51 -07:00
331faac9d1
[AUTO][ci skip]: updating cocos2dx_files.json ( #16436 )
2016-08-24 17:54:11 +08:00
minggo