Commit Graph

4804 Commits

Author SHA1 Message Date
James Chen 52154d5f04 Best gradle configuration for Android. 2018-02-05 11:09:29 +08:00
James Chen eb1d2e46cf Removes unused Texture2D::forceDeleteALLTexture2D which was added from runtime. (#1090) 2018-02-05 10:46:41 +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
CocosRobot 15efc6945c [AUTO][ci skip]: updating cocos2dx_files.json (#1084) 2018-01-31 10:14:55 +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
Jare Guo db13242bde Merge v1.6 into v1.8
# Conflicts:
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
2018-01-18 17:48:35 +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 653367df9f Update cocos2dx_dragonbones.ini 2018-01-18 13:58:41 +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
Knox ab0a3d33d7 fix VideoPlayer code error (#1069) 2018-01-16 14:02:17 +08:00
Knox 7c81e99b67 add Volume and Mute to CCVideoPlayer for fireball/issues/6811 (#1056)
* add Volume and Mute to CCVideoPlayer for fireball/issues/6811

* refine code
2018-01-16 10:49:00 +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 ecef1d178a [iOS] Updates cocosanalytics lib to 1.0.5 (#1065) 2018-01-10 16:17:02 +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 c08c56c9d4 Fixes memory issue in TMXLayer (#1054) 2018-01-04 11:20:24 +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 a942f6d83d Merge pull request #1051 from cocos-creator/v1.7-release
Merge v1.7-release
2018-01-02 14:01:07 +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 fcc3a34602 [iOS] Updates cocosanalytics lib to 1.0.4 (#1049) 2018-01-02 13:49:22 +08:00
James Chen e8d11d07f7 Updates bindings-generator, adds missing se ns (#1047) 2017-12-29 11:19:43 +08:00
Jare Guo 07b1de9d2e Merge pull request #1039 from cocos-creator/v1.7
sync branch
2017-12-21 15:48:53 +08:00
James Chen 3ec85199d5 Corrects the wrong logic of using delete to remove memory allocated by malloc. (#1036) 2017-12-19 16:07:16 +08:00
Jare Guo c4d6e83254 allow TiledMap to read preloaded textures for creator (#1034) 2017-12-19 11:28:12 +08:00
Jare Guo 460ec62905 Merge pull request #1030 from cocos-creator/v1.7
sync branch
2017-12-13 14:08:20 +08:00
James Chen 46ad6b1f38 Fixes ResizableBufferAdapter<Data>::resize doesn't consider the situation of new size which is lower than old size. (#1028) 2017-12-12 16:47:42 +08:00
James Chen 0cfbfd08f7 Kill process if Cocos2dxActivity.onDestroy is invoked to resolve crash if app goes to background for a long time and Activity is recycled by system. (#1027) 2017-12-12 11:10:51 +08:00
James Chen 8bb98375f7 Fixes missing return value of onWavClose function. (#1025) 2017-12-08 21:47:23 +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 df3a37655d Merge branch 'v1.7' into v1.7-release 2017-12-07 17:33:28 +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