Commit Graph

2369 Commits

Author SHA1 Message Date
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
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