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
Jare Guo
5d165f72bf
Merge pull request #1070 from cocos-creator/v1.8-release
...
sync branch
2018-01-16 15:16:46 +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
0af9f17b5a
Merge pull request #1064 from dumganhar/v1.8
...
Merge v1.8-release
2018-01-10 14:21:35 +08:00
James Chen
e87370e41e
Merge branch 'v1.8-release' into v1.8
2018-01-10 14:20:08 +08:00
Jare Guo
c7bd0175ff
Merge pull request #1063 from dumganhar/v1.8-release
...
Cherry-pick important bug fix from v1.8 branch.
2018-01-10 14:16: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
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
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
127d926847
[iOS] Updates cocosanalytics lib to 1.0.4 ( #1050 )
2018-01-02 13:58:17 +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
449c67fafa
Merge pull request #1038 from cocos-creator/v1.7-release
...
sync branch
2017-12-21 15:46:44 +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
9bd74a93af
Merge pull request #1029 from cocos-creator/v1.7-release
...
sync branch
2017-12-13 14:06:41 +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
5c763a6745
Merge pull request #1022 from dumganhar/v1.7
...
Merge v1.7-release
2017-12-07 17:40:29 +08:00
James Chen
4708131018
Merge pull request #1021 from dumganhar/v1.7-release
...
Merge v1.7
2017-12-07 17:36:24 +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
James Chen
4387a16096
Fixes xhr.ontimeout isn't invoked and xhr.onerror is called instead while timeout is triggered. ( #1018 )
2017-12-07 14:49:34 +08:00
James Chen
7fa89539d1
Updates Cocos Analytics library to 1.0.3, resolve Reachability.o conflict with other 3rd libraries. ( #1017 )
2017-12-07 14:08:12 +08:00
James Chen
8dcdf6e276
Merge pull request #1016 from dumganhar/v1.7
...
Merge v1.7-release
2017-12-07 11:35:11 +08:00
James Chen
412f71a89b
[android] Fixes wrong timeout value is used. Should use timeout parameter per requrest instead of per client instance. ( #1014 )
2017-11-28 13:42:01 +08:00
James Chen
901f4fa50c
Auto hide home indicator for iPhoneX. ( #1013 )
2017-11-28 13:36:14 +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
cdad6b5868
Some Android Simulators don't support SSE instruction, so disable it for x86 arch. ( #1011 )
2017-11-23 15:13:34 +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