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 |
|
Jare Guo
|
7834448133
|
Merge branch 'v1.7'
# Conflicts:
# cocos2d/core/load-pipeline/loader.js
|
2017-12-13 14:44:33 +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 |
|
pandamicro
|
7c2e7f852d
|
Remove wrong isBrowser usage
|
2017-11-13 16:30:28 +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 |
|
pandamicro
|
bd1cd1a9d3
|
Remove visual tests
|
2017-10-11 13:51:05 +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 |
|
Jare Guo
|
a0930171b1
|
add decode uuid algorithm
|
2017-06-27 22:45:32 +08:00 |
|
Wang Nan
|
40eceb7590
|
Merge pull request #1763 from cocos-creator/v1.5
merge V1.5
|
2017-06-27 11:51:18 +08:00 |
|
pandamicro
|
854d2d8f14
|
Add circle reference test case
|
2017-06-26 18:29:54 +08:00 |
|
Jare Guo
|
d70eea4e00
|
remove ccui visual test
|
2017-06-21 10:55:00 +08:00 |
|
Jare Guo
|
5e26feaf8c
|
remove unused code for moduleConfig.json
|
2017-06-16 14:20:32 +08:00 |
|
Jare Guo
|
685defed7a
|
add Node.insertChild
|
2017-06-14 14:49:19 +08:00 |
|
Jare Guo
|
166dc1ad38
|
should not mixin class name
|
2017-06-06 11:20:06 +08:00 |
|
pandamicro
|
3ef519e28e
|
Fix unit test case
|
2017-06-05 15:22:34 +08:00 |
|
Jare Guo
|
663c42ecdd
|
fix instantiate-jit if type is wrong
|
2017-06-03 00:55:42 +08:00 |
|
Jare Guo
|
df12f42392
|
skipped onLoad should be called after node re-activated
|
2017-05-26 02:35:15 +08:00 |
|
Jare Guo
|
40dc6b23f1
|
make CCDebugger more concise
|
2017-05-17 16:26:03 +08:00 |
|
Jare Guo
|
4bd7c7f628
|
implement TypeScript support for CCEnum
|
2017-05-16 15:35:01 +08:00 |
|
2youyouo2
|
3c7504110d
|
change animation Array to MutableForwardIterator
|
2017-05-12 15:55:53 +08:00 |
|