Prechádzať zdrojové kódy

Merge branch 'master' of https://github.com/BabylonJS/Babylon.js

Conflicts:
	Babylon/Math/babylon.math.ts
	Babylon/Mesh/babylon.geometry.ts
	Babylon/Mesh/babylon.mesh.js
	Babylon/Mesh/babylon.mesh.ts
	Babylon/Mesh/babylon.mesh.vertexData.ts
	babylon.2.1-beta.js
David Catuhe 10 rokov pred
rodič
commit
a4f18fe893

+ 1 - 1
Babylon/Rendering/babylon.depthRenderer.ts

@@ -147,4 +147,4 @@
             this._depthMap.dispose();
         }
     }
-} 
+} 

+ 4 - 3
Tools/Gulp/package.json

@@ -9,10 +9,11 @@
     "gulp-concat": "^2.2.0",
     "gulp-filter": "^0.4.1",
     "gulp-rename": "^1.2.0",
-	"gulp-typescript" : "2.4.0",
-	"gulp-sourcemaps" : "1.3.0",
+    "gulp-typescript" : "2.4.2",
+    "gulp-sourcemaps" : "1.3.0",
     "gulp-uglify": "^0.3.0",
     "gulp-util": "^2.2.14",
-    "through": "^2.3.4"
+    "through": "^2.3.4",
+    "gulp-param": "0.6.3"
   }
 }