Commit Graph

84 Commits

Author SHA1 Message Date
Jare Guo 21eb9ed894 Merge pull request #1523 from jareguo/master
重新实现组件生命周期调用,支持脚本优先级
2017-03-09 12:56:41 +08:00
Nan Wang 7620cdb009 update accord to review feedback 2017-03-09 09:54:01 +08:00
Jare Guo f2d66a3e7f test execution order 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
Nan Wang 3ac4c75c1e add typescript class, add decorator for typescript 2017-03-02 18:39:13 +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 fff91611cb use shorthand function in properties
stash 2
2017-02-18 22:48:05 +08:00
Jare Guo 52b1e9d5e1 reviewed 2017-02-17 17:19:26 +08:00
Jare Guo 56baab044e fix error when ctor parameter defined 2017-02-17 14:09:14 +08:00
Jare Guo a4beba2740 use Function instead eval to optimize evaluation and variable mangling (cocos-creator/fireball#5220) 2017-02-14 17:33:57 +08:00
Jare Guo 84d0bfff38 fix error when calling super prototype.ctor in CCClass 2017-02-10 15:35:02 +08:00
Jare Guo 5f9e46996b refine CCClass 2017-02-04 02:24:03 +08:00
Jare Guo 7c872f947c receive __ctor__ in CCClass to allow user to skip ctor detection 2017-01-17 17:46:11 +08:00
Jare Guo 2efa1d9d1d allow declare constructor for components 2017-01-16 21:47:01 +08:00
Jare Guo 14f0ba913a fix cocos-creator/fireball#5056 2017-01-16 18:35:04 +08:00
Jare Guo 09583033f1 extract cc._RF for v1.5 2017-01-09 15:04:44 +08:00
Jare Guo 338c8d90d2 prevent method name duplicate with property name 2016-12-28 23:51:03 +08:00
Nan Wang 4dea8e7a8a move all error logs to DebugInfos.js and only show error id in release build 2016-12-15 17:07:01 +08:00
Jare Guo 7f70be3516 Merge commit 'e248709cf2e84be9b6e56005ff15a550af230bd4'
# Conflicts:
#	cocos2d/core/platform/CCView.js
2016-12-08 17:50:26 +08:00
Jare Guo 7a8ad96098 support cc.Mat3/4 2016-12-02 00:47:24 +08:00
Jare Guo 57d8f90bad fix mixins release 2016-11-29 14:08:23 +08:00
Jare Guo c4bc9e96b6 optimize deserialization by using eval 2016-11-25 14:24:35 +08:00
Jare Guo d2e4116546 move runtime eval to misc.js to enalbe mangle in other souces 2016-11-24 18:29:38 +08:00
Jare Guo 4e511774d8 escape string for baked js source 2016-11-17 11:27:24 +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 faaa9128a7 wrap eval to a new scope to perfect minify 2016-11-07 17:08:07 +08:00
Jare Guo a2876a33f8 bake CCClass property initializer (JIT) 2016-11-07 17:08:07 +08:00
Jare Guo c61c9cfe39 minor tweaks 2016-11-07 17:08:07 +08:00
Jare Guo 4bedb8a993 minor tweaks 2016-11-07 17:08:07 +08:00
Jare Guo 34004c31a1 support dynamic visible attribute 2016-10-14 18:04:41 +08:00
Jare Guo 53fa92880e support resetInEditor 2016-10-14 16:38:09 +08:00
Jare Guo 309926065a Merge pull request #1041 from jareguo/v1.2
add min, max, step attribute
2016-08-18 15:50:12 +08:00
Jare Guo 912bd5651b add min, max, step attribute 2016-08-16 11:08:54 +08:00
Wang Nan b5d4a61245 Merge pull request #1032 from jareguo/v1.2
working on fixing memleak in JSB
2016-08-15 09:34:32 +08:00
Nan Wang 80ca28144c update ccclass editor attributes 2016-08-12 19:29:25 +08:00
Jare Guo 61dcd9d68a working on fixing memleak in JSB 2016-08-12 18:05:13 +08:00
Jare Guo 8f3001c289 add Scene.autoReleaseAssets 2016-08-12 11:12:46 +08:00
Jare Guo c35c13e60d add slide and step attribute 2016-07-26 22:35:57 +08:00
Jare Guo f3c3dc00d1 still checking class inheritance by using $super in JSB 2016-07-26 17:16:58 +08:00
Jare Guo b521d61650 avoid reference error about _Scene.AssetsWatcher 2016-07-22 01:09:26 +08:00
Jare Guo a66aee3f31 Merge pull request #896 from jareguo/attr
reimplement attribute system
2016-07-18 10:04:50 +08:00
Jare Guo ce8ee75ce7 reimplement attribute system 2016-07-13 15:39:53 +08:00
Jare Guo ef436d9da4 deferred load scene's raw asset 2016-07-08 17:15:57 +08:00
Jare Guo f7c677ac4e minor fix 2016-06-03 14:12:36 +08:00
Wang Nan ef96a955a0 Merge pull request #693 from jareguo/master
refactor error checking codes for type attribute in CCClass
2016-05-20 15:35:00 +08:00
Jare Guo 5f3aecb6a4 add type checking code for addChild 2016-05-20 10:30:15 +08:00
Jare Guo dbba94fbfb refactor error checking codes for type attribute in CCClass 2016-05-19 11:51:31 +08:00
Jare Guo 10b259a21c support minimized serialization 2016-05-17 00:39:27 +08:00