Commit Graph

4804 Commits

Author SHA1 Message Date
CocosRobot bfaeba008d [AUTO][ci skip]: updating cocos2dx_files.json 2017-08-30 03:35:45 +00:00
James Chen 2b8798a73c Merge pull request #784 from dumganhar/jsb2.0
Some fixes for JSB2.0
2017-08-29 22:30:53 -05:00
pandamicro f17696d7dd Merge pull request #783 from pandamicro/v1.6
Fix crash caused by physics proxy management
2017-08-30 00:01:46 +08:00
James Chen 4889a7f358 updates simulator project configuration. 2017-08-29 18:01:53 +08:00
James Chen 45f8d3ee63 updates templates. 2017-08-29 18:00:51 +08:00
James Chen 9f16c51b4e Simulator works for jsb2.0 2017-08-29 18:00:07 +08:00
James Chen c79e7c96f7 Uses spTrackEntry_setDisposeCallback. 2017-08-29 17:56:17 +08:00
James Chen 23e02645c1 obj.schedule method should check the argument order of target and callback. 2017-08-29 17:55:56 +08:00
James Chen bee4ec4f35 sptrackentry_to_seval should root js object. 2017-08-29 17:55:01 +08:00
James Chen e4250dd01b Adds a method spTrackEntry_setDisposeCallback for notifying spTrackEntry is being disposed. 2017-08-29 17:54:27 +08:00
pandamicro 4722594327 Remove mistaken error log 2017-08-29 17:52:16 +08:00
pandamicro a472884389 Fix crash caused by physics proxy management 2017-08-29 17:50:38 +08:00
pandamicro b9dae71cce Complete jsb proxy tracking log infos 2017-08-29 17:41:02 +08:00
pandamicro 9ebcbe0d53 Refactor ScriptingCore::removeObjectProxy 2017-08-29 17:39:24 +08:00
James Chen 17a98a41f1 more log in ScriptEngine. 2017-08-29 17:37:32 +08:00
knoxHuang 4147b27e3b fix WebView bug for fireball/issues/6328 2017-08-29 17:19:28 +08:00
James Chen 55fd44d419 Fixes potential crash while ScriptEngine::cleanup. 2017-08-29 16:35:23 +08:00
James Chen a2351e779e removes unused debug code in CCNode.cpp 2017-08-29 16:34:47 +08:00
CocosRobot c707237826 [ci skip][AUTO]: updating jsbinding automatically 2017-08-28 08:08:38 +00:00
James Chen ab4299c77c Fixes after merging develop. 2017-08-28 15:03:02 +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
James Chen 4a1cc2ec1b Updates auto bindings code 2017-08-28 14:05:55 +08:00
James Chen 3d5b98b8a0 Refactor the order of class (Node, Label, Sprite) member for saving more memory.
More enum of char elements for saving more memory.
EventTouch and EventMouse are cached.
releaseScriptObject for scene should be placed at setNextScene.
Fixes protential crash while gc comes for JSC and ChakraCore.
Adds assertion in ScriptingCore::releaseScriptObject for not being invoked while gc.
Scheduler binding fix.
2017-08-28 14:03:33 +08:00
James Chen 4bc223f8fa WebSocket-apple.mm should be compiled with ARC. 2017-08-28 13:48:23 +08:00
James Chen bcdfa40c3a Fixes potential memory leak in jsb_xmlhttprequest.cpp 2017-08-28 11:18:23 +08:00
James Chen dc6ebc164a websocket-apple.mm needs to be compiled as ARC enabled. 2017-08-28 11:17:45 +08:00
CocosRobot a29f73e2cf [AUTO][ci skip]: updating cocos2dx_files.json 2017-08-28 02:14:40 +00:00
Wang Nan 30e5963eb0 Merge pull request #774 from pandamicro/debugger
Support Firefox remote debugger in v1.6
2017-08-28 10:10:48 +08:00
Wang Nan 520a2e256d Merge pull request #777 from pandamicro/v1.6
Made GC more sensible on Spidermonkey
2017-08-28 10:10:10 +08:00
pandamicro f2bd7d4c01 Made GC more sensible on Spidermonkey 2017-08-26 19:51:11 +08:00
pandamicro 4f47860d58 Merge pull request #776 from pandamicro/v1.6
Report error stack to js __errorHandler
2017-08-25 18:02:23 +08:00
pandamicro 259aed65ef Report error stack to js __errorHandler 2017-08-25 15:40:35 +08:00
pandamicro b478ec3364 Secure editbox js delegate execution 2017-08-25 15:40:08 +08:00
Jare Guo 59905b8eb6 dragonbones: fix memory leak (picked from DragonBones/DragonBonesCPP#153) and cherry pick a bit code from 5.0 2017-08-25 14:29:25 +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 7e4016c83c toStringForce integer fix. 2017-08-23 16:27:52 +08:00
Wang Nan e63561f9c1 Merge pull request #772 from 2youyou2/v1.6
update build tool version and gradle version
2017-08-23 14:14:33 +08:00
knoxHuang b386eec807 fix BaseJSAction error for fireball/issues/6264 2017-08-23 13:33:42 +08:00
2youyouo2 19be5234c7 refine build.gradle 2017-08-23 10:45:28 +08:00
2youyouo2 49bfa517f2 update build tool version and gradle version 2017-08-23 10:45:07 +08:00
Nan Wang 97b35f5f44 update version to 1.6.1 2017-08-23 10:15:38 +08:00
James Chen 2f38e872c1 Action binding bug fix. 2017-08-22 16:50:41 +08:00
Wang Nan 1c30a80b34 Merge pull request #771 from 2youyou2/v1.6
fixed dragonbones culling
2017-08-22 15:21:32 +08:00
2youyouo2 79810fb273 refine code 2017-08-22 15:21:08 +08:00
2youyouo2 b34af05690 fixed dragonbones culling 2017-08-22 15:13:09 +08:00