Skip to content

Commit a7f5273

Browse files
TimMenschTimMensch
committed
Merge branch 'develop' into develop-tim
2 parents 655345c + 33e7c42 commit a7f5273

File tree

6 files changed

+44
-34
lines changed

6 files changed

+44
-34
lines changed

‎CCBoot.js

+32-21
Original file line numberDiff line numberDiff line change
@@ -1690,7 +1690,7 @@ var _initSys = function () {
16901690
sys.browserType = sys.BROWSER_TYPE_UNKNOWN;
16911691
/* Determine the browser type */
16921692
(function(){
1693-
var typeReg1 = /sogou|qzone|liebao|micromessenger|ucbrowser|360 aphone|360browser|baiduboxapp|baidubrowser|maxthon|mxbrowser|trident|miuibrowser/i;
1693+
var typeReg1 = /mqqbrowser|sogou|qzone|liebao|micromessenger|ucbrowser|360 aphone|360browser|baiduboxapp|baidubrowser|maxthon|mxbrowser|trident|miuibrowser/i;
16941694
var typeReg2 = /qqbrowser|chrome|safari|firefox|opr|oupeng|opera/i;
16951695
var browserTypes = typeReg1.exec(ua);
16961696
if(!browserTypes) browserTypes = typeReg2.exec(ua);
@@ -1720,8 +1720,8 @@ var _initSys = function () {
17201720
sys.browserVersion = "";
17211721
/* Determine the browser version number */
17221722
(function(){
1723-
var versionReg1 = /(micromessenger|mx|maxthon|baidu|sogou)(mobile)?(browser)?\/?([\d.]+)/i;
1724-
var versionReg2 = /(msie |rv:|firefox|chrome|ucbrowser|qq|oupeng|opera|opr|safari|miui)(mobile)?(browser)?\/?([\d.]+)/i;
1723+
var versionReg1 = /(micromessenger|qq|mx|maxthon|baidu|sogou)(mobile)?(browser)?\/?([\d.]+)/i;
1724+
var versionReg2 = /(msie |rv:|firefox|chrome|ucbrowser|oupeng|opera|opr|safari|miui)(mobile)?(browser)?\/?([\d.]+)/i;
17251725
var tmp = ua.match(versionReg1);
17261726
if(!tmp) tmp = ua.match(versionReg2);
17271727
sys.browserVersion = tmp ? tmp[4] : "";
@@ -1810,6 +1810,20 @@ var _initSys = function () {
18101810
if(context) {
18111811
_supportWebGL = true;
18121812
}
1813+
1814+
// Accept only Android 5+ default browser and QQ Brwoser 6.2+
1815+
if (_supportWebGL && sys.os === sys.OS_ANDROID) {
1816+
_supportWebGL = false;
1817+
// QQ Brwoser 6.2+
1818+
var browserVer = parseFloat(sys.browserVersion);
1819+
if (sys.browserType === sys.BROWSER_TYPE_MOBILE_QQ && browserVer >= 6.2) {
1820+
_supportWebGL = true;
1821+
}
1822+
// Android 5+ default browser
1823+
else if (sys.osMainVersion && sys.osMainVersion >= 5 && sys.browserType === sys.BROWSER_TYPE_ANDROID) {
1824+
_supportWebGL = true;
1825+
}
1826+
}
18131827
}
18141828
catch (e) {}
18151829
}
@@ -1901,9 +1915,12 @@ var _initSys = function () {
19011915
str += "isMobile : " + self.isMobile + "\r\n";
19021916
str += "language : " + self.language + "\r\n";
19031917
str += "browserType : " + self.browserType + "\r\n";
1918+
str += "browserVersion : " + self.browserVersion + "\r\n";
19041919
str += "capabilities : " + JSON.stringify(self.capabilities) + "\r\n";
19051920
str += "os : " + self.os + "\r\n";
1921+
str += "osVersion : " + self.osVersion + "\r\n";
19061922
str += "platform : " + self.platform + "\r\n";
1923+
str += "Using " + (cc._renderType === cc.game.RENDER_TYPE_WEBGL ? "WEBGL" : "CANVAS") + " renderer." + "\r\n";
19071924
cc.log(str);
19081925
};
19091926

@@ -1936,39 +1953,33 @@ cc._engineLoaded = false;
19361953

19371954
function _determineRenderType(config) {
19381955
var CONFIG_KEY = cc.game.CONFIG_KEY,
1939-
userRenderMode = parseInt(config[CONFIG_KEY.renderMode]) || 0,
1940-
shieldOs = [cc.sys.OS_ANDROID],
1941-
shieldBrowser = [];
1956+
userRenderMode = parseInt(config[CONFIG_KEY.renderMode]) || 0;
19421957

19431958
// Adjust RenderType
19441959
if (isNaN(userRenderMode) || userRenderMode > 2 || userRenderMode < 0)
19451960
config[CONFIG_KEY.renderMode] = 0;
19461961

19471962
// Determine RenderType
19481963
cc._renderType = cc.game.RENDER_TYPE_CANVAS;
1949-
cc._supportRender = true;
1964+
cc._supportRender = false;
19501965

1951-
if ( userRenderMode === 2 ||
1952-
( userRenderMode === 0 &&
1953-
shieldOs.indexOf(cc.sys.os) === -1 &&
1954-
shieldBrowser.indexOf(cc.sys.browserType) === -1 )) {
1966+
if (userRenderMode === 0) {
19551967
if (cc.sys.capabilities["opengl"]) {
19561968
cc._renderType = cc.game.RENDER_TYPE_WEBGL;
19571969
cc._supportRender = true;
19581970
}
1959-
else {
1960-
cc._supportRender = false;
1961-
}
1962-
}
1963-
if (userRenderMode === 1
1964-
|| (userRenderMode === 0 && !cc._supportRender)) {
1965-
if (cc.sys.capabilities["canvas"]) {
1971+
else if (cc.sys.capabilities["canvas"]) {
19661972
cc._renderType = cc.game.RENDER_TYPE_CANVAS;
19671973
cc._supportRender = true;
19681974
}
1969-
else {
1970-
cc._supportRender = false;
1971-
}
1975+
}
1976+
else if (userRenderMode === 1 && cc.sys.capabilities["canvas"]) {
1977+
cc._renderType = cc.game.RENDER_TYPE_CANVAS;
1978+
cc._supportRender = true;
1979+
}
1980+
else if (userRenderMode === 2 && cc.sys.capabilities["opengl"]) {
1981+
cc._renderType = cc.game.RENDER_TYPE_WEBGL;
1982+
cc._supportRender = true;
19721983
}
19731984
}
19741985

‎cocos2d/core/event-manager/CCEventListener.js

+4-11
Original file line numberDiff line numberDiff line change
@@ -256,31 +256,24 @@ cc.EventListener.KEYBOARD = 3;
256256
* @type {number}
257257
*/
258258
cc.EventListener.MOUSE = 4;
259-
/**
260-
* The type code of acceleration event listener.
261-
* @constant
262-
* @type {number}
263-
*/
264-
cc.EventListener.ACCELERATION = 5;
265259
/**
266260
* The type code of focus event listener.
267261
* @constant
268262
* @type {number}
269263
*/
270264
cc.EventListener.ACCELERATION = 6;
271265
/**
272-
* The type code of custom event listener.
266+
* The type code of Focus change event listener.
273267
* @constant
274268
* @type {number}
275269
*/
276-
cc.EventListener.CUSTOM = 8;
277-
270+
cc.EventListener.FOCUS = 7;
278271
/**
279-
* The type code of Focus change event listener.
272+
* The type code of custom event listener.
280273
* @constant
281274
* @type {number}
282275
*/
283-
cc.EventListener.FOCUS = 7;
276+
cc.EventListener.CUSTOM = 8;
284277

285278
cc._EventListenerCustom = cc.EventListener.extend({
286279
_onCustomEvent: null,

‎cocos2d/core/labelttf/CCLabelTTFCanvasRenderCmd.js

+1
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,7 @@ cc.LabelTTF._firsrEnglish = /^[a-zA-Z0-9ÄÖÜäöüßéèçàùêâîôû]/;
264264
if (cc.LabelTTF._symbolRex.test(sLine || tmpText)) {
265265
result = cc.LabelTTF._lastWordRex.exec(sText);
266266
fuzzyLen -= result ? result[0].length : 0;
267+
if (fuzzyLen === 0) fuzzyLen = 1;
267268

268269
sLine = text.substr(fuzzyLen);
269270
sText = text.substr(0, fuzzyLen);

‎cocos2d/render-texture/CCRenderTextureWebGLRenderCmd.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@
256256
this._oldFBO = gl.getParameter(gl.FRAMEBUFFER_BINDING);
257257
gl.bindFramebuffer(gl.FRAMEBUFFER, this._fBO);//Will direct drawing to the frame buffer created above
258258

259-
/* Certain Qualcomm Andreno gpu's will retain data in memory after a frame buffer switch which corrupts the render to the texture.
259+
/* Certain Qualcomm Adreno gpu's will retain data in memory after a frame buffer switch which corrupts the render to the texture.
260260
* The solution is to clear the frame buffer before rendering to the texture. However, calling glClear has the unintended result of clearing the current texture.
261261
* Create a temporary texture to overcome this. At the end of CCRenderTexture::begin(), switch the attached texture to the second one, call glClear,
262262
* and then switch back to the original texture. This solution is unnecessary for other devices as they don't have the same issue with switching frame buffers.
@@ -384,4 +384,4 @@
384384
this._dirtyFlag = 0;
385385
cc.kmGLPopMatrix();
386386
};
387-
})();
387+
})();

‎extensions/ccui/uiwidgets/UIWebView.js

+2
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,8 @@ ccui.WebView.EventType = {
248248
this._div.style["-webkit-overflow"] = "auto";
249249
this._div.style["-webkit-overflow-scrolling"] = "touch";
250250
this._iframe = document.createElement("iframe");
251+
this._iframe.style["width"] = "100%";
252+
this._iframe.style["height"] = "100%";
251253
this._div.appendChild(this._iframe);
252254
}else{
253255
this._div = this._iframe = document.createElement("iframe");

‎extensions/cocostudio/loader/parsers/timelineParser-2.x.js

+3
Original file line numberDiff line numberDiff line change
@@ -1061,6 +1061,9 @@
10611061
});
10621062
this.widgetAttributes(widget, json);
10631063

1064+
// the TextAtlas must be ignore ContentSize[Size] in the ccs file.
1065+
widget.ignoreContentAdaptWithSize(true);
1066+
10641067
return widget;
10651068
};
10661069

0 commit comments

Comments
 (0)