pandamicro
77febbfe3d
Merge branch 'master' into next
2018-03-13 15:07:21 +08:00
pandamicro
8b3c089a42
Add back high bits zIndex in localZOrder design and add warning
2018-03-08 14:27:52 +08:00
Jare Guo
5ebcef848c
improve test of changing hierarchy during onDisable
2018-03-03 01:46:10 +08:00
Cocos Ass
86cfa26baf
forbid Hierarchy change test example
...
add a new test in test-component-scheduler.js
forbid Hierarchy change part and example
update data make my local file get reset
forbid Hierarchy change part test example
update a new test content about setSiblingIndex
change the report of error test
2018-03-02 11:29:39 +08:00
Jare Guo
6c809263e6
Merge 1.8
2018-02-24 14:58:57 +08:00
pandamicro
a29a5d1c7e
Remove useless macros and cc.bezierAt
2018-02-13 13:25:42 +08:00
pandamicro
5a1c5baea6
Improve EventListener classes definition
2018-02-12 18:04:44 +08:00
pandamicro
b6994de4b2
Remove CCPool
2018-02-12 15:21:21 +08:00
pandamicro
e1d173da1c
Review Director APIs
2018-02-09 10:07:01 +08:00
pandamicro
5fd4afcb55
Add deprecation log
2018-02-01 15:39:15 +08:00
Jare Guo
a6fb92ad90
updating license
2018-02-01 09:38:54 +08:00
pandamicro
7712da14f5
Merge remote-tracking branch 'fireball/master' into next
2018-01-15 17:51:33 +08:00
Jare Guo
957aa2a6e5
Merge pull request #2211 from jareguo/temp
...
support migration for texture array
2017-12-30 15:16:33 +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
pandamicro
f4c589d8c1
Remove useless files
...
- DrawingPrimitives
- Scale9Sprite
- SpriteBatchNode
- RenderTexture
- DrawNode
2017-12-26 16:46:06 +08:00
Jare Guo
e3b7190cd6
support migration for texture array
2017-12-26 10:00:57 +08:00
pandamicro
ec243da6d1
Basic refactorization of ParticleSystem, remove dep of SGParticleSystem
2017-12-18 16:14:44 +08:00
knoxHuang
5843fdcb69
refine code
2017-12-18 11:18:48 +08:00
knoxHuang
2223dcd0c8
refine code
2017-12-18 11:09:48 +08:00
knoxHuang
cf512dd06e
remove error info from the engine release for fireball/issues/6721
2017-12-15 17:21:06 +08:00
Jare Guo
57d19ebe28
use preloaded texture asset for tiled map
2017-12-14 19:22:07 +08:00
pandamicro
950fd4e41d
Use cc.errorID instead of console.error
2017-12-14 17:54:42 +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
96248f80fd
Merge commit 'c374c97567a6e6674aca0576a76748b83caa7866' into v1.7-release
...
# Conflicts:
# cocos2d/core/CCGame.js
# cocos2d/core/platform/CCMacro.js
2017-12-13 14:34:03 +08:00
pandamicro
c8188b5211
Merge remote-tracking branch 'origin/v1.7' into next
2017-11-22 13:58:23 +08:00
Jare Guo
1f94081e95
sync branch
2017-11-21 20:36:39 +08:00
knoxHuang
731e2bb6c7
add jsb-label SystemFont not supported lineHeight warn
2017-11-13 18:05:29 +08:00
Jare Guo
9a758afad1
Merge pull request #2109 from cocos-creator/v1.7
...
Merge 1.7
2017-11-13 02:50:10 -06:00
pandamicro
9626c28485
Improve TMXXMLParser error log
2017-11-07 15:18:23 +08:00
Jare Guo
b96b228b0d
Merge pull request #2092 from jareguo/v1.7-release
...
prefab should be synced if jit can not be used
2017-11-03 19:49:58 +08:00
knoxHuang
30d372e663
add CCToggleContainer
2017-11-03 10:28:38 +08:00
knoxHuang
03f04a4e89
restore toggleGroup code
2017-11-03 09:27:16 +08:00
Jare Guo
bd585d4a5c
prefab should be synced if jit can not be used
2017-11-03 01:20:51 +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
Jare Guo
a1c535c6bb
update texture in property
2017-10-07 16:18:51 +08:00
pandamicro
447dbc72c7
Refactor Texture2D
2017-10-06 17:54:34 +08:00
knoxHuang
ffde44e863
update remove toggleItems tips for fireball/issues/6416
2017-09-28 18:08:57 +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
40c6f1829b
deprecate @property(cc.Texture2D) value = null; in class defined by using ES6 or TypeScript
2017-09-18 18:13:23 +08:00
Jare Guo
fbd473117c
tweaks
2017-09-18 18:13:23 +08:00
Jare Guo
12295dfc94
fix default value of typescript after build
2017-08-22 14:02:44 +08:00
Jare Guo
91b42560da
check if user overwrite destroy in component unexpectedly
2017-08-22 14:01:46 +08:00
Jare Guo
3cef7fdfab
add cc.path.stripSep (+1 squashed commit)
...
Squashed commits:
[5c386cc] stash
2017-08-22 13:53:52 +08:00
Jare Guo
c690efe26c
Sync 1.6
2017-08-18 10:06:20 +08:00
Jare Guo
699432b563
fix default value of typescript after build
2017-08-17 15:27:35 +08:00
Jare Guo
f81b0ba77b
check if user overwrite destroy in component unexpectedly
2017-08-08 16:54:37 +08:00
pandamicro
90746d76a1
Less strict check for schedule, use warn instead of assert when paused state doesn't match
2017-08-02 11:30:20 +08:00