Commit Graph

810 Commits

Author SHA1 Message Date
Joseph Pan a3c7423c37 Fix local reference table overflow error problem. (#1178)
* Fix local reference table error problem.

* Modify the patch according to review comment.

* Fix a variable name.
2018-04-03 20:01:27 +08:00
Jare Guo ea4bfd1fcd Merge pull request #1159 from cocos-creator/v1.9
sync branch
2018-03-22 11:45:51 +08:00
James Chen 7951d52df7 [ios] se::Object::isTypedArray fix for iOS 8~9. 2018-03-12 21:48:38 +08:00
James Chen 4da873ecb8 Merge branch 'v1.8' into develop
# Conflicts:
#	cocos/scripting/js-bindings/script/jsb_cocos2d.js
2018-02-23 10:26:48 +08:00
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 89509a9e53 [iOS] Potential crash fix in SE_BIND_CTOR macro. (#1116) 2018-02-12 17:03:03 +08:00
James Chen a2a28b3bfd PR #1114 fix is incorrect, fix it again. (#1115)
Potential crash fix in cc.callFunc binding.
2018-02-11 18:11:25 +08:00
James Chen 38c09d7afa Potential crash fix in cc.callFunc binding. (#1114) 2018-02-11 17:25:13 +08:00
CocosRobot 6c134875d7 [ci skip][AUTO]: updating jsbinding automatically (#1109) 2018-02-11 14:47:15 +08:00
James Chen a195bffcad Ignore infinite loop in Exception handling. (#1110) 2018-02-11 13:54:37 +08:00
Jare Guo 1a24413ff3 gulp: auto bump version and push tag (#1100)
* gulp: automate push tag while publishing

* gulp: auto bump cpp version
2018-02-09 17:03:12 +08:00
James Chen 94f73ad613 Updates version to 1.8.2 (#1105) 2018-02-09 14:04:36 +08:00
James Chen 380b27b02c fixed #1031: Potential Crash in JSB_WebSocketDelegate::onClose (#1103) 2018-02-09 12:53:29 +08:00
James Chen 5df0d63573 Adds JS interfaces for getting JSBinding object count. (#1095)
__jsc__.getJSBindingObjectCount returns the mapping size of Ref's sub class object and non-Ref class but lifecycle controlled by C++.
__jsc__.getJSBindingObjectCountNonRefCreatedInJS returns the mapping size of Non-Ref class object and JS object created in JS.
2018-02-07 19:02:01 +08:00
feijing566 70e7f38622 add some dragonbones function jsbinding (#1086)
* add dragonbones_Armature_getSlots jsbinding

* update

* add js_cocos2dx_dragonbones_Slot_get_name and js_cocos2dx_dragonbones_BaseFactory_replaceSlotDisplay jsbing
2018-02-01 17:03:43 +08:00
Jare Guo d9bd3d763c update license (#1089)
* updating license

* update license
2018-02-01 15:20:01 +08:00
James Chen c462b3c702 Binds cc.Scheduler.pauseAllTargets and cc.Scheduler.pauseAllTargetsWithMinPriority. (#1087) 2018-01-31 17:47:29 +08:00
James Chen fd523f4fe1 Fixes docs mistake. (#1085) 2018-01-31 10:14:34 +08:00
James Chen 69798998db Adds cc.sys.getBatteryLevel & cc.sys.getNetworkType APIs (#1071)
* Adds cc.Device.getBatteryLevel interface.

* Adds CCReachability.h/.cpp

* Adds CCReachability.h/.cpp

* Reachability supports macOS either.

* Adds cc.Device.getNetworkStatus interface.

* Removed debug log.

* cc.Device.NetworkStatus -> cc.Device.NetworkType

* API to sys namespace

* Update CCDevice-win32.cpp
2018-01-29 17:37:15 +08:00
James Chen 50e386792c Make dragonbones::CCFactory constructor public. (#1083)
* Make dragonbones::CCFactory constructor public.

* Adds auto_api.js
2018-01-29 10:50:39 +08:00
Jare Guo 052d844f30 Merge branch 'v1.8' into v1.8-release 2018-01-24 10:19:52 +08:00
James Chen 918a7cc4d9 Fix redundant zero while se::Value::toStringForce for a float number. (#1081) 2018-01-23 09:32:41 +08:00
James Chen 6e6c3b6e96 cc.Scheduler.schedule(...) argument count be 3. (#1080) 2018-01-21 16:10:23 +08:00
James Chen 2abda7c515 Resolve delete targetScheduler map element wrongly. (#1079)
* Resolve delete targetScheduler map element wrongly.

* fix warning
2018-01-19 19:10:09 +08:00
James Chen c3b8a63377 Don't trigger an assertion if can't find se::Object by a touch. Warning instead. (#1076) 2018-01-18 15:08:36 +08:00
James Chen eb84ae8003 Bug fix of releasing JS object logic in CPP controls JS object's cycle mode (spine, dragonbones, box2d). (#1075) 2018-01-18 14:10:16 +08:00
James Chen b55c44e086 Memory leak fix for dragonbones & spine. (#1073)
* Memory leak fixes for Dragonbones module when restarting game.

* Fixes memory leak for Spine Runtime.

* Compilation fix in BaseObject.

* Remove unused log.

* Copy dragonbones vector before enumating the vector.

* update comments.

* LOG fix.
2018-01-18 13:41:44 +08:00
Knox 1b0965803c fix CocosAnalytics issue for fireball/issues/6730 (#1058) 2018-01-16 18:30:13 +08:00
CocosRobot 7a925d02b7 [ci skip][AUTO]: updating jsbinding automatically (#1068) 2018-01-16 14:02:35 +08:00
James Chen df164be9a4 Fixes crash of missing se::AutoHandleScrope before se::createObjectWithClass in ScriptingCore::retainScriptObject. (#1067) 2018-01-11 15:44:13 +08:00
James Chen 6693c26403 [iOS] Fixes createTypedArray return null on <= iOS 9 (#1066) 2018-01-10 18:42:13 +08:00
James Chen 04598ed326 Adds missing se::autoHandleScope. (#1057) 2018-01-10 13:44:32 +08:00
James Chen fca4269555 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-10 13:44:20 +08:00
James Chen 737fbfc264 Fixed potential crash on iOS. (#1062)
* Fixed potential crash on iOS.

* Remove log
2018-01-10 11:45:06 +08:00
Jare Guo 77d142f7d8 Merge pull request #1061 from cocos-creator/v1.8
sync branch
2018-01-09 22:11:12 +08:00
Jare Guo 861f1b4e98 Merge pull request #1060 from cocos-creator/v1.8-release
sync branch
2018-01-09 22:09:34 +08:00
James Chen 3fa48d4a11 Adds missing se::autoHandleScope. (#1057) 2018-01-08 15:31:20 +08:00
James Chen 560cdff5b6 Binds tmxlayer.getTiles. (#1053) 2018-01-04 11:03:54 +08:00
CocosRobot 9aa2b05e85 [ci skip][AUTO]: updating jsbinding automatically (#1052) 2018-01-03 16:12:52 +08:00
Jare Guo a548db62d1 refactor dragonbones asset managment (#1048) 2018-01-03 14:38:16 +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
Jare Guo c4d6e83254 allow TiledMap to read preloaded textures for creator (#1034) 2017-12-19 11:28:12 +08:00
James Chen 44813f4166 Sync PR: cocos2d-x #18299: JNI ERROR (app bug): local reference table overflow (max=512) (#1024)
* Sync PR:  cocos2d-x #18299: JNI ERROR (app bug): local reference table overflow (max=512)

* Fixes potential memory leak if can't find class by jsb.reflection.callStaticMethod.
2017-12-08 18:25:04 +08:00
James Chen 0a0a177ee7 Fixes xhr.ontimeout isn't invoked and xhr.onerror is called instead while timeout is triggered. (#1020) 2017-12-07 17:20:44 +08:00
James Chen d2dbc9a7ef Workaround for socketio.emit without payload argument (#1019) 2017-12-07 17:10:18 +08:00
James Chen 2e3883f097 [Android] Fixed compilation error while using APP_PLATFORM >= 22. (#1012)
* [Android] Fixed compilation error while using APP_PLATFORM >= 22.

* Don't use deprecated createUint8TypedArray.
2017-11-23 15:19:37 +08:00
James Chen f5f94ac857 [iOS] jsb.reflection.callStaticMethod supports to call objective-c method with NSNumber* and supports to pass undefined/null from JS. (#1010) 2017-11-23 14:26:03 +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 c22673d440 Provides an interface for getting SafeArea (#1008)
* Provides an interface for getting SafeArea

* @available(iOS 11.0, *) isn't supported in Xcode8. So we use the old way.
2017-11-23 13:39:35 +08:00
James Chen 6cf513a377 Adds missing binding code for Scheduler.isTargetPaused. (#1007) 2017-11-22 16:15:30 +08:00