CocosRobot
ced1009291
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17339 )
2017-02-10 14:14:16 +08:00
minggo
34d4c65c86
fix crash on Android ( #17338 )
...
The crash is caused because of local reference table overflow
2017-02-10 13:51:29 +08:00
minggo
c61cd9afe7
fix spine binding codes and test case ( #17335 )
2017-02-10 11:58:23 +08:00
CocosRobot
85dbcc1638
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17332 )
2017-02-09 17:07:42 +08:00
minggo
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
CocosRobot
3d51645d3d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17319 )
2017-02-08 10:42:18 +08:00
Dale Stammen
9381152ef1
removed support for Windows 8.1 store and phone ( #17311 )
2017-02-08 09:46:47 +08:00
mogemimi
75d2e76095
Fix minor typos in comments and docs ( #17294 )
2017-02-07 09:41:52 +08:00
CocosRobot
c1b4358d13
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17290 )
2017-02-06 16:31:09 +08:00
CocosRobot
4e6be0e9da
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17276 )
2017-02-04 10:35:08 +08:00
mogemimi
777a97e141
Fix typo in AudioState ( #17258 )
2017-02-04 10:34:34 +08:00
CocosRobot#Set
bdcf461dc3
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-01-23 01:32:57 +00:00
CocosRobot
21d57bfd39
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17185 )
2017-01-16 11:20:39 +08:00
CocosRobot
f2114f36f8
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17183 )
2017-01-13 14:04:11 +08:00
CocosRobot
91ae4b1c03
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17143 )
2017-01-10 16:59:15 +08:00
kosmosR2
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
CocosRobot#Set
69217f0e8b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-01-05 01:40:38 +00:00
minggo
f63fad3e27
Merge branch 'v3.14' into merge-v314
2017-01-04 09:49:22 +08:00
pandamicro
88be66218b
Small fix to CallbackWrapper
2016-12-26 00:08:59 +08:00
pandamicro
7c2ea03b00
Improve TrackEntry issue solution with internal unordered_map
2016-12-26 00:08:18 +08:00
pandamicro
100c027054
Fix chipmunk crash issues when using setDefaultCollisionHandler
2016-12-21 11:07:18 +08:00
pandamicro
a3d6705b02
Improve cc.formatStr
2016-12-21 11:05:49 +08:00
pandamicro
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
pandamicro
149bdf125e
Update engine version
2016-12-19 12:15:41 +08:00
pandamicro
51a09048bd
Increase default JS heap to 32 mb
2016-12-19 11:51:43 +08:00
pandamicro
a508b7d751
Fix crash during Wrappers deallocation (possible to have leak)
2016-12-19 11:51:23 +08:00
pandamicro
46dbb32fd9
Fix spine TrackEntry recursive conversion issue by using getter
2016-12-19 11:50:52 +08:00
pandamicro
2b6e84e9a2
Separate FinalizeHook for ref objects and non ref objects
2016-12-19 11:50:32 +08:00
James Chen
c0291afad7
Merge branch 'v3.14' into merge-v3.14
2016-12-14 17:03:58 +08:00
CocosRobot
edca6862b9
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17009 )
2016-12-14 09:37:46 +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
pandamicro
a73485a1bc
Use %ld instead of %zd
2016-12-13 18:12:50 +08:00
pandamicro
d89bde4e8e
Fix compilation issues and update web & bindings-generator
2016-12-13 15:37:46 +08:00
pandamicro
bedde74df5
Fix compilation issue when COCOS_DEBUG = 2
2016-12-13 14:29:25 +08:00
pandamicro
00b57c9565
Manual bind EventListeners’ create to avoid memory issue
2016-12-13 14:29:24 +08:00
pandamicro
3d6b1367cd
Manually bind EventDispatcher::addCustomEventListener to avoid memory issue
2016-12-13 14:29:24 +08:00
pandamicro
6b25a73a93
Synchronize Scheduler.PRIORITY_NON_SYSTEM const
2016-12-13 14:29:24 +08:00
pandamicro
d4618e60ef
Synchronize Editbox APIs
2016-12-13 14:29:24 +08:00
pandamicro
ae5ccd16f2
Direct log/error for better understanding problems & add sys.now
2016-12-13 14:29:23 +08:00
pandamicro
b50ea4afce
Support more system languages
2016-12-13 14:29:23 +08:00
pandamicro
197dac204b
Fix function wrapper using js object during its gc
2016-12-13 14:29:23 +08:00
CocosRobot
77f5204877
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16972 )
2016-12-09 14:30:01 +08:00
CocosRobot#Set
5ef072de03
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-12-05 01:43:54 +00:00
CocosRobot
129838d960
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16896 )
2016-11-24 11:39:02 +08:00
CocosRobot
18204c1e37
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16880 )
2016-11-21 15:00:00 +08:00
pyrosphere
663bb4d7ed
No CC_UNUSED_PARAM ( #16812 )
...
* Added -Wno-unused-parameter and removed all uses of the CC_UNUSED_PARAM macro
* Commented unused parameter names in .cpp files which previously used CC_UNUSED_PARAM
* Reverted -Wno-unused-param flag.
Moved deprecated touch methods definitions to .cpp file.
Commented more unused parameter names.
* Fixed some errors and warnings caused by the previous commit.
* Commented remaining unused parameter names in .cpp files.
* Fixed unused parameter warnings in headers.
* Fixed some more unused parameter warnings.
* Fixed some more unused parameters warnings.
* Fixed mistake in previous commit, missing ComAudioReader:: in method. Other warnings.
* Fixed build errors.
* Added missing file to CMakeLists
2016-11-16 09:48:37 +08:00
CocosRobot
d0705d9e25
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16828 )
2016-11-09 17:33:47 +08:00
samael
c6f98cd95b
jsb.addRoot is not a function ( #16509 )
...
* jsb.addRoot is not a function
jsb.addRoot is not a function
* Update jsb_cocos2d.js
remove jsb._root
2016-11-09 15:19:32 +08:00
CocosRobot
2d18d703a0
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16810 )
2016-11-04 14:07:25 +08:00
David DeSimone
9204c87cfc
Adding performance.now() to cocos2d-js. ( #16766 )
...
* Adding performance.now() to cocos2d-js. See https://developer.mozilla.org/en-US/docs/Web/API/Performance/now
* Fixing improper logic for converting from microseconds, to milliseconds with micro-precision
* Adding performance.now tests
2016-11-04 11:58:48 +08:00