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 |
|
James Chen
|
7653cb453f
|
Merge branch 'develop' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# cocos/2d/libcocos2d.vcxproj.filters
# cocos/Android.mk
# cocos/editor-support/creator/CCCameraNode.cpp
# cocos/editor-support/creator/physics/CCPhysicsAABBQueryCallback.cpp
# cocos/editor-support/creator/physics/CCPhysicsAABBQueryCallback.h
# cocos/network/SocketIO.cpp
# cocos/network/WebSocket-libwebsockets.cpp
# cocos/renderer/CCTextureCache.cpp
# cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
# cocos/scripting/js-bindings/auto/jsb_box2d_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_box2d_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_audioengine_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_dragonbones_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_video_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_extension_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_network_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_spine_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_ui_auto.hpp
# cocos/scripting/js-bindings/auto/jsb_creator_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_creator_auto.hpp
# cocos/scripting/js-bindings/manual/JavaScriptJavaBridge.h
# cocos/scripting/js-bindings/manual/JavaScriptObjCBridge.h
# cocos/scripting/js-bindings/manual/ScriptingCore.cpp
# cocos/scripting/js-bindings/manual/ScriptingCore.h
# cocos/scripting/js-bindings/manual/box2d/js_bindings_box2d_manual.cpp
# cocos/scripting/js-bindings/manual/box2d/js_bindings_box2d_manual.h
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
# cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp
# cocos/scripting/js-bindings/manual/creator/js_bindings_creator_manual.cpp
# cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.cpp
# cocos/scripting/js-bindings/manual/dragonbones/jsb_cocos2dx_dragonbones_manual.h
# cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_video_manual.cpp
# cocos/scripting/js-bindings/manual/experimental/jsb_cocos2dx_experimental_webView_manual.cpp
# cocos/scripting/js-bindings/manual/extension/jsb_cocos2dx_extension_manual.cpp
# cocos/scripting/js-bindings/manual/js_bindings_config.h
# cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.h
# cocos/scripting/js-bindings/manual/js_module_register.cpp
# cocos/scripting/js-bindings/manual/js_module_register.h
# cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp
# cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.h
# cocos/scripting/js-bindings/manual/jsb_helper.h
# cocos/scripting/js-bindings/manual/jsb_opengl_functions.cpp
# cocos/scripting/js-bindings/manual/jsb_opengl_functions.h
# cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp
# cocos/scripting/js-bindings/manual/jsb_opengl_manual.h
# cocos/scripting/js-bindings/manual/jsb_opengl_registration.cpp
# cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.cpp
# cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_functions.h
# cocos/scripting/js-bindings/manual/localstorage/js_bindings_system_registration.cpp
# cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.cpp
# cocos/scripting/js-bindings/manual/network/js_network_manual.cpp
# cocos/scripting/js-bindings/manual/network/js_network_manual.h
# cocos/scripting/js-bindings/manual/network/jsb_socketio.cpp
# cocos/scripting/js-bindings/manual/network/jsb_websocket.cpp
# cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.cpp
# cocos/scripting/js-bindings/manual/platform/android/CCJavascriptJavaBridge.h
# cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.h
# cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm
# cocos/scripting/js-bindings/manual/spidermonkey_specifics.h
# cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp
# cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.h
# cocos/scripting/js-bindings/manual/ui/jsb_cocos2dx_ui_manual.cpp
# cocos/scripting/js-bindings/proj.android/Android.mk
# cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
# cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj
# cocos/scripting/js-bindings/proj.win32/libjscocos2d.vcxproj.filters
# cocos/scripting/js-bindings/script/jsb_boot.js
# tools/bindings-generator
# tools/tojs/cocos2dx.ini
# tools/tojs/genbindings.py
|
2017-08-10 18:04:24 +08:00 |
|
James Chen
|
e86ed76abf
|
jsb2.0 windows works on v8.
|
2017-08-09 18:06:33 +08:00 |
|
pandamicro
|
a9c5e50745
|
Remove simple audio engine
|
2017-06-30 18:02:05 +08:00 |
|
pandamicro
|
27536dad4c
|
Fix critical issues in bindings code
|
2017-06-30 18:02:01 +08:00 |
|
pandamicro
|
f72d66db24
|
Refactor JSFunctionWrapper & Use MutableHandleValue for conversion’s return value
Upgrade to Spidermonkey v52. pass 8
|
2017-06-30 18:01:58 +08:00 |
|
James Chen
|
af6aa8f45e
|
ios jsc, sm works.
|
2017-06-26 10:41:26 +08:00 |
|
James Chen
|
91359f1f75
|
first commit
|
2017-06-15 17:24:30 +08:00 |
|
pandamicro
|
7df074e172
|
Reverse pure JS Action, reuse JSB Action
|
2017-04-22 14:57:16 +08:00 |
|
Nan Wang
|
58ddc819a9
|
merge v1.4
|
2017-03-29 17:12:33 +08:00 |
|
pandamicro
|
2fcd3cd67e
|
Remove native actionManager from jsb
|
2017-03-23 18:17:02 +08:00 |
|
pandamicro
|
201a2ba4e4
|
Compilation succeed after remove Action in native
|
2017-03-23 18:15:47 +08:00 |
|
pandamicro
|
9db16ae099
|
Fix jsb.loadRemoteImg crash issue
|
2017-03-15 17:12:20 +08:00 |
|
pandamicro
|
32d6e03478
|
Remove all arguments usage in JSB
|
2017-03-10 16:57:04 +08:00 |
|
pandamicro
|
af7661c0ce
|
Remove useless jsb polyfills to reduce memory usage
|
2017-02-24 18:08:35 +08:00 |
|
pandamicro
|
1ada1f3351
|
Small fixes
|
2017-01-22 18:59:49 +08:00 |
|
pandamicro
|
ed180996ac
|
Use JS Function bind to avoid memory tracking issues
|
2017-01-06 17:00:47 +08:00 |
|
pandamicro
|
f4e3341115
|
Sync js bindings code from cocos2d-x v3.14
|
2017-01-06 16:59:40 +08:00 |
|
pandamicro
|
a79014a51e
|
Fix cc.director._actionManager and cc.director._scheduler
|
2016-12-20 11:36:33 +08:00 |
|
Jare Guo
|
341a2973c4
|
bind new language codes
|
2016-11-28 16:18:02 +08:00 |
|
pandamicro
|
919fba57c2
|
Remove useless GLProgrameState.setUniformCallback polyfill
|
2016-09-08 09:45:22 +08:00 |
|
pandamicro
|
ba33766602
|
Upgrade scripting/js-bindings/script to v3.13
|
2016-08-25 17:25:51 +08:00 |
|
knoxHuang
|
06bf021143
|
merge code for #/fireball/issues/2787
|
2016-06-28 14:22:22 +08:00 |
|
2youyouo2
|
39343dd9ef
|
add window resize event when resize
|
2016-06-06 15:28:48 +08:00 |
|
Wenhai Lin
|
94501cc8f1
|
Bug fix and stability improvements
|
2016-04-25 15:56:03 +08:00 |
|
2youyouo2
|
fb87e4f62a
|
only load project-runtime.json on runtime platform
|
2016-04-14 15:42:05 +08:00 |
|
Wenhai Lin
|
a6dbf31dcf
|
cocos 2d lite version
|
2016-03-29 17:55:48 +08:00 |
|