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
pandamicro
ba05646469
Refactor cc.isChildClassOf to cc.js.isChildClassOf
2018-03-12 17:50:26 +08:00
pandamicro
666bf01611
Fix Node API usage issue
2018-03-12 16:16:02 +08:00
yinkaile
4a1087e92d
ensure play the right time after change animation time
2018-03-12 14:18:12 +08:00
pandamicro
6d6e1206be
Cleanup Node APIs
2018-03-09 18:27:56 +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
pandamicro
ba6e8f11a3
Remove cc._renderType, cc._canvas, cc.container
2018-02-24 11:31:51 +08:00
pandamicro
6f2f7a6cc9
remove sgNode usage
2018-02-20 00:12:41 +08:00
pandamicro
4aa1cf5b53
Use TextUtils, CustomFontLoader, HtmlTextParser as module
2018-02-12 15:20:24 +08:00
pandamicro
ab72058841
Fix Node rotation issue
2018-02-08 15:19:38 +08:00
pandamicro
cc06d40ab6
Use vec3 rot instead of rotationX & Y, apply 3d transform
2018-02-07 15:27:03 +08:00
pandamicro
5de9366c08
Use vec3 scale instead of scaleX & scaleY
2018-02-07 12:07:05 +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
knoxHuang
4e6d645f97
fix cc.path.dirname bug
2018-01-18 17:21:13 +08:00
pandamicro
7712da14f5
Merge remote-tracking branch 'fireball/master' into next
2018-01-15 17:51:33 +08:00
Jare Guo
e3b7190cd6
support migration for texture array
2017-12-26 10:00:57 +08:00
knoxHuang
1af150c107
fix eventManager error for unit test
2017-12-21 11:11:46 +08:00
pandamicro
3fe7948213
Add node.walk function and unit test
2017-11-27 16:28:08 +08:00
pandamicro
c8188b5211
Merge remote-tracking branch 'origin/v1.7' into next
2017-11-22 13:58:23 +08:00
Jare Guo
000f4c1fc9
prefab should not resync if is instantiated by its parent (which is not a prefab)
2017-11-16 21:56:27 +08:00
Jare Guo
fb3310fb12
Merge master
2017-10-29 01:14:15 +08:00
Jare Guo
44a53f5404
fix ci
2017-10-26 10:04:29 +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
806c0ec2d4
event listener should not add more than once when using once
2017-10-10 01:08:04 +08:00
Jare Guo
e0a92f093b
Merge pull request #2023 from cocos-creator/master
...
Sync master
2017-10-07 05:40:36 -05:00
pandamicro
1abfab8621
Refactor textureCache to textureUtil, only cache texture to loader
2017-10-06 17:53:07 +08:00
2youyouo2
5fccfd4477
remove AnimationNode
2017-09-26 10:06:02 +08:00
Jare Guo
6561b380ff
Merge commit 'c0a1b5e369829cd2fd63b52b4cb588690e3ddeea' into asset
2017-09-23 09:02:21 +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
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
afabe198a9
support loading texture assets from packs
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
2youyouo2
17ceb14aae
update
2017-09-14 14:03:03 +08:00
Jare Guo
47dc522e92
support formerlySerializedAs attribute
2017-08-31 12:27:49 +08:00
2youyouo2
6bc0ff1cae
should ignore animation playOnLoad if already play an animation
2017-08-29 17:58:07 +08:00
Jare Guo
3055157fb7
Sync 1.6
...
# Conflicts:
# cocos2d/core/platform/js.js
2017-08-24 11:56:36 +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
076cf9e792
fix cache url of texture
2017-08-21 22:23:31 +08:00
Jare Guo
d313f2828f
should load position of node when synced with prefab
2017-08-18 18:36:05 +08:00
Jare Guo
c690efe26c
Sync 1.6
2017-08-18 10:06:20 +08:00
Jare Guo
eed3cc2d0f
fix deserialization about TypeScript
2017-08-15 22:23:03 +08:00
Jare Guo
e3212cdf68
reimplement CallbacksInvoker
2017-08-07 17:41:05 +08:00
Jare Guo
e06c67a212
remove bindKey and invokeAndRemove of CallbacksInvoker
2017-08-04 13:37:41 +08:00
Jare Guo
4a7b88ff6b
add unit test for callback-invoker
2017-08-04 13:37:41 +08:00
Jare Guo
826301e6f5
add cc.path.stripSep (+1 squashed commit)
...
Squashed commits:
[5c386cc] stash
2017-08-01 17:09:17 +08:00
Jare Guo
da3cd5a3cd
optimize test pipeline, add gulp buld-test-sm for debugging
2017-07-25 11:17:36 +08:00
Jare Guo
a78bd81a62
refine AssetLibrary api
2017-06-27 22:45:32 +08:00