Commit Graph

418 Commits

Author SHA1 Message Date
Jare Guo 21eb9ed894 Merge pull request #1523 from jareguo/master
重新实现组件生命周期调用,支持脚本优先级
2017-03-09 12:56:41 +08:00
Wang Nan 4f3c56a39a Merge pull request #1534 from nantas/typescript
Typescript support
2017-03-09 09:54:46 +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 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
2youyouo2 dae0a14f41 Merge branch 'v1.4' of github.com:fireball-x/engine into physics 2017-03-08 16:41:00 +08:00
Nan Wang 915c9a23a2 use lower case for decorator 2017-03-07 17:54:27 +08:00
pandamicro 310cf2a9ca Improve doc for FIX_ARTIFACTS_BY_STRECHING_TEXEL 2017-03-07 11:20:07 +08:00
pandamicro 6dc195acc2 Fix adaptation issue in iframe nested game 2017-03-07 11:07:10 +08:00
Jare Guo 9fce1b96f9 Merge pull request #1495 from pandamicro/artifacts
Activate FIX_ARTIFACTS_BY_STRECHING_TEXEL by default
2017-03-06 20:56:34 +08:00
Nan Wang f06678020b update decorator to add reset function 2017-03-03 18:56:52 +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 38eecf3e03 fix property shorthand about Raw Asset 2017-03-01 13:49:27 +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
pandamicro 1690651ae1 Merge pull request #1487 from jareguo/v1.4
fix ClassManager
2017-02-17 10:18:08 +08:00
Jare Guo 5d38426653 working on component scheduler 2017-02-17 00:24:36 +08:00
pandamicro ff569e8a45 Activate FIX_ARTIFACTS_BY_STRECHING_TEXEL by default 2017-02-15 14:27:10 +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 fac0533c4a fix ClassManager 2017-02-14 10:41:42 +08:00
Wang Nan a64aa19375 Merge pull request #1482 from jareguo/v1.4
fix error when calling super prototype.ctor in CCClass
2017-02-10 18:44:22 +08:00
pandamicro afc2640127 Fix cc.view undefined issue 2017-02-10 17:10:49 +08:00
pandamicro 5876a71865 Merge pull request #1483 from pandamicro/v1.4
Last minutes fixes
2017-02-10 16:31:52 +08:00
pandamicro 6a429365dc Improve screen adaptation logic 2017-02-10 16:23:33 +08:00
Jare Guo 84d0bfff38 fix error when calling super prototype.ctor in CCClass 2017-02-10 15:35:02 +08:00
knoxHuang acb126217c fix callInNextTick execution sequence for #fireball/issues/5157 2017-02-10 11:02:04 +08:00
knoxHuang e2c8ab34ed fix animation bug for fireball/issues/5157 2017-02-09 15:29:00 +08:00
Jare Guo 0192e50569 Merge branch 'v1.4'
# Conflicts:
#	cocos2d/core/CCNode.js
2017-02-09 11:19:38 +08:00
Jare Guo bd6750fc0a fix prefab loading issue 2017-02-08 12:06:45 +08:00
Jare Guo 5f9e46996b refine CCClass 2017-02-04 02:24:03 +08:00
Jare Guo c861b7ded2 Merge pull request #1468 from cocos-creator/v1.4
Sync V1.4
2017-02-03 21:24:43 +08:00
Jare Guo 42ba8c1fd3 reviewed 2017-02-03 14:40:05 +08:00
Jare Guo 36a7328f40 remove unused prototype properties 2017-02-03 13:53:54 +08:00
Jare Guo 78cb8d488c minify ClassManager 2017-02-03 11:44:23 +08:00
Jare Guo 64e253a1e7 Sync 1.4 2017-01-24 15:16:29 +08:00
Nan Wang 16b7f87f02 fix ccmacro api doc error 2017-01-24 14:15:18 +08:00
Wang Nan ca3fdca9b7 Merge pull request #1444 from jareguo/temp
Improve CCClass
2017-01-24 09:38:44 +08:00
pandamicro d375942ca8 Small fixes 2017-01-22 19:01:09 +08:00
pandamicro e8f116778a Fix issues 2017-01-22 17:35:38 +08:00
pandamicro 8ad9170410 Small improvements and fixes 2017-01-22 17:34:22 +08:00
pandamicro 839d5028d7 Open WebGL access for more browsers and forbid auto full screen in wechat 2017-01-22 17:34:22 +08:00
pandamicro 3a254718e6 Add cc.macro.ENABLE_GC_FOR_NATIVE_OBJECTS to detect memory model 2017-01-22 17:34:22 +08:00
pandamicro e8a268bdb0 Add cc.macro.BATCH_VERTEX_COUNT configuration 2017-01-22 17:34:22 +08:00
pandamicro d0850d0881 Fix scissor clipping issue 2017-01-22 17:34:22 +08:00
pandamicro 65a07db109 Improve compatibility 2017-01-22 17:34:22 +08:00
pandamicro 1eb3a05e8a Improve _CCClass construction performance 2017-01-22 17:34:22 +08:00