James Chen
cc1f3423d4
Reverts PR #1062 which may lead to other issues, fix it by another way. ( #1117 )
...
* Fixes custom listener returned by cc.eventManager.addCustomListener isn't attached to cc.eventManager.
* Reverts PR #1062 which may lead to other issues, fix it by another way.
1. JS LifeCycle control for GLProgram, GLProgramState.
2. jsb.registerNativeRef should be invoked in JS for cc.TMXTiledMap.getLayer/getObjectGroup/getObjectGroups, cc.TMXObjectGroup.getObject, cc.TMXObjectGroup.getObjects, cc.TMXObject.prototype.getNode.
2018-02-22 17:44:12 +08:00
James Chen
94f73ad613
Updates version to 1.8.2 ( #1105 )
2018-02-09 14:04:36 +08:00
Knox
1b0965803c
fix CocosAnalytics issue for fireball/issues/6730 ( #1058 )
2018-01-16 18:30:13 +08:00
James Chen
cc40611944
fixed #1041 : Potential crash in invokeJSTouchOneByOneCallback. ( #1043 )
...
And fixed potential invalid se::Object after invoking cc.director.getScheduler/getActionManager/getEventDispatcher, cc.SpriteFrame/Sprite.getTexture.
Added hook functions in EventDispatcher, TextureCache to prevent using dangerous se::Object.
Stop propagation for TouchOneByOne event should only affect current Touch point.
Fixed updateListener may not be invoked.
2018-01-02 13:56:26 +08:00
James Chen
7c4eeecdde
Removes the unneeded support for passing 'key' arguments to cc.Scheduer.schedule/unschedule. ( #1009 )
...
* Removes the unneeded support for passing 'key' arguments to cc.Scheduler.schedule/unschedule.
* cc.REPEAT_FOREVER isn't defined in lite and it isn't needed to hack cc.Scheduler.schedule in script either.
2017-11-23 13:47:15 +08:00
James Chen
69ee2e12bb
Reverts localStorage changes in PR #545 since any js value could be converted to string.
...
Keeps the behavior the same as web browser.
2017-11-17 13:57:30 +08:00
James Chen
de091e7369
se::Object::getTypedArrayData fix for jsc and v8. Need to consider byteOffset of ArrayBuffer stored in TypedArray. ( #989 )
2017-11-16 10:39:33 +08:00
James Chen
a55cb9b0d3
Adds New API se::Object::createTypedArray and deprecates se::Object::createUint8TypedArray. ( #974 )
...
* Adds New API se::Object::createTypedArray and deprecates se::Object::createUint8TypedArray.
* Fixes mistake while cherry-pick.
2017-11-09 17:06:13 +08:00
James Chen
6a8106c5f3
Updates Cocos Analytics relevant code.
...
Adds missing onPause, onResume, onDestroy invocation.
Disabled local debug by default.
Uses AnySDK channel ID in APK or IPA file if channel ID isn't found.
2017-11-03 15:19:03 +08:00
James Chen
6272f4f42e
Empty implementation for the platforms that don't support Cocos Analytics.
2017-11-02 17:51:16 +08:00
James Chen
4730002095
Uses undefined check instead of ! operator since !0 will be true and id is probably equal to 0. in jsb.unregisterNativeRef.
2017-10-27 21:43:44 +08:00
James Chen
9368814446
Don't check target exist to improve a little performance.
2017-10-27 21:28:06 +08:00
James Chen
75864862bb
Uses undefined check instead of ! operator since !0 will be true and id is probably equal to 0.
2017-10-27 21:27:19 +08:00
James Chen
479de69a14
Removes unused check before delete
2017-10-27 21:12:57 +08:00
James Chen
c6e1a012c1
unregisterNativeRef fix, return if targetID is null
2017-10-26 22:04:22 +08:00
James Chen
9f50c5f127
Fixes performance issus in jsb.registerNativeRef and jsb.unregisterNativeRef
2017-10-26 21:58:37 +08:00
James Chen
e1e3200366
Uses Higher performance of checking object instance of which class.
2017-10-25 16:30:52 +08:00
James Chen
843b5c9712
jswrapper works for iOS 8.0 .
2017-10-25 15:54:57 +08:00
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