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
5b83fa1ac0
Fix LNK4098 and LNK2001 warnings ( #16372 )
...
* Fix LNK4098 warnings
Fixes these two warnings:
```
warning: LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library
warning: LNK4098: defaultlib 'LIBCMT' conflicts with use of other libs; use /NODEFAULTLIB:library
```
* Fix LNK2001 error
The `version` library is not linked for MSVC compiler and it produces these errors when compiling with MSVC 19.
```
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _GetFileVersionInfoSizeW@8
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _GetFileVersionInfoW@16
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _VerQueryValueW@16
```
This commit fixes that problem
2016-08-22 15:50:17 +08:00
0fbc404cd9
[AUTO][ci skip]: updating cocos2dx_files.json ( #16403 )
2016-08-22 09:38:51 +08:00
2c37be5d86
fix lua tempate error ( #16377 )
2016-08-17 16:09:48 +08:00
9019d7f2c4
[AUTO][ci skip]: updating cocos2dx_files.json ( #16374 )
2016-08-17 13:59:55 +08:00
3ce4134ab3
use java reflection to avoid API level dependent, use app-abi 10 ( #16371 )
...
* use java reflection to avoid API level dependent, use app-abi 10
* add license header
2016-08-17 13:55:26 +08:00
c03f6468fc
[AUTO][ci skip]: updating cocos2dx_files.json ( #16368 )
2016-08-15 17:27:05 +08:00
14b8fc0a71
Remove AppDelegate memory leak in Android projects ( #16333 )
...
* Remove AppDelegate memory leak from Android projects
AppDelegate object and all its members are never released.
As a solution I propose to use static unique_ptr that could destroy it
at the end of the application.
Issue:
https://github.com/cocos2d/cocos2d-x/issues/14110
* Correct code style in Android main.cpp files
- removed redundant headers (reduced dependencies)
- removed redundant code
- corrected code style
2016-08-08 10:53:04 +08:00
1cb506a5c5
fix compiling error if building for Android Studio ( #16317 )
2016-08-05 14:03:35 +08:00
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
808a10429b
Fix some typos in comments and strings ( #16290 )
2016-08-02 15:29:23 +08:00
bbfd2d334c
Some bug-fix and quality assurance for Tizen support. ( #16281 )
...
* Support audio interruption and resume callback when change earphone status.
* Refactor keyevent callback and add makecurrent for compatible with different binary.
* Enable Tizen indicator.
* Remove the unnecessary evasobject in the window and refactor the function for glview mode.
* Fix the compatible issue between Tizen 2.3 and 2.4.
* Fix the wrong directory of script resources for HellLua template project.
* Create performance-test project for Tizen platform.
2016-07-31 22:32:59 +08:00
dea3a83efc
[AUTO][ci skip]: updating cocos2dx_files.json ( #16272 )
2016-07-29 17:39:32 +08:00
7131451f1b
change to use api 19 ( #16248 )
...
* change to use api 19
* update deps version
2016-07-29 13:57:01 +08:00
fbf74a49d5
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-29 01:38:42 +00:00
ddc5a90686
Merge pull request #16247 from minggo/js-template
...
[ci skip]fix JS template
2016-07-28 15:55:03 +08:00
fc36ce3c92
copy script
2016-07-28 10:40:08 +08:00
9096e19ec7
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-28 01:59:39 +00:00
09aa7d9cf4
Win32 move unicode utils global. ( #16234 )
...
* Win32 move unicode utils global.
It need for easy converting utf-8 string in all code.
And use it api in user code also WinRT version.
* Move to CCUtils-win32
Also in WinRT version.
* Copyright
2016-07-28 09:57:29 +08:00
b74900fe70
fix js template
2016-07-27 16:57:03 +08:00
67ec4521e5
explicitly set app-abi to armeabi
2016-07-27 10:10:09 +08:00
588ac1c70d
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-25 09:33:45 +00:00
358f247700
remove unneeded flag
2016-07-22 09:42:08 +08:00
a97906a280
Merge pull request #16184 from minggo/issue-16161
...
Issue 16161
2016-07-22 13:51:54 +08:00
5f2c1df448
use android 21 to fix compiling error
2016-07-22 10:53:56 +08:00
235e65b835
[AUTO][ci skip]: updating cocos2dx_files.json ( #16174 )
2016-07-21 10:09:27 +08:00
9c35dedb75
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-18 06:17:04 +00:00
727138b800
Fix browserVersion detection
...
Due to typo, the code meant for browser versions below 6.2 would
never run.
2016-07-14 08:24:12 +02:00
eea229c101
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-13 04:38:56 +00:00
f4accbdf3e
Solve the error in command gen-templates & gen-simulator.
2016-07-13 09:42:05 +08:00
4408f28480
Solve the error in simulator project.
...
Remove unused files.
2016-07-12 17:33:43 +08:00
ca28b5b603
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-11 04:04:47 +00:00
d4bd1d0c9a
fix conflict
2016-07-08 18:15:57 +08:00
826b142096
remove ide-support in framework project
2016-07-08 18:07:57 +08:00
3f60d1d886
remove code ide related codes in tempaltes
2016-07-08 17:17:23 +08:00
734d857ced
Merge branch 'v3.12' into merge-v312
2016-07-07 15:13:21 +08:00
d99a8f0f84
Made css style inline
2016-07-06 19:42:27 +08:00
96155a670f
Improve web template and update web ref
2016-07-06 13:54:55 +08:00
afe36e4a00
feat: upgrades to GLFW v3.2
...
Inclues Mac and Win32 binaries
Includes udpated downlaod+compile Linux script
fixes github issue #11748
uses WINAPI instead of APIENTRY
it seems that it is being redefined somewhere... but I couldn't find
exactly where
2016-06-29 16:11:30 -07:00
076e0b488b
Merge pull request #15980 from minggo/merge-v312
...
Merge v312
2016-06-29 09:41:30 +08:00
2fbf3c9940
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-29 01:01:21 +00:00
6e54080e83
Fix style issue in html page
2016-06-28 21:59:37 +08:00
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
683a4bfec6
Fix tests for v3.12 web
2016-06-22 17:39:38 +08:00
1c8ab4f504
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-20 05:41:22 +00:00
eee0d14e8f
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-17 02:17:23 +00:00
134a09da6f
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-16 07:51:35 +00:00
600175a93c
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-16 03:10:20 +00:00
925e938724
Merge pull request #15839 from Shulepov/refactor_and_cleanup_RootViewController
...
Cleanup and refactor RootViewController
2016-06-15 14:17:05 +08:00
77e71fa638
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-15 02:45:36 +00:00
51f4deee01
Add system label overflow ( #15827 )
...
* Add system font overflow
1. currently only iOS, Mac and Android platform are supported
add mac label overflow shrink
modify system font overflow test
fix warning and possible memory leaks
add ios system label overflow support
add iOS system font overflow support
fix iOS system font overflow
fix Mac System font overflow
add android system font clamp
add Android system font shrink
cleanup iOS shrink related code
fix Android system font clamp
add core text to project template
fix iOS tests project
fix mac and iOS shrink
improve iOS and Mac clamp feature
fix header file include path
* modify the comments, make it more clearer
2016-06-15 10:43:15 +08:00
2cd7850427
Cleanup and refactor RootViewController
2016-06-14 19:55:31 +03:00
70000bcc84
Refine cpp template for iOS ( #15792 )
...
* Modified the layer follow action class to include a horizontal (x) and vertical (y) offset on the screen from which the node is to be followed.
* Added offsetX and offsetY parameters in Follow::clone() method.
* Added test case for follow action with offset.
* Made changes to the test case on follow action with offset.
* Added new createWithOffset function to create a follow action with offset.
* Modified the test case for followWithoffset to use the newly added createWithOffsets function for follow action.
* Refined the code for creating follow action with offsets.
* Modified test case for follow with offset as per updated create method.
* Code refined in createWithOffset method of follow action.
* Refined AppController.mm,RootViewController.mm and HelloWorldScene.cpp to load the cocos2d-x scene more effectively.Also included the procedure to dismiss the game scene and navigate back to iOS screen.
2016-06-08 10:55:02 +08:00
21ab86b5fe
iOS: ARC support #12518 ( #13937 )
...
* iOS: ARC support #12518
* Use @autoreleasepool with and without ARC
* Missed release for _viewController
2016-06-06 13:48:02 +08:00
6a2f417498
[AUTO][ci skip]: updating cocos2dx_files.json
2016-05-30 09:23:17 +00:00
7516db0fa8
Merge pull request #15734 from pandamicro/v3
...
Support cc.view.setOrientation on web
2016-05-27 14:26:50 +08:00
1928d24bf0
Made templates support cc.view.setOrientation on web
2016-05-26 19:24:24 +08:00
93ed59bfb3
English grammar corrections.
2016-05-25 15:25:38 +01:00
6097c3abd1
English grammar corrections.
...
Make brackets consistent.
2016-05-25 15:18:57 +01:00
5019dc7878
don't strip png text
2016-05-24 10:06:28 +08:00
ecf181036a
remove unneeded files
2016-05-18 16:44:06 +08:00
74af3b5232
merge v3.11 back to v3
2016-05-12 09:50:03 +08:00
530d890c6c
[AUTO][ci skip]: updating cocos2dx_files.json
2016-05-10 02:41:22 +00:00
2a712a0c3b
set correct package name
2016-05-09 18:14:53 +08:00
Chaoren Lin