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 |
|
pandamicro
|
70e648397e
|
Fix loader.getResCount
|
2017-02-14 17:18:48 +08:00 |
|
Jare Guo
|
64e253a1e7
|
Sync 1.4
|
2017-01-24 15:16:29 +08:00 |
|
pandamicro
|
873c27f9c0
|
Fix unit tests
|
2017-01-23 15:51:00 +08:00 |
|
Jare Guo
|
4351f7c82c
|
add progress callback for loadRes
|
2017-01-13 15:56:58 +08:00 |
|
pandamicro
|
4f6100323e
|
Make new loader pass the unit test
|
2016-09-24 23:23:20 +08:00 |
|
knoxHuang
|
f605874747
|
backing out loader code, Later refactoring
|
2016-07-27 18:07:27 +08:00 |
|
knoxHuang
|
c48e18cd5f
|
fix load prefab bug for fireball/issues/3749
|
2016-07-27 10:02:51 +08:00 |
|
pandamicro
|
17aa75520d
|
Refactor LoadingItem.src to id and url
|
2016-03-04 00:55:35 +08:00 |
|
pandamicro
|
4048a6fbb0
|
Polish single file loading API for cc.loader.load
|
2016-02-25 17:38:58 +08:00 |
|
pandamicro
|
0ea99226cc
|
Replace cc.loader with pipeline loader
|
2016-02-25 10:34:09 +08:00 |
|
pandamicro
|
42515d56ce
|
Refine pipeline implementation, add some important features to adopt CCLoader needs
|
2016-02-25 10:34:09 +08:00 |
|
pandamicro
|
0c950a9a57
|
Add font downloader
|
2016-02-20 22:21:17 +08:00 |
|
pandamicro
|
38c3da6767
|
Add audio downloader
|
2016-02-19 20:31:44 +08:00 |
|
pandamicro
|
7da025e42d
|
Improve pipeline implementation and add loader test
|
2016-02-18 19:10:42 +08:00 |
|
pandamicro
|
03ebc79029
|
Add loader test
|
2016-02-17 19:59:38 +08:00 |
|