From 1b17deea43a9690a3ea9cb565ee79123d69045e9 Mon Sep 17 00:00:00 2001
From: joni <johnfshaughnessy@gmail.com>
Date: Thu, 21 Jun 2018 17:11:58 -0700
Subject: [PATCH] Point to the right cannon and physics system
---
package.json | 2 +-
yarn.lock | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index d21ad9c0e..d0eb8b918 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
"aframe-input-mapping-component": "https://github.com/mozillareality/aframe-input-mapping-component#hubs/master",
"aframe-motion-capture-components": "https://github.com/mozillareality/aframe-motion-capture-components#1ca616fa67b627e447b23b35a09da175d8387668",
"aframe-physics-extras": "^0.1.3",
- "aframe-physics-system": "https://github.com/mozillareality/aframe-physics-system#hubs/master",
+ "aframe-physics-system": "https://github.com/mozillareality/aframe-physics-system#monitor-scale-on-body",
"aframe-rounded": "^1.0.3",
"aframe-slice9-component": "^1.0.0",
"aframe-teleport-controls": "https://github.com/mozillareality/aframe-teleport-controls#hubs/master",
diff --git a/yarn.lock b/yarn.lock
index 906c4615f..22aa09c6b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -182,13 +182,13 @@ aframe-physics-extras@^0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/aframe-physics-extras/-/aframe-physics-extras-0.1.3.tgz#803e2164fb96c0a80f2d1a81458f3277f262b130"
-"aframe-physics-system@github:donmccurdy/aframe-physics-system":
+"aframe-physics-system@https://github.com/mozillareality/aframe-physics-system#monitor-scale-on-body":
version "3.1.2"
- resolved "https://codeload.github.com/donmccurdy/aframe-physics-system/tar.gz/c142a301e3ce76f88bab817c89daa5b3d4d97815"
+ resolved "https://github.com/mozillareality/aframe-physics-system#4c83e7bdd666b054e31e229576404bbc069595b6"
dependencies:
browserify "^14.3.0"
budo "^10.0.3"
- cannon "github:donmccurdy/cannon.js#v0.6.2-dev1"
+ cannon "https://github.com/mozillareality/cannon.js#resize-cylinder"
three-to-cannon "^1.3.0"
webworkify "^1.4.0"
@@ -1748,9 +1748,9 @@ caniuse-lite@^1.0.30000792:
version "1.0.30000810"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000810.tgz#47585fffce0e9f3593a6feea4673b945424351d9"
-"cannon@github:donmccurdy/cannon.js#v0.6.2-dev1":
+"cannon@https://github.com/mozillareality/cannon.js#resize-cylinder":
version "0.6.2"
- resolved "https://codeload.github.com/donmccurdy/cannon.js/tar.gz/022e8ba53fa83abf0ad8a0e4fd08623123838a17"
+ resolved "https://github.com/mozillareality/cannon.js#b401ccbec3b9996e31d6ad060028065a432fcff7"
caseless@~0.11.0:
version "0.11.0"
--
GitLab