Commit Graph

2453 Commits

Author SHA1 Message Date
Bin Zhang 740e761d88 Update the reference of submodule cocos2d-console. (#17425)
Changed: Improve the logic of gen-libs with external libraries tremolo & pvmp3dec.
2017-03-01 13:41:01 +08:00
Bin Zhang a8dd7aff4f Update the reference of submodule cocos2d-console. (#17407)
Changed: Add argument "--agreement" for skip the shown of agreement.
2017-02-24 17:28:47 +08:00
minggo 8cb299eb2b fix lua binding string conversion (#17367)
* fix lua binding string conversion
In previous, the characters after \0 will be truncated.

* revert some unneeded modification
2017-02-15 09:27:10 +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
Bin Zhang 1ef380f3a9 Update the submodule cocos2d-console. (#17337)
Changed: Solve the error when compile project for tizen with option `--tizen-strip`.
2017-02-10 10:44:05 +08:00
Wilson E. Alvarez ca28af0113 Fixed variable order in initializer lists (#17274) 2017-02-04 10:33:58 +08:00
James Chen b1f2a056b2 Refactor WebSocket to support SSL (wss) (#17172)
* Refactors WebSocket:
1. Supports wss protocol
2. Uses only one libwebsockets context, multiple wsi instances to avoid multi-thread issues
3. Uses lws_create_vhost to create multiple virtual host, different protocols works

* Adds openssl include path to xcode project configuration.

* mac doesn’t depend on curl

* ca file path should be full path.

* More bug fixes like which in https://github.com/cocos2d/cocos2d-x/pull/6986

* Remove curl dependence for mac

* Updates Andorid.mk

* [win32] Adds wss support for win32, and updates openssl, libcurl, libwebsockets libraries.

* Updates external/config.json to 118.

* [win32] Updates cocos/2d/libcocos2d.vcxproj to fix compilation error while building in release mode.

* Linux support websocket ssl connection.

* Updates external/config.json

* Updates install-deps-linux.sh

* Adds dependence of binutils, print ld version

* Updates travis scripts.

* Updates travis scripts.

* Updates travis script, don’t output log while extracting.

* update before-install.sh

* updates before-install.sh

* updates before-install.sh

* don’t output log for installing software.

* Updates config.json to 120.
2017-01-19 13:55:14 +08:00
Bin Zhang 1496b9e8be Update the reference of submodule cocos2d-console. (#17212) 2017-01-19 09:42:26 +08:00
minggo 8fbc905134 purge glfw3 before installing glfw3.2 (#17165)
* purge glfw3 before installing glfw3.2

* purge glfw3 before installing glfw3.2
2017-01-12 11:42:01 +08:00
minggo 0cb1e29323 update cocos console to fix compiling error with Android Studio projects (#17129) 2017-01-09 14:44:52 +08:00
Bin Zhang 3656c999da Update the reference of submodule cocos2d-console. (#17074)
Changes: Keep the ndk module paths without relative path.
2016-12-27 18:30:05 +08:00
pandamicro 5823f5792b Synchronize creator engine bug fixes and upgrade web engine (#17003)
* Add EventDispatcher#hasEventListener (sync from creator)

* Fix function wrapper using js object during its gc

* Support more system languages

* Direct log/error for better understanding problems & add sys.now

* Synchronize Editbox APIs

* Synchronize Scheduler.PRIORITY_NON_SYSTEM const

* Upgrade web engine

* Upgrade test cases

* Manually bind EventDispatcher::addCustomEventListener to avoid memory issue

* Manual bind EventListeners’ create to avoid memory issue

* Fix compilation issue when COCOS_DEBUG = 2

* Unify function name of Texture2D::releaseTexture

* Fix compilation issues and update web & bindings-generator

* Fix lua compilation issue

* Use %ld instead of %zd
2016-12-14 09:27:47 +08:00
James Chen 73542b2f17 Updates cocos2d-console (#16951) 2016-12-02 14:47:29 +08:00
minggo 403d679333 update sunbmodule to fix lua in arm64 bit in debug mode 2016-11-29 15:30:50 +08:00
falconlegend cc3da8e5d8 fix compile error when using cocos gen-libs (#16816) 2016-11-23 09:29:28 +08:00
Wilson E. Alvarez 3056269531 Various small performance tweaks (#16881)
* These variables can be accessed by reference

* Assign values in initialization list

* _range can also be in initialization list

* Prefixed ++ and added 'auto' to loops

Also removed extra whitespace

* Prefixed ++/--, and changed for-loop implementation to use 'auto' on some loops
2016-11-22 09:54:04 +08:00
Bin Zhang 3e59a082f5 Update submodule cocos2d-console. (#16851)
* Update submodule cocos2d-console.
Changes: Add option '--ap' for command gen-libs.

* Update submodule cocos2d-console.
Changes: Support strip arm64-v8a libs when generating android libs.
2016-11-17 18:06:32 +08:00
James Chen 7e14812240 fixed #16492: RapidJSON Crashes in Release mode on Android. (#16792)
* fixed #16492: RapidJSON Crashes in Release mode on Android.

* Updates external/config.json

* json/filestream.h -> json/filereadstream.h
2016-11-04 09:36:59 +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
Bin Zhang de9a3e52a5 Update the submodule cocos2d-console. (#16753)
Changed : Improve `cocos run -p iOS`  for support XCode 8.
2016-10-28 09:35:30 +08:00
Bin Zhang 93609ff586 Update submodule cocos2d-console. (#16683)
Solve the error prebuilt Android.mk generated by cocos gen-libs.
2016-10-12 16:53:11 +08:00
Ricardo Quesada e4be87a059 Adds Spine binary-file format support (#16629)
* Adds Spine binary-file format support

fixes issue #10438

* ignore SkeletonBinary.c from linter

* add another file to the exclude list

* lua manual fixes for spine

* SkeletonBinary.c and not .cpp

* missing files for win8.1

* don't compile it as crt

* new updates from spine
2016-10-11 10:56:14 -07:00
Wilson E. Alvarez a4769cdf2e Removed COCOS2D_DEBUG from Android simulator on release build (#16645) 2016-10-08 10:04:39 +08:00
Paul Gardiner 68ec773f39 lua: generate bindings for Sprite3DMaterial (#16609)
Add Sprite3DMaterial to the list of classes for autogeneration of
lua bindings.

Add a new test case to the end of Sprite3DTest.lua showing the
use of outline.material.
2016-09-30 09:34:16 +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
Rubonnek d5b5ecd886 Fix memory leak when loading Cocos Studio file (#16487) 2016-09-02 10:33:00 +08:00
minggo 978f9f99de generate binding codes and cocos_file.json (#16496) 2016-09-01 18:54:49 +08:00
minggo db21e5f349 [ci skip]Travis enable pull request (#16494)
* refactor travis and build pull request

* delete unneeded file
2016-09-01 16:25:47 +08:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +08:00
minggo 20a0798007 avoid to use __system_get_property__ (#16433)
* avoid to use __system_get_property__

* add utils

* revert console
2016-08-24 17:11:41 +08:00
minggo 1748dfa79d update agreement (#16431) 2016-08-24 14:52:55 +08:00
yanli.huang 5db61ca26f fix cocos package can't update (#16428)
* update cocos2d-console commit id : cocos package so change pyc

* update cocos2d-console  commit id: fix cocos package can't update
2016-08-24 10:09:42 +08:00
yanli.huang b0c8a8505a update cocos2d-console commit id : cocos package so change pyc (#16413) 2016-08-22 16:06:29 +08:00
yanli.huang 13a503bda7 update cocos2d-console commit fix part of mac can`t use cocos package (#16391)
* update cocos2d-console commit

* update cocos2d-console commit:
fix: Interrupt to compile when cocos package prompted user to update

* update cocos2d console commit  :fault-tolerant for cocos package
1.add mode param when call cocos package encrypt
2.fault-tolerant. call encrypt if and only if used cocos package to import plugin

* update cocos2d-console commit id :fix part of mac can't use cocos package

* update cocos2d-console commit id:cocos package so change pyc
2016-08-22 15:57:30 +08:00
pandamicro f0be4f3069 Merge part of Cocos2d-x-lite (#16380)
* Update js auto binding settings with new ndk version

* Remove unnecessary property from Ref

* Merge part of Cocos2d-x-lite :
1. Improve network bindings
2. Use nullptr instead of NULL
3. Remove usage of some deprecated APIs
4. Add some defensive code and cleanup

* Fix spine track entry circle referencing issue

* cocos2d/cocos2d-x#16327: Fix global object leak issue in JSB

* Improve ScriptingCore::evalString, old implementation have been deprecated in Spidermonkey

* Update JS versions

* Add docs for web v3.13

* Improve ScriptingCore

* Manual merge cocos2d/cocos2d-x#16383 by DavidDeSimone

* Fix auto bindings configurations

* Update web ref
2016-08-19 16:28:47 +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
halx99 a2adfaf7df #Improve node sort performance for 64-bit by std::sort + long long (_localZOrder) (#16262)
* #improve node sort performance by std::sort + unsigned long long (_localZOrder)

* Use bit field for make _localZOrder storage more clearly.

* #Comment _localZOrder members for meaningful.

* fix issues

* #use explicit bits integer of localZOrder storage

* #Fix compile error, add include <cstdint> to CCNode.h

* use the optimization for 64bit and no optimization solution for 32bit

* Use the optimization for 64bit and no optimization solution for 32bit

* #Improve node sort performance 64-bit by std::sort + long long (_localZOrder)

* fix issues

* test case

* Revert "test case"

This reverts commit 85471d07a433f2b7f0265c3b7dd483fcc28e3e2f.

* fix issues

* use lambda, and any other sort issues.

* skip sotNodes

* fix compile error

* fix  compile issue
2016-07-31 22:44:24 +08:00
yanli.huang 4a2d384a6c update cocos2d-console commit:fault-tolerant for cocos package (#16273)
* update cocos2d-console commit

* update cocos2d-console commit:
fix: Interrupt to compile when cocos package prompted user to update

* update cocos2d console commit  :fault-tolerant for cocos package
1.add mode param when call cocos package encrypt
2.fault-tolerant. call encrypt if and only if used cocos package to import plugin
2016-07-31 22:30:44 +08:00
Ricardo Quesada 2945968614 Upgrades to Spine v3.4 (#16242)
* Upgrades to Spine v3.4

Github issue #16115

* compiles and works on windows

tested on:

* win32
* win10
* win8.1

* include-linter: don't test spine files

we need them unmodified

* spine bindings fixes

also, doesn't use goblins-ffd. instead it uses goblins.
goblins-ffd is no longer present in spine v3.4
2016-07-28 07:25:50 -07:00
minggo 295f0716dc use gcc 4.9 instead 2016-07-28 10:56:52 +08:00
yanli.huang 3e33b7a1ca update cocos2d-console commit (#16222)
* update cocos2d-console commit

* update cocos2d-console commit:
fix: Interrupt to compile when cocos package prompted user to update
2016-07-27 15:37:12 +08:00
zhangbin 361a94e920 Update the submodule cocos2d-console.
Solve the crash problem of cocos console on some Mac machines. Related issue: #16138
2016-07-25 11:38:03 +08:00
yanli.huang 5b3eae7be8 update cocos2d-console commit (#16196) 2016-07-25 11:19:11 +08:00
mogemimi 5bd2d74078 Fix spelling for `getPolygonCenter` function 2016-07-19 08:24:22 +09:00
minggo 147fe4336c Merge pull request #16104 from natural-law/v3
Solve the error in command gen-templates & gen-simulator.
2016-07-13 09:45:29 +08:00
zhangbin f4accbdf3e Solve the error in command gen-templates & gen-simulator. 2016-07-13 09:42:05 +08:00
mogemimi 905bd36e32 Bump simulator version number to 3.12 2016-07-13 00:41:27 +09:00
zhangbin 4408f28480 Solve the error in simulator project.
Remove unused files.
2016-07-12 17:33:43 +08: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 4e125d84a4 fix compiling and linking error with ndk r12b 2016-07-08 15:29:35 +08:00
zhangbin 51e7de9457 Update submodule cocos2d-console.
Changed:
- Remove unused command framework.
2016-07-01 12:03:26 +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
Ricardo Quesada 7d7936bbc1 fix issue #15958
again
2016-06-28 18:07:30 -07:00
Ricardo Quesada 5a8eb243e6 fix: cocos new does not crash
Github issue #15958
2016-06-27 18:33:38 -07:00
Ricardo Quesada 71572d9015 updates cocos console
fix github issue #15890 and partially fixes github issue #15889
2016-06-24 18:31:32 -07:00
Adrien de Sentenac eafceb38b7 Fixed simulator project files to add tinyxml2 to the include paths 2016-06-21 11:13:10 -04:00
minggo 9b210e00d7 Merge pull request #15837 from geemedia/cmake-improvements
Various CMake improvements
2016-06-16 14:53:10 +08:00
MagicXrEv 8e6ca57f4f lua binding : Rename end() to endToLua(). 2016-06-14 23:35:17 +08:00
Adrien de Sentenac dac9be5016 Various CMake improvements
- Added c++_shared (LLVM) to Android toolchain options. Fixed AndroidNdkGdb.cmake.
- Fixed includes when not using prebuilt libs. Added option to use sources in external when not using prebuilt libs.
- Added option in CMake to be able build Box2D without using it as physics library in cocos2d-x (similar to what is done in the Visual Studio solution).
2016-06-14 10:20:57 -04:00
minggo 88bb8a4974 cocos command use clang 2016-06-02 14:34:10 +08:00
minggo 33e34f6e1c Merge pull request #15725 from natural-law/v3
Update the reference of submodule cocos2d-console.
2016-05-26 11:27:37 +08:00
minggo 1116176362 Merge pull request #15720 from billyquith/v3
Grammar corrections
2016-05-26 11:00:53 +08:00
zhangbin 08706012e8 Update the reference of submodule cocos2d-console.
1. Change the Tracker ID of GA in console.
2. Disable the BI Data Statistic.
3. Add special prefix '2dx-' for the Data uploaded by console in -x engine.
2016-05-26 10:42:56 +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
pandamicro 8692ee176c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Conflicts:
	cocos/network/HttpAsynConnection-apple.m
	cocos/network/HttpClient-android.cpp
	cocos/network/HttpClient.cpp
	cocos/network/HttpCookie.h
	cocos/network/HttpRequest.h
	cocos/network/HttpResponse.h
	cocos/network/SocketIO.cpp
	cocos/network/WebSocket.h
2016-05-25 19:19:27 +08:00
pandamicro 8d5c102d75 Update bindings generator 2016-05-25 18:36:16 +08:00
minggo d95ee0f94c Merge pull request #15687 from minggo/isnan-issue
fix compiling error on ubuntu 16.04 because of isnan
2016-05-20 11:54:39 +08:00
minggo 8e1f1d2c14 fix compiling error 2016-05-20 11:19:40 +08:00
zhangbin c68ecaffab Update the reference of submodule cocos2d-console.
Solve the english grammar error.
2016-05-19 12:04:56 +08:00
zhangbin 2f5b53ad59 Update the reference of submodule cocos2d-console.
Solve the error when running cocos command if ~/.cocos is not existed.
2016-05-19 11:30:28 +08:00
zhangbin 2d00073653 Update the reference of submodule cocos2d-console. 2016-05-17 17:25:31 +08:00
minggo 74af3b5232 merge v3.11 back to v3 2016-05-12 09:50:03 +08:00
minggo 76d8f81771 Merge pull request #15582 from minggo/issue-isnan
update bindings-generator to fix compiling issues on ubuntu 16.04
2016-05-06 17:55:49 +08:00
minggo 086df25fdc update bindings-generator to fix compiling issues on ubuntu 16.04 2016-05-06 16:19:48 +08:00
minggo 997011601e revert correct search path 2016-05-06 15:58:43 +08:00
minggo a5602cc732 merge v3.11 back to v3 2016-05-04 16:02:23 +08:00
minggo 3d09e529ee use Ref::release() to release Ref instance 2016-04-29 17:11:36 +08:00
zilongshanren 482788c933 Add tizen support (#15518)
* add Tizen Support

* fix linter error

* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
xpol 43a94c0693 Add FileUtils::getContents(). (#15479)
* Add FileUtils::getContents().

* skip FileUtils::getContents() in binding generator config.

* use FileUtils::getContents in CCDataReaderHelper.

* obey the cocos2d-x coding style.

* Explicit constructor.

* More docs.

* More tests.

* Move FileError to FileUtils::Error.

* Fixes wrong buffer size for reading into string and vector.

* Update tests.

* Add note on padding for output buffers.

* FileUtils: implements old methods by using `getContents()`.

methods are:

* FileUtils::getDataFromFile()
* FileUtils::getStringFromFile()
* FileUtils::getFileData()

and follow Android methods are now just calls FileUtils' ones.

* FileUtilsAndroid::getDataFromFile()
* FileUtilsAndroid::getStringFromFile()
* FileUtilsAndroid::getFileData()

* Fixes build error.

* FileUtils::getFileData: Return the size of data.

* Remove old methods form FileUtilsAndroid they are now done in FileUtils.

* Fixes for win32 code.

* Fixes build error in test and add more test.

* Better error message.

* Make template type name more readable.

* Update comments.

* Move internal functions to anonymous namespace.

* Refactor FileUtils test.

* Fix warning about compare signed and unsigned.

* Win32 and WinRT does not use text mode.

That is we don't need simulate convert CRLF to LF.

* Fixes for Win32 and WinRT.

* Update for Win32 and WinRT.

* Win32: return FileUtils:Error::TooLarge when file is large than 2^32-1.
* Win32: remove checkFileName() which has no effect at all.
* WinRT: add FileUtilsWinRT::getContents() using ::CreateFile2.
* WinRT: add override keyword for FileUtilsWinRT::getFileSize().

* Update for coding styles.

* More error strings.

* check read and malloc return codes.

* rename FileUtils::Error to FileUtils::Status.

* Fixes for WinRT, use GetFileInformationByHandleEx to get file size.

* Fixes build error for winrt and cleanup FileUtils::Status.

* Try to fix the build error on Linux.

Status must defined in some header, so move FileUtils.h up.

* Remove support of text mode on WinRT (it is the last platform support text mode).
2016-04-26 13:37:22 +08:00
minggo ba78999ffd update cocos2d-console 2016-04-21 09:39:19 +08:00
Yukio Murakami a8ddbdc12c defaults and append tag support 2016-04-21 10:03:57 +09:00
zilongshanren b0b2d8a5e8 Merge pull request #15344 from xpol/withespaces-does-matter
Withespaces does matter
2016-04-17 20:41:26 -05:00
pandamicro f9f9551645 Fix some issues
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-11 11:11:34 +08:00
pandamicro bb2cfc7308 Update engine version 2016-04-11 11:11:17 +08:00
pandamicro e6d4beef8a Merge pull request #15388 from pandamicro/v3
Issue fixes and update engine version
2016-04-07 23:15:39 +08:00
pandamicro 1ada222c36 Fix some issues
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-07 22:40:32 +08:00
pandamicro 817f4f4871 Update engine version 2016-04-07 22:36:29 +08:00
minggo aa8cf8dfd4 Merge pull request #15343 from xpol/fixes-porject-config-waring
Use pre-processor condition rather than runtime check.
2016-04-06 11:25:24 +08:00
pandamicro 3d7d5de95d Merge pull request #15317 from pandamicro/v3
Fix Socket IO handshake issue with latest version libwebsocket
2016-04-01 22:27:57 +08:00
zhangbin bb4e9869d1 Update the submodule cocos2d-console 2016-03-30 15:14:05 +08:00
Xpol Wan bc275b81a2 Add a coding style tool for tailing whitespace.
in this tool:

* it remove tailing white spaces
* and ensures one and only one empty ending line.
* it fixes '.c', '.cpp', '.h', '.hpp', '.m', '.mm', '.java' sources in
    - $engineRoot/cocos
    - $engineRoot/extensions
    - $engineRoot/templates
    - $engineRoot/tests
    - $engineRoot/tools/simulator
2016-03-29 22:46:52 +08:00
Xpol Wan 5c632adf5e Use pre-processor condition rather than runtime check.
This avoids compiler warning.
2016-03-29 21:54:23 +08:00
zhangbin e3de0d1f0b Update the submodule cocos2d-console 2016-03-29 15:38:00 +08:00
pandamicro 446527301b Support llvm 3.5 for latest version idk 2016-03-25 17:12:47 +08:00
Xpol Wan 220e1f8e4b exclude some platform specific files form linter. 2016-03-24 21:35:15 +08:00
Xpol Wan 8d9cdeae7b Update binding generator
with fixes for generated include path for headers that not in cocos directory (e.g. extensions ).
2016-03-22 20:49:54 +08:00