Jare Guo
58f7ea35c4
Merge v1.8 into develop
2018-04-04 17:09:49 +08:00
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
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
fe87896bb3
fix simulator link error ( #1162 )
2018-03-23 16:03:38 +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
e033dc5509
Fixes AnySDK framework crash after restarting game. ( #1120 )
2018-02-23 10:21:17 +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
James Chen
d4cfc6c37e
Fix mouse scroll event dispatching issue. ( #1108 )
2018-02-09 17:31:17 +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
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
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
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