Commit Graph

168 Commits

Author SHA1 Message Date
RickyZheng001 f8e325792b V3.15 (#17752)
* remove APP_SHORT_COMMANDS setting (#17722)

some developers report it will cause error on Windows though i can not reproduce it. It is strange, the setting is used to resolve command length limitation on Windows.

* Particle font size should be a const value (#17676)

* Particle font size should be a const value

* Minor fix: CCStencilStateManager.hpp -> CCStencilStateManager.h in xcode project.

* JSB SocketIO.connect supports to pass a CA cert file (#17736)

* JSB SocketIO.connect supports to pass a CA cert file

* The second parameter of SocketIO.connect function is probably a `option` object. JSB just ignores it.
2017-04-27 09:25:20 +08:00
minggo ee84d9f12e update v3.15 2017-04-14 13:45:32 +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
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
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
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 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
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
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 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
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
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
Dale Stammen 9381152ef1 removed support for Windows 8.1 store and phone (#17311) 2017-02-08 09:46:47 +08:00
Wilson E. Alvarez ca28af0113 Fixed variable order in initializer lists (#17274) 2017-02-04 10:33:58 +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
minggo 84a102edf8 merge v3.13.1 back to v3 2016-09-15 10:08:28 +08:00
minggo 937525a4de prevent restarting activity on some events (#16525) 2016-09-06 16:12:49 +08:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +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
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
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
minggo 7131451f1b change to use api 19 (#16248)
* change to use api 19

* update deps version
2016-07-29 13:57:01 +08:00
minggo fc36ce3c92 copy script 2016-07-28 10:40:08 +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
minggo 5f2c1df448 use android 21 to fix compiling error 2016-07-22 10:53:56 +08: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
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
pandamicro 96155a670f Improve web template and update web ref 2016-07-06 13:54:55 +08:00
Ricardo Quesada 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
pandamicro 6e54080e83 Fix style issue in html page 2016-06-28 21:59:37 +08:00
pandamicro 683a4bfec6 Fix tests for v3.12 web 2016-06-22 17:39:38 +08: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
minggo 7516db0fa8 Merge pull request #15734 from pandamicro/v3
Support cc.view.setOrientation on web
2016-05-27 14:26:50 +08:00
pandamicro 1928d24bf0 Made templates support cc.view.setOrientation on web 2016-05-26 19:24:24 +08:00
BQ 93ed59bfb3 English grammar corrections. 2016-05-25 15:25:38 +01:00
BQ 6097c3abd1 English grammar corrections.
Make brackets consistent.
2016-05-25 15:18:57 +01:00
minggo 5019dc7878 don't strip png text 2016-05-24 10:06:28 +08:00
minggo ecf181036a remove unneeded files 2016-05-18 16:44:06 +08:00
minggo 2a712a0c3b set correct package name 2016-05-09 18:14:53 +08:00
minggo a5602cc732 merge v3.11 back to v3 2016-05-04 16:02:23 +08:00