Commit Graph

349 Commits

Author SHA1 Message Date
Jare Guo a815a844f9 Merge master
# Conflicts:
#	cocos2d/core/textures/CCTexture2D.js
#	cocos2d/core/textures/CCTextureCache.js
2017-10-07 18:46:57 +08:00
Jare Guo e0a92f093b Merge pull request #2023 from cocos-creator/master
Sync master
2017-10-07 05:40:36 -05:00
Jare Guo ccc91746cb support deferred load texture in runtime 2017-10-07 17:53:56 +08:00
Jare Guo a1c535c6bb update texture in property 2017-10-07 16:18:51 +08:00
Jare Guo 5c443fecd2 remove comments 2017-10-01 12:55:09 +08:00
Jare Guo bca9d854ac deprecate texture.releaseTexture(), use texture.destroy() instead 2017-09-28 22:55:59 +08:00
James Chen 172d650428 Fixes passing wrong argument to createWithTTF 2017-09-28 15:14:25 +08:00
Jare Guo e27666cfac update jsb 2017-09-25 17:19:12 +08:00
Jare Guo 6561b380ff Merge commit 'c0a1b5e369829cd2fd63b52b4cb588690e3ddeea' into asset 2017-09-23 09:02:21 +08:00
Jare Guo 64c13c7dab sync jsb 2017-09-23 09:02:13 +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
Jare Guo f6cc4032c3 Merge commit '870f900f6ca6a455bedc4e12f9c4febcf54aefe0' into asset
# Conflicts:
#	cocos2d/core/sprites/CCSGSpriteWebGLRenderCmd.js
#	cocos2d/core/sprites/CCSpriteFrame.js
#	cocos2d/core/textures/CCTexture2D.js
#	cocos2d/core/textures/CCTextureCache.js
#	jsb/jsb-tex-sprite-frame.js
2017-09-18 23:08:03 +08:00
Jare Guo 6ddb0eac7d load texture as url or object and deprecate spriteFrame._textureLoaded 2017-09-18 18:13:23 +08:00
Jare Guo 301f4e709a refactoring API of cc.Asset: rawUrl -> nativeUrl, _rawFile -> _native, _setRawFile(s) -> _setRawAsset, rawType -> _nativeObject 2017-09-18 18:13:23 +08:00
Jare Guo fbd473117c tweaks 2017-09-18 18:13:23 +08:00
Jare Guo efa57bb48f make texture as common asset 2017-09-18 18:13:23 +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
zilongshanren c70c7a2989 improve ttf font creation performance 2017-07-25 14:39:53 +08:00
pandamicro f94677996e Fix DebugInfos not included in jsb issue 2017-07-22 14:29:41 +08:00
pandamicro fce95c971e Fix callFunc creation issue with primitive data parameter 2017-07-22 14:29:24 +08:00
pandamicro d391f17810 Fix director event before update missing issue 2017-07-21 15:37:26 +08:00
knoxHuang 90b9d5f4b8 fix schedule error 2017-07-19 16:30:45 +08:00
knoxHuang 01578b40c9 fix get _prevX and _prevY error for fireball/issues/6042 2017-07-17 14:06:40 +08:00
Jare Guo bf79d94fe6 remove extname used in require 2017-07-05 16:32:41 +08:00
pandamicro 110123df64 Use pure js event instead of native event 2017-06-30 18:12:49 +08:00
pandamicro d9986e1200 Fix event issues for jsb sm52 branch 2017-06-30 18:06:42 +08:00