Commit Graph

2627 Commits

Author SHA1 Message Date
Jare Guo a2e165fce0 Merge pull request #1093 from dumganhar/fix/best-gradle-config
Best gradle configuration for Android.
2018-04-04 17:07:53 +08:00
James Chen 0dc2a3c580 Merge pull request #1121 from cocos-creator/v1.8-release
Fixes AnySDK framework crash after restarting game. (#1120)
2018-02-23 10:22:20 +08:00
James Chen e033dc5509 Fixes AnySDK framework crash after restarting game. (#1120) 2018-02-23 10:21:17 +08:00
Jare Guo 0689d64fa9 Merge pull request #1118 from cocos-creator/v1.8-release
sync branch
2018-02-23 10:02:36 +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
Jare Guo b9a6be6f73 Merge pull request #1113 from cocos-creator/v1.8-release
sync branch
2018-02-11 14:55:20 +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
James Chen d4cfc6c37e Fix mouse scroll event dispatching issue. (#1108) 2018-02-09 17:31:17 +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
Jare Guo 3ff7b14a92 Merge pull request #1102 from cocos-creator/v1.8-release
sync branch
2018-02-09 10:06:33 +08:00
James Chen 31c25306bf Removes unused code in CallFunc. (#1099) 2018-02-08 15:50:24 +08:00
James Chen 5a14a7953b Crash fix for cc.spawn (#1098) 2018-02-08 15:11:42 +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
James Chen e7c6fc492b Fix memory leak which will cause slow down on games those use lot of actions. (#1094) 2018-02-07 18:29:03 +08:00
James Chen 38d4906ec6 Merge pull request #1092 from cocos-creator/v1.8-release
Merge v1.8-release
2018-02-05 15:56:27 +08:00
James Chen 409d1320b5 cocos2dx build.gradle fix. 2018-02-05 11:20:00 +08:00
James Chen 3e5f8dd0f2 API Level is minSDKVersion now. 2018-02-05 11:18:13 +08:00
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
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 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 a3caef5926 Merge remote v1.8 2018-01-24 10:45:19 +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
Jare Guo a4d0759f58 did merge 1.6 (#1078)
* fix fireball/issues/6475

* Fix unscheduleAllCallbacks not working for schedules by key
2018-01-19 19:11:37 +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