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

Merge pull request #13419 from pandamicro/v3 

[ci skip] Permit webp image loading and Add default viewport meta to js templates
This commit is contained in:
pandamicro 2015-08-17 21:46:05 +08:00
parent f2edb1c8f9 2d1fcecfa5
commit 8d0359cac1
4 changed files with 6 additions and 4 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){

3
templates/js-template-default/index.html
View File

@ -4,6 +4,7 @@
<meta charset="utf-8">
<title>Cocos2d-html5 Hello World test</title>
<link rel="icon" type="image/GIF" href="res/favicon.ico"/>
<meta name="viewport" content="width=480, initial-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes"/>
<meta name="full-screen" content="yes"/>
<meta name="screen-orientation" content="portrait"/>
@ -21,7 +22,7 @@
</head>
<body style="padding:0; margin: 0; background: transparent;">
<script src="res/loading.js"></script>
<canvas id="gameCanvas" width="800" height="450"></canvas>
<canvas id="gameCanvas" width="480" height="720"></canvas>
<script src="frameworks/cocos2d-html5/CCBoot.js"></script>
<script cocos src="main.js"></script>
</body>

3
templates/js-template-runtime/index.html
View File

@ -4,6 +4,7 @@
<meta charset="utf-8">
<title>Cocos2d-html5 Hello World test</title>
<link rel="icon" type="image/GIF" href="res/favicon.ico"/>
<meta name="viewport" content="width=480, initial-scale=1">
<meta name="apple-mobile-web-app-capable" content="yes"/>
<meta name="full-screen" content="yes"/>
<meta name="screen-orientation" content="portrait"/>
@ -21,7 +22,7 @@
</head>
<body style="padding:0; margin: 0; background: transparent;">
<script src="res/loading.js"></script>
<canvas id="gameCanvas" width="800" height="450"></canvas>
<canvas id="gameCanvas" width="480" height="720"></canvas>
<script src="frameworks/cocos2d-html5/CCBoot.js"></script>
<script cocos src="main.js"></script>
</body>

2
web

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