James Chen
|
4869077bcc
|
isArrayBuffer and isTypedArray hack.
|
2017-10-24 14:44:40 +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
|
0ef60bfeb7
|
Updates cocos analytics lib for iOS.
|
2017-10-19 18:37:55 +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
|
1265b26bba
|
Supports cocos analytics for Android. iOS support is on the road.
|
2017-10-18 16:48:50 +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 |
|
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 |
|
James Chen
|
f7bd0dd738
|
Updates version to 1.7.0
|
2017-10-11 22:09:52 +08:00 |
|
Jare Guo
|
6914b57c22
|
Merge commit 'aade73a2f487510ff2f6138e8336d1f76b264ab7' into develop
|
2017-10-11 14:48:16 +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 |
|
James Chen
|
a73bb35b2b
|
Uses push instead of concat.
|
2017-10-10 18:31:49 +08:00 |
|
James Chen
|
9fb3358463
|
Reverts ...args
|
2017-10-10 18:02:43 +08:00 |
|
James Chen
|
7f4088eb4a
|
Win32 template fix, LOGD could output log in vs in se module. (#826)
* Win32 template fix, LOGD could output log in vs in se module.
* Updates config.json
|
2017-09-19 05:09:07 -05:00 |
|
2youyouo2
|
e642e4a7bb
|
remove unused code
|
2017-09-19 15:19:26 +08:00 |
|
2youyouo2
|
6771164c5d
|
remove unused ccui
|
2017-09-18 18:16:51 +08:00 |
|
James Chen
|
53e07c1da7
|
Merge branch 'v1.6' of git://github.com/cocos-creator/cocos2d-x-lite into jsb2.0
|
2017-09-07 18:32:24 +08:00 |
|
pandamicro
|
087f1f8c8d
|
Remove inappropriate logs in debugger
|
2017-09-07 17:48:48 +08:00 |
|
James Chen
|
99c1b24256
|
Merge branch 'develop' into jsb2.0
|
2017-08-28 14:38:47 +08:00 |
|
James Chen
|
621ff28b4a
|
Merge branch 'v1.6' into develop
# Conflicts:
# cocos/scripting/js-bindings/auto/api/jsb_cocos2dx_auto_api.js
# 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_experimental_webView_auto.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_experimental_webView_auto.hpp
# cocos/scripting/js-bindings/manual/BaseJSAction.cpp
# cocos/scripting/js-bindings/manual/BaseJSAction.h
# cocos/scripting/js-bindings/manual/ScriptingCore.cpp
# cocos/scripting/js-bindings/manual/ScriptingCore.h
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
# cocos/scripting/js-bindings/manual/cocos2d_specifics.hpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
# cocos/scripting/js-bindings/manual/network/XMLHTTPRequest.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/ios/JavaScriptObjCBridge.mm
# cocos/scripting/js-bindings/manual/spidermonkey_specifics.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_debugger.js
# extensions/anysdk/js-bindings/SDKManager.cpp
# extensions/anysdk/js-bindings/manualanysdkbindings.cpp
# templates/cocos2dx_files.json
# templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
# templates/js-template-link/frameworks/runtime-src/proj.ios_mac/ios/AppController.mm
# tools/tojs/cocos2dx.ini
# tools/tojs/cocos2dx_experimental_webView.ini
|
2017-08-28 14:23:30 +08:00 |
|
pandamicro
|
64f2ea8b83
|
Debugger working on Firefox v52
|
2017-08-25 13:50:25 +08:00 |
|
pandamicro
|
52e266856d
|
Connected and source listed
|
2017-08-25 13:50:25 +08:00 |
|
pandamicro
|
b02c200cba
|
Update 2
|
2017-08-25 13:49:47 +08:00 |
|
pandamicro
|
7f93e195c8
|
update 1
|
2017-08-25 13:49:47 +08:00 |
|
pandamicro
|
d03eec6561
|
Initial commit with v52 debugger
|
2017-08-25 13:49:47 +08:00 |
|
James Chen
|
2f38e872c1
|
Action binding bug fix.
|
2017-08-22 16:50:41 +08:00 |
|
James Chen
|
dbe9716536
|
Adds BaseJSAction
|
2017-08-16 15:41:27 +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 |
|
knoxHuang
|
a14c83d712
|
fix Follow isDone error for fireball/issues/6191
|
2017-08-04 16:06:20 +08:00 |
|
pandamicro
|
f0a6acc6c5
|
Fix callFunc creation issue with primitive data parameter
|
2017-07-22 14:29:00 +08:00 |
|
pandamicro
|
856de64714
|
Avoid restart crash in spidermonkey
|
2017-07-11 18:33:39 +08:00 |
|
pandamicro
|
32f9c7dc1f
|
Remove debugger
|
2017-06-30 18:02:05 +08:00 |
|
pandamicro
|
31af3a1e4e
|
Remove useless module and made Android compilation pass
|
2017-06-30 18:02:05 +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 |
|
pandamicro
|
b3107dc1db
|
Update engine version for -x-lite
|
2017-06-26 12:38:52 +08:00 |
|
James Chen
|
af6aa8f45e
|
ios jsc, sm works.
|
2017-06-26 10:41:26 +08:00 |
|
James Chen
|
259bbbd6b2
|
updates.
|
2017-06-16 16:32:24 +08:00 |
|
James Chen
|
91359f1f75
|
first commit
|
2017-06-15 17:24:30 +08:00 |
|
knoxHuang
|
9aa16c1bfe
|
fix create renderTexture error for fireball/issues/5860
|
2017-06-07 09:52:09 +08:00 |
|
pandamicro
|
e37196f41d
|
Fix issues with AssetsManager new features
|
2017-05-04 23:32:08 +08:00 |
|
pandamicro
|
cea2e9a012
|
Add more progression info to EventAssetsManager
|
2017-04-25 14:45:03 +08:00 |
|
pandamicro
|
eb55b59f14
|
Fix crash caused by some action create functions not referencing sub action
|
2017-04-24 12:05:36 +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 |
|