Merge branch 'develop'

ekelokorpi · Mar 31, 2020 · 8cbe5a7 · 8cbe5a7
2 parents 708567f + 35a16a8
commit 8cbe5a7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/engine/core.js b/src/engine/core.js
@@ -99,7 +99,7 @@ var game = {
  Engine version.
  @property {String} version
  **/
- version: '2.13.0',
+ version: '2.13.1',
  /**
  @property {Boolean} _booted
  @private

diff --git a/src/engine/physics.js b/src/engine/physics.js
@@ -460,7 +460,7 @@ game.createClass('Physics', {
  }
  for (j = 0; j < this._collisionGroups[i].length; j++) {
  if (this._collisionGroups[i][j] && this._collisionGroups[i][j].collideAgainst.length > 0) {
- this._collide(this._collisionGroups[i][j]);
+ this.collide(this._collisionGroups[i][j]);
  }
  }
  }

diff --git a/src/engine/system.js b/src/engine/system.js
@@ -452,6 +452,7 @@ game.createClass('System', {
  **/
  _updateWindowSize: function() {
  if (typeof document === 'undefined') return;
+ if (game.device.android && window.innerHeight - this._windowHeight === 24) return; // Fix Android 6 screen size bug
  this._windowWidth = game.device.WKWebView ? document.documentElement.clientWidth : window.innerWidth;
  this._windowHeight = game.device.WKWebView ? document.documentElement.clientHeight : window.innerHeight;
  if (game.device.crosswalk && this._windowWidth === 0) {