minggo
ee84d9f12e
update v3.15
2017-04-14 13:45:32 +08:00
CocosRobot
487490def0
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17693 )
2017-04-13 17:59:19 +08:00
minggo
270bcb28a5
do not set attributes in java ( #17680 )
...
if setting attribures in java code, then engine can not select GLES2/GLES3 dynamically
2017-04-10 17:41:53 +08:00
James Chen
ccb0c168d4
[android] Fixes that android studio project will be created with a default package name ‘org.cocos2dx.MyLuaGame’. ( #17674 )
2017-04-10 13:50:31 +08:00
minggo
8a587a3681
[ci skip]fix some error for Android Studio project ( #17655 )
...
* use '/' for path separator on windows
* enable short commands
it is useful on windows because windows has length limitation of commands
2017-04-06 15:41:38 +08:00
minggo
9ed5127edc
synchronize v3.15
2017-04-01 17:16:45 +08:00
CocosRobot
7ae2e9ebd0
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17626 )
2017-04-01 14:45:38 +08:00
minggo
9d81f16bc5
[ci skip]make android studio work for release mode ( #17610 )
...
* release mode of lua test case work with Android Studio
* add missing file
* fix error for debug mode
* make android studio work
2017-03-29 15:56:46 +08:00
effolkronium
55362547fa
Fix bug with unresolved symbols in Android Studio 2.3 ( #17586 )
...
* Fix bug with unresolved symbols in Android Studio 2.3
* Fix bug with unresolved symbols in Android Studio 2.3
2017-03-27 11:05:16 +08:00
pandamicro
5341f7517e
Improve js template and test pages ( #17575 )
...
* Improve js template and test pages
* Update web ref
2017-03-27 11:03:51 +08:00
minggo
6b7e5d69bb
correct module path ( #17569 )
2017-03-22 17:04:26 +08:00
minggo
db837ebdae
remove unneeded test cases and fix parameter length limitation on windows
...
* delete unnneded test case on windows
* delete unneeded test cases
* avoid parameter length limit when building android on windows
* adjust project setting to delete unneeded test cases
* remove unneeded test cases for windows10
* remove unneeded test cases for tizen
* remove unnedded test case for android
2017-03-22 13:43:12 +08:00
James Chen
ab9104f3ce
Updates templates for switching AudioEngine in AppDelegate.cpp. ( #17555 )
2017-03-22 11:19:25 +08:00
rh101
f8eccb9608
Added VS2017 support in project files ( #17548 )
...
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entries for non-existent files that were causing "Build is out of date" issues in Visual Studio
[project.pbxproj] Removed entries for non-existent file
* [libcocos2d.vcxproj.filters] Renamed CCStencilStateManager.h extension to .hpp.
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entry for file CCDownloaderImpl.h which does not exist.
* Changed extension of CCStencilStateManager.hpp to .h
* Added support for VS2017 in project files.
2017-03-20 09:36:07 +08:00
minggo
ebdae8c2da
use different separator on different platforms and make path length short ( #17542 )
2017-03-17 11:54:36 +08:00
CocosRobot
a1772418b1
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17524 )
2017-03-16 14:16:56 +08:00
pandamicro
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
CocosRobot
87b4d7d54d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17507 )
2017-03-15 16:23:50 +08:00
pandamicro
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
Bin Zhang
010a724149
Solve the error when building Android Studio project. ( #17504 )
2017-03-15 15:45:50 +08:00
minggo
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
Bin Zhang
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
James Chen
b8edb47abb
[ci skip][win32] Updates lua template ( #17493 )
2017-03-14 11:57:41 +08:00
James Chen
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
CocosRobot
0536f6dc74
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17458 )
2017-03-07 14:34:39 +08:00
CocosRobot
06f2d415f7
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17392 )
2017-02-22 11:38:58 +08:00
minggo
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
Chaoren Lin
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
CocosRobot
126c983ca9
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17375 )
2017-02-17 10:17:46 +08:00
CocosRobot
59a15ac1e4
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17366 )
2017-02-14 16:04:59 +08:00
CocosRobot
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
CocosRobot
62e759b9a1
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17350 )
2017-02-13 15:36:30 +08:00
CocosRobot
671861c710
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17322 )
2017-02-08 13:57:29 +08:00
CocosRobot
3d51645d3d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17319 )
2017-02-08 10:42:18 +08:00
Dale Stammen
9381152ef1
removed support for Windows 8.1 store and phone ( #17311 )
2017-02-08 09:46:47 +08:00
Wilson E. Alvarez
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
Wilson E. Alvarez
ca28af0113
Fixed variable order in initializer lists ( #17274 )
2017-02-04 10:33:58 +08:00
CocosRobot
1bc016b354
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17232 )
2017-01-19 14:15:08 +08:00
minggo
5d41d3c65e
add cocos/editor-support into search path ( #17137 )
2017-01-10 11:57:01 +08:00
CocosRobot#Set
69217f0e8b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-01-05 01:40:38 +00:00
minggo
f63fad3e27
Merge branch 'v3.14' into merge-v314
2017-01-04 09:49:22 +08:00
CocosRobot#Set
7950719e83
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-12-29 02:31:01 +00:00
minggo
b57db96f09
don't use Layer ( #17048 )
2016-12-21 13:49:59 +08:00
Wilson E. Alvarez
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
CocosRobot
e2100ce88c
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16950 )
2016-12-02 14:47:45 +08:00
Dale Stammen
8791794f39
updated for v3.14 ( #16942 )
2016-12-01 10:37:04 +08:00
Dmitry
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
tmr111116
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
CocosRobot
2d18d703a0
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16810 )
2016-11-04 14:07:25 +08:00
Bin Zhang
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
CocosRobot
23ff5fc51f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16676 )
2016-10-11 11:40:11 -07:00
minggo
56e0e6f741
correct search path ( #16660 )
2016-10-08 14:44:18 +08:00
CocosRobot
c046257efc
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16630 )
2016-09-30 09:44:34 +08:00
minggo
a6f3773aef
Luajit ( #16620 )
...
* update console
* load lua according architecture
* install android-13 in travis
2016-09-28 16:19:20 +08:00
minggo
84a102edf8
merge v3.13.1 back to v3
2016-09-15 10:08:28 +08:00
Dale Stammen
c6f6952258
added missing COCOS2D_DEBUG=1 to debug preprocessor defines ( #16551 )
2016-09-12 09:48:56 +08:00
minggo
937525a4de
prevent restarting activity on some events ( #16525 )
2016-09-06 16:12:49 +08:00
James Chen
93322eb728
Fixes lua template in release mode. ( #16501 )
2016-09-05 10:02:42 +08:00
CocosRobot
b6536e8d9f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16499 )
2016-09-02 10:44:55 +08:00
CocosRobot
e33aa63226
[AUTO][ci skip]: updating cocos2dx_files.json
2016-08-30 09:20:13 +00:00
minggo
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
CocosRobot
6d7140d4af
[AUTO][ci skip]: updating cocos2dx_files.json ( #16439 )
2016-08-24 17:47:51 -07:00
CocosRobot
331faac9d1
[AUTO][ci skip]: updating cocos2dx_files.json ( #16436 )
2016-08-24 17:54:11 +08:00
Furkan Üzümcü
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
CocosRobot
0fbc404cd9
[AUTO][ci skip]: updating cocos2dx_files.json ( #16403 )
2016-08-22 09:38:51 +08:00
minggo
2c37be5d86
fix lua tempate error ( #16377 )
2016-08-17 16:09:48 +08:00
CocosRobot
9019d7f2c4
[AUTO][ci skip]: updating cocos2dx_files.json ( #16374 )
2016-08-17 13:59:55 +08:00
minggo
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
CocosRobot
c03f6468fc
[AUTO][ci skip]: updating cocos2dx_files.json ( #16368 )
2016-08-15 17:27:05 +08:00
Greg Rynkowski
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
minggo
1cb506a5c5
fix compiling error if building for Android Studio ( #16317 )
2016-08-05 14:03:35 +08:00
James Chen
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
mogemimi
808a10429b
Fix some typos in comments and strings ( #16290 )
2016-08-02 15:29:23 +08:00
QingliWang
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
CocosRobot
dea3a83efc
[AUTO][ci skip]: updating cocos2dx_files.json ( #16272 )
2016-07-29 17:39:32 +08:00
minggo
7131451f1b
change to use api 19 ( #16248 )
...
* change to use api 19
* update deps version
2016-07-29 13:57:01 +08:00
CocosRobot
fbf74a49d5
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-29 01:38:42 +00:00
minggo
ddc5a90686
Merge pull request #16247 from minggo/js-template
...
[ci skip]fix JS template
2016-07-28 15:55:03 +08:00
minggo
fc36ce3c92
copy script
2016-07-28 10:40:08 +08:00
CocosRobot
9096e19ec7
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-28 01:59:39 +00:00
Vladimir Perminov
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
minggo
b74900fe70
fix js template
2016-07-27 16:57:03 +08:00
minggo
67ec4521e5
explicitly set app-abi to armeabi
2016-07-27 10:10:09 +08:00
CocosRobot
588ac1c70d
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-25 09:33:45 +00:00
minggo
358f247700
remove unneeded flag
2016-07-22 09:42:08 +08:00
minggo
a97906a280
Merge pull request #16184 from minggo/issue-16161
...
Issue 16161
2016-07-22 13:51:54 +08:00
minggo
5f2c1df448
use android 21 to fix compiling error
2016-07-22 10:53:56 +08:00
CocosRobot
235e65b835
[AUTO][ci skip]: updating cocos2dx_files.json ( #16174 )
2016-07-21 10:09:27 +08:00
CocosRobot
9c35dedb75
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-18 06:17:04 +00:00
Bojan Matić
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
CocosRobot
eea229c101
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-13 04:38:56 +00:00
zhangbin
f4accbdf3e
Solve the error in command gen-templates & gen-simulator.
2016-07-13 09:42:05 +08:00
zhangbin
4408f28480
Solve the error in simulator project.
...
Remove unused files.
2016-07-12 17:33:43 +08:00
CocosRobot
ca28b5b603
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-11 04:04:47 +00:00
minggo
d4bd1d0c9a
fix conflict
2016-07-08 18:15:57 +08:00
minggo
826b142096
remove ide-support in framework project
2016-07-08 18:07:57 +08:00
minggo
3f60d1d886
remove code ide related codes in tempaltes
2016-07-08 17:17:23 +08:00
minggo
734d857ced
Merge branch 'v3.12' into merge-v312
2016-07-07 15:13:21 +08:00
pandamicro
d99a8f0f84
Made css style inline
2016-07-06 19:42:27 +08:00