Skip to content

Commit

Permalink
Merge pull request #1 from BabylonJS/master
Browse files Browse the repository at this point in the history
Sync with Babylon master
  • Loading branch information
a-carvallo committed Apr 26, 2018
2 parents b675661 + cfbc474 commit ee7c578
Show file tree
Hide file tree
Showing 396 changed files with 113,838 additions and 1,007,192 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,10 @@ dist/preview release/package/
/Viewer/dist/viewer.js
/Viewer/dist/viewer.min.js
dist/preview release/viewer/babylon.d.ts
dist/preview release/viewer/babylonjs.loaders.d.ts
dist/preview release/viewer/babylon.glTF2Interface.d.ts
Viewer/dist/viewer.max.js
!Viewer/src/externalModules.d.ts
Viewer/tests/unit/src/**/*.js
Viewer/tests/Lib/**/*.js
Viewer/tests/commons/**/*.js
20 changes: 10 additions & 10 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"**/.svn": true,
"**/.hg": true,
"**/.DS_Store": true,
"**/.vs": true,
"**/.vs": true,
"**/.tempChromeProfileForDebug": true,
"**/node_modules": true,
"**/temp": true,
Expand All @@ -19,11 +19,11 @@
"postProcessesLibrary/**/*.d.ts": true,
"proceduralTexturesLibrary/**/*.d.ts": true,
"serielazers/**/*.d.ts": true,
"viewer/**/*.d.ts": true,
"Viewer/**/*.d.ts": true,
"**/*.js.map": true,
"**/*.js.fx": true,
"**/*.js": {
"when":"$(basename).ts"
"**/*.js": {
"when": "$(basename).ts"
}
},
"files.associations": {
Expand All @@ -37,11 +37,11 @@
"**/.temp": true,
"**/dist": true,
"**/*.map": true,
"**/*.js": {
"when":"$(basename).ts"
},
"**/*.js": {
"when": "$(basename).ts"
},
"**/*.d.ts": true,
"assets":true
"assets": true
},
"typescript.check.workspaceVersion": false
}
"typescript.tsdk": "./Tools/Gulp/node_modules/typescript/lib"
}
Loading

0 comments on commit ee7c578

Please sign in to comment.