Merge branch 'playcanvas:main' into main

playcanvas · Nov 19, 2024 · 819041d · 819041d
2 parents 215258f + ce5ea35
commit 819041d
Show file tree

Hide file tree

Showing 549 changed files with 9,232 additions and 5,767 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -17,13 +17,13 @@ export default [
                 ...globals.browser,
                 ...globals.mocha,
                 ...globals.node,
-                'Ammo': false,
-                'earcut': false,
-                'opentype': false,
-                'pc': false,
-                'TWEEN': false,
-                'twgsl': false,
-                'webkitAudioContext': false
+                'Ammo': 'readonly',
+                'earcut': 'readonly',
+                'opentype': 'readonly',
+                'pc': 'readonly',
+                'TWEEN': 'readonly',
+                'twgsl': 'readonly',
+                'webkitAudioContext': 'readonly'
             }
         },
         rules: {

diff --git a/examples/assets/cubemaps/morning-env-atlas.png b/examples/assets/cubemaps/morning-env-atlas.png
diff --git a/examples/assets/models/fps-map.glb b/examples/assets/models/fps-map.glb
diff --git a/examples/assets/models/fps-map.txt b/examples/assets/models/fps-map.txt
@@ -1,4 +1,4 @@
 The low poly fps tdm game map model has been obtained from this address:
-https://sketchfab.com/3d-models/lowpoly-fps-tdm-game-map-d41a19f699ea421a9aa32b407cb7537b
+https://sketchfab.com/3d-models/de-dust-2-with-real-light-4ce74cd95c584ce9b12b5ed9dc418db5
 It's distributed under CC license:
 https://creativecommons.org/licenses/by/4.0/