Commit Graph

15 Commits

Author SHA1 Message Date
pandamicro 77febbfe3d Merge branch 'master' into next 2018-03-13 15:07:21 +08:00
pandamicro ba05646469 Refactor cc.isChildClassOf to cc.js.isChildClassOf 2018-03-12 17:50:26 +08:00
Jare Guo a6fb92ad90 updating license 2018-02-01 09:38:54 +08:00
Jare Guo bd15543093 updating license: Chukong Aipu -> Xiamen Yaji 2018-01-31 17:51:49 +08:00
Jare Guo e3b7190cd6 support migration for texture array 2017-12-26 10:00:57 +08:00
Jare Guo 33f80773b7 Merge commit '87304f287ab53bfe091b6ded51def95b6904db6e'
# Conflicts:
#	cocos2d/core/platform/preprocess-class.js
#	extensions/dragonbones/ArmatureDisplay.js
2017-12-21 15:52:45 +08:00
knoxHuang 7798ad818b fix button bug 2017-12-20 16:28:45 +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 40c6f1829b deprecate @property(cc.Texture2D) value = null; in class defined by using ES6 or TypeScript 2017-09-18 18:13:23 +08:00
Jare Guo f81b0ba77b check if user overwrite destroy in component unexpectedly 2017-08-08 16:54:37 +08:00
Jare Guo 5757403b95 fix cc.Integer 2017-04-27 16:14:58 +08:00
Jare Guo 900b2b5dc2 fix TypeScript support 2017-04-06 19:58:10 +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 38eecf3e03 fix property shorthand about Raw Asset 2017-03-01 13:49:27 +08:00
Jare Guo 338c8d90d2 prevent method name duplicate with property name 2016-12-28 23:51:03 +08:00