Skip to content

Commit eb65a7e

Browse files
committed
Merge branch 'develop'
2 parents df2909c + 73e55d2 commit eb65a7e

File tree

6 files changed

+303
-119
lines changed

6 files changed

+303
-119
lines changed

src/engine/core.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ var game = {
9999
Engine version.
100100
@property {String} version
101101
**/
102-
version: '2.10.0',
102+
version: '2.11.0',
103103
/**
104104
@property {Boolean} _booted
105105
@private
@@ -797,6 +797,8 @@ var game = {
797797
this.device.cocoonCanvasPlus = /CocoonJS/i.test(navigator.browser);
798798
this.device.ejecta = /Ejecta/i.test(navigator.userAgent);
799799
this.device.facebook = /FB/i.test(navigator.userAgent);
800+
this.device.panda2 = /Panda2/i.test(navigator.userAgent);
801+
this.device.electron = (!this.device.panda2 && /Electron/i.test(navigator.userAgent));
800802

801803
this.device.mobile = this.device.iOS || this.device.android || this.device.wp || this.device.wt;
802804
if (this.device.androidTV) this.device.mobile = false;

0 commit comments

Comments
 (0)