Commit Graph

358 Commits

Author SHA1 Message Date
pandamicro c8188b5211 Merge remote-tracking branch 'origin/v1.7' into next 2017-11-22 13:58:23 +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 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
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
pandamicro 2bb573b3db Use undefined for id validation 2017-10-09 15:48:00 +08:00
pandamicro 3fab547edc Merge remote-tracking branch 'pandamicro/v1.6' into v1.6 2017-10-09 15:26:23 +08:00
pandamicro 928964bd70 Fix 0 id causing assert failure issue 2017-10-09 15:26:01 +08:00
James Chen 5bed39b96a Merge branch 'v1.6' of git://github.com/cocos-creator/engine
# Conflicts:
#	jsb/jsb-etc.js
2017-10-09 10:30:28 +08:00
pandamicro 5c27b585fa Use 0 instead of random seed for _callbackId 2017-10-06 08:59:23 -05:00
pandamicro bcd93d3d16 [JSB] use key to schedule to avoid memory leak in scheduleOnce 2017-10-06 15:25:34 +08:00
James Chen 172d650428 Fixes passing wrong argument to createWithTTF 2017-09-28 15:14:25 +08:00
Jare Guo fa6287c21c fix texture url on native 2017-09-26 22:44:57 +08:00
Jare Guo e1601ac00f Merge 1.6
# Conflicts:
#	cocos2d/core/CCDirector.js
#	cocos2d/core/components/CCSprite.js
2017-09-22 10:48:01 +08:00
2youyouo2 d054738d2c Merge branch 'master' into native-modular 2017-09-18 13:59:42 +08:00
2youyouo2 c3f5745559 remove jsb ui 2017-09-18 10:27:54 +08:00
pandamicro 76a4219cde Update JSB Texture2D APIs 2017-09-15 10:24:16 +08:00
pandamicro 06011baeb8 remove empty error handler 2017-09-05 20:43:58 +08:00
Jare Guo 94012eaed7 check released asset each frame 2017-08-31 18:36:00 +08:00
James Chen d5b9154179 Removes unused action code. 2017-08-29 11:10:34 +08:00
Wang Nan 6084eeeb22 Merge pull request #1911 from dumganhar/jsb2.0
Changes for jsb2.0
2017-08-28 10:09:21 +08:00
knoxHuang 55e49f62f7 fix label error for fireball/issues/6066 2017-08-24 11:25:47 +08:00
Jare Guo c2a3ee32cb sync jsb-director 2017-08-24 11:01:05 +08:00
Jare Guo 3cef7fdfab add cc.path.stripSep (+1 squashed commit)
Squashed commits:
[5c386cc] stash
2017-08-22 13:53:52 +08:00
James Chen 6520c362ac Changes for jsb2.0 2017-08-18 15:46:14 +08:00
Jare Guo c690efe26c Sync 1.6 2017-08-18 10:06:20 +08:00
knoxHuang dc703aa96b Repair outline bug for fireball/issues/6254 and fireball/issues/6258 2017-08-15 18:15:38 +08:00
Jare Guo 614f2ddfdf sync jsb-director 2017-08-07 18:20:14 +08:00
pandamicro 98ad78974e [native] Improve setTimeout, setInterval implementation 2017-08-07 00:49:06 +08:00
knoxHuang 15949c81f7 fix Follow isDone error for fireball/issues/6191 2017-08-04 16:09:15 +08:00
Jare Guo 826301e6f5 add cc.path.stripSep (+1 squashed commit)
Squashed commits:
[5c386cc] stash
2017-08-01 17:09:17 +08:00
pandamicro 39e1d00b9a Fix cc._RF.reset is not defined issue 2017-07-31 16:04:34 +08:00
pandamicro 945c03b5aa Revert useless alpha check in jsb-action 2017-07-31 15:55:20 +08:00
pandamicro 740c6c2f94 Fix setting alpha with color warning during tint action 2017-07-31 14:45:32 +08:00
pandamicro b30a2b7069 Reset other js caches in jsb __cleanup 2017-07-28 15:42:34 +08:00
pandamicro 9efec05781 Add __cleanup for jsb data cleanup during restart 2017-07-28 15:34:02 +08:00
Jare Guo 0460947563 log scene loading time for profiling 2017-07-27 11:48:10 +08:00
Jare Guo 8442569917 polyfill console.time 2017-07-27 11:32:55 +08:00
Jare Guo 0ef01329fb remove jsb versions polyfill 2017-07-27 10:13:42 +08:00