From 9250aca913ab0bc5860cc7aa0475a4d96fda4e82 Mon Sep 17 00:00:00 2001
From: netpro2k <netpro2k@gmail.com>
Date: Tue, 28 Aug 2018 11:45:45 -0700
Subject: [PATCH] Fix Oculus Go controller reconnection
---
package-lock.json | 34 ++++++++++++++--------------------
package.json | 4 ++--
2 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index c238011f9..f7c3719b3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -512,8 +512,8 @@
}
},
"aframe": {
- "version": "github:aframevr/aframe#1be48d9204f0919d6362ef4c4dfa955e4ef64439",
- "from": "aframe@github:aframevr/aframe#1be48d9204f0919d6362ef4c4dfa955e4ef64439",
+ "version": "github:mozillareality/aframe#b9d11e68fdeaa75ae0c6893103b54bc149a2e38f",
+ "from": "github:mozillareality/aframe#bugfix/oculus-go-controller-reconnect-pre-e0c8ff7",
"requires": {
"@tweenjs/tween.js": "^16.8.0",
"browserify-css": "^0.8.2",
@@ -526,19 +526,14 @@
"present": "0.0.6",
"promise-polyfill": "^3.1.0",
"style-attr": "^1.0.2",
- "three": "0.93.0",
+ "three": "0.94.0",
"three-bmfont-text": "^2.1.0",
"webvr-polyfill": "^0.10.5"
},
"dependencies": {
"debug": {
"version": "github:ngokevin/debug#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a",
- "from": "debug@github:ngokevin/debug#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a"
- },
- "three": {
- "version": "0.93.0",
- "resolved": "https://registry.npmjs.org/three/-/three-0.93.0.tgz",
- "integrity": "sha1-P9bDZ+9FVKu7bhataZNig+iVwSM="
+ "from": "github:ngokevin/debug#noTimestamp"
}
}
},
@@ -563,9 +558,8 @@
"from": "aframe-motion-capture-components@github:mozillareality/aframe-motion-capture-components#1ca616fa67b627e447b23b35a09da175d8387668"
},
"aframe-physics-extras": {
- "version": "0.1.3",
- "resolved": "https://registry.yarnpkg.com/aframe-physics-extras/-/aframe-physics-extras-0.1.3.tgz",
- "integrity": "sha1-gD4hZPuWwKgPLRqBRY8yd/JisTA="
+ "version": "github:mozillareality/aframe-physics-extras#3a00539a9c9f259df3a55c70648b1ec0648b5479",
+ "from": "github:mozillareality/aframe-physics-extras#bugfix/physics-collider-world"
},
"aframe-physics-system": {
"version": "github:mozillareality/aframe-physics-system#ecc5c9c533d6d9c71f8d6453ab961ed074d44b1c",
@@ -3804,7 +3798,7 @@
},
"document-register-element": {
"version": "github:dmarcos/document-register-element#8ccc532b7f3744be954574caf3072a5fd260ca90",
- "from": "document-register-element@github:dmarcos/document-register-element#8ccc532b7f3744be954574caf3072a5fd260ca90"
+ "from": "github:dmarcos/document-register-element#8ccc532b7"
},
"dom-converter": {
"version": "0.1.4",
@@ -7923,15 +7917,15 @@
}
},
"load-bmfont": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.3.0.tgz",
- "integrity": "sha1-u358cQ3mvK/LE8s7jIHgwBMey8k=",
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.3.1.tgz",
+ "integrity": "sha512-lQkEawgez06lM2iw1vQEEOtVLJXyMzFcUqbwWMrB0g6zwhdUs/+e0KNd1zEJ7OFBbMVz0tbzQyjgjtTB47+PBg==",
"requires": {
"buffer-equal": "0.0.1",
"mime": "^1.3.4",
"parse-bmfont-ascii": "^1.0.3",
"parse-bmfont-binary": "^1.0.5",
- "parse-bmfont-xml": "^1.1.0",
+ "parse-bmfont-xml": "^1.1.4",
"xhr": "^2.0.1",
"xtend": "^4.0.0"
},
@@ -9577,9 +9571,9 @@
"integrity": "sha1-0Di0dtPp3Z2x4RoLDlOiJ5K2kAY="
},
"parse-bmfont-xml": {
- "version": "1.1.3",
- "resolved": "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.3.tgz",
- "integrity": "sha1-1rZqNxr9OcUAfZ8O6yYqTyzOe3w=",
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz",
+ "integrity": "sha512-bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ==",
"requires": {
"xml-parse-from-string": "^1.0.0",
"xml2js": "^0.4.5"
diff --git a/package.json b/package.json
index 778ebff68..f98e849c5 100644
--- a/package.json
+++ b/package.json
@@ -25,12 +25,12 @@
"@fortawesome/fontawesome-svg-core": "^1.2.2",
"@fortawesome/free-solid-svg-icons": "^5.2.0",
"@fortawesome/react-fontawesome": "^0.1.0",
- "aframe": "github:aframevr/aframe#1be48d9204f0919d6362ef4c4dfa955e4ef64439",
+ "aframe": "github:mozillareality/aframe#bugfix/oculus-go-controller-reconnect-pre-e0c8ff7",
"aframe-billboard-component": "^1.0.0",
"aframe-extras": "github:MozillaReality/aframe-extras#feature/precompute-nav-mesh",
"aframe-input-mapping-component": "github:mozillareality/aframe-input-mapping-component#hubs/master",
"aframe-motion-capture-components": "github:mozillareality/aframe-motion-capture-components#1ca616fa67b627e447b23b35a09da175d8387668",
- "aframe-physics-extras": "^0.1.3",
+ "aframe-physics-extras": "github:mozillareality/aframe-physics-extras#bugfix/physics-collider-world",
"aframe-physics-system": "github:mozillareality/aframe-physics-system#ecc5c9c533d6d9c71f8d6453ab961ed074d44b1c",
"aframe-rounded": "^1.0.3",
"aframe-slice9-component": "^1.0.0",
--
GitLab