Commit Graph

2395 Commits

Author SHA1 Message Date
CocosRobot bbd9bc666b [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-24 06:59:08 +00:00
James Chen 8c35991218 Merge pull request #924 from dumganhar/jsb2.0
JSC API for TypedArray and ArrayBuffer is supported from macOS 10.12, iOS 10. Try to hack it and make it work on lower version.
2017-10-24 14:53:28 +08:00
James Chen 4869077bcc isArrayBuffer and isTypedArray hack. 2017-10-24 14:44:40 +08:00
James Chen 3a8940883f jsb2.0 docs update. 2017-10-24 11:43:51 +08:00
James Chen 1d7ce13590 JSC API for TypedArray and ArrayBuffer is supported from macOS 10.12, iOS 10. Try to hack it and make it work on lower version. 2017-10-24 11:43:33 +08:00
James Chen ea08d2f9bc Safe check of _stencil variable in CCClippingNode.cpp. 2017-10-24 11:03:27 +08:00
James Chen 2562fa5ce5 Merge pull request #923 from dumganhar/develop
[iOS, macOS] Should fflush log output immediately for LOGD, LOGE in jswrapper.
2017-10-24 10:21:43 +08:00
James Chen 3bdc85413c [iOS, macOS] Should fflush log output immediately for LOGD, LOGE in jswrapper. 2017-10-24 10:19:39 +08:00
James Chen 19d9d90608 Merge pull request #922 from dumganhar/jsb2.0
Fixes passing wrong message in console.log to browser's console.
2017-10-24 10:06:58 +08:00
James Chen 1173b2931b Pass wrong message in console.log to browser's console. 2017-10-24 10:05:24 +08:00
James Chen 1415feda6c Merge pull request #921 from CocosRobot/update_js_bindings_1508742864
[ci skip][AUTO]: updating jsbinding automatically
2017-10-23 15:18:50 +08:00
CocosRobot e0e7867719 [ci skip][AUTO]: updating jsbinding automatically 2017-10-23 07:16:38 +00:00
James Chen 6c83e8a298 Merge pull request #920 from dumganhar/jsb2.0
Fixes crash while using PolygonCollider to make mask.
2017-10-23 15:10:46 +08:00
James Chen 3bc6e34825 Fixes crash while using PolygonCollider to make mask.
fixed https://github.com/cocos-creator/fireball/issues/6502
2017-10-23 15:08:46 +08:00
Wang Nan 9f50382530 Merge pull request #919 from 2youyou2/develop
fixed android binary template
2017-10-23 00:50:40 -05:00
yinkaile df09438eab Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop 2017-10-23 11:47:01 +08:00
yinkaile c141be5a7c fixed android binary template 2017-10-23 11:46:28 +08:00
James Chen fd9b235619 Merge pull request #918 from dumganhar/fix/websocket_finalize
Fixes assertion while websocket instance is garbage collected.
2017-10-21 19:49:30 +08:00
James Chen ccacdafb23 Fixes assertion while websocket instance is garbage collected. 2017-10-21 19:47:15 +08:00
James Chen 32a0fd85c7 Merge pull request #917 from dumganhar/jsb2.0
Spine conversion should use pointer instead of reference since it probably returns nullptr.
2017-10-20 10:03:58 +08:00
James Chen 8ae6d54df3 Spine conversion should use pointer instead of reference since it probably returns nullptr. 2017-10-20 10:01:04 +08:00
James Chen b7ac034385 Merge pull request #916 from CocosRobot/update_cocosfiles_1508409911
[AUTO][ci skip]: updating cocos2dx_files.json
2017-10-19 20:15:24 +08:00
CocosRobot 2ff8667734 [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-19 10:45:11 +00:00
James Chen d89b643eda Merge pull request #915 from dumganhar/jsb2.0
Updates cocos analytics lib for iOS.
2017-10-19 18:39:05 +08:00
James Chen 0ef60bfeb7 Updates cocos analytics lib for iOS. 2017-10-19 18:37:55 +08:00
James Chen 1c286f1afe Merge pull request #914 from CocosRobot/update_cocosfiles_1508407361
[AUTO][ci skip]: updating cocos2dx_files.json
2017-10-19 18:04:43 +08:00
CocosRobot 7a42a8a3c0 [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-19 10:02:42 +00:00
James Chen 82afc7dbe4 Merge pull request #913 from dumganhar/jsb2.0
Adds jsb bindings of Cocos analytics for iOS and adds missing libcocosanalytics.jar.
2017-10-19 17:57:34 +08:00
James Chen e42ed18678 Merge branch 'develop' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0
# Conflicts:
#	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
2017-10-19 17:49:57 +08:00
James Chen bd4a56370f Removes unused files from projects, includes spidermonkey libraries. 2017-10-19 17:45:41 +08:00
James Chen 4c8e57762b Adds jsb bindings of Cocos analytics for iOS and adds missing libcocosanalytics.jar. 2017-10-19 17:39:24 +08:00
James Chen 1962051dc9 Refactors JavaScriptObjcBridge, support more raw type like bool, int, long, float, double. 2017-10-19 16:17:51 +08:00
Wang Nan 0b776889be Merge pull request #912 from CocosRobot/update_cocosfiles_1508378721
[AUTO][ci skip]: updating cocos2dx_files.json
2017-10-18 21:05:33 -05:00
CocosRobot 68c8e98753 [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-19 02:05:22 +00:00
Wang Nan b44d89d731 Merge pull request #911 from CocosRobot/update_cocosfiles_1508378205
[AUTO][ci skip]: updating cocos2dx_files.json
2017-10-18 21:01:05 -05:00
Wang Nan 51c8d2ebd9 Merge pull request #909 from dumganhar/jsb2.0
Supports cocos analytics for Android. iOS support is on the road.
2017-10-18 21:00:39 -05:00
CocosRobot 6ff8a2dc47 [AUTO][ci skip]: updating cocos2dx_files.json 2017-10-19 01:56:45 +00:00
James Chen f46cb75958 Merge pull request #907 from 2youyou2/native-modules
support native modules
2017-10-19 09:51:40 +08:00
James Chen 1265b26bba Supports cocos analytics for Android. iOS support is on the road. 2017-10-18 16:48:50 +08:00
James Chen 1890949d86 [android] JavascriptJavaBridge supports signature of Long type.
And uses enum class for ValueType.
2017-10-18 16:46:56 +08:00
yinkaile 72663e21f8 Merge branch 'native-modules' of github.com:2youyouo2/cocos2d-x-lite into native-modules 2017-10-18 11:30:21 +08:00
yinkaile c9dabff513 fixed ios project 2017-10-18 11:29:50 +08:00
James Chen efd591f969 Merge pull request #908 from dumganhar/jsb2.0
Updates bindings-generator
2017-10-18 10:58:56 +08:00
James Chen 365f7b8329 Updates bindings-generator 2017-10-18 10:55:56 +08:00
2youyou2 5a8b02df27 Merge branch 'native-modules' of github.com:2youyouo2/cocos2d-x-lite into native-modules 2017-10-18 10:27:37 +08:00
2youyou2 790ae1fcf4 fixed windows project 2017-10-18 10:26:26 +08:00
James Chen b3a09b7be4 Merge pull request #906 from dumganhar/jsb2.0
Improves native window.console support. Message could be shown both in Browser while debugging and Creator's console.
2017-10-17 16:03:59 +08:00
James Chen f63aa25170 Fixes console.assert 2017-10-17 15:44:49 +08:00
James Chen fa4805203d Fixes a typo in docs. 2017-10-17 15:41:16 +08:00
James Chen c195c82c2f Improves native window.console support. Message could be shown both in Browser while debugging and Creator's console.
The line number of console.log(debug,info,warn,error) output in browser is precise.
2017-10-17 15:41:00 +08:00