minggo
31cf7bc625
add windows ci ( #18077 )
2017-07-17 15:52:44 +08:00
minggo
4b61ea1f1e
use travis to build iOS and mac ( #17999 )
2017-06-29 16:41:06 +08:00
minggo
029dabc4d5
Template issue ( #17958 )
...
* add search path
* do not ignore release/debug folder
VS out put folder name is debug/release.win32
and there may have debug/release folder name in 3rd party library
* don not ignore debug folder
2017-06-21 16:18:55 +08:00
minggo
4ce443bac2
use prebuilt version of bullet ( #17950 )
...
* use prebuilt bullet
* prebuilt bullet work ok on linux
* update search path
* update search path
* fix compiling issue for lua/jsb projects
* prebuilt bullet work on windows
* update 3rd party lib version
* add bullet search path
* fix script bindings issue
* fix scripting binding
2017-06-21 13:39:38 +08:00
pyrosphere
5ce38d14fe
On XCode projects, removed specific SDK versions from framework paths. ( #17929 )
2017-06-15 09:53:32 +08:00
minggo
c4173dff3e
update console to fix crash when compiling ios ( #17912 )
2017-06-08 17:07:06 +08:00
minggo
fb7a2fd3fe
update console to fix compiling issue on with Xcode 8.3+ ( #17862 )
2017-05-25 14:59:33 +08:00
xbpiao
4e92bcad19
[tolua]Lua bindings-generator support android-ndk-r9d android-ndk-r10d android-ndk-r10e (win32 support android-ndk-r9d android-ndk-r10d android-ndk-r10e android-ndk-r11c android-ndk-r13b android-ndk-r14b) ( #17820 )
...
* [tolua]Lua bindings-generator support android-ndk-r9d android-ndk-r10d android-ndk-r10e
(win32 support android-ndk-r9d android-ndk-r10d android-ndk-r10e android-ndk-r11c android-ndk-r13b android-ndk-r14b)
* [tojs]Javascript bindings-generator support android-ndk-r9d android-ndk-r10d android-ndk-r10e (win32 support android-ndk-r9d android-ndk-r10d android-ndk-r10e android-ndk-r11c android-ndk-r13b android-ndk-r14b)
2017-05-17 17:10:27 +08:00
David DeSimone
ca0a7f313e
Changing AsyncTaskPool/Scheduler to better leverage move semantics ( #17727 )
...
* Changing CCAsyncTaskPool and CCScheduler to better leverage move semantics, to avoid several lambda copy constructor calls. Chaning call sites in the cocos engine to better leverage move semantics.
* Editing binding generator to not generate bindings for AsyncTaskPool::enqueue. Bindings were not previously generated for this function due to it's type signature involving a template parameter.
* Adding missing std::move call in AsyncTaskPool to skip a copy constructor call.
2017-05-08 13:39:17 +08:00
minggo
28928263c0
update console ( #17772 )
2017-05-03 13:41:45 +08:00
子龙山人
947d068ac7
Merge pull request #17732 from zilongshanren/add-tizen-daily-build
...
[ci skip]add tizen mac daily build
2017-04-20 15:14:16 +08:00
zilongshanren
bc67f3b3fc
add tizen mac daily build
2017-04-20 15:13:40 +08:00
子龙山人
012cf2a636
Merge pull request #17731 from zilongshanren/add-tizen-daily-build
...
[ci skip]Add tizen daily build
2017-04-20 15:05:20 +08:00
zilongshanren
7bc327683a
add tizen daily build script
2017-04-20 15:04:14 +08:00
David DeSimone
246406bda1
Adding additional async functions to FileUtils ( #17634 )
...
* Adding async functions for FileUtils::listFiles and FileUtils::listFilesRecursively.
* Updating CCFileUtils::listFiles and CCFileUtils::listFilesRecursively to not expose their async version to
the JS and Lua scripting layers, due to a bug in the binding generator code.
* Updating comments in CCFileUtils.h to prevent improper JS bindings to be generated.
* Editing the cocos2dx.ini files, to prevent bindings for listFilesRecursivelyAsync and listFilesAsync to be generated.
2017-04-19 09:14:06 +08:00
zilongshanren
f35218026d
fix android daily build
2017-04-18 11:10:11 +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
Bin Zhang
3ec14488fc
Update submodule cocos2d-console. ( #17523 )
...
Changed: Disable the command `cocos gen-templates`.
2017-03-16 14:04:56 +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
Bin Zhang
ce40f13a74
Update the reference of submodule cocos2d-console. ( #17501 )
...
Changed:
1. Support VS2017 in cocos compile.
2. Solve the error that when building android project with Android SDK Tools 25.3.x.
2017-03-15 11:06:43 +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
Bin Zhang
c69d14c32e
Update the reference of submodule cocos2d-console. ( #17432 )
...
Solve the error when using cocos command on Windows.
2017-03-02 18:07:05 +08:00
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
Xpol Wan
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
Xpol Wan
a66c2060b5
Also check the #import statement for m and mm files.
2016-03-21 20:12:15 +08:00
Xpol Wan
be688d33c4
Remove debug print [ci skip]
2016-03-21 15:08:45 +08:00
Xpol Wan
764389036d
Try fix win32 path issue.
2016-03-21 15:01:01 +08:00
Xpol Wan
d063f26173
Add some debug print in linter script.
2016-03-21 14:16:17 +08:00
Xpol Wan
56f2aff34c
Replace '\\' with '/' when scan source files.
2016-03-21 13:53:15 +08:00
Xpol Wan
bd2d7c3ee7
Always use posixpath.
2016-03-21 13:35:40 +08:00
Xpol Wan
c6c2e42a51
include include path check in Jenkins build script.
2016-03-21 11:41:17 +08:00
Xpol Wan
6dcd7d51c3
Update include-linter.py excludes pch.cpp and include .m and .mm.
2016-03-21 11:01:23 +08:00
Xpol Wan
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
zilongshanren
7993ad93d2
fix jsb API inconsistency.
...
Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275
2016-03-18 16:18:40 +08:00
beichen.liu
c599f071a4
Add missing include file in ProjectConfig.cpp.
2016-03-08 14:36:01 +08:00
beichen.liu
c50d54339f
Add localization arguments in simulator start args.
2016-03-07 09:52:53 +08:00
zhangcheng
709d79ad14
Add first search path to command param.
2016-03-04 13:16:37 +08:00
xiaofeng11
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
beichen.liu
b207d559ae
Change the interface of LocalizationHelper::setCurrentManager.
2016-03-04 10:34:04 +08:00
zilongshanren
b5a44bc2f4
Merge pull request #15170 from geron-cn/uitabcontrol
...
add TabControl TabHeader to tolua
2016-03-04 10:26:06 +08:00
geron-cn
008089a506
add TabControl TabHeader to tolua
2016-03-03 16:22:42 +08:00
beichen.liu
0489fd76e8
1.Change the interface in LocalizationManager.
...
2.Add new args of localization in simulator.
2016-03-03 15:49:50 +08:00
zilongshanren
cd4abc0a7f
don't remove chipmunk js auto bindings
2016-03-03 15:46:16 +08:00
geron-cn
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 6bf55ed
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:57:48 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview
# Conflicts:
# cocos/ui/CMakeLists.txt
commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:27:31 2016 +0800
configure for win8.1
commit ec236bff711b72952d48ec4d8b9137b4812b7a72
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:20:23 2016 +0800
configure for iOS mac twos android linux
commit 9d6678a4388461a791abe968fa637df2fc6839d3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:02:17 2016 +0800
add lack files
commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 22:05:22 2016 +0800
add test case for TabControl
commit 97b8d8d87a37881b33ebe90478392150ef341b3e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 15:43:29 2016 +0800
add const to getter setter
commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 14:50:04 2016 +0800
format the comments
commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:51:06 2016 +0800
remove reference
commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:40:04 2016 +0800
configure for win8.1
commit c015ac54028534202f62ff85f9a9d4b62b12801e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:27:54 2016 +0800
fix error
commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:25:51 2016 +0800
add interface
commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:21:22 2016 +0800
fix compile error for tw-os
commit 3bfaa2976751e844a591ae5524bfd81249927c7c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:04:23 2016 +0800
fix linux compile error
commit fafe3ad660e644924fd02665b77e1df4076a4802
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:54:34 2016 +0800
re-indent code with X-Code
commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:37:51 2016 +0800
add reader configure for android
commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:22:00 2016 +0800
format code, remove some warning
commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:02:27 2016 +0800
configure for mac project
commit de21cea12c0a898ea95f9951022be85bdddeefaf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 18:28:10 2016 +0800
add comment for apis
commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 15:32:46 2016 +0800
fix parse objects in container
commit 53bcce68b053a5b918a29735fed393c210d9cc2c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 22:10:54 2016 +0800
fix flatbuffer parse
commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 18:26:07 2016 +0800
Init ui::TabControl
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 6bf55ed
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:57:48 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview
# Conflicts:
# cocos/ui/CMakeLists.txt
commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:27:31 2016 +0800
configure for win8.1
commit ec236bff711b72952d48ec4d8b9137b4812b7a72
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:20:23 2016 +0800
configure for iOS mac twos android linux
commit 9d6678a4388461a791abe968fa637df2fc6839d3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:02:17 2016 +0800
add lack files
commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 22:05:22 2016 +0800
add test case for TabControl
commit 97b8d8d87a37881b33ebe90478392150ef341b3e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 15:43:29 2016 +0800
add const to getter setter
commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 14:50:04 2016 +0800
format the comments
commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:51:06 2016 +0800
remove reference
commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:40:04 2016 +0800
configure for win8.1
commit c015ac54028534202f62ff85f9a9d4b62b12801e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:27:54 2016 +0800
fix error
commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:25:51 2016 +0800
add interface
commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:21:22 2016 +0800
fix compile error for tw-os
commit 3bfaa2976751e844a591ae5524bfd81249927c7c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:04:23 2016 +0800
fix linux compile error
commit fafe3ad660e644924fd02665b77e1df4076a4802
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:54:34 2016 +0800
re-indent code with X-Code
commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:37:51 2016 +0800
add reader configure for android
commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:22:00 2016 +0800
format code, remove some warning
commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:02:27 2016 +0800
configure for mac project
commit de21cea12c0a898ea95f9951022be85bdddeefaf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 18:28:10 2016 +0800
add comment for apis
commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 15:32:46 2016 +0800
fix parse objects in container
commit 53bcce68b053a5b918a29735fed393c210d9cc2c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 22:10:54 2016 +0800
fix flatbuffer parse
commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 18:26:07 2016 +0800
Init ui::TabControl
2016-03-03 14:17:48 +08:00
zhangcheng
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
zhangbin
077b5e7bfc
Update the reference of submodule cocos2d-console
2016-02-15 10:49:57 +08:00
pandamicro
6bbfc846da
Update bindings generator and Activate new memory model by default
2016-02-14 09:48:29 +08:00
pandamicro
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
pandamicro
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
XiaoFeng
0f3cb16efd
Fix when add two ActionTimeLine object in one node, play state is wrong
2016-01-14 16:16:37 +08:00
zilongshanren
161be986af
Merge pull request #14340 from fnz/easyjni
...
easy jni
2016-01-12 11:50:16 +08:00
XiaoFeng
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
XiaoFeng
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
XiaoFeng
52fb3fd098
Fix js project with pre-build frameworks crash when exit program
2015-12-29 19:38:37 +08:00
Ricardo Quesada
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
lunhao.guo
1871813c2b
update cocos2d-console submodule to 6cc7a09dc64a57fd5307c2ba3a0a705f834dfd97
2015-12-24 20:35:12 +08:00
pandamicro
6c2fd67d08
Update auto bindings
2015-12-21 00:14:51 +08:00
pandamicro
4f94b03b86
Upgrade bindings generator
2015-12-19 17:18:39 +08:00
xiaofeng11
ef71d8cdcf
Merge pull request #14689 from GuoLunHao/v3.10_updateConsole
...
update cocos2d-console submodule to 1ad9331a9e3cbef9c499b6c7
2015-12-16 12:23:23 +08:00
lunhao.guo
b32d013dc4
update cocos2d-console submodule to SH1 1ad9331a9e3cbef9c499b6c785d64c25b2f7e133
2015-12-15 20:06:16 +08:00
pandamicro
6e20c3cc4f
Merge pull request #14681 from pandamicro/v3.10
...
Fix ComponentJS proxy management issue in JSB
2015-12-15 12:26:12 +08:00
pandamicro
64276bd664
Fix ComponentJS proxy management issue in JSB
2015-12-15 11:48:44 +08:00
pandamicro
280a8e9d9c
Merge pull request #14663 from xiaofeng11/v3.10
...
Update all version number to v3.10
2015-12-15 10:48:51 +08:00
pandamicro
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
XiaoFeng
4815ec8b9a
Update version number to v3.10
2015-12-14 10:32:29 +08:00
Ricardo Quesada
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
Ricardo Quesada
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
GuoLunHao
5872745593
fix compile error and link error on ios/Mac platform
2015-12-10 16:43:01 +08:00
lunhao.guo
ae980c19d2
fix the link error and compile error in windows and android platform
2015-12-09 20:18:37 +08:00
Ricardo Quesada
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
XiaoFeng
b435f1df86
Fix wrong #endif statement
2015-12-07 10:44:52 +08:00
XiaoFeng
0328c31596
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_xf
2015-12-07 10:27:38 +08:00
Ricardo Quesada
d02f4afd4a
using new bindings templates
...
ignores createInstance() from ui
2015-12-05 22:26:54 -08:00
Ricardo Quesada
cd8631ef09
sfunction "create" uses new optimized code
...
...although this code should never be called
2015-12-04 18:42:31 -08:00
XiaoFeng
76bd37e109
Add missing export declaration.
2015-12-04 19:40:09 +08:00
Ricardo Quesada
e5d722b2a8
new bindings
2015-12-02 15:24:49 -08:00
yangxiao
45b25666ea
reset submodule
2015-12-02 13:28:24 +08:00
yangxiao
ebd5c1cca7
resolve conflict and fix checktexture bug
2015-12-02 11:26:05 +08:00
pandamicro
df62e92d7b
Correct bindings generator ref
2015-12-01 23:50:52 +08:00
yangxiao
1b3cb97b71
fix script binding
2015-12-01 23:05:47 +08:00
XiaoFeng
e5d57b4fa2
update binding-generator sub module & code
2015-12-01 22:30:36 +08:00
yangxiao
01e0803587
not export Sprite3DMaterial::setTexture
2015-12-01 20:27:31 +08:00
yangxiao
84068c5189
not export Mesh::getTexture and Mesh::setTexture
2015-12-01 18:05:03 +08:00
yangxiao
f298e49bf3
not export lua Mesh::getTexture and Mesh::setTexture
2015-12-01 17:39:00 +08:00
yangxiao
6fe361f06e
not export Mesh::getTexture
2015-12-01 15:13:51 +08:00
XiaoFeng
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
XiaoFeng
167aa9b648
Update console sub-module, update project template.json to meet file position change
2015-12-01 15:00:45 +08:00
yangxiao
9b371a55bf
js not export Mesh::setTexture
2015-12-01 14:35:39 +08:00
pandamicro
08837955a7
Skip Useless MenuItemToggle::initWithCallback to fix windows compilation issue
2015-11-30 23:54:42 +08:00
pandamicro
43c68aa16b
Fix Chipmunk bindings issue
2015-11-27 22:38:16 +08:00
fnz
8c691430c1
conflicts resolved
2015-11-27 13:19:10 +03:00
fnz
c4b995fe59
updates to JniHelper, refactoring of existing JNI calls
2015-11-27 12:00:33 +03:00
pandamicro
ae2b75c8be
Fix issues causing by temporary RootedObject passed as function parameters
2015-11-27 01:35:06 +08:00
XiaoFeng
5a2a343152
update code as comment
2015-11-26 17:38:32 +08:00
XiaoFeng
9811d6efcf
Combine studio change for LuaBinding, jsb and simulator
2015-11-25 21:52:44 +08:00
pandamicro
be2a3077c2
Remove useless manual bindings for addEventListener functions in UI
2015-11-25 14:15:45 +08:00
pandamicro
930405d52c
Remove useless manual bindings for MenuItems
2015-11-24 16:32:02 +08:00
XiaoFeng
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
XiaoFeng
c0c35c603e
Update version number & RELEASE_NOTES.md, prepare 3.9 release
2015-11-06 18:38:09 +08:00
pandamicro
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
zhangbin
47ea0dfb02
Update the reference of submodule cocos2d-console.
2015-11-04 10:43:30 +08:00
pandamicro
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
zhangbin
bfa50de768
Update the reference of submodule cocos2d-console.
2015-11-03 16:06:12 +08:00
hugo
0dd0233ba7
update sdkbox console
2015-11-03 13:06:09 +08:00
geron-cn
c6feb3d34d
update submodule cocos2d-console
2015-11-02 17:49:26 +08:00
XiaoFeng
218b5625bf
Fix can not start js project with simulator in CodeIDE
2015-11-02 17:36:47 +08:00
pandamicro
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
pandamicro
a3c2904e7f
Fix cc.DrawNode.drawPoly
2015-10-27 16:46:25 +08:00
XiaoFeng
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
pandamicro
be45e0bc50
Merge pull request #14174 from noshbar/v3
...
CPPCheck fixes, correct deallocation, array size.
2015-10-19 10:05:01 +08:00
pandamicro
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
Dirk de la Hunt
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
hugo
2bf7f8ae3f
update console
2015-10-16 16:10:08 +08:00
pandamicro
8915fc6cb9
Revert "Remove screen direction check in simulator to avoid render error"
2015-10-16 11:36:20 +08:00
zhangcheng
3edbf0f4a3
Fix#22934
...
Node, Skeleton needs to show at the middle of the simulator.
2015-10-15 19:35:06 +08:00
XiaoFeng
ca8977b6f8
Remove screen direction check in simulator to avoid render error
2015-10-15 10:11:26 +08:00
XiaoFeng
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
zhangbin
f25b62b4b5
Update the reference of submodule cocos2d-console.
2015-10-12 14:16:18 +08:00
Joachim Grill
9a0ea79b61
remove set/get/hasPolygonInfo methods from js / lua api; fixed C++11 issue
2015-09-30 15:20:53 +02:00
pandamicro
4f6bdd6d74
Fix mistaken uploaded lua bindings
2015-09-29 14:52:47 +08:00
pandamicro
7b85211cfe
Remove ScriptComponent
...
Because windows platform can't successfully compile in previous architecture
2015-09-27 22:18:59 +08:00
pandamicro
2a3526a3fd
Fix lua project
2015-09-26 19:43:36 +08:00
pandamicro
91928aa23d
Add ComponentJS test case and fix windows platforms
2015-09-26 19:43:36 +08:00
pandamicro
ddb636a022
Add ScriptComponent and ComponentJS
2015-09-26 19:43:36 +08:00
pandamicro
7e2b8c71a7
Improve lua script component
2015-09-26 19:43:35 +08:00
minggo
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
pandamicro
d3504a9216
Update versions and html5 engine
2015-09-22 02:31:21 +08:00
WenhaiLin
4241df7af7
Fixed binding...
2015-09-21 15:41:14 +08:00
WenhaiLin
2288b7e8d1
Fixed tools/travis-scripts/before-install.sh...
2015-09-21 15:22:00 +08:00
WenhaiLin
460d0fd5a6
[ci skip]Fixed tools/travis-scripts/before-install.sh
2015-09-21 14:58:14 +08:00
WenhaiLin
1c7d4805ef
Fixed travis-scripts/before-install.sh
2015-09-21 13:52:28 +08:00
pandamicro
44329d96ba
Merge pull request #13946 from WenhaiLin/v3-binding-tool-refine
...
Refine lua/js binding tool
2015-09-20 16:42:40 +08:00
WenhaiLin
a3f363735e
Refine lua/js binding tool
2015-09-19 00:08:15 +08:00
pandamicro
0cbc1e5f40
Merge pull request #13923 from WenhaiLin/v3-physics-refine
...
Refine components to improve physics performance
2015-09-18 21:56:36 +08:00
WenhaiLin
a17a702cd1
Refine components to improve performance
2015-09-18 14:34:02 +08:00
Vincent Yang
56ea700d37
Fix bug: new project created by template compile error.
2015-09-18 11:40:16 +08:00
zhangbin
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
pandamicro
1e7b78b057
Merge pull request #13795 from pandamicro/v3
...
Update bindings-generator to initialize numeric/pointer variables
2015-09-14 11:54:02 +08:00
zhangbin
da24454c6c
Update the reference of submodule cocos2d-console.
2015-09-14 11:46:02 +08:00
pandamicro
b0dc83aed8
Update bindings-generator to initialize numeric/pointer variables
2015-09-14 11:22:06 +08:00
zhangbin
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
pandamicro
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