Commit Graph

285 Commits

Author SHA1 Message Date
Jare Guo e0a92f093b Merge pull request #2023 from cocos-creator/master
Sync master
2017-10-07 05:40:36 -05: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
2youyouo2 99fde38c39 should remove animator from animation manager when pause animator 2017-05-12 11:18:07 +08:00
2youyouo2 dcd8da6a6f should not resume animation when call node.active = true and animation is paused before 2017-05-11 16:24:31 +08:00
2youyouo2 c3a9c6926d fixed animation not worked 2017-05-10 15:09:15 +08:00
Jare Guo 830b51d9bd should not skip onLoad when previous sibling node is deactivated 2017-05-05 18:07:02 +08:00
Jare Guo 5757403b95 fix cc.Integer 2017-04-27 16:14:58 +08:00
pandamicro 3a7c704da1 Use isPhantomJS to detect test environment 2017-04-23 22:19:40 +08:00
pandamicro 19b42a34ae Fix audio not supported in test environment 2017-04-22 16:01:24 +08:00
Jare Guo 05c8871b5c fix test loadResDir 2017-04-17 13:54:48 +08:00
Jare Guo fa44c6bc00 minor tweaks 2017-04-14 16:15:32 +08:00
Jare Guo e1110c9741 add some editor decorators 2017-04-06 11:43:11 +08:00
Jare Guo 7ef2eb8cb7 add test for decorated Classes 2017-04-01 16:27:45 +08:00
Jare Guo 7b660e8c9f add decorators for CCClass, add ES6 support for unit test 2017-04-01 16:27:11 +08:00
Jare Guo 431f2ecc41 fix unit test 2017-03-15 14:44:41 +08:00
Jare Guo f2d66a3e7f test execution order 2017-03-08 17:33:20 +08:00