Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Permit webp image loading

This commit is contained in:
pandamicro 2015-08-17 18:55:53 +08:00
parent f2edb1c8f9
commit be165ef900
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/scripting/js-bindings/script/jsb_loaders.js
View File

@ -75,7 +75,7 @@ cc._imgLoader = {
});
}
};
cc.loader.register(["png", "jpg", "bmp","jpeg","gif"], cc._imgLoader);
cc.loader.register(["png", "jpg", "bmp","jpeg","gif", "webp"], cc._imgLoader);
cc._plistLoader = {
load : function(realUrl, url, res, cb){

2
web

@ -1 +1 @@
Subproject commit f33b9d95a5ecb4f7210f2c99e23f5fbba46fd119
Subproject commit 3aac6645cf36f40077d642daf8876913361fc930