Commit Graph

251 Commits

Author SHA1 Message Date
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
Jare Guo b74880fa10 fix activate child node directly in parent's onDisable 2017-03-08 17:33:20 +08:00
Jare Guo c949c486f6 fix deactivate child node directly in parent's onDisable 2017-03-08 17:33:20 +08:00
Jare Guo b272941cf6 working on execution order of lifecycle methods 2017-03-08 17:33:20 +08:00
Jare Guo 1f0b5503f0 Merge commit 'aaa2ac73b9dc0b05bf3d1b05342d10676e0ad432' into temp2
# Conflicts:
#	cocos2d/core/platform/CCClass.js
#	cocos2d/core/platform/CCView.js
#	cocos2d/core/platform/_CCClass.js
#	jsb/jsb-director.js
2017-03-02 14:30:09 +08:00
Jare Guo 5d38426653 working on component scheduler 2017-02-17 00:24:36 +08:00
pandamicro 70e648397e Fix loader.getResCount 2017-02-14 17:18:48 +08:00
Jare Guo 64e253a1e7 Sync 1.4 2017-01-24 15:16:29 +08:00
pandamicro 873c27f9c0 Fix unit tests 2017-01-23 15:51:00 +08:00
Jare Guo 3ea81e7bfa Merge pull request #1437 from jareguo/temp2
support empty path in loadResDir
2017-01-19 09:59:32 +08:00
Jare Guo 2902c6e790 return url dict as the 3rd parameter for loadResDir 2017-01-13 16:57:32 +08:00
Jare Guo 4351f7c82c add progress callback for loadRes 2017-01-13 15:56:58 +08:00
Jare Guo 69da1c1968 add cc.loader.loadResArray 2017-01-13 10:28:40 +08:00
Jare Guo b9c532111c support empty path in loadResDir 2017-01-12 16:06:31 +08:00
Jare Guo 8da330d3a7 Scene now inherit from Node so some Node verification should be refactored 2017-01-12 14:47:51 +08:00
Jare Guo 894b3bcc4f test life-cycle order between parent and children 2017-01-11 18:27:42 +08:00
Jare Guo ba3bdf284b fix global pollute while instantiating 2017-01-10 19:10:34 +08:00
Jare Guo 9ed97adbc8 fix unit tests about loader 2017-01-10 16:23:23 +08:00
zilongshanren 1a799671e5 finish outline tag parser 2017-01-05 16:37:14 +08:00
zilongshanren 8a89d303d9 add more outline tests 2017-01-05 16:17:46 +08:00
zilongshanren 98c151c405 add outline color 2017-01-04 16:55:50 +08:00
Jare Guo 96ecaba46e remove deprecated files 2016-12-28 22:42:28 +08:00
Jare Guo 31efbebb60 fully support serialization for FastDefined value types 2016-12-23 14:11:45 +08:00
VisualSJ 32d2f3dad5 Fixed a bug about missing url 2016-12-14 10:33:37 +08:00
Jare Guo 31dd92280a support for loading the same asset from multiple packages 2016-12-13 11:02:53 +08:00
Jare Guo 5dc7735e0d optimize destruct operation by using eval 2016-11-24 18:29:38 +08:00
Jare Guo c5526caee8 rename loadResAll to loadResDir 2016-11-17 16:15:04 +08:00
Jare Guo 4e511774d8 escape string for baked js source 2016-11-17 11:27:24 +08:00
Nan Wang a93d65d0f6 Merge branch 'v1.3' of github.com:cocos-creator/engine 2016-11-17 10:10:04 +08:00
2youyouo2 3a48a569b4 improve animation interface, fixed typo 2016-11-15 11:41:41 +08:00
Jare Guo 08a6b31398 sync with changes of Editor.utils 2016-11-09 10:51:07 +08:00
Jare Guo 4c2c52ead9 CCClass: ctor of mixin should be called only once 2016-11-08 20:54:43 +08:00
Jare Guo b54c819f38 minify code and output warning if _super method undefined 2016-11-08 17:36:50 +08:00
Jare Guo a2876a33f8 bake CCClass property initializer (JIT) 2016-11-07 17:08:07 +08:00
Jare Guo b22b36ea58 bake instantiate codes (JIT) 2016-11-07 17:08:07 +08:00