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
1748dfa79d
update agreement ( #16431 )
2016-08-24 14:52:55 +08:00
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
b0c8a8505a
update cocos2d-console commit id : cocos package so change pyc ( #16413 )
2016-08-22 16:06:29 +08:00
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
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
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
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
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
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
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
295f0716dc
use gcc 4.9 instead
2016-07-28 10:56:52 +08:00
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
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
5b3eae7be8
update cocos2d-console commit ( #16196 )
2016-07-25 11:19:11 +08:00
5bd2d74078
Fix spelling for `getPolygonCenter` function
2016-07-19 08:24:22 +09:00
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
f4accbdf3e
Solve the error in command gen-templates & gen-simulator.
2016-07-13 09:42:05 +08:00
905bd36e32
Bump simulator version number to 3.12
2016-07-13 00:41:27 +09:00
4408f28480
Solve the error in simulator project.
...
Remove unused files.
2016-07-12 17:33:43 +08: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
4e125d84a4
fix compiling and linking error with ndk r12b
2016-07-08 15:29:35 +08:00
51e7de9457
Update submodule cocos2d-console.
...
Changed:
- Remove unused command framework.
2016-07-01 12:03:26 +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
7d7936bbc1
fix issue #15958
...
again
2016-06-28 18:07:30 -07:00
5a8eb243e6
fix: cocos new does not crash
...
Github issue #15958
2016-06-27 18:33:38 -07:00
71572d9015
updates cocos console
...
fix github issue #15890 and partially fixes github issue #15889
2016-06-24 18:31:32 -07:00
eafceb38b7
Fixed simulator project files to add tinyxml2 to the include paths
2016-06-21 11:13:10 -04:00
9b210e00d7
Merge pull request #15837 from geemedia/cmake-improvements
...
Various CMake improvements
2016-06-16 14:53:10 +08:00
8e6ca57f4f
lua binding : Rename end() to endToLua().
2016-06-14 23:35:17 +08:00
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
88bb8a4974
cocos command use clang
2016-06-02 14:34:10 +08:00
33e34f6e1c
Merge pull request #15725 from natural-law/v3
...
Update the reference of submodule cocos2d-console.
2016-05-26 11:27:37 +08:00
1116176362
Merge pull request #15720 from billyquith/v3
...
Grammar corrections
2016-05-26 11:00:53 +08:00
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
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
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
8d5c102d75
Update bindings generator
2016-05-25 18:36:16 +08:00
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
8e1f1d2c14
fix compiling error
2016-05-20 11:19:40 +08:00
c68ecaffab
Update the reference of submodule cocos2d-console.
...
Solve the english grammar error.
2016-05-19 12:04:56 +08:00
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
2d00073653
Update the reference of submodule cocos2d-console.
2016-05-17 17:25:31 +08:00
74af3b5232
merge v3.11 back to v3
2016-05-12 09:50:03 +08:00
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
086df25fdc
update bindings-generator to fix compiling issues on ubuntu 16.04
2016-05-06 16:19:48 +08:00
997011601e
revert correct search path
2016-05-06 15:58:43 +08:00
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
3d09e529ee
use Ref::release() to release Ref instance
2016-04-29 17:11:36 +08:00
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
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
ba78999ffd
update cocos2d-console
2016-04-21 09:39:19 +08:00
a8ddbdc12c
defaults and append tag support
2016-04-21 10:03:57 +09:00
b0b2d8a5e8
Merge pull request #15344 from xpol/withespaces-does-matter
...
Withespaces does matter
2016-04-17 20:41:26 -05:00
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
bb2cfc7308
Update engine version
2016-04-11 11:11:17 +08:00
e6d4beef8a
Merge pull request #15388 from pandamicro/v3
...
Issue fixes and update engine version
2016-04-07 23:15:39 +08:00
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
817f4f4871
Update engine version
2016-04-07 22:36:29 +08:00
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
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
bb4e9869d1
Update the submodule cocos2d-console
2016-03-30 15:14:05 +08:00
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
5c632adf5e
Use pre-processor condition rather than runtime check.
...
This avoids compiler warning.
2016-03-29 21:54:23 +08:00
e3de0d1f0b
Update the submodule cocos2d-console
2016-03-29 15:38:00 +08:00
446527301b
Support llvm 3.5 for latest version idk
2016-03-25 17:12:47 +08:00
220e1f8e4b
exclude some platform specific files form linter.
2016-03-24 21:35:15 +08:00
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
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
a66c2060b5
Also check the #import statement for m and mm files.
2016-03-21 20:12:15 +08:00
be688d33c4
Remove debug print [ci skip]
2016-03-21 15:08:45 +08:00
764389036d
Try fix win32 path issue.
2016-03-21 15:01:01 +08:00
d063f26173
Add some debug print in linter script.
2016-03-21 14:16:17 +08:00
56f2aff34c
Replace '\\' with '/' when scan source files.
2016-03-21 13:53:15 +08:00
bd2d7c3ee7
Always use posixpath.
2016-03-21 13:35:40 +08:00
c6c2e42a51
include include path check in Jenkins build script.
2016-03-21 11:41:17 +08:00
6dcd7d51c3
Update include-linter.py excludes pch.cpp and include .m and .mm.
2016-03-21 11:01:23 +08:00
0001ac18f1
Add a include linter script.
...
It has follow:
1. lint mode: check include lines of all .h .hpp .inl .c .cpp files in cocos directory, find any included cocos2d-x files using #include "???" path not search from cocos directory.
2. fix mode: when run with -f (or --fix), it will fixes these include path.
3. when running in lint mode, it exit with code 1 if any issues found, this can be used in CI scripts to check commits and PRs.
2016-03-20 21:50:25 +08:00
7993ad93d2
fix jsb API inconsistency.
...
Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275
2016-03-18 16:18:40 +08:00
c599f071a4
Add missing include file in ProjectConfig.cpp.
2016-03-08 14:36:01 +08:00
c50d54339f
Add localization arguments in simulator start args.
2016-03-07 09:52:53 +08:00
709d79ad14
Add first search path to command param.
2016-03-04 13:16:37 +08:00
e46e392ff5
Merge pull request #15175 from FrostPolaris/v3_localizeManage
...
Add language localization support for Button, Text, TextField and TextBMFont.
It's OK, merged
2016-03-04 11:43:47 +08:00
b207d559ae
Change the interface of LocalizationHelper::setCurrentManager.
2016-03-04 10:34:04 +08:00
b5a44bc2f4
Merge pull request #15170 from geron-cn/uitabcontrol
...
add TabControl TabHeader to tolua
2016-03-04 10:26:06 +08:00
008089a506
add TabControl TabHeader to tolua
2016-03-03 16:22:42 +08:00
0489fd76e8
1.Change the interface in LocalizationManager.
...
2.Add new args of localization in simulator.
2016-03-03 15:49:50 +08:00
cd4abc0a7f
don't remove chipmunk js auto bindings
2016-03-03 15:46:16 +08:00
4f6fd3ef64
Squashed commit of the following:
...
commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 13:43:04 2016 +0800
change enum to enum class
use tabitem as pointer to replace _currentTabItemIndex
commit c0830cc581b8a07d6eed63268bf5be6a828c113a
Merge: 3663156 166931a
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:44 2016 +0800
Merge remote-tracking branch 'gero/tabview' into tabcontrol
commit 366315624143ff01c3e2b22b415ab79050e381e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:15 2016 +0800
Squashed commit of the following:
commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:35:06 2016 +0800
fix
commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:30:44 2016 +0800
fix active deactive in tabcontrol
commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 20:16:22 2016 +0800
fix active -1
commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 16:00:51 2016 +0800
fix merge file
commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed6bf55ed
2016-03-03 14:17:48 +08:00
c449f61124
Add "-use-local-script" command to control whether to load js script files from simulator local directory.
2016-02-29 13:53:49 +08:00
077b5e7bfc
Update the reference of submodule cocos2d-console
2016-02-15 10:49:57 +08:00
6bbfc846da
Update bindings generator and Activate new memory model by default
2016-02-14 09:48:29 +08:00
e2568b3a6f
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory
...
Conflicts:
tests/js-memory-gc-tests/src/tests-main.js
2016-01-28 01:12:49 +08:00
fc19435123
Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory
...
Conflicts:
cocos/base/ccConfig.h
cocos/scripting/js-bindings/manual/ScriptingCore.cpp
cocos/scripting/js-bindings/manual/ScriptingCore.h
cocos/scripting/js-bindings/script/jsb_prepare.js
2016-01-18 16:40:00 +08:00
0f3cb16efd
Fix when add two ActionTimeLine object in one node, play state is wrong
2016-01-14 16:16:37 +08:00
161be986af
Merge pull request #14340 from fnz/easyjni
...
easy jni
2016-01-12 11:50:16 +08:00
ab0efd933a
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
CHANGELOG
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
1554b6e676
Fix pre-compiled framework js project will crash if use "Force Quit" to terminate program.
2016-01-07 10:42:47 +08:00
7bd9ceda10
Use method same as MacOS solution fix js pre-compiled framework project crash when exit on windows.
2015-12-31 09:54:32 +08:00
0c0f241c5e
Fix pre-compiled frame work js project will crash when exit on MacOS
2015-12-30 19:42:19 +08:00
52fb3fd098
Fix js project with pre-build frameworks crash when exit program
2015-12-29 19:38:37 +08:00
692c0f8a0e
adds tvOS support
...
Ported tests:
- js-tests
- cpp-tsts
- lua-tests
- game-controller tests
all of them working, but most of the tests can't be navigated
since they expect a controller.
2015-12-28 15:59:36 -08:00
1871813c2b
update cocos2d-console submodule to 6cc7a09dc64a57fd5307c2ba3a0a705f834dfd97
2015-12-24 20:35:12 +08:00
6c2fd67d08
Update auto bindings
2015-12-21 00:14:51 +08:00
4f94b03b86
Upgrade bindings generator
2015-12-19 17:18:39 +08:00
ef71d8cdcf
Merge pull request #14689 from GuoLunHao/v3.10_updateConsole
...
update cocos2d-console submodule to 1ad9331a9e3cbef9c499b6c7
2015-12-16 12:23:23 +08:00
b32d013dc4
update cocos2d-console submodule to SH1 1ad9331a9e3cbef9c499b6c785d64c25b2f7e133
2015-12-15 20:06:16 +08:00
6e20c3cc4f
Merge pull request #14681 from pandamicro/v3.10
...
Fix ComponentJS proxy management issue in JSB
2015-12-15 12:26:12 +08:00
64276bd664
Fix ComponentJS proxy management issue in JSB
2015-12-15 11:48:44 +08:00
280a8e9d9c
Merge pull request #14663 from xiaofeng11/v3.10
...
Update all version number to v3.10
2015-12-15 10:48:51 +08:00
41218a65e7
Merge pull request #14668 from pandamicro/v3
...
Sync v3 and Fix win32 js project crash issue
2015-12-14 13:12:42 +08:00
4815ec8b9a
Update version number to v3.10
2015-12-14 10:32:29 +08:00
8b2dfb1a4b
Mooooores fixes
...
but GC memory model doesn't work yet... somewhere someone is still
retaining a reference that prevents the whole thing from
releasing
2015-12-10 22:15:44 -08:00
96d391ea30
Squashed commit of the following:
...
commit aff4e27200a77db60b13ea30c2457558e5f53059
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 17:58:41 2015 -0800
compiles with new GC model
commit 1fa69cd71231d56371cd45a378e50a1888308b42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 17:41:15 2015 -0800
Animation3D works Ok
commit d439969caf7e6fe83a74e37d078c4361a08cb816
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 13:39:50 2015 -0800
Sprite3d create: converted to new API
commit aabe449e4a968fad882c44df9be787eb7c3bfcec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 13:27:33 2015 -0800
ouch...
commit 688ab610a8cb7607bc3c51b8ca01d800ef3c9794
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Dec 10 13:12:25 2015 -0800
Spawn/Sequence init* were not bound
Fixed. Now JS Scheduler Test works Ok
2015-12-10 18:02:55 -08:00
5872745593
fix compile error and link error on ios/Mac platform
2015-12-10 16:43:01 +08:00
ae980c19d2
fix the link error and compile error in windows and android platform
2015-12-09 20:18:37 +08:00
13dc967b03
js_get_or_create_jsobject() and other stuff
...
- getDescendatns() converted
- singletons converted
- new helper template-specialized js_get_or_create_jsobject()
Squashed commit of the following:
commit 3f21e65bca5f7e5e5c4bf304f2daed0eff26f6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 19:04:24 2015 -0800
logging added (and commented)
will be useful in the future
commit f995295b385a515c1f82136688610a90eb379855
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 19:00:09 2015 -0800
new js_get_or_create_jsobject<T>
Specializes Template on cocos2d::Ref.
When Ref, it calls the `jsb_ref` functions
commit 240b80e4080757ebb47db0d02a1fe1f875237d24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 13:31:52 2015 -0800
singletons converted
commit 667d94bf90267c103b620630bacfffa7767b42dd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Dec 7 12:20:07 2015 -0800
getDescendants() converted
2015-12-07 19:05:23 -08:00
b435f1df86
Fix wrong #endif statement
2015-12-07 10:44:52 +08:00
0328c31596
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_xf
2015-12-07 10:27:38 +08:00
d02f4afd4a
using new bindings templates
...
ignores createInstance() from ui
2015-12-05 22:26:54 -08:00
cd8631ef09
sfunction "create" uses new optimized code
...
...although this code should never be called
2015-12-04 18:42:31 -08:00
76bd37e109
Add missing export declaration.
2015-12-04 19:40:09 +08:00
e5d722b2a8
new bindings
2015-12-02 15:24:49 -08:00
45b25666ea
reset submodule
2015-12-02 13:28:24 +08:00
ebd5c1cca7
resolve conflict and fix checktexture bug
2015-12-02 11:26:05 +08:00
df62e92d7b
Correct bindings generator ref
2015-12-01 23:50:52 +08:00
1b3cb97b71
fix script binding
2015-12-01 23:05:47 +08:00
e5d57b4fa2
update binding-generator sub module & code
2015-12-01 22:30:36 +08:00
01e0803587
not export Sprite3DMaterial::setTexture
2015-12-01 20:27:31 +08:00
84068c5189
not export Mesh::getTexture and Mesh::setTexture
2015-12-01 18:05:03 +08:00
f298e49bf3
not export lua Mesh::getTexture and Mesh::setTexture
2015-12-01 17:39:00 +08:00
6fe361f06e
not export Mesh::getTexture
2015-12-01 15:13:51 +08:00
ea077c5141
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim
...
Conflicts:
cocos/scripting/js-bindings/manual/js_manual_conversions.h
2015-12-01 15:12:32 +08:00
167aa9b648
Update console sub-module, update project template.json to meet file position change
2015-12-01 15:00:45 +08:00
9b371a55bf
js not export Mesh::setTexture
2015-12-01 14:35:39 +08:00
08837955a7
Skip Useless MenuItemToggle::initWithCallback to fix windows compilation issue
2015-11-30 23:54:42 +08:00
43c68aa16b
Fix Chipmunk bindings issue
2015-11-27 22:38:16 +08:00
8c691430c1
conflicts resolved
2015-11-27 13:19:10 +03:00
c4b995fe59
updates to JniHelper, refactoring of existing JNI calls
2015-11-27 12:00:33 +03:00
ae2b75c8be
Fix issues causing by temporary RootedObject passed as function parameters
2015-11-27 01:35:06 +08:00
5a2a343152
update code as comment
2015-11-26 17:38:32 +08:00
9811d6efcf
Combine studio change for LuaBinding, jsb and simulator
2015-11-25 21:52:44 +08:00
be2a3077c2
Remove useless manual bindings for addEventListener functions in UI
2015-11-25 14:15:45 +08:00
930405d52c
Remove useless manual bindings for MenuItems
2015-11-24 16:32:02 +08:00
32f21ca5be
Binding ResouceData structure to js to fix auto compile error
2015-11-19 14:31:39 +08:00
3aeb5e0389
Fix when start simulator in CocoStudio to run a scene, can not read the correct config.json on MacOSX
2015-11-09 23:30:03 +08:00
c0c35c603e
Update version number & RELEASE_NOTES.md, prepare 3.9 release
2015-11-06 18:38:09 +08:00
01fdb60b7d
Merge pull request #14311 from natural-law/v3
...
[ci skip] Update the reference of submodule cocos2d-console.
2015-11-04 10:45:35 +08:00
47ea0dfb02
Update the reference of submodule cocos2d-console.
2015-11-04 10:43:30 +08:00
0dabb4cfb7
Merge pull request #14295 from xiaofeng11/v3_xf
...
Fix CodeIDE can not start js project with simulator
2015-11-03 17:37:01 +08:00
bfa50de768
Update the reference of submodule cocos2d-console.
2015-11-03 16:06:12 +08:00
0dd0233ba7
update sdkbox console
2015-11-03 13:06:09 +08:00
c6feb3d34d
update submodule cocos2d-console
2015-11-02 17:49:26 +08:00
218b5625bf
Fix can not start js project with simulator in CodeIDE
2015-11-02 17:36:47 +08:00
aa9f0d5bd5
Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist
...
Extending SpriteFrameCache to read PolygonInfo from atlas plist file
2015-10-27 17:28:22 +08:00
a3c2904e7f
Fix cc.DrawNode.drawPoly
2015-10-27 16:46:25 +08:00
83a48ee501
Fix simulator run time only check screen direction flag, but won't check if size setting need swap
2015-10-19 19:43:10 +08:00
be45e0bc50
Merge pull request #14174 from noshbar/v3
...
CPPCheck fixes, correct deallocation, array size.
2015-10-19 10:05:01 +08:00
784dbc4c88
Merge pull request #14158 from cocos2d/revert-14144-v3
...
Revert "Remove screen direction check in simulator"
2015-10-18 22:49:09 +08:00
88bcaad518
General fixes:
...
- changed some delete operations to be deletions of arrays where applicable
- changed some "free" operations to "delete" where memory was allocated with "new"
CCPUScriptCompiler.cpp:
- added checks to see if temp1 and temp2 are non-null before dereferencing them
FileServer.cpp:
- changed the size of startFlag to be 13, seeing as the strcpy into it copies a string, "RuntimeSend:",
is already 12 characters long, but strcpy() attempts to copy the NULL terminator too.
2015-10-16 21:43:09 +02:00
2bf7f8ae3f
update console
2015-10-16 16:10:08 +08:00
8915fc6cb9
Revert "Remove screen direction check in simulator to avoid render error"
2015-10-16 11:36:20 +08:00
3edbf0f4a3
Fix#22934
...
Node, Skeleton needs to show at the middle of the simulator.
2015-10-15 19:35:06 +08:00
ca8977b6f8
Remove screen direction check in simulator to avoid render error
2015-10-15 10:11:26 +08:00
90b96be690
Fix when scene been set a very large size(eg. 2048x1536), the simulator windows will been move out of window
2015-10-13 13:01:37 +08:00
f25b62b4b5
Update the reference of submodule cocos2d-console.
2015-10-12 14:16:18 +08:00
9a0ea79b61
remove set/get/hasPolygonInfo methods from js / lua api; fixed C++11 issue
2015-09-30 15:20:53 +02:00
4f6bdd6d74
Fix mistaken uploaded lua bindings
2015-09-29 14:52:47 +08:00
7b85211cfe
Remove ScriptComponent
...
Because windows platform can't successfully compile in previous architecture
2015-09-27 22:18:59 +08:00
2a3526a3fd
Fix lua project
2015-09-26 19:43:36 +08:00
91928aa23d
Add ComponentJS test case and fix windows platforms
2015-09-26 19:43:36 +08:00
ddb636a022
Add ScriptComponent and ComponentJS
2015-09-26 19:43:36 +08:00
7e2b8c71a7
Improve lua script component
2015-09-26 19:43:35 +08:00
26632ec69a
linjia demo finish
2015-09-26 19:43:35 +08:00
9eb05707fb
add custom spine skeletonAnimation test
2015-09-25 13:36:48 +08:00
d3504a9216
Update versions and html5 engine
2015-09-22 02:31:21 +08:00
4241df7af7
Fixed binding...
2015-09-21 15:41:14 +08:00
2288b7e8d1
Fixed tools/travis-scripts/before-install.sh...
2015-09-21 15:22:00 +08:00
460d0fd5a6
[ci skip]Fixed tools/travis-scripts/before-install.sh
2015-09-21 14:58:14 +08:00
1c7d4805ef
Fixed travis-scripts/before-install.sh
2015-09-21 13:52:28 +08:00
44329d96ba
Merge pull request #13946 from WenhaiLin/v3-binding-tool-refine
...
Refine lua/js binding tool
2015-09-20 16:42:40 +08:00
a3f363735e
Refine lua/js binding tool
2015-09-19 00:08:15 +08:00
0cbc1e5f40
Merge pull request #13923 from WenhaiLin/v3-physics-refine
...
Refine components to improve physics performance
2015-09-18 21:56:36 +08:00
a17a702cd1
Refine components to improve performance
2015-09-18 14:34:02 +08:00
56ea700d37
Fix bug: new project created by template compile error.
2015-09-18 11:40:16 +08:00
aaabe42e75
Update the reference of submodule cocos2d-console.
2015-09-16 11:01:52 +08:00
4c4a007b99
Merge pull request #13797 from natural-law/v3
...
Update the reference of submodule cocos2d-console.
2015-09-15 10:06:24 +08:00
1e7b78b057
Merge pull request #13795 from pandamicro/v3
...
Update bindings-generator to initialize numeric/pointer variables
2015-09-14 11:54:02 +08:00
da24454c6c
Update the reference of submodule cocos2d-console.
2015-09-14 11:46:02 +08:00
b0dc83aed8
Update bindings-generator to initialize numeric/pointer variables
2015-09-14 11:22:06 +08:00
5d47ce8f23
Add tools for converting the performance tests data to excel files.
2015-09-14 09:52:21 +08:00
4509a316cc
add uniform conversion
...
relate issue:https://github.com/cocos2d/cocos2d-x/issues/13747
relate pr:https://github.com/cocos2d/bindings-generator/pull/191
2015-09-09 16:03:57 +08:00
dc607a1784
Merge pull request #13726 from jianglong0156/actionExtendSquash
...
support custom action, and rewrite update function
2015-09-09 10:25:56 +08:00
badd80bf3a
support custom action, and rewrite update function
...
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
ctor:function (duration, deltaPos, deltaY) {
this._super(duration, deltaPos, deltaY);
},
update:function (dt) {
this._super(dt);
if (this.getTarget()) { // rand color
this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
}
}
});
2015-09-09 10:08:07 +08:00
8326ed6535
add physics component
2015-09-08 09:54:01 +08:00
d145416e1f
Update the reference of submodule cocos2d-console.
2015-09-07 17:36:54 +08:00
4fb34ba190
Merge pull request #13703 from cocos2d/v3.8
...
Sync v3.8 to v3
2015-09-07 14:56:37 +08:00
2c6c35cb76
Update the version displayed in about dialog of windows simulator.
2015-09-01 18:00:50 +08:00
4cd3683e5b
Use solution path as root path
2015-08-31 18:14:38 +08:00
be2be30162
Fix missing config.json notice when simulator start to run a cocostudio project
2015-08-31 16:16:10 +08:00
2520e16cc0
Update the reference of submodule cocos2d-console.
2015-08-31 12:04:18 +08:00
d6045fdbea
Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/audio/winrt/Audio.cpp
cocos/platform/winrt/CCCommon.cpp
cocos/platform/winrt/CCWinRTUtils.cpp
cocos/platform/winrt/CCWinRTUtils.h
2015-08-27 10:40:04 +08:00
71f4b804ea
Add BlendFuncFrame auto binding
2015-08-26 13:42:52 +08:00
c2fae3987b
fix Jenkins template compile
2015-08-24 10:26:12 +08:00
6ee33499b4
Update changelog and versions for v3.8 rc0
2015-08-22 11:56:25 +08:00
72496ae426
add missing ui test in Lua
2015-08-20 15:25:09 +08:00
78ef019561
Made travis run for v3.8
2015-08-18 10:17:44 +08:00
81d5a8377f
Merge pull request #13418 from jianglong0156/fixTMXTileFlagsError
...
Remove duplicate function definition, Add function adaptation
2015-08-17 22:56:59 +08:00
b19e02bdf6
Remove duplicate function definition, Add function adaptation
2015-08-17 18:18:38 +08:00
3f6816f2f7
Update the reference of submodule cocos2d-console.
2015-08-17 17:16:21 +08:00
559305646b
Merge pull request #13411 from natural-law/v3
...
Update the reference of submodule cocos2d-console.
2015-08-17 17:13:12 +08:00
9db78b2bb7
Merge pull request #13407 from liamcindy/v3.8
...
fix the skybox display error from editor files
2015-08-17 16:57:32 +08:00
deaf50e803
Update the reference of submodule cocos2d-console.
2015-08-17 15:41:56 +08:00
7aa36d14be
fix the skybox display error from editor files
2015-08-17 13:04:25 +08:00
6628dc47cb
Update the reference of submodule cocos2d-console.
2015-08-14 15:12:58 +08:00
5baa90c79e
libcurl.h not included in the header to avoid...
...
too many dependencies
2015-08-13 19:28:38 -07:00
d2e8cf53be
don't generate bindings for `getCocos2dThreadId`
2015-08-13 11:18:51 -07:00
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8#5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a#4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
9f63cf677e
Merge pull request #13340 from zilongshanren/fix-lua-checkbox-bindings
...
fix checkbox Luabindings issue.
2015-08-13 10:44:28 +08:00
d9645b63c7
fix checkbox Luabindings issue.
...
https://github.com/cocos2d/cocos2d-x/issues/13080
2015-08-13 10:04:16 +08:00
9a83ed9b28
remove unneeded protocol in AppController.h.
2015-08-12 13:55:36 +08:00
f91908d651
Add copy resources config of js-tests for web platform.
2015-08-10 12:00:53 +08:00
cf3f5ab26c
Update the reference of submodule cocos2d-console.
2015-08-07 15:56:52 +08:00
91b2191988
Move the framework-compile tools into cocos2d-console.
2015-08-05 17:54:32 +08:00
a06421b753
Merge pull request #13196 from chengstory/UpdateSimulator
...
Node, Skeleton needs to show at the middle of the simulator.
2015-08-04 17:00:25 +08:00
613a6f48a9
Node, Skeleton needs to show at the middle of the simulator.
2015-08-04 15:41:12 +08:00
d11605aa37
Update the reference of submodule cocos2d-console.
2015-08-04 14:35:56 +08:00
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
46bb4f8aae
Merge pull request #13149 from jianglong0156/constructedWith3D_3#12404
...
Constructed with3d
2015-08-01 21:15:08 +08:00
09c3da3247
skip init funciton in lua physics3d.ini
2015-08-01 18:30:06 +08:00
00a3d572d1
Merge pull request #12899 from super626/v3
...
Animate3D Callback and Bug fix
2015-08-01 18:24:05 +08:00
bcec599993
Merge branch 'v3' into constructedWith3D_3#12404
2015-08-01 15:38:26 +08:00
d52a5da1d8
Merge pull request #13114 from jianglong0156/constructedWith3D_2#12404
...
Constructed with3d
2015-08-01 10:09:08 +08:00
80e812e5a0
add Physics3DShape support constructor
2015-07-31 18:17:35 +08:00
3fa016a280
Fix win32 project and add winrt support
2015-07-30 23:39:52 +08:00
537927c34b
Tiny improvement for bindings generator
2015-07-30 20:52:21 +08:00
c0066f9afd
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
2015-07-30 20:25:57 +08:00
cf806913e3
Auto bind public members of AudioProfil
2015-07-30 20:19:53 +08:00
8542f8a7a9
Merge pull request #13067 from pandamicro/scrollviewbar
...
Bind UIScrollViewBar
2015-07-30 18:42:08 +08:00
77b3facd7c
Support generate prebuilt libs of engine with debug mode.
2015-07-30 18:27:20 +08:00
507a094653
Merge pull request #13108 from jianglong0156/constructedWith3D#12404
...
improve jsval_to_physics3DRigidBodyDes
2015-07-30 17:58:16 +08:00
b016b642ce
add Terrain support constructor
2015-07-30 17:17:57 +08:00
3496fe896d
improve the rigidbody conversion function
2015-07-30 14:26:28 +08:00
89b266d8b5
Auto binding for ctor function support parameter
2015-07-30 12:46:12 +08:00
f53ba42b3b
Fix test issues and Add audio engine to js templates
2015-07-29 21:22:44 +08:00
9972bfb98c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
...
# Conflicts:
# tests/js-tests/src/NativeTest/NativeTest.js
2015-07-29 21:01:56 +08:00
da4e062614
Add js wrapper for audio engine
2015-07-29 20:47:28 +08:00
c8ff43133f
Move web folder from js template folder to engine folder in Cocos Framework.
2015-07-29 17:22:26 +08:00
96d44e1078
Merge pull request #13076 from WenhaiLin/v3.8-label-gb2312
...
Label:support font that contains GB2312 char map.
2015-07-29 14:51:17 +08:00
70628c9dec
Fixed link errors on iOS/Mac
2015-07-29 13:59:58 +08:00
3089ac302e
Refine ui bindings and JS constants
2015-07-29 13:06:49 +08:00
81842417c4
Merge pull request #13032 from xiaofeng11/v3
...
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
2015-07-29 09:54:43 +08:00
d9c5600f41
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3.7.1
2015-07-29 09:17:53 +08:00
f48dae09db
Bind UIScrollViewBar
2015-07-29 00:11:52 +08:00
8bc96a10b4
Update the reference of submodule cocos2d-console.
2015-07-28 15:06:28 +08:00
ca54340982
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-07-28 13:00:10 +08:00
d5a6522a37
Merge branch 'v3' into constructedWith3D#12404
2015-07-28 09:59:35 +08:00
09d9fcf4d6
Fix lua binding
2015-07-27 21:24:52 +08:00
cb2b427eed
add Physics3DRigidBodyDes support new , add new file jsb_cocos2dx_3d_conversions.h and jsb_cocos2dx_3d_conversions.cpp
2015-07-27 18:19:10 +08:00
e0aef73306
Fix lua binding
2015-07-27 17:31:09 +08:00
63f8b941c9
Fix setting file
2015-07-27 16:03:05 +08:00
8421ff7149
Disable new function bind to lua to avoid compile error
2015-07-27 15:09:34 +08:00
6d16d1674d
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3.7.1
2015-07-27 11:50:14 +08:00
e73fc94345
Remove the unused files in tools/gen-prebuilt.
2015-07-27 11:38:41 +08:00
632b36fa43
Fix bindings generator for Lua
2015-07-27 10:21:18 +08:00
08e3d8d533
Gen bindings for BoneNode and SkeletonNode
2015-07-27 09:56:55 +08:00
4c7e4c654a
update cocos2dx.ini for luabinding
2015-07-26 17:16:50 +08:00
a2a32ef58c
Release docs for v3.7.1
2015-07-25 15:16:39 +08:00
93c1cb70c4
Gen bindings and cocos2dx_files for v3.7.1
2015-07-25 13:31:52 +08:00
c1bc03b342
Gen bindings for v3.7.1
2015-07-25 13:28:02 +08:00
fa46a0abb4
Merge pull request #12992 from yangws/v3.7.1
...
Fixed #12962 : Scene can't have std::vector member.
2015-07-25 09:52:00 +08:00
54330576e6
Fix JS binding issues for skeleton animation
2015-07-24 20:16:01 +08:00
6e8edc401c
Revert changes to lua ini
2015-07-24 17:19:40 +08:00
29b9ed685f
Add BoneNode/SkeletonNode/SkinNode JS bindings
2015-07-24 15:48:34 +08:00
e4a8aeee45
Fixed #12962 : Scene can't have std::vector member.
2015-07-24 11:16:45 +08:00
ef6ada5bf4
Fix cocos2dx_studio.ini format error.
2015-07-24 09:28:55 +08:00
3945ce7a4e
Add ComExtensionData to luabinding.
2015-07-23 18:27:19 +08:00
6a1bf83fce
Merge branch 'OptimizationExtensionData' of https://github.com/chengstory/cocos2d-x into OptimizationExtensionData
2015-07-23 18:11:57 +08:00
19e078da19
Add ComExtensionData lua binding.
2015-07-23 18:11:47 +08:00
ae2a966458
Fix jsb issue for refactor ObjectExtensionData to ComExtensionData
2015-07-23 17:49:32 +08:00
739befdc08
Add audio engine bindings in JSB
2015-07-23 14:43:01 +08:00
0a6186d68f
Solve the error in Xcode project of simulator.
2015-07-22 13:44:34 +08:00
3addf38134
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 12:01:34 +08:00
85d4ce0d5a
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
docs/RELEASE_NOTES.md
tools/cocos2d-console
tools/tojs/cocos2dx.ini
2015-07-21 11:39:24 +08:00
e5ac3ee090
ignore Animate getKeyFrameUserInfo
2015-07-20 14:54:11 +08:00
583d82c1e8
ignore Animate getKeyFrameUserInfo
2015-07-20 11:49:30 +08:00
042a3dc2ec
add xcpretty to framework mac build
2015-07-17 10:48:05 +08:00
a5e3267c98
Update the reference of submodule cocos2d-console.
2015-07-17 10:08:35 +08:00
490d5a3747
Remove cleanup from auto bindings add made it support override in JS
2015-07-16 14:09:26 +08:00
436564f922
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
docs/RELEASE_NOTES.md
web
2015-07-15 14:39:40 +08:00
3c08b497ba
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-07-15 14:26:19 +08:00
7f7cf92da3
Update bindings-generator
2015-07-15 14:21:47 +08:00
15b0fea530
fix win32&win8.1 template compile
2015-07-15 10:00:35 +08:00
55890f6206
Update the JS templates to keep the directory structure is same with before.
2015-07-14 18:07:17 +08:00
97168fa139
add cocos framework build on linux platform.
2015-07-14 16:25:54 +08:00
ac1bf36208
update submodule
2015-07-14 10:10:20 +08:00
569695d844
Update the reference of submodule cocos2d-console.
2015-07-14 09:40:42 +08:00
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
75920b8e11
Update the reference of submodule cocos2d-console.
2015-07-13 12:05:17 +08:00
15bb633adb
Revert "add lua-binding of EventDispacher::dispatchCustomEvent()"
2015-07-12 20:19:52 +08:00
0d9da2f500
Merge pull request #12773 from minggo/bind-missing-function
...
add lua-binding of EventDispacher::dispatchCustomEvent()
2015-07-11 17:17:32 +08:00
8ca9e10a22
Use msbuild to generating engine prebuilt libs on win32.
2015-07-10 17:01:08 +08:00
2d27091398
Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge
...
add write api in FileUtils
2015-07-10 15:13:21 +08:00
3911e1d696
add lua-binding of EventDispacher::dispatchCustomEvent()
2015-07-10 10:29:21 +08:00
9857a4acc4
fix template daily build
2015-07-09 14:17:49 +08:00
6cf38586c2
fix template daily build
2015-07-09 13:50:58 +08:00
32171c491a
fix slave scripts path
2015-07-09 11:34:37 +08:00
0d0787b212
fix pr build scripts
2015-07-09 11:26:55 +08:00
c83a398381
fix win32 and winrt build error
2015-07-09 10:27:13 +08:00
4bdbca829b
fix scripts path error
2015-07-09 10:15:27 +08:00
7098261523
unassigned shouldn't trigger jenkins rebuild
2015-07-09 10:10:37 +08:00
3f07b0c67a
refactor daily build into one
2015-07-09 09:53:20 +08:00
2df9ce8909
fix runtime ios build error
2015-07-08 18:05:12 +08:00
30c79fea02
Add auto bindings for Frame::g|setTweenType
2015-07-08 17:19:30 +08:00
dda07bebf5
fix ios/mac/win32/win8.1 compile error
2015-07-08 07:36:26 +08:00
a18116aaa4
minor improvements
2015-07-07 16:56:38 +08:00
0ca645f744
add runtime daily build script
2015-07-07 16:54:03 +08:00
47bae38168
finish template daily build
2015-07-07 16:27:38 +08:00
04ade7c16e
remove xcode scheme
2015-07-07 14:57:25 +08:00
13d00d129d
fix the jsb and lua ini error, ignore writeDataToFile
2015-07-07 14:54:31 +08:00
a5115bd739
improve
2015-07-07 14:34:02 +08:00
494036be1a
fix linux build
2015-07-07 14:34:02 +08:00
d8bf9c8a2a
improve template daily build scripts
2015-07-07 14:34:02 +08:00
6238ddebf3
Merge remote-tracking branch 'upstream/v3.7-release' into v3
2015-07-07 10:18:43 +08:00
a9f98aefea
[Simulator JSB] Fix issue caused by video and web view binding
2015-07-07 09:38:38 +08:00
92585d3a8e
fix python syntax error
2015-07-06 17:09:55 +08:00
881a388892
add framework daily build scripts
2015-07-06 16:43:37 +08:00
0bcdf898bf
Solve the error in simulator.
2015-07-04 10:17:40 +08:00
aeeb6eb683
Merge pull request #12661 from pandamicro/v3.7-release
...
Fixed #12652 Add retain/release for XMLHTTPReqest in JSB
2015-07-04 08:40:55 +08:00
6f3fc302e6
Fix web view and video player in simulator
2015-07-04 08:39:49 +08:00
4704d38c13
add v3 to travis build
2015-07-03 18:27:42 +08:00
698f70f5b6
fix runtime template compilation
2015-07-03 15:38:53 +08:00
f37d4d226b
fix templates daily build issue
2015-07-03 15:18:33 +08:00
f27b370b94
Add argument --ios to compile Mac & iOS platforms separately.
2015-07-03 11:31:40 +08:00
1b22438792
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
...
Conflicts:
cocos/ui/UICheckBox.cpp
2015-07-03 10:23:49 +08:00
558e9c3d61
Solve the error when generating simulator on win32.
2015-07-03 10:14:20 +08:00
c713708e4d
Not compile the scripts when generating simulator.
2015-07-02 17:13:35 +08:00
5b971ee93d
Merge pull request #12607 from neokim/add_radio_button_and_group
...
Add RadioButton and RadioButtonGroup widgets
2015-07-02 17:12:59 +08:00
7ffb5edc27
Update the bundle version when generating simulator.
2015-07-02 14:37:42 +08:00
e24975f0fe
Add python script for generate cocos simulator.
2015-07-02 13:43:52 +08:00
dce583db93
fix jsb bindings error
2015-07-01 18:28:22 +08:00
8f7098e2c8
Merge pull request #12611 from andyque/add-project-template-to-jenkins
...
finish template daily build.
2015-07-01 17:26:12 +08:00
8d928e60c8
Update the version displayed in simulator about dialog.
2015-07-01 17:23:34 +08:00
d0fc1e9d34
Add link libs config in simulator project for framework.
2015-07-01 15:31:03 +08:00
53817618b7
finish template daily build.
...
1. daily build doesn't clean when build finished.
2. add options to template daily build
2015-07-01 11:24:46 +08:00
077241eecf
Merge pull request #12599 from jianglong0156/jsbProjectMerge
...
merge the jsb project into cocos2d project
2015-06-30 17:04:12 +08:00
0726b2be9c
Generate prebuilt Android.mk when compiling prebuilt libs for android.
2015-06-30 16:53:11 +08:00
minggo