Merge pull request #39 from gameclosure/browser-optimizations

Update to and support timestep v2.1.0
play-co · Oct 10, 2015 · 4f53b46 · 4f53b46
2 parents 7c65727 + b84655b
commit 4f53b46
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/modules/timestep b/modules/timestep
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "devkit-core",
   "author": "Game Closure",
   "description": "devkit engine",
-  "version": "3.0.2",
+  "version": "3.1.0",
   "repository": {
     "type": "git",
     "url": "http://github.com/gameclosure/devkit-core.git"

diff --git a/src/build/browser/fonts.js b/src/build/browser/fonts.js
@@ -135,12 +135,10 @@ var CSSFont = Class(function () {
   this.init = function (file) {
     this.file = file;
     this.fileBase = path.basename(file, path.extname(file));
-
     this.name = this.fileBase.trim();
 
     var split = this.name.split(/\-/g);
     if (split.length > 1) {
-      this.name = split[0];
 
       var suffix = normalizeFontType(split[1].toLowerCase());
 

diff --git a/src/build/common/jsConfig.js b/src/build/common/jsConfig.js
@@ -29,7 +29,8 @@ exports.JSConfig = Class(function () {
       sdkVersion: config.sdkVersion || 'unknown',
       splash: {
         autoHide: true
-      }
+      },
+      useWebGL: manifest.browser && manifest.browser.canvas && manifest.browser.canvas.useWebGL || false
     };
 
     if (manifest.disableNativeViews) {