Commit Graph

700 Commits

Author SHA1 Message Date
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 3bdc85413c [iOS, macOS] Should fflush log output immediately for LOGD, LOGE in jswrapper. 2017-10-24 10:19:39 +08:00
James Chen 1173b2931b Pass wrong message in console.log to browser's console. 2017-10-24 10:05:24 +08:00
CocosRobot e0e7867719 [ci skip][AUTO]: updating jsbinding automatically 2017-10-23 07:16:38 +00:00
James Chen ccacdafb23 Fixes assertion while websocket instance is garbage collected. 2017-10-21 19:47:15 +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 0ef60bfeb7 Updates cocos analytics lib for iOS. 2017-10-19 18:37:55 +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 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
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
2youyou2 790ae1fcf4 fixed windows project 2017-10-18 10:26:26 +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
yinkaile 578f44248e add USE_NET_WORK macro 2017-10-16 17:08:09 +08:00
yinkaile 5629e26e58 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into native-modules
# Conflicts:
#	cocos/scripting/js-bindings/manual/jsb_creator_manual.cpp
2017-10-16 15:53:44 +08:00
James Chen 96709d7609 Fixes wrong usage of assert macro in jsb_creator_manual.cpp. 2017-10-13 17:45:08 +08:00
James Chen 03057774cd Updates docs for Ref class binding. 2017-10-13 14:55:51 +08:00
yinkaile 8ac7257a46 fixed merge errors 2017-10-12 18:15:21 +08:00
yinkaile f7b2b1f87f Merge branch 'develop' into native-modules
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_creator_auto.cpp
#	cocos/scripting/js-bindings/manual/jsb_creator_physics_manual.cpp
2017-10-12 17:48:16 +08:00
yinkaile d38e168441 support native modules 2017-10-12 17:35:08 +08:00
James Chen b9b9a88354 Don't crash if jsb.reflection.callStaticMethod invokes a nonexistent Java Class. 2017-10-12 15:31:24 +08:00
James Chen 2a9f8441fb Less asserts and more precondtions in jsb_xmlhttprequest.cpp. 2017-10-12 13:59:26 +08:00
James Chen 26375fcddc Updates docs for conversion functions. 2017-10-12 11:42:01 +08:00
James Chen c821a5cc90 More safe checks in jsb_websockets.cpp 2017-10-12 11:17:48 +08:00
James Chen 50c36d32f5 Same behavior of cc.sys.localStorage.getItem(null) as bowser, it should return null instead of undefined. 2017-10-12 11:16:53 +08:00
James Chen d7c0982463 Merge pull request #884 from jareguo/develop
support load spine atlas from preloaded texture on JSB
2017-10-12 11:15:55 +08:00
Jare Guo 377881d4d3 update atlas getter 2017-10-12 10:05:46 +08:00
James Chen f7bd0dd738 Updates version to 1.7.0 2017-10-11 22:09:52 +08:00
James Chen ee9713e007 CCLOG -> CCLOGINFO in finalize callback for less log output. 2017-10-11 17:02:46 +08:00
James Chen 1764e440cd Comments code of listening EVENT_RESET in WebSocket-libwebsockets.cpp since it isn't needed for JSB.
Minior fix: CCLOG -> LOGD in jsb_xmlhttprequest.cpp.
2017-10-11 16:33:02 +08:00
Jare Guo 6914b57c22 Merge commit 'aade73a2f487510ff2f6138e8336d1f76b264ab7' into develop 2017-10-11 14:48:16 +08:00
James Chen c146c9c0c7 Adds seval_to_Map_string_key convertion function. 2017-10-11 14:45:39 +08:00
James Chen 331eb55a18 Updates config.json and adds error check for no script engine selected. 2017-10-11 12:44:42 +08:00
James Chen e1ac3249a2 jsb_enable_debugger() uses local IP "0, 0, 0, 0", then Android debugging doesn't need to change IP. 2017-10-11 12:30:08 +08:00
James Chen 320812ce69 SAXParser is a singleton, root it. 2017-10-11 10:45:51 +08:00
James Chen de52ad0d97 Updates docs for debugging & profiling JS code. 2017-10-11 09:52:41 +08:00
James Chen 8fe8b9a250 Updates docs for debugging & profiling JS code. 2017-10-11 09:50:03 +08:00
James Chen 2dd124ac9e Condition fix for gl.texImage2D & gl.texSubImage2D. 2017-10-11 09:25:54 +08:00
James Chen 01b4553cee Reverts switch case in Class constructor. 2017-10-11 09:22:10 +08:00
Jare Guo 63236f2cf9 support load spine atlas from preloaded texture on JSB 2017-10-11 01:10:03 +08:00