knoxHuang
|
5843fdcb69
|
refine code
|
2017-12-18 11:18:48 +08:00 |
|
knoxHuang
|
2223dcd0c8
|
refine code
|
2017-12-18 11:09:48 +08:00 |
|
knoxHuang
|
cf512dd06e
|
remove error info from the engine release for fireball/issues/6721
|
2017-12-15 17:21:06 +08:00 |
|
Jare Guo
|
57d19ebe28
|
use preloaded texture asset for tiled map
|
2017-12-14 19:22:07 +08:00 |
|
Jare Guo
|
7834448133
|
Merge branch 'v1.7'
# Conflicts:
# cocos2d/core/load-pipeline/loader.js
|
2017-12-13 14:44:33 +08:00 |
|
Jare Guo
|
96248f80fd
|
Merge commit 'c374c97567a6e6674aca0576a76748b83caa7866' into v1.7-release
# Conflicts:
# cocos2d/core/CCGame.js
# cocos2d/core/platform/CCMacro.js
|
2017-12-13 14:34:03 +08:00 |
|
Jare Guo
|
1f94081e95
|
sync branch
|
2017-11-21 20:36:39 +08:00 |
|
knoxHuang
|
731e2bb6c7
|
add jsb-label SystemFont not supported lineHeight warn
|
2017-11-13 18:05:29 +08:00 |
|
Jare Guo
|
9a758afad1
|
Merge pull request #2109 from cocos-creator/v1.7
Merge 1.7
|
2017-11-13 02:50:10 -06:00 |
|
pandamicro
|
9626c28485
|
Improve TMXXMLParser error log
|
2017-11-07 15:18:23 +08:00 |
|
knoxHuang
|
30d372e663
|
add CCToggleContainer
|
2017-11-03 10:28:38 +08:00 |
|
knoxHuang
|
03f04a4e89
|
restore toggleGroup code
|
2017-11-03 09:27:16 +08:00 |
|
Jare Guo
|
bd585d4a5c
|
prefab should be synced if jit can not be used
|
2017-11-03 01:20:51 +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 |
|
Jare Guo
|
e0cf0a1533
|
refine
|
2017-10-23 15:35:36 +08:00 |
|
Jare Guo
|
a1c535c6bb
|
update texture in property
|
2017-10-07 16:18:51 +08:00 |
|
knoxHuang
|
ffde44e863
|
update remove toggleItems tips for fireball/issues/6416
|
2017-09-28 18:08:57 +08:00 |
|
Jare Guo
|
6ddb0eac7d
|
load texture as url or object and deprecate spriteFrame._textureLoaded
|
2017-09-18 18:13:23 +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
|
fbd473117c
|
tweaks
|
2017-09-18 18:13:23 +08:00 |
|
Jare Guo
|
12295dfc94
|
fix default value of typescript after build
|
2017-08-22 14:02:44 +08:00 |
|
Jare Guo
|
91b42560da
|
check if user overwrite destroy in component unexpectedly
|
2017-08-22 14:01:46 +08:00 |
|
Jare Guo
|
3cef7fdfab
|
add cc.path.stripSep (+1 squashed commit)
Squashed commits:
[5c386cc] stash
|
2017-08-22 13:53:52 +08:00 |
|
Jare Guo
|
c690efe26c
|
Sync 1.6
|
2017-08-18 10:06:20 +08:00 |
|
Jare Guo
|
699432b563
|
fix default value of typescript after build
|
2017-08-17 15:27:35 +08:00 |
|
Jare Guo
|
f81b0ba77b
|
check if user overwrite destroy in component unexpectedly
|
2017-08-08 16:54:37 +08:00 |
|
pandamicro
|
90746d76a1
|
Less strict check for schedule, use warn instead of assert when paused state doesn't match
|
2017-08-02 11:30:20 +08:00 |
|
Jare Guo
|
826301e6f5
|
add cc.path.stripSep (+1 squashed commit)
Squashed commits:
[5c386cc] stash
|
2017-08-01 17:09:17 +08:00 |
|
knoxHuang
|
f091d25e76
|
add CCAudioEngine play arguments error tips
|
2017-07-27 16:36:54 +08:00 |
|
pandamicro
|
93695863af
|
Merge pull request #1795 from zilongshanren/fix-pipeline-issue
Fix pipeline issue
|
2017-07-11 11:07:17 +08:00 |
|
zilongshanren
|
dca892d85f
|
renaming warnID sequence ID
|
2017-07-11 10:37:24 +08:00 |
|
zilongshanren
|
9d8f6ef8b1
|
use warnID instead of raw warn message
|
2017-07-11 10:29:29 +08:00 |
|
Jare Guo
|
4936aa1531
|
remove cc._tmp
|
2017-07-05 14:46:55 +08:00 |
|
Wang Nan
|
40eceb7590
|
Merge pull request #1763 from cocos-creator/v1.5
merge V1.5
|
2017-06-27 11:51:18 +08:00 |
|
pandamicro
|
f40b2a00bc
|
Strict assert for sequence construction
|
2017-06-26 14:05:13 +08:00 |
|
Jare Guo
|
814851cd6a
|
display error info in debug build
|
2017-06-14 16:51:11 +08:00 |
|
pandamicro
|
c9adca15b8
|
More secured Scheduler with target id assert
|
2017-05-27 11:20:30 +08:00 |
|
zilongshanren
|
cee31521bd
|
remove debug msg
|
2017-05-11 17:17:07 +08:00 |
|
Jare Guo
|
65a3f04796
|
optimizing startup time
|
2017-05-05 13:37:03 +08:00 |
|
Jare Guo
|
00947c6afe
|
Merge pull request #1599 from 2youyou2/camera
add warn info for camera
|
2017-04-19 09:55:30 +08:00 |
|
2youyouo2
|
bfc6fa87ab
|
add warn info for camera
|
2017-04-18 18:00:18 +08:00 |
|
Jare Guo
|
ecb242f046
|
fix JSB crash of label when texture not loaded
|
2017-04-18 17:23:43 +08:00 |
|
Jare Guo
|
0bd31f0932
|
Merge commit 'be31191693322daf4f2cd5c25060502fa2fda0ca'
# Conflicts:
# cocos2d/core/platform/CCClass.js
|
2017-04-07 10:37:08 +08:00 |
|
Jare Guo
|
7b660e8c9f
|
add decorators for CCClass, add ES6 support for unit test
|
2017-04-01 16:27:11 +08:00 |
|
2youyouo2
|
5e94bc4a87
|
refine camera
|
2017-03-27 12:00:50 +08:00 |
|
2youyouo2
|
b12914197c
|
refine camera
|
2017-03-27 10:34:35 +08:00 |
|
2youyouo2
|
124605c804
|
refine warn info
|
2017-03-17 13:06:49 +08:00 |
|
2youyouo2
|
8c5f75906d
|
disallow set RigidBody enabled, should use node.active instead
|
2017-03-17 11:59:01 +08:00 |
|
Jare Guo
|
c949c486f6
|
fix deactivate child node directly in parent's onDisable
|
2017-03-08 17:33:20 +08:00 |
|