Commit Graph

406 Commits

Author SHA1 Message Date
pandamicro 77febbfe3d Merge branch 'master' into next 2018-03-13 15:07:21 +08:00
pandamicro 4e47017aa4 Merge branch 'v1.9' 2018-03-13 11:54:54 +08:00
Jare Guo 0593215fde Merge pull request #2401 from knoxHuang/v1.8
disabled CC_SUPPORT_JIT for qqplay
2018-03-06 15:05:32 +08:00
knox 337e0c8be2 disabled CC_SUPPORT_JIT for qqplay 2018-03-06 14:59:42 +08:00
PP a487a982ad delete useless createMap 2018-03-05 14:27:09 +08:00
PP 45979bc988 require JS in jsb/jsb-tex-sprite-frame.js 2018-03-05 11:19:55 +08:00
PP d9a7e80246 literalMap to flatMap 2018-03-02 09:48:10 +08:00
Jare Guo d6c1c5a028 fix action.repeatForever on native 2018-02-27 17:12:38 +08:00
pandamicro ba6e8f11a3 Remove cc._renderType, cc._canvas, cc.container 2018-02-24 11:31:51 +08:00
Jare Guo 992b74f0ac merge bricks (#2328)
* support bk game

* update code

* update code

* update code

* update code

* refine code

* update code

* update code

* update code
2018-02-09 10:12:44 +08:00
Jare Guo b32ff4d02e register engine version for both web and jsb 2018-02-09 00:31:36 +08:00
Jare Guo a6fb92ad90 updating license 2018-02-01 09:38:54 +08:00
Jare Guo bd15543093 updating license: Chukong Aipu -> Xiamen Yaji 2018-01-31 17:51:49 +08:00
Jare Guo ded7092432 Merge branch 'v1.8'
# Conflicts:
#	cocos2d/core/platform/deserialize.js
#	extensions/dragonbones/CCFactory.js
#	gulp/util/utils.js
2018-01-25 13:47:35 +08:00
pandamicro 027274708f Fix issues caused by merging master 2018-01-16 17:28:05 +08:00
pandamicro 7712da14f5 Merge remote-tracking branch 'fireball/master' into next 2018-01-15 17:51:33 +08:00
knoxHuang 73d6435de5 improve setLineHeight warning 2018-01-12 15:56:38 +08:00
Jare Guo b31566d75f Merge 1.8 2018-01-09 18:40:43 +08:00
Jare Guo df36e5dc9c Merge branch 'v1.8-release' into v1.8 2018-01-09 18:25:55 +08:00
Jare Guo 2e2fd59193 add CC_SUPPORT_JIT macro 2018-01-03 22:58:37 +08:00
Jare Guo 5706539bd5 remove cc._LogInfos, use cc._getError instead 2017-12-27 10:55:34 +08:00
Jare Guo dc533d2811 merge message formater for logger 2017-12-27 02:00:03 +08:00
Jare Guo 7834448133 Merge branch 'v1.7'
# Conflicts:
#	cocos2d/core/load-pipeline/loader.js
2017-12-13 14:44:33 +08:00
Jare Guo e57ee27447 Merge branch 'v1.7-release' into v1.7
# Conflicts:
#	cocos2d/core/editbox/CCSGEditBox.js
#	cocos2d/core/platform/CCInputManager.js
#	cocos2d/core/videoplayer/CCSGVideoPlayer.js
2017-12-13 14:39:10 +08:00
pandamicro f0b6fa6e77 Fix native recycling touch not correctly inited issue 2017-12-11 19:16:39 +08:00
knoxHuang 5d394c5ce6 fix Persist Root Node set local Z Order invalid 2017-11-30 16:52:54 +08:00
knoxHuang c2dd872f5c refine code 2017-11-30 11:43:34 +08:00
knoxHuang 7de9e24340 perfect native md5 cache to JSB for fireball/issues/6656 2017-11-29 17:29:49 +08:00
pandamicro c8188b5211 Merge remote-tracking branch 'origin/v1.7' into next 2017-11-22 13:58:23 +08:00
Jare Guo 3893c290f9 Merge pull request #2123 from VisualSJ/master-audio
support playMusic
2017-11-22 10:23:45 +08:00
Jare Guo 1f94081e95 sync branch 2017-11-21 20:36:39 +08:00
VisualSJ fee3a0a7bd support playMusic 2017-11-21 10:37:05 +08:00
knoxHuang 731e2bb6c7 add jsb-label SystemFont not supported lineHeight warn 2017-11-13 18:05:29 +08:00
pandamicro 25a42c101e Merge pull request #2055 from 2youyou2/jit
fallback function if not support Function
2017-11-03 17:48:27 +08:00
Jare Guo fb3310fb12 Merge master 2017-10-29 01:14:15 +08:00
Jare Guo fb1751be8a Merge branch 'v1.6' into v1.7
# Conflicts:
#	cocos2d/core/sprites/CCScale9Sprite.js
#	jsb/jsb-etc.js
2017-10-29 01:03:44 +08:00
James Chen 2c9db1b3e6 Removes unused jsb.(un)registerNativeRef 2017-10-26 22:12:21 +08:00
Jare Guo d77c5925da Merge pull request #2066 from knoxHuang/v1.7
restore getName for fireball/issues/6505
2017-10-25 05:30:26 -05:00
knoxHuang 19ee0534b0 restore getName for fireball/issues/6505 2017-10-25 18:28:16 +08:00
James Chen c9d477edf0 Fixes str.startswith isn't found on JSC in iOS 8. 2017-10-25 18:08:59 +08:00
Jare Guo 23f0cb4a6b Merge master into asset
# Conflicts:
#	cocos2d/core/load-pipeline/CCLoader.js
#	cocos2d/core/platform/deserialize.js
#	gulpfile.js
#	jsb/jsb-loader.js
2017-10-23 18:00:20 +08:00
Jare Guo e0cf0a1533 refine 2017-10-23 15:35:36 +08:00
yinkaile dc7ae7fc8f refine code 2017-10-20 09:29:45 +08:00
yinkaile 62841321a5 fallback function if not support Function 2017-10-19 17:32:03 +08:00
Jare Guo 3c2cce1a5b Merge pull request #2050 from 2youyou2/native-modules
support native modules
2017-10-17 21:44:25 -05:00
James Chen d1e56cb58a Removes fake console.log since it's implemented in native code now. 2017-10-17 15:46:44 +08:00
yinkaile 0968a41087 refine jsb modules 2017-10-16 17:09:59 +08:00
pandamicro 553e62c5bc Fix Texture width / height API usage 2017-10-11 13:49:28 +08:00
James Chen e5d8a288ab Reverts ...args 2017-10-10 18:01:33 +08:00
knoxHuang fc13234a5c update unschedule code jsb-etc.js fix fireball/issues/6432 2017-10-10 16:26:30 +08:00