Skip to content

Commit

Permalink
Merge pull request #1 from BabylonJS/master
Browse files Browse the repository at this point in the history
Pull upstream
  • Loading branch information
phenry20 committed Jun 20, 2020
2 parents bb2f213 + 2ac37c6 commit 2d5674c
Show file tree
Hide file tree
Showing 1,042 changed files with 466,315 additions and 352,329 deletions.
64 changes: 0 additions & 64 deletions .travis.yml

This file was deleted.

16 changes: 15 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,21 @@
"name": "Launch sandbox (Chrome)",
"type": "chrome",
"request": "launch",
"url": "http://localhost:1338/sandbox/index-local.html",
"url": "http://localhost:1338/sandbox/public/index-local.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"preLaunchTask": "run",
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch sandbox (Edge)",
"type": "edge",
"version": "dev",
"request": "launch",
"url": "http://localhost:1338/sandbox/public/index-local.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"preLaunchTask": "run",
Expand Down
2 changes: 1 addition & 1 deletion Playground/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ body {
-ms-user-select: none;
user-select: none;
position: relative;
z-index: 5;
z-index: 11;
}

.navbar a {
Expand Down
12 changes: 11 additions & 1 deletion Playground/debug.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@
<script src="https://preview.babylonjs.com/libktx.js"></script>
<script src="https://preview.babylonjs.com/babylon.max.js"></script>
<script src="https://preview.babylonjs.com/gui/babylon.gui.js"></script>
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
<script src="https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.js"></script>
<!-- Babylon.js -->
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.fireMaterial.min.js"></script>
Expand Down Expand Up @@ -100,6 +99,8 @@

<script src="https://preview.babylonjs.com/serializers/babylonjs.serializers.js"></script>

<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>

<!-- Extensions -->
<script
src="https://rawcdn.githack.com/BabylonJS/Extensions/f43ab677b4bca0a6ab77132d3f785be300382760/ClonerSystem/src/babylonx.cloner.js"
Expand Down Expand Up @@ -172,6 +173,9 @@
<div class="option checked noSubSelect" id="editorButton1280">Editor
<i class="fa fa-check-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="ctrlsToggle1280">CTRL+S to save
<i class="fa fa-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="fullscreenButton1280">Fullscreen</div>
<div class="option noSubSelect" id="editorFullscreenButton1280">Editor Fullscreen</div>
<div class="option noSubSelect" id="formatButton1280">Format code</div>
Expand Down Expand Up @@ -252,6 +256,9 @@
<div class="option checked noSubSelect" id="editorButton1024">Editor
<i class="fa fa-check-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="ctrlsToggle1024">CTRL+S to save
<i class="fa fa-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="fullscreenButton1024">Fullscreen</div>
<div class="option noSubSelect" id="editorFullscreenButton1024">Editor Fullscreen</div>
<div class="option noSubSelect" id="formatButton1024">Format code</div>
Expand Down Expand Up @@ -339,6 +346,9 @@
<div style="display: none;" class="option checked noSubSelect" id="editorButtonMobile">Editor
<i class="fa fa-check-square" aria-hidden="true"></i>
</div>
<div style="display: none;" class="option noSubSelect" id="ctrlsToggleMobile">CTRL+S to save
<i class="fa fa-square" aria-hidden="true"></i>
</div>
<div style="display: none;" class="option nosubselect" id="fullscreenButtonMobile"
style="display: none">Fullscreen</div>
<div style="display: none;" class="option nosubselect" id="editorFullscreenButtonMobile"
Expand Down
3 changes: 2 additions & 1 deletion Playground/frame.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
<script src="https://preview.babylonjs.com/earcut.min.js"></script>
<script src="https://preview.babylonjs.com/babylon.js"></script>
<script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script>
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
<script src="https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.js"></script>
<!-- Babylon.js -->
<script src="https://preview.babylonjs.com/materialsLibrary/babylon.fireMaterial.min.js"></script>
Expand Down Expand Up @@ -71,6 +70,8 @@

<script src="https://preview.babylonjs.com/serializers/babylonjs.serializers.min.js"></script>

<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>

<!-- Extensions -->
<script
src="https://rawcdn.githack.com/BabylonJS/Extensions/f43ab677b4bca0a6ab77132d3f785be300382760/ClonerSystem/src/babylonx.cloner.js"
Expand Down
3 changes: 2 additions & 1 deletion Playground/full.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@
<script src="https://preview.babylonjs.com/libktx.js"></script>
<script src="https://preview.babylonjs.com/babylon.js"></script>
<script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script>
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
<script src="https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylonjs.materials.min.js"></script>
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js">
</script>
<script src="https://preview.babylonjs.com/postProcessesLibrary/babylonjs.postProcess.min.js"></script>
<script src="https://preview.babylonjs.com/loaders/babylonjs.loaders.js"></script>

<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>

<!-- Extensions -->
<script
src="https://rawcdn.githack.com/BabylonJS/Extensions/f43ab677b4bca0a6ab77132d3f785be300382760/ClonerSystem/src/babylonx.cloner.js"
Expand Down
9 changes: 9 additions & 0 deletions Playground/index-local.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@
</div>
<div class="option checked noSubSelect" id="editorButton1280">Editor
<i class="fa fa-check-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="ctrlsToggle1280">CTRL+S to save
<i class="fa fa-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="fullscreenButton1280">Fullscreen</div>
<div class="option noSubSelect" id="editorFullscreenButton1280">Editor Fullscreen</div>
Expand Down Expand Up @@ -176,6 +179,9 @@
<div class="option checked noSubSelect" id="editorButton1024">Editor
<i class="fa fa-check-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="ctrlsToggle1024">CTRL+S to save
<i class="fa fa-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="fullscreenButton1024">Fullscreen</div>
<div class="option noSubSelect" id="editorFullscreenButton1024">Editor Fullscreen</div>
<div class="option noSubSelect" id="formatButton1024">Format code</div>
Expand Down Expand Up @@ -263,6 +269,9 @@
<div style="display: none;" class="option checked noSubSelect" id="editorButtonMobile">Editor
<i class="fa fa-check-square" aria-hidden="true"></i>
</div>
<div style="display: none;" class="option noSubSelect" id="ctrlsToggleMobile">CTRL+S to save
<i class="fa fa-square" aria-hidden="true"></i>
</div>
<div style="display: none;" class="option nosubselect" id="fullscreenButtonMobile"
style="display: none">Fullscreen</div>
<div style="display: none;" class="option nosubselect" id="editorFullscreenButtonMobile"
Expand Down
11 changes: 10 additions & 1 deletion Playground/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@
<div class="option checked noSubSelect" id="editorButton1280">Editor
<i class="fa fa-check-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="ctrlsToggle1280">CTRL+S to save
<i class="fa fa-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="fullscreenButton1280">Fullscreen</div>
<div class="option noSubSelect" id="editorFullscreenButton1280">Editor Fullscreen</div>
<div class="option noSubSelect" id="formatButton1280">Format code</div>
Expand Down Expand Up @@ -157,6 +160,9 @@
<div class="option checked noSubSelect" id="editorButton1024">Editor
<i class="fa fa-check-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="ctrlsToggle1024">CTRL+S to save
<i class="fa fa-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="fullscreenButton1024">Fullscreen</div>
<div class="option noSubSelect" id="editorFullscreenButton1024">Editor Fullscreen</div>
<div class="option noSubSelect" id="formatButton1024">Format code</div>
Expand Down Expand Up @@ -244,6 +250,9 @@
<div style="display: none;" class="option checked noSubSelect" id="editorButtonMobile">Editor
<i class="fa fa-check-square" aria-hidden="true"></i>
</div>
<div style="display: none;" class="option noSubSelect" id="ctrlsToggleMobile">CTRL+S to save
<i class="fa fa-square" aria-hidden="true"></i>
</div>
<div style="display: none;" class="option nosubselect" id="fullscreenButtonMobile"
style="display: none">Fullscreen</div>
<div style="display: none;" class="option nosubselect" id="editorFullscreenButtonMobile"
Expand Down Expand Up @@ -398,14 +407,14 @@ <h1>Examples<img id="examplesButtonClose" src="/css/img/clearButton.svg"></h1>
<!-- Babylon.js -->
<script src="https://preview.babylonjs.com/babylon.js"></script>
<script src="https://preview.babylonjs.com/gui/babylon.gui.min.js"></script>
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
<script src="https://preview.babylonjs.com/nodeEditor/babylon.nodeEditor.js"></script>
<script src="https://preview.babylonjs.com/materialsLibrary/babylonjs.materials.min.js"></script>
<script src="https://preview.babylonjs.com/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js">
</script>
<script src="https://preview.babylonjs.com/postProcessesLibrary/babylonjs.postProcess.min.js"></script>
<script src="https://preview.babylonjs.com/loaders/babylonjs.loaders.min.js"></script>
<script src="https://preview.babylonjs.com/serializers/babylonjs.serializers.min.js"></script>
<script src="https://preview.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>

<!-- Dependencies -->
<script src="https://preview.babylonjs.com/ammo.js"></script>
Expand Down
13 changes: 11 additions & 2 deletions Playground/indexStable.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@
<div class="option checked noSubSelect" id="editorButton1280">Editor
<i class="fa fa-check-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="ctrlsToggle1280">CTRL+S to save
<i class="fa fa-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="fullscreenButton1280">Fullscreen</div>
<div class="option noSubSelect" id="editorFullscreenButton1280">Editor Fullscreen</div>
<div class="option noSubSelect" id="formatButton1280">Format code</div>
Expand Down Expand Up @@ -155,6 +158,9 @@
<div class="option checked noSubSelect" id="editorButton1024">Editor
<i class="fa fa-check-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="ctrlsToggle1024">CTRL+S to save
<i class="fa fa-square" aria-hidden="true"></i>
</div>
<div class="option noSubSelect" id="fullscreenButton1024">Fullscreen</div>
<div class="option noSubSelect" id="editorFullscreenButton1024">Editor Fullscreen</div>
<div class="option noSubSelect" id="formatButton1024">Format code</div>
Expand Down Expand Up @@ -231,7 +237,10 @@
</div>
<div style="display: none;" class="option checked noSubSelect" id="editorButtonMobile">Editor
<i class="fa fa-check-square" aria-hidden="true"></i>
</div>
</div>
<div style="display: none;" class="option noSubSelect" id="ctrlsToggleMobile">CTRL+S to save
<i class="fa fa-square" aria-hidden="true"></i>
</div>
<div style="display: none;" class="option nosubselect" id="fullscreenButtonMobile"
style="display: none">Fullscreen</div>
<div style="display: none;" class="option nosubselect" id="editorFullscreenButtonMobile"
Expand Down Expand Up @@ -378,12 +387,12 @@ <h1>Examples<img id="examplesButtonClose" src="/css/img/clearButton.svg"></h1>
<!-- Babylon.js -->
<script src="https://cdn.babylonjs.com/babylon.js"></script>
<script src="https://cdn.babylonjs.com/gui/babylon.gui.min.js"></script>
<script src="https://cdn.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>
<script src="https://cdn.babylonjs.com/materialsLibrary/babylonjs.materials.min.js"></script>
<script src="https://cdn.babylonjs.com/proceduralTexturesLibrary/babylonjs.proceduralTextures.min.js"></script>
<script src="https://cdn.babylonjs.com/postProcessesLibrary/babylonjs.postProcess.min.js"></script>
<script src="https://cdn.babylonjs.com/loaders/babylonjs.loaders.js"></script>
<script src="https://cdn.babylonjs.com/serializers/babylonjs.serializers.min.js"></script>
<script src="https://cdn.babylonjs.com/inspector/babylon.inspector.bundle.js"></script>

<!-- Monaco -->
<script src="/node_modules/monaco-editor/dev/vs/loader.js"></script>
Expand Down
Loading

0 comments on commit 2d5674c

Please sign in to comment.