Merge pull request #221 from vircadia/fix/model-shape-types-physics

Fix collisions due to bad mapping of shape types.
vircadia · Jun 15, 2024 · 5111acb · 5111acb
2 parents be3a734 + fc0f4ea
commit 5111acb
Show file tree

Hide file tree

Showing 7 changed files with 566 additions and 566 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
-[submodule "public/assets"]
-	path = public/assets
-	url = https://github.com/vircadia/vircadia-assets.git
+[submodule "public/assets"]
+	path = public/assets
+	url = https://github.com/vircadia/vircadia-assets.git
+[submodule "src/vircadia-world"]
+	path = src/vircadia-world
+	url = https://github.com/vircadia/vircadia-world.git
diff --git a/package-lock.json b/package-lock.json