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
|
67afe336d2
|
partly change JS into js
|
2018-03-06 11:47:09 +08:00 |
|
PP
|
d9a7e80246
|
literalMap to flatMap
|
2018-03-02 09:48:10 +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
|
3cef7fdfab
|
add cc.path.stripSep (+1 squashed commit)
Squashed commits:
[5c386cc] stash
|
2017-08-22 13:53:52 +08:00 |
|
Jare Guo
|
480ae19826
|
minor tweak
|
2017-08-21 15:35:13 +08:00 |
|
zilongshanren
|
d9ec5dae6c
|
fix custom ttf md5 cache
|
2017-07-21 13:56:01 +08:00 |
|
zilongshanren
|
6ea5d7957a
|
md5 cache respect libraryPath and rawAssetsPath
improve libraryBase
use slice instead replace
|
2017-07-19 11:31:25 +08:00 |
|
zilongshanren
|
d3c73c47ac
|
fix code review issue
|
2017-07-12 11:07:26 +08:00 |
|
zilongshanren
|
1fcf182711
|
add md5Pipe
|
2017-07-12 09:56:33 +08:00 |
|
Jare Guo
|
82a69bdded
|
decode uuid for all imported assets
|
2017-06-27 22:45:32 +08:00 |
|
Jare Guo
|
a78bd81a62
|
refine AssetLibrary api
|
2017-06-27 22:45:32 +08:00 |
|
Jare Guo
|
b58a854dde
|
reduce a bit memory footprint
|
2017-06-20 10:51:51 +08:00 |
|
pandamicro
|
1474cb43db
|
Fix AssetLibrary.loadJson
|
2017-06-06 10:04:28 +08:00 |
|
pandamicro
|
00d01dc56d
|
Fix loader reference key usage issue
|
2017-01-18 14:58:44 +08:00 |
|
pandamicro
|
963b7254f2
|
Ensure remove scene after loaded
|
2017-01-07 16:35:09 +08:00 |
|
Jare Guo
|
adb94371aa
|
improve error message if asset not found
|
2016-12-26 16:35:31 +08:00 |
|
pandamicro
|
3723be228c
|
Remove isRawAsset
|
2016-12-21 12:04:00 +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 |
|
pandamicro
|
70335a82f4
|
Fix getResWithUrl issue
|
2016-12-15 16:32:52 +08:00 |
|
pandamicro
|
a09f36187b
|
Refactor cc.loader to use url as reference key
Deprecate any external id usage, user should use uuid / url to load
Always use url as reference key, when only uuid is available, copy uuid to url
|
2016-12-15 12:33:19 +08:00 |
|
VisualSJ
|
9988c1657f
|
Using URL cache(loader)
|
2016-11-28 18:04:45 +08:00 |
|
Jare Guo
|
08a6b31398
|
sync with changes of Editor.utils
|
2016-11-09 10:51:07 +08:00 |
|
Nan Wang
|
3c49921cfe
|
merged v1.3
|
2016-11-07 15:21:06 +08:00 |
|
Jare Guo
|
ea90fb1da9
|
remove loadingItem.deserializeInfo
|
2016-10-19 16:59:24 +08:00 |
|
Jare Guo
|
e018884d12
|
stash
|
2016-10-10 11:40:07 +08:00 |
|
pandamicro
|
713f85bd3e
|
Protect owner access
|
2016-09-30 15:26:00 +08:00 |
|
Jare Guo
|
81aeb911a8
|
support missing prefab
|
2016-09-06 11:33:41 +08:00 |
|
Jare Guo
|
5477ba9bd9
|
implement autoReleaseRecursively
|
2016-08-12 11:12:46 +08:00 |
|
Jare Guo
|
f04a119e94
|
working on auto release
|
2016-08-12 11:12:46 +08:00 |
|
Jare Guo
|
09c3563abf
|
implement load from pack
|
2016-06-16 19:01:59 +08:00 |
|
Jare Guo
|
880f0e28ca
|
add preloadScene
|
2016-05-13 17:37:16 +08:00 |
|
Nan Wang
|
3e396e3080
|
merged v1.0
|
2016-05-11 17:29:17 +08:00 |
|
Jare Guo
|
612ad35614
|
loadRes should not support sub asset path to avoid confusing with folder
|
2016-05-11 00:00:49 +08:00 |
|
Jare Guo
|
8bfe957286
|
support loadRes by type
|
2016-05-10 18:59:29 +08:00 |
|
Jare Guo
|
02117aaf3f
|
minor fix
|
2016-04-27 10:57:39 +08:00 |
|
Jare Guo
|
1b8fafc9cc
|
turn on dead code optimization in building
|
2016-04-25 14:32:57 +08:00 |
|
Jare Guo
|
98cc058392
|
support the live reloading of undo history
|
2016-04-17 14:21:58 +08:00 |
|
Johnny Wu
|
6109149369
|
refine ipc reply
|
2016-04-14 11:58:48 +08:00 |
|
Jare Guo
|
1bfe4f3fd1
|
Merge pull request #591 from cocos-creator/v1.0
sync V1.0
|
2016-04-12 14:39:26 +08:00 |
|
Jare Guo
|
10a03eccd5
|
Can not use JSON.stringify to present Error (#581)
|
2016-04-11 14:10:16 +08:00 |
|
Johnny Wu
|
e493f2047b
|
upgrade editor-framework to v0.5.0
|
2016-04-07 16:56:39 +08:00 |
|
Jare Guo
|
51c5e1a2ba
|
add cc.loader.loadRes, remove "resources://" protocol
|
2016-03-22 15:40:50 +08:00 |
|
Jare Guo
|
b67f7384f9
|
support to use resources:// instead of cc.url.raw
|
2016-03-09 09:58:10 +08:00 |
|
Jare Guo
|
be9719414e
|
support sprite frame
|
2016-03-09 09:58:10 +08:00 |
|
Jare Guo
|
8902bce59b
|
support to load resources dynamically
|
2016-03-09 09:58:10 +08:00 |
|
pandamicro
|
17aa75520d
|
Refactor LoadingItem.src to id and url
|
2016-03-04 00:55:35 +08:00 |
|