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 |
|
PP
|
1f448e821f
|
change all JS into js
|
2018-03-06 11:44:11 +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
|
b31566d75f
|
Merge 1.8
|
2018-01-09 18:40:43 +08:00 |
|
Jare Guo
|
2e2fd59193
|
add CC_SUPPORT_JIT macro
|
2018-01-03 22:58:37 +08:00 |
|
Jare Guo
|
23f0cb4a6b
|
Merge master into asset
# Conflicts:
# cocos2d/core/load-pipeline/CCLoader.js
# cocos2d/core/platform/deserialize.js
# gulpfile.js
# jsb/jsb-loader.js
|
2017-10-23 18:00:20 +08:00 |
|
yinkaile
|
62841321a5
|
fallback function if not support Function
|
2017-10-19 17:32:03 +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
|
9481afcae8
|
optimize deserialization
|
2017-05-11 17:55:50 +08:00 |
|
Jare Guo
|
633e976f69
|
optimizing startup time by reusing property descripter
|
2017-05-05 13:37:03 +08:00 |
|
Jare Guo
|
65a3f04796
|
optimizing startup time
|
2017-05-05 13:37:03 +08:00 |
|
Jare Guo
|
5757403b95
|
fix cc.Integer
|
2017-04-27 16:14:58 +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
|
a4beba2740
|
use Function instead eval to optimize evaluation and variable mangling (cocos-creator/fireball#5220)
|
2017-02-14 17:33:57 +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
|
c35c13e60d
|
add slide and step attribute
|
2016-07-26 22:35:57 +08:00 |
|
Jare Guo
|
ce8ee75ce7
|
reimplement attribute system
|
2016-07-13 15:39:53 +08:00 |
|
Jare Guo
|
78768eb5fa
|
CCClass should not omit type info if default value is defined by function
|
2016-05-27 17:40:39 +08:00 |
|
Jare Guo
|
dbba94fbfb
|
refactor error checking codes for type attribute in CCClass
|
2016-05-19 11:51:31 +08:00 |
|
Jare Guo
|
24e9937fc7
|
CCClass: export getDefault in edit mode
|
2016-03-07 14:12:48 +08:00 |
|
Nan Wang
|
3a70ae6060
|
update license file and source code header.
|
2016-03-01 11:04:12 +08:00 |
|
minggo
|
9d605e2734
|
fix comments
|
2016-02-04 18:34:49 +08:00 |
|
Jare Guo
|
51d98d8bb6
|
Merge 0.7
# Conflicts:
# cocos2d/core/platform/CCClass.js
# cocos2d/core/platform/attribute.js
|
2016-01-24 21:42:20 +08:00 |
|
Jare Guo
|
2b8ec985e4
|
add cc.Float, cc.Boolean, cc.String, cc.Integer
|
2016-01-22 13:58:56 +08:00 |
|
Jare Guo
|
dd31716186
|
minor fix
|
2016-01-22 02:17:04 +08:00 |
|
Jare Guo
|
39d348da28
|
make code about CCClass more concise
|
2016-01-17 18:48:37 +08:00 |
|
Jare Guo
|
43058b6120
|
add cc.Float, cc.Boolean, cc.String, cc.Integer
|
2016-01-12 14:17:11 +08:00 |
|
Nan Wang
|
3981104a1f
|
correct example path.
|
2015-12-10 19:26:35 +08:00 |
|
Nan Wang
|
c0f59c1598
|
synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history.
|
2015-12-05 12:22:41 +08:00 |
|