Commit Graph

16 Commits

Author SHA1 Message Date
Jare Guo 0192e50569 Merge branch 'v1.4'
# Conflicts:
#	cocos2d/core/CCNode.js
2017-02-09 11:19:38 +08:00
pandamicro 7313332daf Remove cc.spriteFrameCache 2017-02-06 10:43:08 +08:00
Jare Guo 64e253a1e7 Sync 1.4 2017-01-24 15:16:29 +08:00
Wang Nan ca3fdca9b7 Merge pull request #1444 from jareguo/temp
Improve CCClass
2017-01-24 09:38:44 +08:00
pandamicro f285545e03 Remove reference to cc.spriteFrameCache 2017-01-23 12:09:00 +08:00
pandamicro 38226ea61f Flat visit call stack by move visit from render command to node 2017-01-22 17:35:38 +08:00
pandamicro 8ad9170410 Small improvements and fixes 2017-01-22 17:34:22 +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 4351f7c82c add progress callback for loadRes 2017-01-13 15:56:58 +08:00
Jare Guo 338c8d90d2 prevent method name duplicate with property name 2016-12-28 23:51:03 +08:00
Jare Guo 11f5e3d6a9 Merge pull request #1381 from pandamicro/master
Fix loader load subAsset with the same url issue
2016-12-21 12:51:25 +08:00
pandamicro 181d6b32a3 Fix loader load subAsset with the same url issue 2016-12-21 11:12:16 +08:00
knoxHuang bd8127aff7 optimization shader and tooltip for #fireball/issues/4771 2016-12-19 18:19:18 +08:00
Nan Wang 52b1a7658c fix merge conflict of CCLoader getReferenceKey 2016-12-16 10:53:37 +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