a8b6e33d9c
Unregister spine event lua event handler should set listener to null. ( #12845 )
2017-11-21 10:55:55 +08:00
d42098e2c4
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18431 )
2017-11-02 11:17:04 +08:00
cfaa77be28
Update spine ( #18427 )
2017-11-02 09:06:13 +08:00
496de07633
don't have to set NDK_MODULE_PATH manually
2017-10-26 13:40:27 +08:00
bf67850710
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18397 )
2017-10-23 11:58:20 +08:00
79b97e9992
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18385 )
2017-10-20 10:06:21 +08:00
36f7f3c37e
Merge branch 'v3.16' of github.com:cocos2d/cocos2d-x into syn-v316
2017-09-13 11:18:39 +08:00
2fbb6fe32a
[ci skip][lua] Bug fix in xhr:getResponseHeader("xxx") and better coding particle. ( #18252 )
...
* [lua] Bug fix in xhr:getResponseHeader("xxx") and better coding particle.
* More const auto &.
2017-09-13 10:54:35 +08:00
1929265a7c
[ci skip] Fix web engine issues for 3.16 QA ( #18251 )
...
* Fix web test case issue in UIListView
* imgLoader callback use texture instead of image
* Update web ref
2017-09-11 21:03:22 -05:00
46e70d3c71
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18236 )
2017-09-08 10:49:17 +08:00
5d2c3f5d43
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18234 )
2017-09-08 09:28:16 +08:00
c89e35e22a
Merge pull request #18216 from cocos2d/v3.16
...
V3.16
2017-09-06 14:59:36 +08:00
7a65363208
Changes JS version to 3.16. ( #18210 )
2017-09-06 09:10:14 +08:00
03635ecc4a
Improved Cocos2dxLuaLoader.cpp ( #18171 )
...
* Improved Cocos2dxLuaLoader.cpp
* Added testcase for new LuaLoader
2017-08-25 09:32:02 +08:00
d11674fd9c
[ci skip]implementation conversion lua table to ObjC Dictionary ( #18134 )
2017-08-24 14:17:21 +08:00
b274322961
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18183 )
2017-08-22 10:06:38 +08:00
1fa0f3d237
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18129 )
2017-08-07 17:01:27 +08:00
efe95fd899
[ci skip]Add Chipmunk JS binding for segmentQuery ( #18107 )
2017-08-07 11:57:45 +08:00
db79a5ea6f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18102 )
2017-07-26 17:03:19 +08:00
54586d06a4
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18081 )
2017-07-17 16:51:50 +08:00
17f2a12a28
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18061 )
2017-07-13 11:13:38 +08:00
81d70adece
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18052 )
2017-07-12 09:50:15 +08:00
012e9982d8
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-07-05 01:32:25 +00:00
f2e9785132
Export cocos2d::utils::findChild to lua-bindings ( #18013 )
2017-07-04 14:37:44 +08:00
e7a2708812
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18021 )
2017-07-03 15:21:55 +08:00
41ef696019
luaoc static function return type fix ( #17956 )
...
* update remote repo
* Revert "update remote repo"
This reverts commit c92200d0ac4203c32048ea902e92535dcb4d0935.
* returnType BOOL
* luaoc return type encode
2017-06-26 14:04:55 +08:00
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
e6210874dd
Processing Lua file(UTF8+BOM) that is encrypted will crash,when free the buffer pointer that is changed pointer address. ( #17937 )
2017-06-20 09:02:40 +08:00
78d5a809c8
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17933 )
2017-06-20 09:01:57 +08:00
992ac34a2d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17913 )
2017-06-09 09:54:03 +08:00
7230593be0
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17910 )
2017-06-08 17:06:05 +08:00
12db177f5c
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17905 )
2017-06-07 16:54:36 +08:00
421bd16cb7
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17904 )
2017-06-07 13:44:00 +08:00
4ca29ac1cf
Merge v3.15.1 ( #17897 )
...
* remove APP_SHORT_COMMANDS setting (#17722 )
some developers report it will cause error on Windows though i can not reproduce it. It is strange, the setting is used to resolve command length limitation on Windows.
* Particle font size should be a const value (#17676 )
* Particle font size should be a const value
* Minor fix: CCStencilStateManager.hpp -> CCStencilStateManager.h in xcode project.
* JSB SocketIO.connect supports to pass a CA cert file (#17736 )
* JSB SocketIO.connect supports to pass a CA cert file
* The second parameter of SocketIO.connect function is probably a `option` object. JSB just ignores it.
* The optimization for huawei. (#17832 )
* The optimization for huawei.
* setAnimationInterval fix for all platforms.
* disable debug
* include fix.
* Uses better configuration for huawei optimization (#17838 )
* Uses better configuration for huawei optimization
* Updates jar file and uncomment fps controlling code
* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17840 )
* update release not and version (#17845 )
* [android] Removes an unused variable sRegistered in Cocos2dxActvity.java. (#17861 )
* Updates jar to resolve warning while packaging APK file. (#17863 )
* update release date (#17870 )
* fix compiling error
2017-06-05 13:37:50 +08:00
3eadc05d36
Fix iskindof ( #17785 )
...
* Fix iskindof logic error
* fix iskindof
* No need to deal metatables in function iskindof_
2017-05-23 16:13:37 +08:00
dd880eedf7
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17857 )
2017-05-23 10:17:48 +08:00
a857ebe831
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17848 )
2017-05-22 16:47:08 +08:00
2f3a7df55a
Fixing serious XMLHTTP leak when CC_ENABLE_GC_FOR_NATIVE_OBJECTS enabled ( #17844 )
...
* Fixing issue where XMLHttpRequests would not have their destructor fire if CC_ENABLE_GC_FOR_NATIVE_OBJECTS was set. This was due to mismanagement of JSHeap object tracing.
* Removing unused variables in js_add_object_root.
2017-05-22 13:40:07 +08:00
1bfbf35026
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17830 )
2017-05-19 09:41:55 +08:00
c23330e528
webview supports https in jsb ( #17805 )
2017-05-11 10:25:43 +08:00
cc21ff32bf
Issue #16188 : Fix lua-script Sprite:playAnimationOnce(animation, args) blink bug ( #17583 )
2017-05-10 17:37:38 +08:00
e7a9ffb396
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17780 )
2017-05-05 11:11:06 +08:00
f8e325792b
V3.15 ( #17752 )
...
* remove APP_SHORT_COMMANDS setting (#17722 )
some developers report it will cause error on Windows though i can not reproduce it. It is strange, the setting is used to resolve command length limitation on Windows.
* Particle font size should be a const value (#17676 )
* Particle font size should be a const value
* Minor fix: CCStencilStateManager.hpp -> CCStencilStateManager.h in xcode project.
* JSB SocketIO.connect supports to pass a CA cert file (#17736 )
* JSB SocketIO.connect supports to pass a CA cert file
* The second parameter of SocketIO.connect function is probably a `option` object. JSB just ignores it.
2017-04-27 09:25:20 +08:00
ddb4dc893b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17733 )
2017-04-21 09:16:25 +08:00
ee84d9f12e
update v3.15
2017-04-14 13:45:32 +08:00
c69823ba6f
cc.Follow not working on mobile
...
When using a cc.Follow action, I've tested on mobile devices (Android & iOS) and it's not working. This changed fixed the problem.
2017-04-06 08:45:06 -03:00
9ed5127edc
synchronize v3.15
2017-04-01 17:16:45 +08:00
4fe75a99b5
Update engine version ( #17624 )
2017-03-31 16:09:20 +08:00
31c0e27b4b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17606 )
2017-03-29 14:23:15 +08:00
d25cd8ddf4
[ci skip] Fix QA issues ( #17596 )
...
* Fix RenderTexture#clear API inconsistency
* Improve js-tests desktop page
* Fix issues in js test cases
2017-03-27 18:03:20 +08:00
cab5195ad4
find .luac first ( #17572 )
2017-03-23 10:43:39 +08:00
72d47c7f39
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17566 )
2017-03-22 14:56:45 +08:00
95921836ca
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17549 )
2017-03-20 09:39:41 +08:00
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
0e0987d337
Support notify progression in XMLHTTPRequest ( #17509 )
...
* Support notify progression in XMLHTTPRequest
* Fix indent
* Fix issues
* fix issue
2017-03-16 14:09:51 +08:00
75383bdcde
Jsb improvements ( #17513 )
...
* Cleanup ScriptingCore code
* Add jsb.ENABLE_GC_FOR_NATIVE_OBJECTS to indicate the memory model
* Use incremental GC
* Improve ScriptingCore::executeFunctionWithOwner performance
* Support ScriptingCore::executeGlobalFunction
* Reuse js objects for get_or_create_weak_jsobject reduce memory usage
* Fix sequence / spawn js object lost issue
* Improve wrappers with cppOwner system
2017-03-16 09:42:16 +08:00
87b4d7d54d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17507 )
2017-03-15 16:23:50 +08:00
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
98d2236914
Prevent signed/unsigned mismatch ( #17468 )
2017-03-08 14:32:23 +08:00
fb730b5395
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17456 )
2017-03-07 11:29:17 +08:00
e08cbc1c39
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17453 )
2017-03-07 09:45:23 +08:00
b32c84f8c2
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17449 )
2017-03-06 18:28:58 +08:00
7dbfc85a8f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17430 )
2017-03-02 16:08:53 +08:00
619e012d9b
[WebSocket] Adds support for getting url and server selected protocol ( #17381 )
...
* [WebSocket] Adds support for getting url and server selected protocol
* Adds const keyword for getter methods, and make LOGE also works in release mode.
2017-02-20 09:44:20 +08:00
a3daaf3626
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-02-17 07:53:15 +00:00
126c983ca9
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17375 )
2017-02-17 10:17:46 +08:00
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
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
4237639dd6
Some fixes for websocket ( #17342 )
...
* libwebsockets & curl are dynamic libraries now, modify project configuration for win32.
Updates WebSocketTest.cpp to test wss connection.
* Corrects some logic in WebSocket.cpp. Adds wss test case. WebSocketTest suggests developers to use `WebSocket::closeAsync` method which will not block current thread.
* mutex unlock fix in WebSocket.cpp. Reverts TEST URL.
* Allows self-assign cert.
* Each ws connection will create a virutal host now. Supports self-signed cert and update test case to suggest developer use ‘closeAsync’.
* Updates deps to 123.
2017-02-13 15:15:23 +08:00
ced1009291
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17339 )
2017-02-10 14:14:16 +08:00
34d4c65c86
fix crash on Android ( #17338 )
...
The crash is caused because of local reference table overflow
2017-02-10 13:51:29 +08:00
c61cd9afe7
fix spine binding codes and test case ( #17335 )
2017-02-10 11:58:23 +08:00
85dbcc1638
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17332 )
2017-02-09 17:07:42 +08:00
8825a091bb
update spine to 3.5.35 ( #17331 )
...
* update spine to 3.5.35
* fix jsb compiling error
* fix lua compiling error
2017-02-09 16:57:42 +08:00
3d51645d3d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17319 )
2017-02-08 10:42:18 +08:00
9381152ef1
removed support for Windows 8.1 store and phone ( #17311 )
2017-02-08 09:46:47 +08:00
75d2e76095
Fix minor typos in comments and docs ( #17294 )
2017-02-07 09:41:52 +08:00
c1b4358d13
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17290 )
2017-02-06 16:31:09 +08:00
1d47ae7e90
Fix typo in function name ( #17253 )
2017-02-04 10:35:56 +08:00
4e6be0e9da
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17276 )
2017-02-04 10:35:08 +08:00
777a97e141
Fix typo in AudioState ( #17258 )
2017-02-04 10:34:34 +08:00
bdcf461dc3
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-01-23 01:32:57 +00:00
690db56f44
Merge v3.14.1 ( #17231 )
...
* update cocos console to fix compiling error with Android Studio projects (#17129 ) (#17145 )
* fix crash if physics3d camera is not set (#17139 ) (#17144 )
* fix linking error with vs2015 (#17146 )
* fix issue #17116 & #17119 for v3.14.1
* tests cases
* better documentation
* doc: updates sprite doc
* Fix scale9sprite polygon info (#17161 )
* add guard code to Scale9Sprite
* add new test code
* Glfw linux issue (#17166 )
* purge glfw3 before installing glfw3.2
* purge glfw3 before installing glfw3.2
* Update web engine ref (#17169 )
* update version and release note (#17170 )
* issue ##17119 improved v3.14.1 (#17189 )
* update version (#17230 )
2017-01-20 09:59:30 +08:00
1bc016b354
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17232 )
2017-01-19 14:15:08 +08:00
00b9dcd62e
Lua custom handler ( #17211 )
...
* avoid crash if custom handler vector is empty
* simplify codes
2017-01-18 17:05:08 +08:00
888b985e0e
Fix variable name typo ( #17195 )
2017-01-16 11:21:34 +08:00
21d57bfd39
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17185 )
2017-01-16 11:20:39 +08:00
f2114f36f8
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17183 )
2017-01-13 14:04:11 +08:00
1b6c8cc5c1
bind FileUtils:getDataFromFile() to lua ( #17182 )
2017-01-13 13:39:58 +08:00
afb55253f1
fix dutch language value and add missing languages ( #17160 )
2017-01-11 14:04:45 +08:00
90e0ab0c2e
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17152 )
2017-01-11 10:49:48 +08:00
91ae4b1c03
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17143 )
2017-01-10 16:59:15 +08:00
44fb4ba3bc
To use some HTTP client library those use `send(null)` like `superagent`,`XMLHTTPRequest` should send a empty request instead of abort. ( #16989 )
2017-01-05 16:12:03 +08:00
69217f0e8b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-01-05 01:40:38 +00:00
a0acaf5972
Merge pull request #17101 from minggo/merge-v314
...
Merge v314
2017-01-04 11:48:31 +08:00
61170c69ee
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17103 )
2017-01-04 11:47:58 +08:00
f63fad3e27
Merge branch 'v3.14' into merge-v314
2017-01-04 09:49:22 +08:00
88be66218b
Small fix to CallbackWrapper
2016-12-26 00:08:59 +08:00
7c2ea03b00
Improve TrackEntry issue solution with internal unordered_map
2016-12-26 00:08:18 +08:00
100c027054
Fix chipmunk crash issues when using setDefaultCollisionHandler
2016-12-21 11:07:18 +08:00
Jason Xu