95921836ca
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17549 )
2017-03-20 09:39:41 +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
a3d6705b02
Improve cc.formatStr
2016-12-21 11:05:49 +08:00
24be2acde0
Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14
...
# Conflicts:
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
# cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp
# tests/js-tests/src/SpineTest/SpineTest.js
2016-12-19 12:39:55 +08:00
149bdf125e
Update engine version
2016-12-19 12:15:41 +08:00
CocosRobot