Commit Graph

22 Commits

Author SHA1 Message Date
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 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 fa6287c21c fix texture url on native 2017-09-26 22:44:57 +08:00
Jare Guo e27666cfac update jsb 2017-09-25 17:19:12 +08:00
Jare Guo 64c13c7dab sync jsb 2017-09-23 09:02:13 +08:00
pandamicro 191d16e114 Support synchronous loader process 2017-06-06 14:45:40 +08:00
pandamicro 1011b4ed12 Made JSB download functions synchronous 2017-06-05 15:22:34 +08:00
pandamicro 73cf8a288d Avoid texture memory leak 2017-02-06 13:44:12 +08:00
pandamicro 911991d7d3 Revert downloadText overload 2016-07-21 16:04:11 +08:00
pandamicro e161341df9 Update JSB downloaders 2016-07-21 10:39:07 +08:00
Jare Guo 5dcff33b98 fix pack loader on JSB 2016-06-30 21:52:14 +08:00
Jare Guo 51c5e1a2ba add cc.loader.loadRes, remove "resources://" protocol 2016-03-22 15:40:50 +08:00
pandamicro 755f89dc3b Fix audio loading in JSB 2016-03-21 12:44:25 +08:00
pandamicro d43870aff0 Add jsc downloader in JSB 2016-03-14 22:03:40 +08:00
Jare Guo 28b3da738b minor tweaks 2016-03-13 15:33:24 +08:00
pandamicro 195ed922f8 Fix downloadText won't return error issue 2016-03-09 18:08:27 +08:00
Jare Guo 6b98138063 working on using resources:// instead of cc.url.raw in JSB 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
Nan Wang 3a70ae6060 update license file and source code header. 2016-03-01 11:04:12 +08:00
pandamicro b748628c41 Add some useful types 2016-02-25 14:27:08 +08:00
pandamicro 600e7a59ef Use pipeline loader in JSB 2016-02-25 13:06:57 +08:00