From b50bc495bc2d1dd4496ce246c74212399af361f6 Mon Sep 17 00:00:00 2001 From: Ryan Maradiaga Date: Tue, 9 Aug 2022 13:54:40 -0400 Subject: [PATCH 01/16] Updated the documentation of shrink() and grow() to include the need of setMagnitude() --- src/myr/reference.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/myr/reference.js b/src/myr/reference.js index 2a5847d6..9b2fafea 100644 --- a/src/myr/reference.js +++ b/src/myr/reference.js @@ -625,13 +625,13 @@ const animations = [ { name: "grow", parameters: [{ type: "string", name: "elementID" }], - description: The grow function scales the element by a [magnitude] multiplier in the x, y, z components., + description: The grow function scales the element by a [magnitude] multiplier in the x, y, z components. Use the setMagnitude function before passing the grow function., example: "grow" }, { name: "shrink", parameters: [{ type: "string", name: "elementID" }], - description: The shrink function scales the element down by the inverse of the magnitude in the x, y, z components., + description: The shrink function scales the element down by the inverse of the magnitude in the x, y, z components. Use the setMagnitude function before passing the shrink function and set the magnitude to any value other than 1 to see the animation., example: "shrink" }, { From fa0575dee0858e21ebfe1d087e9baca44aaf2db4 Mon Sep 17 00:00:00 2001 From: jf-kelly Date: Tue, 23 Aug 2022 12:57:59 -0400 Subject: [PATCH 02/16] Added text and link prompting users to submit scenes to be examples --- src/components/structural/header/ProjectView.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/structural/header/ProjectView.js b/src/components/structural/header/ProjectView.js index 0294c522..1e448e94 100644 --- a/src/components/structural/header/ProjectView.js +++ b/src/components/structural/header/ProjectView.js @@ -480,7 +480,8 @@ class Project extends React.Component { } {this.state.value === "b" &&
-
+
+

Want to see YOUR scenes here? Submit them using this form!

{ exampleProjs.sort(this.projectSort).map(proj => { return this.helper(proj, false); From f74a28f943022b5487e8b3ca2ca5d3e5a0e9e7d4 Mon Sep 17 00:00:00 2001 From: jf-kelly Date: Tue, 31 Jan 2023 16:13:47 -0500 Subject: [PATCH 03/16] updated npm packages --- package-lock.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 479f19e0..127a7350 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8277,7 +8277,7 @@ } }, "node_modules/debug": { - "resolved": "https://github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a" + "resolved": "git+ssh://git@github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a" }, "node_modules/decamelize": { "version": "1.2.0", @@ -8771,7 +8771,7 @@ } }, "node_modules/document-register-element": { - "resolved": "https://github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90" + "resolved": "git+ssh://git@github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90" }, "node_modules/dom-converter": { "version": "0.2.0", @@ -25608,7 +25608,7 @@ }, "node_modules/three-bmfont-text": { "version": "2.4.0", - "resolved": "https://github.com/dmarcos/three-bmfont-text.git#21d017046216e318362c48abd1a48bddfb6e0733", + "resolved": "git+ssh://git@github.com/dmarcos/three-bmfont-text.git#21d017046216e318362c48abd1a48bddfb6e0733", "integrity": "sha512-lIMa1n+QKNU1f/LZgtS1oUGpoop3MuVXrUr5ybZOUR3+Jk//zjqScnQpHml6MWyvZzL8A5/1Hd8Tsqd3M1kudA==", "license": "MIT", "dependencies": { @@ -25623,7 +25623,7 @@ }, "node_modules/three-buffer-vertex-data": { "version": "1.1.0", - "resolved": "https://github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", + "resolved": "git+ssh://git@github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", "integrity": "sha512-ZPCCbGfueRzd2/YwH136UnVN+N11Mvxu7uPaEzIdtuk0m5HPs1LGXOM5hOkpxamjvqSC6MDJ3nd11grGi7sMKw==", "license": "MIT", "dependencies": { @@ -34724,7 +34724,7 @@ } }, "debug": { - "version": "https://github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a", + "version": "git+ssh://git@github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a", "from": "debug@github:ngokevin/debug#noTimestamp" }, "decamelize": { @@ -35129,7 +35129,7 @@ } }, "document-register-element": { - "version": "https://github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90", + "version": "git+ssh://git@github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90", "from": "document-register-element@github:dmarcos/document-register-element#8ccc532b7f3744be954574caf3072a5fd260ca90" }, "dom-converter": { @@ -48643,7 +48643,7 @@ "integrity": "sha512-eOEXnZeE1FDV0XgL1u08auIP13jxdN9LQBAEmlErYzMxtIIfuGIAZbijOyookALUhqVzVOx0Tywj6n192VM+nQ==" }, "three-bmfont-text": { - "version": "https://github.com/dmarcos/three-bmfont-text.git#21d017046216e318362c48abd1a48bddfb6e0733", + "version": "git+ssh://git@github.com/dmarcos/three-bmfont-text.git#21d017046216e318362c48abd1a48bddfb6e0733", "integrity": "sha512-lIMa1n+QKNU1f/LZgtS1oUGpoop3MuVXrUr5ybZOUR3+Jk//zjqScnQpHml6MWyvZzL8A5/1Hd8Tsqd3M1kudA==", "from": "three-bmfont-text@github:dmarcos/three-bmfont-text#21d017046216e318362c48abd1a48bddfb6e0733", "requires": { @@ -48657,7 +48657,7 @@ } }, "three-buffer-vertex-data": { - "version": "https://github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", + "version": "git+ssh://git@github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", "integrity": "sha512-ZPCCbGfueRzd2/YwH136UnVN+N11Mvxu7uPaEzIdtuk0m5HPs1LGXOM5hOkpxamjvqSC6MDJ3nd11grGi7sMKw==", "from": "three-buffer-vertex-data@dmarcos/three-buffer-vertex-data#69378fc58daf27d3b1d930df9f233473e4a4818c", "requires": { From d791fe35a0f99133c5eb8f3dd432bbb74b5e71f1 Mon Sep 17 00:00:00 2001 From: jf-kelly Date: Tue, 31 Jan 2023 16:25:09 -0500 Subject: [PATCH 04/16] FIxed reference examples again - for some reason it broke --- src/components/layouts/ReferenceExample.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/layouts/ReferenceExample.js b/src/components/layouts/ReferenceExample.js index 3dc8a478..1419b6e6 100644 --- a/src/components/layouts/ReferenceExample.js +++ b/src/components/layouts/ReferenceExample.js @@ -15,7 +15,7 @@ import "../../css/ReferencePage.css"; * @returns {HTMLElement} Layout for example scene page */ -export const ReferenceExample = ({ editor, user, scene, referenceExample, referenceExampleActions, editorActions, authActions, projectActions, projects, courseActions, courses, match, sceneActions, collectionActions, collections, usersettings, userActions }) => ( +export const ReferenceExample = ({ editor, user, scene, referenceExample, referenceExampleActions, editorActions, authActions, projectActions, projects, courseActions, courses, match, sceneActions, collectionActions, collections, userSettings, userActions }) => (
- +
From 0ffa03b16b509462a8fc2fa540a86f153ed6e2e8 Mon Sep 17 00:00:00 2001 From: StevenH1234 Date: Tue, 7 Feb 2023 16:22:44 -0500 Subject: [PATCH 05/16] moved reset button from sceneconfig menu to the header --- src/components/structural/header/Header.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/components/structural/header/Header.js b/src/components/structural/header/Header.js index 00dee71a..39fe9ec2 100644 --- a/src/components/structural/header/Header.js +++ b/src/components/structural/header/Header.js @@ -14,6 +14,7 @@ import * as layoutTypes from "../../../constants/LayoutTypes.js"; import { Button, + ButtonBase, Icon, MenuItem, Tooltip, @@ -35,6 +36,15 @@ const exitBtnStyle = { right: 0, }; +const resetButtonStyle = { + top: 2, + paddingLeft: 10, + paddingRight: 10, + color: "white", + opacity: 1 + +}; + /** * React component class for the header */ @@ -792,6 +802,16 @@ class Header extends Component { save + + this.props.sceneActions.setCamera(0, 1.6, 3)} + className="header-btn d-none d-md-block" + style= {resetButtonStyle} + disabled={referenceMode}> + settings_backup_restore + + Date: Tue, 14 Feb 2023 17:08:30 -0500 Subject: [PATCH 06/16] Fixed the problem where vertical movement was disabled --- src/components/structural/View.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/structural/View.js b/src/components/structural/View.js index 96a35957..020048e4 100644 --- a/src/components/structural/View.js +++ b/src/components/structural/View.js @@ -307,7 +307,8 @@ class View extends Component { * @returns {HTMLElement} A-Frame camera elements with basic movement */ basicMoveCam = () => { - let realSpeed = (this.props.sceneConfig.settings.moveSpeed / 10) + 10; + let realVertSpeed = (this.props.sceneConfig.settings.moveSpeed / 2) + 10; + let realHorizontalSpeed = (this.props.sceneConfig.settings.moveSpeed /10) + 10; switch(browserType()) { case "mobile": return ( @@ -347,7 +348,8 @@ class View extends Component { + wasd-plus-controls={`acceleration: ${realVertSpeed}`} + wasd-controls={`acceleration: ${realHorizontalSpeed}`}> Date: Wed, 22 Feb 2023 16:47:05 -0500 Subject: [PATCH 07/16] removed previous reset button from scene config --- src/components/structural/header/SceneConfigMenu.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/components/structural/header/SceneConfigMenu.js b/src/components/structural/header/SceneConfigMenu.js index 391a11eb..0817f013 100644 --- a/src/components/structural/header/SceneConfigMenu.js +++ b/src/components/structural/header/SceneConfigMenu.js @@ -637,9 +637,6 @@ class ConfigModal extends Component {
-
- -
{this.state.displaySkyColorPicker ?
From aed94be4a5a7263140f067cad11180cca64363f5 Mon Sep 17 00:00:00 2001 From: John Kelly <90471846+jf-kelly@users.noreply.github.com> Date: Sun, 26 Feb 2023 13:11:57 -0500 Subject: [PATCH 08/16] Revert "Fixed Vertical Movement" --- package-lock.json | 16 ++++++++-------- src/components/layouts/ReferenceExample.js | 4 ++-- src/components/structural/View.js | 6 ++---- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 127a7350..479f19e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8277,7 +8277,7 @@ } }, "node_modules/debug": { - "resolved": "git+ssh://git@github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a" + "resolved": "https://github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a" }, "node_modules/decamelize": { "version": "1.2.0", @@ -8771,7 +8771,7 @@ } }, "node_modules/document-register-element": { - "resolved": "git+ssh://git@github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90" + "resolved": "https://github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90" }, "node_modules/dom-converter": { "version": "0.2.0", @@ -25608,7 +25608,7 @@ }, "node_modules/three-bmfont-text": { "version": "2.4.0", - "resolved": "git+ssh://git@github.com/dmarcos/three-bmfont-text.git#21d017046216e318362c48abd1a48bddfb6e0733", + "resolved": "https://github.com/dmarcos/three-bmfont-text.git#21d017046216e318362c48abd1a48bddfb6e0733", "integrity": "sha512-lIMa1n+QKNU1f/LZgtS1oUGpoop3MuVXrUr5ybZOUR3+Jk//zjqScnQpHml6MWyvZzL8A5/1Hd8Tsqd3M1kudA==", "license": "MIT", "dependencies": { @@ -25623,7 +25623,7 @@ }, "node_modules/three-buffer-vertex-data": { "version": "1.1.0", - "resolved": "git+ssh://git@github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", + "resolved": "https://github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", "integrity": "sha512-ZPCCbGfueRzd2/YwH136UnVN+N11Mvxu7uPaEzIdtuk0m5HPs1LGXOM5hOkpxamjvqSC6MDJ3nd11grGi7sMKw==", "license": "MIT", "dependencies": { @@ -34724,7 +34724,7 @@ } }, "debug": { - "version": "git+ssh://git@github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a", + "version": "https://github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a", "from": "debug@github:ngokevin/debug#noTimestamp" }, "decamelize": { @@ -35129,7 +35129,7 @@ } }, "document-register-element": { - "version": "git+ssh://git@github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90", + "version": "https://github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90", "from": "document-register-element@github:dmarcos/document-register-element#8ccc532b7f3744be954574caf3072a5fd260ca90" }, "dom-converter": { @@ -48643,7 +48643,7 @@ "integrity": "sha512-eOEXnZeE1FDV0XgL1u08auIP13jxdN9LQBAEmlErYzMxtIIfuGIAZbijOyookALUhqVzVOx0Tywj6n192VM+nQ==" }, "three-bmfont-text": { - "version": "git+ssh://git@github.com/dmarcos/three-bmfont-text.git#21d017046216e318362c48abd1a48bddfb6e0733", + "version": "https://github.com/dmarcos/three-bmfont-text.git#21d017046216e318362c48abd1a48bddfb6e0733", "integrity": "sha512-lIMa1n+QKNU1f/LZgtS1oUGpoop3MuVXrUr5ybZOUR3+Jk//zjqScnQpHml6MWyvZzL8A5/1Hd8Tsqd3M1kudA==", "from": "three-bmfont-text@github:dmarcos/three-bmfont-text#21d017046216e318362c48abd1a48bddfb6e0733", "requires": { @@ -48657,7 +48657,7 @@ } }, "three-buffer-vertex-data": { - "version": "git+ssh://git@github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", + "version": "https://github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", "integrity": "sha512-ZPCCbGfueRzd2/YwH136UnVN+N11Mvxu7uPaEzIdtuk0m5HPs1LGXOM5hOkpxamjvqSC6MDJ3nd11grGi7sMKw==", "from": "three-buffer-vertex-data@dmarcos/three-buffer-vertex-data#69378fc58daf27d3b1d930df9f233473e4a4818c", "requires": { diff --git a/src/components/layouts/ReferenceExample.js b/src/components/layouts/ReferenceExample.js index 1419b6e6..3dc8a478 100644 --- a/src/components/layouts/ReferenceExample.js +++ b/src/components/layouts/ReferenceExample.js @@ -15,7 +15,7 @@ import "../../css/ReferencePage.css"; * @returns {HTMLElement} Layout for example scene page */ -export const ReferenceExample = ({ editor, user, scene, referenceExample, referenceExampleActions, editorActions, authActions, projectActions, projects, courseActions, courses, match, sceneActions, collectionActions, collections, userSettings, userActions }) => ( +export const ReferenceExample = ({ editor, user, scene, referenceExample, referenceExampleActions, editorActions, authActions, projectActions, projects, courseActions, courses, match, sceneActions, collectionActions, collections, usersettings, userActions }) => (
- +
diff --git a/src/components/structural/View.js b/src/components/structural/View.js index 020048e4..96a35957 100644 --- a/src/components/structural/View.js +++ b/src/components/structural/View.js @@ -307,8 +307,7 @@ class View extends Component { * @returns {HTMLElement} A-Frame camera elements with basic movement */ basicMoveCam = () => { - let realVertSpeed = (this.props.sceneConfig.settings.moveSpeed / 2) + 10; - let realHorizontalSpeed = (this.props.sceneConfig.settings.moveSpeed /10) + 10; + let realSpeed = (this.props.sceneConfig.settings.moveSpeed / 10) + 10; switch(browserType()) { case "mobile": return ( @@ -348,8 +347,7 @@ class View extends Component { + wasd-controls={`acceleration: ${realSpeed}`}> Date: Mon, 13 Mar 2023 20:13:33 -0400 Subject: [PATCH 09/16] Third times the charm - same vert movement fix --- src/components/structural/View.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/structural/View.js b/src/components/structural/View.js index 96a35957..b58b24dc 100644 --- a/src/components/structural/View.js +++ b/src/components/structural/View.js @@ -307,7 +307,8 @@ class View extends Component { * @returns {HTMLElement} A-Frame camera elements with basic movement */ basicMoveCam = () => { - let realSpeed = (this.props.sceneConfig.settings.moveSpeed / 10) + 10; + let realVertSpeed = (this.props.sceneConfig.settings.moveSpeed / 2) + 10; + let realHorizontalSpeed = (this.props.sceneConfig.settings.moveSpeed / 10) + 10; switch(browserType()) { case "mobile": return ( @@ -347,7 +348,8 @@ class View extends Component { + wasd-plus-controls={`acceleration: ${realVertSpeed}`} + wasd-controls={`acceleration: ${realHorizontalSpeed}`}> Date: Mon, 27 Mar 2023 23:37:03 -0400 Subject: [PATCH 10/16] Update ReferenceExample.js --- src/components/layouts/ReferenceExample.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/layouts/ReferenceExample.js b/src/components/layouts/ReferenceExample.js index 3dc8a478..233a8f15 100644 --- a/src/components/layouts/ReferenceExample.js +++ b/src/components/layouts/ReferenceExample.js @@ -15,7 +15,7 @@ import "../../css/ReferencePage.css"; * @returns {HTMLElement} Layout for example scene page */ -export const ReferenceExample = ({ editor, user, scene, referenceExample, referenceExampleActions, editorActions, authActions, projectActions, projects, courseActions, courses, match, sceneActions, collectionActions, collections, usersettings, userActions }) => ( +export const ReferenceExample = ({ editor, user, scene, referenceExample, referenceExampleActions, editorActions, authActions, projectActions, projects, courseActions, courses, match, sceneActions, collectionActions, collections, userSettings, userActions }) => (
- +
@@ -62,4 +62,4 @@ export const ReferenceExample = ({ editor, user, scene, referenceExample, refere
); -export default ReferenceExample; \ No newline at end of file +export default ReferenceExample; From eadf44e64d16979892cbcb6f30d86ec98636332c Mon Sep 17 00:00:00 2001 From: jf-kelly Date: Sun, 2 Apr 2023 16:03:31 -0400 Subject: [PATCH 11/16] Fixed the function call for displayCursor --- src/components/structural/View.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/structural/View.js b/src/components/structural/View.js index b58b24dc..20356a28 100644 --- a/src/components/structural/View.js +++ b/src/components/structural/View.js @@ -322,7 +322,7 @@ class View extends Component { raycaster="objects:.raycastable" position="0 0 -1" geometry="primitive: ring; radiusInner: 0.02; radiusOuter: 0.03;" - material={this.displayCursor} /> + material={this.displayCursor()} /> ); @@ -337,7 +337,7 @@ class View extends Component { raycaster="objects:.raycastable" position="0 0 -1" geometry="primitive: ring; radiusInner: 0.02; radiusOuter: 0.03;" - material={this.displayCursor} /> + material={this.displayCursor()} /> ); From f3cd32067e699c864968738e714bafd8f8c63f29 Mon Sep 17 00:00:00 2001 From: Bryan Mointalvan Date: Thu, 6 Apr 2023 10:27:57 -0400 Subject: [PATCH 12/16] Downgraded A-Frame version to fix VR bug This commit downgrades aframe from 1.3 to 1.2, in turn fixing the VR not working on mobile --- package-lock.json | 150 ++++++++++++++++++++++++++-------------------- package.json | 2 +- 2 files changed, 85 insertions(+), 67 deletions(-) diff --git a/package-lock.json b/package-lock.json index 479f19e0..105c678b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@engaging-computing/aframe-physics-system": "^4.0.0", "@material-ui/core": "^4.12.3", - "aframe": "^1.3.0", + "aframe": "1.2", "aframe-animation-component": "^5.0.0", "aframe-environment-component": "^1.3.1", "aframe-extras": "^4.1.2", @@ -4619,9 +4619,9 @@ } }, "node_modules/aframe": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/aframe/-/aframe-1.3.0.tgz", - "integrity": "sha512-f6OQaDf49SzdSxVskJPvPWldOwHpYMsGttmQHhU6FRiASsnyULKG1nqZom9pDuS3fFYEzQVqRMakQ2AhXeLkFg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aframe/-/aframe-1.2.0.tgz", + "integrity": "sha512-e4lGvxLQ5CAptlbCqmnR4+qUf9s3f5SSnkMQaBsIFlJ2QMZhzEBr/SSV3+NEvMhsQf88EOvSpN1Vez942mBLcQ==", "dependencies": { "custom-event-polyfill": "^1.0.6", "debug": "github:ngokevin/debug#noTimestamp", @@ -4632,13 +4632,13 @@ "present": "0.0.6", "promise-polyfill": "^3.1.0", "super-animejs": "^3.1.0", - "super-three": "^0.137.0", - "three-bmfont-text": "github:dmarcos/three-bmfont-text#21d017046216e318362c48abd1a48bddfb6e0733", + "super-three": "^0.125.1", + "three-bmfont-text": "github:dmarcos/three-bmfont-text#1babdf8507c731a18f8af3b807292e2b9740955e", "webvr-polyfill": "^0.10.12" }, "engines": { "node": ">= 4.6.0", - "npm": ">= 2.15.9" + "npm": "^2.15.9" } }, "node_modules/aframe-animation-component": { @@ -4777,7 +4777,7 @@ "node_modules/an-array": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/an-array/-/an-array-1.0.0.tgz", - "integrity": "sha1-wSWlu4JXd4419LT2qpx9D6nkJmU=" + "integrity": "sha512-M175GYI7RmsYu24Ok383yZQa3eveDfNnmhTe3OQ3bm70bEovz2gWenH+ST/n32M8lrwLWk74hcPds5CDRPe2wg==" }, "node_modules/animejs": { "version": "2.2.0", @@ -4959,7 +4959,7 @@ "node_modules/array-shuffle": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/array-shuffle/-/array-shuffle-1.0.1.tgz", - "integrity": "sha1-fqSIKjVrS8pfVF4LblLq9tlxVXo=", + "integrity": "sha512-PBqgo1Y2XWSksBzq3GFPEb798ZrW2snAcmr4drbVeF/6MT/5aBlkGJEvu5A/CzXHf4EjbHOj/ZowatjlIiVidA==", "engines": { "node": ">=0.10.0" } @@ -5052,7 +5052,7 @@ "node_modules/as-number": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/as-number/-/as-number-1.0.0.tgz", - "integrity": "sha1-rLJ+NPj52KsNqeN287iVmGD4CmY=" + "integrity": "sha512-HkI/zLo2AbSRO4fqVkmyf3hms0bJDs3iboHqTrNuwTiCRvdYXM7HFhfhB6Dk51anV2LM/IMB83mtK9mHw4FlAg==" }, "node_modules/asap": { "version": "2.0.6", @@ -6554,7 +6554,7 @@ "node_modules/buffer-to-arraybuffer": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz", - "integrity": "sha1-YGSkD6dutDxyOrqe+PbhIW0QURo=" + "integrity": "sha512-3dthu5CYiVB1DEJp61FtApNnNndTckcqe4pFcLdvHtrpG+kcyekCJKg4MRiDcFW7A6AODnXB9U4dwQiCW5kzJQ==" }, "node_modules/buffer-xor": { "version": "1.0.3", @@ -8277,7 +8277,7 @@ } }, "node_modules/debug": { - "resolved": "https://github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a" + "resolved": "git+ssh://git@github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a" }, "node_modules/decamelize": { "version": "1.2.0", @@ -8304,7 +8304,7 @@ "node_modules/decompress-response": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==", "dependencies": { "mimic-response": "^1.0.0" }, @@ -8771,7 +8771,10 @@ } }, "node_modules/document-register-element": { - "resolved": "https://github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90" + "version": "0.5.4", + "resolved": "git+ssh://git@github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90", + "integrity": "sha512-dwvGei9I/m1pYQ/9aNODyVmvSWBtlncfIROn5Sbi4MVnIcZKre5QaWx+AGLI/j6VH9sp8jwLyeuWP1micANT0g==", + "license": "MIT" }, "node_modules/dom-converter": { "version": "0.2.0", @@ -8918,7 +8921,7 @@ "node_modules/dtype": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/dtype/-/dtype-2.0.0.tgz", - "integrity": "sha1-zQUjI84GFETs0uj1dI9popvihDQ=", + "integrity": "sha512-s2YVcLKdFGS0hpFqJaTwscsyt0E8nNFdmo73Ocd81xNPj4URI4rj6D60A+vFMIw7BXWlb4yRkEwfBqcZzPGiZg==", "engines": { "node": ">= 0.8.0" } @@ -13283,9 +13286,23 @@ } }, "node_modules/ieee754": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] }, "node_modules/iferr": { "version": "0.1.5", @@ -17139,7 +17156,7 @@ "node_modules/layout-bmfont-text": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/layout-bmfont-text/-/layout-bmfont-text-1.3.4.tgz", - "integrity": "sha1-8g8sVGR3T0jabOipl/vObUaUW4E=", + "integrity": "sha512-mceomHZ8W7pSKQhTdLvOe1Im4n37u8xa5Gr0J3KPCHRMO/9o7+goWIOzZcUUd+Xgzy3+22bvoIQ0OaN3LRtgaw==", "dependencies": { "as-number": "^1.0.0", "word-wrapper": "^1.0.7", @@ -17541,7 +17558,7 @@ "node_modules/map-limit": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/map-limit/-/map-limit-0.0.1.tgz", - "integrity": "sha1-63lhAxwPDo0AG/LVb6toXViCLzg=", + "integrity": "sha512-pJpcfLPnIF/Sk3taPW21G/RQsEEirGaFpCW3oXRwH9dnFHPHNGjNyvh++rdmC2fNqEaTw2MhYJraoJWAHx8kEg==", "dependencies": { "once": "~1.3.0" } @@ -17549,7 +17566,7 @@ "node_modules/map-limit/node_modules/once": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", + "integrity": "sha512-6vaNInhu+CHxtONf3zw3vq4SP2DOQhjBvIa3rNcG0+P7eKWlYH6Peu7rHizSloRU2EwMz6GraLieis9Ac9+p1w==", "dependencies": { "wrappy": "1" } @@ -18127,7 +18144,7 @@ "node_modules/new-array": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/new-array/-/new-array-1.0.0.tgz", - "integrity": "sha1-XbxjnZYerH8an7wacUbsEvKST78=" + "integrity": "sha512-K5AyFYbuHZ4e/ti52y7k18q8UHsS78FlRd85w2Fmsd6AkuLipDihPflKC0p3PN5i8II7+uHxo+CtkLiJDfmS5A==" }, "node_modules/next-tick": { "version": "1.0.0", @@ -18138,7 +18155,7 @@ "node_modules/nice-color-palettes": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/nice-color-palettes/-/nice-color-palettes-1.0.1.tgz", - "integrity": "sha1-h16gHchu+uf1leBmqLJmDnIGBT4=", + "integrity": "sha512-aHEFYKuGiaga8LqMi0Ttarqzn4tKS7BaIE2MeD9SDjv6yVc7DMIu/Eax4RvUgwR7vS0hXAUEIUx9P0/54O1W0g==", "dependencies": { "map-limit": "0.0.1", "minimist": "^1.2.0", @@ -21039,7 +21056,7 @@ "node_modules/quad-indices": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/quad-indices/-/quad-indices-2.0.1.tgz", - "integrity": "sha1-ppQdiaE9Y+7WwdSlpiGgRjYXqBQ=", + "integrity": "sha512-6jtmCsEbGAh5npThXrBaubbTjPcF0rMbn57XCJVI7LkW8PUT56V+uIrRCCWCn85PSgJC9v8Pm5tnJDwmOBewvA==", "dependencies": { "an-array": "^1.0.0", "dtype": "^2.0.0", @@ -25010,9 +25027,9 @@ "integrity": "sha512-6MFAFJDRuvwkovxQZPruuyHinTa4rgj4hNLOndjcYYhZLckoXtVRY9rJPuq8p6c/tgZJrFYEAYAfJ2/hhNtUCA==" }, "node_modules/super-three": { - "version": "0.137.0", - "resolved": "https://registry.npmjs.org/super-three/-/super-three-0.137.0.tgz", - "integrity": "sha512-8jM8DiYiXQoalUoeFRxKWbW6KFQo3GFwgw+3vE2y6SJU/einw+JvuvgK+WhbIYRfz4LQV68nyOQ2eEZqAuouGw==" + "version": "0.125.1", + "resolved": "https://registry.npmjs.org/super-three/-/super-three-0.125.1.tgz", + "integrity": "sha512-poTMpd0fa5tWVJDtWKSFWuqbb+h2Z0m1Eop66hRsfaeOE2p9xnl78MDJmj0S/jYI0Ly4iMQOWIkS0LyKCZe0SA==" }, "node_modules/supports-color": { "version": "5.5.0", @@ -25607,9 +25624,9 @@ "integrity": "sha512-eOEXnZeE1FDV0XgL1u08auIP13jxdN9LQBAEmlErYzMxtIIfuGIAZbijOyookALUhqVzVOx0Tywj6n192VM+nQ==" }, "node_modules/three-bmfont-text": { - "version": "2.4.0", - "resolved": "https://github.com/dmarcos/three-bmfont-text.git#21d017046216e318362c48abd1a48bddfb6e0733", - "integrity": "sha512-lIMa1n+QKNU1f/LZgtS1oUGpoop3MuVXrUr5ybZOUR3+Jk//zjqScnQpHml6MWyvZzL8A5/1Hd8Tsqd3M1kudA==", + "version": "2.3.0", + "resolved": "git+ssh://git@github.com/dmarcos/three-bmfont-text.git#1babdf8507c731a18f8af3b807292e2b9740955e", + "integrity": "sha512-1ACVhQynOX5fUHx9WY0leDApaQ8fa12wdU+z1iVRCiMDq5bZGw67kqUgEBrbK1BQ5awTZL3+VG3LX5xg+ty89Q==", "license": "MIT", "dependencies": { "array-shuffle": "^1.0.1", @@ -25623,7 +25640,7 @@ }, "node_modules/three-buffer-vertex-data": { "version": "1.1.0", - "resolved": "https://github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", + "resolved": "git+ssh://git@github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", "integrity": "sha512-ZPCCbGfueRzd2/YwH136UnVN+N11Mvxu7uPaEzIdtuk0m5HPs1LGXOM5hOkpxamjvqSC6MDJ3nd11grGi7sMKw==", "license": "MIT", "dependencies": { @@ -25675,7 +25692,7 @@ "node_modules/timed-out": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", - "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", + "integrity": "sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==", "engines": { "node": ">=0.10.0" } @@ -26363,7 +26380,7 @@ "node_modules/url-set-query": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/url-set-query/-/url-set-query-1.0.0.tgz", - "integrity": "sha1-AW6M/Xwg7gXK/neV6JK9BwL6ozk=" + "integrity": "sha512-3AChu4NiXquPfeckE5R5cGdiHCMWJx1dwCWOmWIL4KHAziJNOFIYJlpGFeKDvwLPHovZRCxK3cYlwzqI9Vp+Gg==" }, "node_modules/url/node_modules/punycode": { "version": "1.3.2", @@ -27912,7 +27929,7 @@ "node_modules/word-wrapper": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/word-wrapper/-/word-wrapper-1.0.7.tgz", - "integrity": "sha1-HxSv6/Zt/fD+9V79NxhO+9CMKLY=" + "integrity": "sha512-VOPBFCm9b6FyYKQYfn9AVn2dQvdR/YOVFV6IBRA1TBMJWKffvhEX1af6FMGrttILs2Q9ikCRhLqkbY2weW6dOQ==" }, "node_modules/workbox-background-sync": { "version": "5.1.4", @@ -31727,9 +31744,9 @@ } }, "aframe": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/aframe/-/aframe-1.3.0.tgz", - "integrity": "sha512-f6OQaDf49SzdSxVskJPvPWldOwHpYMsGttmQHhU6FRiASsnyULKG1nqZom9pDuS3fFYEzQVqRMakQ2AhXeLkFg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aframe/-/aframe-1.2.0.tgz", + "integrity": "sha512-e4lGvxLQ5CAptlbCqmnR4+qUf9s3f5SSnkMQaBsIFlJ2QMZhzEBr/SSV3+NEvMhsQf88EOvSpN1Vez942mBLcQ==", "requires": { "custom-event-polyfill": "^1.0.6", "debug": "github:ngokevin/debug#noTimestamp", @@ -31740,8 +31757,8 @@ "present": "0.0.6", "promise-polyfill": "^3.1.0", "super-animejs": "^3.1.0", - "super-three": "^0.137.0", - "three-bmfont-text": "github:dmarcos/three-bmfont-text#21d017046216e318362c48abd1a48bddfb6e0733", + "super-three": "^0.125.1", + "three-bmfont-text": "github:dmarcos/three-bmfont-text#1babdf8507c731a18f8af3b807292e2b9740955e", "webvr-polyfill": "^0.10.12" } }, @@ -31857,7 +31874,7 @@ "an-array": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/an-array/-/an-array-1.0.0.tgz", - "integrity": "sha1-wSWlu4JXd4419LT2qpx9D6nkJmU=" + "integrity": "sha512-M175GYI7RmsYu24Ok383yZQa3eveDfNnmhTe3OQ3bm70bEovz2gWenH+ST/n32M8lrwLWk74hcPds5CDRPe2wg==" }, "animejs": { "version": "2.2.0", @@ -31993,7 +32010,7 @@ "array-shuffle": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/array-shuffle/-/array-shuffle-1.0.1.tgz", - "integrity": "sha1-fqSIKjVrS8pfVF4LblLq9tlxVXo=" + "integrity": "sha512-PBqgo1Y2XWSksBzq3GFPEb798ZrW2snAcmr4drbVeF/6MT/5aBlkGJEvu5A/CzXHf4EjbHOj/ZowatjlIiVidA==" }, "array-union": { "version": "2.1.0", @@ -32056,7 +32073,7 @@ "as-number": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/as-number/-/as-number-1.0.0.tgz", - "integrity": "sha1-rLJ+NPj52KsNqeN287iVmGD4CmY=" + "integrity": "sha512-HkI/zLo2AbSRO4fqVkmyf3hms0bJDs3iboHqTrNuwTiCRvdYXM7HFhfhB6Dk51anV2LM/IMB83mtK9mHw4FlAg==" }, "asap": { "version": "2.0.6", @@ -33320,7 +33337,7 @@ "buffer-to-arraybuffer": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz", - "integrity": "sha1-YGSkD6dutDxyOrqe+PbhIW0QURo=" + "integrity": "sha512-3dthu5CYiVB1DEJp61FtApNnNndTckcqe4pFcLdvHtrpG+kcyekCJKg4MRiDcFW7A6AODnXB9U4dwQiCW5kzJQ==" }, "buffer-xor": { "version": "1.0.3", @@ -34724,7 +34741,7 @@ } }, "debug": { - "version": "https://github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a", + "version": "git+ssh://git@github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a", "from": "debug@github:ngokevin/debug#noTimestamp" }, "decamelize": { @@ -34746,7 +34763,7 @@ "decompress-response": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", + "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==", "requires": { "mimic-response": "^1.0.0" } @@ -35129,7 +35146,8 @@ } }, "document-register-element": { - "version": "https://github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90", + "version": "git+ssh://git@github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90", + "integrity": "sha512-dwvGei9I/m1pYQ/9aNODyVmvSWBtlncfIROn5Sbi4MVnIcZKre5QaWx+AGLI/j6VH9sp8jwLyeuWP1micANT0g==", "from": "document-register-element@github:dmarcos/document-register-element#8ccc532b7f3744be954574caf3072a5fd260ca90" }, "dom-converter": { @@ -35266,7 +35284,7 @@ "dtype": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/dtype/-/dtype-2.0.0.tgz", - "integrity": "sha1-zQUjI84GFETs0uj1dI9popvihDQ=" + "integrity": "sha512-s2YVcLKdFGS0hpFqJaTwscsyt0E8nNFdmo73Ocd81xNPj4URI4rj6D60A+vFMIw7BXWlb4yRkEwfBqcZzPGiZg==" }, "duplexer": { "version": "0.1.2", @@ -38768,9 +38786,9 @@ } }, "ieee754": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" }, "iferr": { "version": "0.1.5", @@ -41702,7 +41720,7 @@ "layout-bmfont-text": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/layout-bmfont-text/-/layout-bmfont-text-1.3.4.tgz", - "integrity": "sha1-8g8sVGR3T0jabOipl/vObUaUW4E=", + "integrity": "sha512-mceomHZ8W7pSKQhTdLvOe1Im4n37u8xa5Gr0J3KPCHRMO/9o7+goWIOzZcUUd+Xgzy3+22bvoIQ0OaN3LRtgaw==", "requires": { "as-number": "^1.0.0", "word-wrapper": "^1.0.7", @@ -42060,7 +42078,7 @@ "map-limit": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/map-limit/-/map-limit-0.0.1.tgz", - "integrity": "sha1-63lhAxwPDo0AG/LVb6toXViCLzg=", + "integrity": "sha512-pJpcfLPnIF/Sk3taPW21G/RQsEEirGaFpCW3oXRwH9dnFHPHNGjNyvh++rdmC2fNqEaTw2MhYJraoJWAHx8kEg==", "requires": { "once": "~1.3.0" }, @@ -42068,7 +42086,7 @@ "once": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", + "integrity": "sha512-6vaNInhu+CHxtONf3zw3vq4SP2DOQhjBvIa3rNcG0+P7eKWlYH6Peu7rHizSloRU2EwMz6GraLieis9Ac9+p1w==", "requires": { "wrappy": "1" } @@ -42553,7 +42571,7 @@ "new-array": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/new-array/-/new-array-1.0.0.tgz", - "integrity": "sha1-XbxjnZYerH8an7wacUbsEvKST78=" + "integrity": "sha512-K5AyFYbuHZ4e/ti52y7k18q8UHsS78FlRd85w2Fmsd6AkuLipDihPflKC0p3PN5i8II7+uHxo+CtkLiJDfmS5A==" }, "next-tick": { "version": "1.0.0", @@ -42564,7 +42582,7 @@ "nice-color-palettes": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/nice-color-palettes/-/nice-color-palettes-1.0.1.tgz", - "integrity": "sha1-h16gHchu+uf1leBmqLJmDnIGBT4=", + "integrity": "sha512-aHEFYKuGiaga8LqMi0Ttarqzn4tKS7BaIE2MeD9SDjv6yVc7DMIu/Eax4RvUgwR7vS0hXAUEIUx9P0/54O1W0g==", "requires": { "map-limit": "0.0.1", "minimist": "^1.2.0", @@ -44976,7 +44994,7 @@ "quad-indices": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/quad-indices/-/quad-indices-2.0.1.tgz", - "integrity": "sha1-ppQdiaE9Y+7WwdSlpiGgRjYXqBQ=", + "integrity": "sha512-6jtmCsEbGAh5npThXrBaubbTjPcF0rMbn57XCJVI7LkW8PUT56V+uIrRCCWCn85PSgJC9v8Pm5tnJDwmOBewvA==", "requires": { "an-array": "^1.0.0", "dtype": "^2.0.0", @@ -48167,9 +48185,9 @@ "integrity": "sha512-6MFAFJDRuvwkovxQZPruuyHinTa4rgj4hNLOndjcYYhZLckoXtVRY9rJPuq8p6c/tgZJrFYEAYAfJ2/hhNtUCA==" }, "super-three": { - "version": "0.137.0", - "resolved": "https://registry.npmjs.org/super-three/-/super-three-0.137.0.tgz", - "integrity": "sha512-8jM8DiYiXQoalUoeFRxKWbW6KFQo3GFwgw+3vE2y6SJU/einw+JvuvgK+WhbIYRfz4LQV68nyOQ2eEZqAuouGw==" + "version": "0.125.1", + "resolved": "https://registry.npmjs.org/super-three/-/super-three-0.125.1.tgz", + "integrity": "sha512-poTMpd0fa5tWVJDtWKSFWuqbb+h2Z0m1Eop66hRsfaeOE2p9xnl78MDJmj0S/jYI0Ly4iMQOWIkS0LyKCZe0SA==" }, "supports-color": { "version": "5.5.0", @@ -48643,9 +48661,9 @@ "integrity": "sha512-eOEXnZeE1FDV0XgL1u08auIP13jxdN9LQBAEmlErYzMxtIIfuGIAZbijOyookALUhqVzVOx0Tywj6n192VM+nQ==" }, "three-bmfont-text": { - "version": "https://github.com/dmarcos/three-bmfont-text.git#21d017046216e318362c48abd1a48bddfb6e0733", - "integrity": "sha512-lIMa1n+QKNU1f/LZgtS1oUGpoop3MuVXrUr5ybZOUR3+Jk//zjqScnQpHml6MWyvZzL8A5/1Hd8Tsqd3M1kudA==", - "from": "three-bmfont-text@github:dmarcos/three-bmfont-text#21d017046216e318362c48abd1a48bddfb6e0733", + "version": "git+ssh://git@github.com/dmarcos/three-bmfont-text.git#1babdf8507c731a18f8af3b807292e2b9740955e", + "integrity": "sha512-1ACVhQynOX5fUHx9WY0leDApaQ8fa12wdU+z1iVRCiMDq5bZGw67kqUgEBrbK1BQ5awTZL3+VG3LX5xg+ty89Q==", + "from": "three-bmfont-text@github:dmarcos/three-bmfont-text#1babdf8507c731a18f8af3b807292e2b9740955e", "requires": { "array-shuffle": "^1.0.1", "inherits": "^2.0.1", @@ -48657,7 +48675,7 @@ } }, "three-buffer-vertex-data": { - "version": "https://github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", + "version": "git+ssh://git@github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", "integrity": "sha512-ZPCCbGfueRzd2/YwH136UnVN+N11Mvxu7uPaEzIdtuk0m5HPs1LGXOM5hOkpxamjvqSC6MDJ3nd11grGi7sMKw==", "from": "three-buffer-vertex-data@dmarcos/three-buffer-vertex-data#69378fc58daf27d3b1d930df9f233473e4a4818c", "requires": { @@ -48711,7 +48729,7 @@ "timed-out": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", - "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=" + "integrity": "sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==" }, "timers-browserify": { "version": "2.0.12", @@ -49251,7 +49269,7 @@ "url-set-query": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/url-set-query/-/url-set-query-1.0.0.tgz", - "integrity": "sha1-AW6M/Xwg7gXK/neV6JK9BwL6ozk=" + "integrity": "sha512-3AChu4NiXquPfeckE5R5cGdiHCMWJx1dwCWOmWIL4KHAziJNOFIYJlpGFeKDvwLPHovZRCxK3cYlwzqI9Vp+Gg==" }, "use": { "version": "3.1.1", @@ -50526,7 +50544,7 @@ "word-wrapper": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/word-wrapper/-/word-wrapper-1.0.7.tgz", - "integrity": "sha1-HxSv6/Zt/fD+9V79NxhO+9CMKLY=" + "integrity": "sha512-VOPBFCm9b6FyYKQYfn9AVn2dQvdR/YOVFV6IBRA1TBMJWKffvhEX1af6FMGrttILs2Q9ikCRhLqkbY2weW6dOQ==" }, "workbox-background-sync": { "version": "5.1.4", diff --git a/package.json b/package.json index 1a5f6d49..152daf8b 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "dependencies": { "@engaging-computing/aframe-physics-system": "^4.0.0", "@material-ui/core": "^4.12.3", - "aframe": "^1.3.0", + "aframe": "1.2", "aframe-animation-component": "^5.0.0", "aframe-environment-component": "^1.3.1", "aframe-extras": "^4.1.2", From 7a90d8ede335f86e95fdc60ea926995e928acbb6 Mon Sep 17 00:00:00 2001 From: John Kelly <90471846+jf-kelly@users.noreply.github.com> Date: Mon, 8 May 2023 16:53:25 -0400 Subject: [PATCH 13/16] Revert "Downgraded A-Frame version to fix VR bug" --- package-lock.json | 150 ++++++++++++++++++++-------------------------- package.json | 2 +- 2 files changed, 67 insertions(+), 85 deletions(-) diff --git a/package-lock.json b/package-lock.json index 105c678b..479f19e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@engaging-computing/aframe-physics-system": "^4.0.0", "@material-ui/core": "^4.12.3", - "aframe": "1.2", + "aframe": "^1.3.0", "aframe-animation-component": "^5.0.0", "aframe-environment-component": "^1.3.1", "aframe-extras": "^4.1.2", @@ -4619,9 +4619,9 @@ } }, "node_modules/aframe": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aframe/-/aframe-1.2.0.tgz", - "integrity": "sha512-e4lGvxLQ5CAptlbCqmnR4+qUf9s3f5SSnkMQaBsIFlJ2QMZhzEBr/SSV3+NEvMhsQf88EOvSpN1Vez942mBLcQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/aframe/-/aframe-1.3.0.tgz", + "integrity": "sha512-f6OQaDf49SzdSxVskJPvPWldOwHpYMsGttmQHhU6FRiASsnyULKG1nqZom9pDuS3fFYEzQVqRMakQ2AhXeLkFg==", "dependencies": { "custom-event-polyfill": "^1.0.6", "debug": "github:ngokevin/debug#noTimestamp", @@ -4632,13 +4632,13 @@ "present": "0.0.6", "promise-polyfill": "^3.1.0", "super-animejs": "^3.1.0", - "super-three": "^0.125.1", - "three-bmfont-text": "github:dmarcos/three-bmfont-text#1babdf8507c731a18f8af3b807292e2b9740955e", + "super-three": "^0.137.0", + "three-bmfont-text": "github:dmarcos/three-bmfont-text#21d017046216e318362c48abd1a48bddfb6e0733", "webvr-polyfill": "^0.10.12" }, "engines": { "node": ">= 4.6.0", - "npm": "^2.15.9" + "npm": ">= 2.15.9" } }, "node_modules/aframe-animation-component": { @@ -4777,7 +4777,7 @@ "node_modules/an-array": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/an-array/-/an-array-1.0.0.tgz", - "integrity": "sha512-M175GYI7RmsYu24Ok383yZQa3eveDfNnmhTe3OQ3bm70bEovz2gWenH+ST/n32M8lrwLWk74hcPds5CDRPe2wg==" + "integrity": "sha1-wSWlu4JXd4419LT2qpx9D6nkJmU=" }, "node_modules/animejs": { "version": "2.2.0", @@ -4959,7 +4959,7 @@ "node_modules/array-shuffle": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/array-shuffle/-/array-shuffle-1.0.1.tgz", - "integrity": "sha512-PBqgo1Y2XWSksBzq3GFPEb798ZrW2snAcmr4drbVeF/6MT/5aBlkGJEvu5A/CzXHf4EjbHOj/ZowatjlIiVidA==", + "integrity": "sha1-fqSIKjVrS8pfVF4LblLq9tlxVXo=", "engines": { "node": ">=0.10.0" } @@ -5052,7 +5052,7 @@ "node_modules/as-number": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/as-number/-/as-number-1.0.0.tgz", - "integrity": "sha512-HkI/zLo2AbSRO4fqVkmyf3hms0bJDs3iboHqTrNuwTiCRvdYXM7HFhfhB6Dk51anV2LM/IMB83mtK9mHw4FlAg==" + "integrity": "sha1-rLJ+NPj52KsNqeN287iVmGD4CmY=" }, "node_modules/asap": { "version": "2.0.6", @@ -6554,7 +6554,7 @@ "node_modules/buffer-to-arraybuffer": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz", - "integrity": "sha512-3dthu5CYiVB1DEJp61FtApNnNndTckcqe4pFcLdvHtrpG+kcyekCJKg4MRiDcFW7A6AODnXB9U4dwQiCW5kzJQ==" + "integrity": "sha1-YGSkD6dutDxyOrqe+PbhIW0QURo=" }, "node_modules/buffer-xor": { "version": "1.0.3", @@ -8277,7 +8277,7 @@ } }, "node_modules/debug": { - "resolved": "git+ssh://git@github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a" + "resolved": "https://github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a" }, "node_modules/decamelize": { "version": "1.2.0", @@ -8304,7 +8304,7 @@ "node_modules/decompress-response": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "dependencies": { "mimic-response": "^1.0.0" }, @@ -8771,10 +8771,7 @@ } }, "node_modules/document-register-element": { - "version": "0.5.4", - "resolved": "git+ssh://git@github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90", - "integrity": "sha512-dwvGei9I/m1pYQ/9aNODyVmvSWBtlncfIROn5Sbi4MVnIcZKre5QaWx+AGLI/j6VH9sp8jwLyeuWP1micANT0g==", - "license": "MIT" + "resolved": "https://github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90" }, "node_modules/dom-converter": { "version": "0.2.0", @@ -8921,7 +8918,7 @@ "node_modules/dtype": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/dtype/-/dtype-2.0.0.tgz", - "integrity": "sha512-s2YVcLKdFGS0hpFqJaTwscsyt0E8nNFdmo73Ocd81xNPj4URI4rj6D60A+vFMIw7BXWlb4yRkEwfBqcZzPGiZg==", + "integrity": "sha1-zQUjI84GFETs0uj1dI9popvihDQ=", "engines": { "node": ">= 0.8.0" } @@ -13286,23 +13283,9 @@ } }, "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" }, "node_modules/iferr": { "version": "0.1.5", @@ -17156,7 +17139,7 @@ "node_modules/layout-bmfont-text": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/layout-bmfont-text/-/layout-bmfont-text-1.3.4.tgz", - "integrity": "sha512-mceomHZ8W7pSKQhTdLvOe1Im4n37u8xa5Gr0J3KPCHRMO/9o7+goWIOzZcUUd+Xgzy3+22bvoIQ0OaN3LRtgaw==", + "integrity": "sha1-8g8sVGR3T0jabOipl/vObUaUW4E=", "dependencies": { "as-number": "^1.0.0", "word-wrapper": "^1.0.7", @@ -17558,7 +17541,7 @@ "node_modules/map-limit": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/map-limit/-/map-limit-0.0.1.tgz", - "integrity": "sha512-pJpcfLPnIF/Sk3taPW21G/RQsEEirGaFpCW3oXRwH9dnFHPHNGjNyvh++rdmC2fNqEaTw2MhYJraoJWAHx8kEg==", + "integrity": "sha1-63lhAxwPDo0AG/LVb6toXViCLzg=", "dependencies": { "once": "~1.3.0" } @@ -17566,7 +17549,7 @@ "node_modules/map-limit/node_modules/once": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "integrity": "sha512-6vaNInhu+CHxtONf3zw3vq4SP2DOQhjBvIa3rNcG0+P7eKWlYH6Peu7rHizSloRU2EwMz6GraLieis9Ac9+p1w==", + "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", "dependencies": { "wrappy": "1" } @@ -18144,7 +18127,7 @@ "node_modules/new-array": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/new-array/-/new-array-1.0.0.tgz", - "integrity": "sha512-K5AyFYbuHZ4e/ti52y7k18q8UHsS78FlRd85w2Fmsd6AkuLipDihPflKC0p3PN5i8II7+uHxo+CtkLiJDfmS5A==" + "integrity": "sha1-XbxjnZYerH8an7wacUbsEvKST78=" }, "node_modules/next-tick": { "version": "1.0.0", @@ -18155,7 +18138,7 @@ "node_modules/nice-color-palettes": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/nice-color-palettes/-/nice-color-palettes-1.0.1.tgz", - "integrity": "sha512-aHEFYKuGiaga8LqMi0Ttarqzn4tKS7BaIE2MeD9SDjv6yVc7DMIu/Eax4RvUgwR7vS0hXAUEIUx9P0/54O1W0g==", + "integrity": "sha1-h16gHchu+uf1leBmqLJmDnIGBT4=", "dependencies": { "map-limit": "0.0.1", "minimist": "^1.2.0", @@ -21056,7 +21039,7 @@ "node_modules/quad-indices": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/quad-indices/-/quad-indices-2.0.1.tgz", - "integrity": "sha512-6jtmCsEbGAh5npThXrBaubbTjPcF0rMbn57XCJVI7LkW8PUT56V+uIrRCCWCn85PSgJC9v8Pm5tnJDwmOBewvA==", + "integrity": "sha1-ppQdiaE9Y+7WwdSlpiGgRjYXqBQ=", "dependencies": { "an-array": "^1.0.0", "dtype": "^2.0.0", @@ -25027,9 +25010,9 @@ "integrity": "sha512-6MFAFJDRuvwkovxQZPruuyHinTa4rgj4hNLOndjcYYhZLckoXtVRY9rJPuq8p6c/tgZJrFYEAYAfJ2/hhNtUCA==" }, "node_modules/super-three": { - "version": "0.125.1", - "resolved": "https://registry.npmjs.org/super-three/-/super-three-0.125.1.tgz", - "integrity": "sha512-poTMpd0fa5tWVJDtWKSFWuqbb+h2Z0m1Eop66hRsfaeOE2p9xnl78MDJmj0S/jYI0Ly4iMQOWIkS0LyKCZe0SA==" + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/super-three/-/super-three-0.137.0.tgz", + "integrity": "sha512-8jM8DiYiXQoalUoeFRxKWbW6KFQo3GFwgw+3vE2y6SJU/einw+JvuvgK+WhbIYRfz4LQV68nyOQ2eEZqAuouGw==" }, "node_modules/supports-color": { "version": "5.5.0", @@ -25624,9 +25607,9 @@ "integrity": "sha512-eOEXnZeE1FDV0XgL1u08auIP13jxdN9LQBAEmlErYzMxtIIfuGIAZbijOyookALUhqVzVOx0Tywj6n192VM+nQ==" }, "node_modules/three-bmfont-text": { - "version": "2.3.0", - "resolved": "git+ssh://git@github.com/dmarcos/three-bmfont-text.git#1babdf8507c731a18f8af3b807292e2b9740955e", - "integrity": "sha512-1ACVhQynOX5fUHx9WY0leDApaQ8fa12wdU+z1iVRCiMDq5bZGw67kqUgEBrbK1BQ5awTZL3+VG3LX5xg+ty89Q==", + "version": "2.4.0", + "resolved": "https://github.com/dmarcos/three-bmfont-text.git#21d017046216e318362c48abd1a48bddfb6e0733", + "integrity": "sha512-lIMa1n+QKNU1f/LZgtS1oUGpoop3MuVXrUr5ybZOUR3+Jk//zjqScnQpHml6MWyvZzL8A5/1Hd8Tsqd3M1kudA==", "license": "MIT", "dependencies": { "array-shuffle": "^1.0.1", @@ -25640,7 +25623,7 @@ }, "node_modules/three-buffer-vertex-data": { "version": "1.1.0", - "resolved": "git+ssh://git@github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", + "resolved": "https://github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", "integrity": "sha512-ZPCCbGfueRzd2/YwH136UnVN+N11Mvxu7uPaEzIdtuk0m5HPs1LGXOM5hOkpxamjvqSC6MDJ3nd11grGi7sMKw==", "license": "MIT", "dependencies": { @@ -25692,7 +25675,7 @@ "node_modules/timed-out": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", - "integrity": "sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==", + "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", "engines": { "node": ">=0.10.0" } @@ -26380,7 +26363,7 @@ "node_modules/url-set-query": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/url-set-query/-/url-set-query-1.0.0.tgz", - "integrity": "sha512-3AChu4NiXquPfeckE5R5cGdiHCMWJx1dwCWOmWIL4KHAziJNOFIYJlpGFeKDvwLPHovZRCxK3cYlwzqI9Vp+Gg==" + "integrity": "sha1-AW6M/Xwg7gXK/neV6JK9BwL6ozk=" }, "node_modules/url/node_modules/punycode": { "version": "1.3.2", @@ -27929,7 +27912,7 @@ "node_modules/word-wrapper": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/word-wrapper/-/word-wrapper-1.0.7.tgz", - "integrity": "sha512-VOPBFCm9b6FyYKQYfn9AVn2dQvdR/YOVFV6IBRA1TBMJWKffvhEX1af6FMGrttILs2Q9ikCRhLqkbY2weW6dOQ==" + "integrity": "sha1-HxSv6/Zt/fD+9V79NxhO+9CMKLY=" }, "node_modules/workbox-background-sync": { "version": "5.1.4", @@ -31744,9 +31727,9 @@ } }, "aframe": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aframe/-/aframe-1.2.0.tgz", - "integrity": "sha512-e4lGvxLQ5CAptlbCqmnR4+qUf9s3f5SSnkMQaBsIFlJ2QMZhzEBr/SSV3+NEvMhsQf88EOvSpN1Vez942mBLcQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/aframe/-/aframe-1.3.0.tgz", + "integrity": "sha512-f6OQaDf49SzdSxVskJPvPWldOwHpYMsGttmQHhU6FRiASsnyULKG1nqZom9pDuS3fFYEzQVqRMakQ2AhXeLkFg==", "requires": { "custom-event-polyfill": "^1.0.6", "debug": "github:ngokevin/debug#noTimestamp", @@ -31757,8 +31740,8 @@ "present": "0.0.6", "promise-polyfill": "^3.1.0", "super-animejs": "^3.1.0", - "super-three": "^0.125.1", - "three-bmfont-text": "github:dmarcos/three-bmfont-text#1babdf8507c731a18f8af3b807292e2b9740955e", + "super-three": "^0.137.0", + "three-bmfont-text": "github:dmarcos/three-bmfont-text#21d017046216e318362c48abd1a48bddfb6e0733", "webvr-polyfill": "^0.10.12" } }, @@ -31874,7 +31857,7 @@ "an-array": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/an-array/-/an-array-1.0.0.tgz", - "integrity": "sha512-M175GYI7RmsYu24Ok383yZQa3eveDfNnmhTe3OQ3bm70bEovz2gWenH+ST/n32M8lrwLWk74hcPds5CDRPe2wg==" + "integrity": "sha1-wSWlu4JXd4419LT2qpx9D6nkJmU=" }, "animejs": { "version": "2.2.0", @@ -32010,7 +31993,7 @@ "array-shuffle": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/array-shuffle/-/array-shuffle-1.0.1.tgz", - "integrity": "sha512-PBqgo1Y2XWSksBzq3GFPEb798ZrW2snAcmr4drbVeF/6MT/5aBlkGJEvu5A/CzXHf4EjbHOj/ZowatjlIiVidA==" + "integrity": "sha1-fqSIKjVrS8pfVF4LblLq9tlxVXo=" }, "array-union": { "version": "2.1.0", @@ -32073,7 +32056,7 @@ "as-number": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/as-number/-/as-number-1.0.0.tgz", - "integrity": "sha512-HkI/zLo2AbSRO4fqVkmyf3hms0bJDs3iboHqTrNuwTiCRvdYXM7HFhfhB6Dk51anV2LM/IMB83mtK9mHw4FlAg==" + "integrity": "sha1-rLJ+NPj52KsNqeN287iVmGD4CmY=" }, "asap": { "version": "2.0.6", @@ -33337,7 +33320,7 @@ "buffer-to-arraybuffer": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz", - "integrity": "sha512-3dthu5CYiVB1DEJp61FtApNnNndTckcqe4pFcLdvHtrpG+kcyekCJKg4MRiDcFW7A6AODnXB9U4dwQiCW5kzJQ==" + "integrity": "sha1-YGSkD6dutDxyOrqe+PbhIW0QURo=" }, "buffer-xor": { "version": "1.0.3", @@ -34741,7 +34724,7 @@ } }, "debug": { - "version": "git+ssh://git@github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a", + "version": "https://github.com/ngokevin/debug.git#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a", "from": "debug@github:ngokevin/debug#noTimestamp" }, "decamelize": { @@ -34763,7 +34746,7 @@ "decompress-response": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", - "integrity": "sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==", + "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "requires": { "mimic-response": "^1.0.0" } @@ -35146,8 +35129,7 @@ } }, "document-register-element": { - "version": "git+ssh://git@github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90", - "integrity": "sha512-dwvGei9I/m1pYQ/9aNODyVmvSWBtlncfIROn5Sbi4MVnIcZKre5QaWx+AGLI/j6VH9sp8jwLyeuWP1micANT0g==", + "version": "https://github.com/dmarcos/document-register-element.git#8ccc532b7f3744be954574caf3072a5fd260ca90", "from": "document-register-element@github:dmarcos/document-register-element#8ccc532b7f3744be954574caf3072a5fd260ca90" }, "dom-converter": { @@ -35284,7 +35266,7 @@ "dtype": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/dtype/-/dtype-2.0.0.tgz", - "integrity": "sha512-s2YVcLKdFGS0hpFqJaTwscsyt0E8nNFdmo73Ocd81xNPj4URI4rj6D60A+vFMIw7BXWlb4yRkEwfBqcZzPGiZg==" + "integrity": "sha1-zQUjI84GFETs0uj1dI9popvihDQ=" }, "duplexer": { "version": "0.1.2", @@ -38786,9 +38768,9 @@ } }, "ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" }, "iferr": { "version": "0.1.5", @@ -41720,7 +41702,7 @@ "layout-bmfont-text": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/layout-bmfont-text/-/layout-bmfont-text-1.3.4.tgz", - "integrity": "sha512-mceomHZ8W7pSKQhTdLvOe1Im4n37u8xa5Gr0J3KPCHRMO/9o7+goWIOzZcUUd+Xgzy3+22bvoIQ0OaN3LRtgaw==", + "integrity": "sha1-8g8sVGR3T0jabOipl/vObUaUW4E=", "requires": { "as-number": "^1.0.0", "word-wrapper": "^1.0.7", @@ -42078,7 +42060,7 @@ "map-limit": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/map-limit/-/map-limit-0.0.1.tgz", - "integrity": "sha512-pJpcfLPnIF/Sk3taPW21G/RQsEEirGaFpCW3oXRwH9dnFHPHNGjNyvh++rdmC2fNqEaTw2MhYJraoJWAHx8kEg==", + "integrity": "sha1-63lhAxwPDo0AG/LVb6toXViCLzg=", "requires": { "once": "~1.3.0" }, @@ -42086,7 +42068,7 @@ "once": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", - "integrity": "sha512-6vaNInhu+CHxtONf3zw3vq4SP2DOQhjBvIa3rNcG0+P7eKWlYH6Peu7rHizSloRU2EwMz6GraLieis9Ac9+p1w==", + "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", "requires": { "wrappy": "1" } @@ -42571,7 +42553,7 @@ "new-array": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/new-array/-/new-array-1.0.0.tgz", - "integrity": "sha512-K5AyFYbuHZ4e/ti52y7k18q8UHsS78FlRd85w2Fmsd6AkuLipDihPflKC0p3PN5i8II7+uHxo+CtkLiJDfmS5A==" + "integrity": "sha1-XbxjnZYerH8an7wacUbsEvKST78=" }, "next-tick": { "version": "1.0.0", @@ -42582,7 +42564,7 @@ "nice-color-palettes": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/nice-color-palettes/-/nice-color-palettes-1.0.1.tgz", - "integrity": "sha512-aHEFYKuGiaga8LqMi0Ttarqzn4tKS7BaIE2MeD9SDjv6yVc7DMIu/Eax4RvUgwR7vS0hXAUEIUx9P0/54O1W0g==", + "integrity": "sha1-h16gHchu+uf1leBmqLJmDnIGBT4=", "requires": { "map-limit": "0.0.1", "minimist": "^1.2.0", @@ -44994,7 +44976,7 @@ "quad-indices": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/quad-indices/-/quad-indices-2.0.1.tgz", - "integrity": "sha512-6jtmCsEbGAh5npThXrBaubbTjPcF0rMbn57XCJVI7LkW8PUT56V+uIrRCCWCn85PSgJC9v8Pm5tnJDwmOBewvA==", + "integrity": "sha1-ppQdiaE9Y+7WwdSlpiGgRjYXqBQ=", "requires": { "an-array": "^1.0.0", "dtype": "^2.0.0", @@ -48185,9 +48167,9 @@ "integrity": "sha512-6MFAFJDRuvwkovxQZPruuyHinTa4rgj4hNLOndjcYYhZLckoXtVRY9rJPuq8p6c/tgZJrFYEAYAfJ2/hhNtUCA==" }, "super-three": { - "version": "0.125.1", - "resolved": "https://registry.npmjs.org/super-three/-/super-three-0.125.1.tgz", - "integrity": "sha512-poTMpd0fa5tWVJDtWKSFWuqbb+h2Z0m1Eop66hRsfaeOE2p9xnl78MDJmj0S/jYI0Ly4iMQOWIkS0LyKCZe0SA==" + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/super-three/-/super-three-0.137.0.tgz", + "integrity": "sha512-8jM8DiYiXQoalUoeFRxKWbW6KFQo3GFwgw+3vE2y6SJU/einw+JvuvgK+WhbIYRfz4LQV68nyOQ2eEZqAuouGw==" }, "supports-color": { "version": "5.5.0", @@ -48661,9 +48643,9 @@ "integrity": "sha512-eOEXnZeE1FDV0XgL1u08auIP13jxdN9LQBAEmlErYzMxtIIfuGIAZbijOyookALUhqVzVOx0Tywj6n192VM+nQ==" }, "three-bmfont-text": { - "version": "git+ssh://git@github.com/dmarcos/three-bmfont-text.git#1babdf8507c731a18f8af3b807292e2b9740955e", - "integrity": "sha512-1ACVhQynOX5fUHx9WY0leDApaQ8fa12wdU+z1iVRCiMDq5bZGw67kqUgEBrbK1BQ5awTZL3+VG3LX5xg+ty89Q==", - "from": "three-bmfont-text@github:dmarcos/three-bmfont-text#1babdf8507c731a18f8af3b807292e2b9740955e", + "version": "https://github.com/dmarcos/three-bmfont-text.git#21d017046216e318362c48abd1a48bddfb6e0733", + "integrity": "sha512-lIMa1n+QKNU1f/LZgtS1oUGpoop3MuVXrUr5ybZOUR3+Jk//zjqScnQpHml6MWyvZzL8A5/1Hd8Tsqd3M1kudA==", + "from": "three-bmfont-text@github:dmarcos/three-bmfont-text#21d017046216e318362c48abd1a48bddfb6e0733", "requires": { "array-shuffle": "^1.0.1", "inherits": "^2.0.1", @@ -48675,7 +48657,7 @@ } }, "three-buffer-vertex-data": { - "version": "git+ssh://git@github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", + "version": "https://github.com/dmarcos/three-buffer-vertex-data.git#69378fc58daf27d3b1d930df9f233473e4a4818c", "integrity": "sha512-ZPCCbGfueRzd2/YwH136UnVN+N11Mvxu7uPaEzIdtuk0m5HPs1LGXOM5hOkpxamjvqSC6MDJ3nd11grGi7sMKw==", "from": "three-buffer-vertex-data@dmarcos/three-buffer-vertex-data#69378fc58daf27d3b1d930df9f233473e4a4818c", "requires": { @@ -48729,7 +48711,7 @@ "timed-out": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", - "integrity": "sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==" + "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=" }, "timers-browserify": { "version": "2.0.12", @@ -49269,7 +49251,7 @@ "url-set-query": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/url-set-query/-/url-set-query-1.0.0.tgz", - "integrity": "sha512-3AChu4NiXquPfeckE5R5cGdiHCMWJx1dwCWOmWIL4KHAziJNOFIYJlpGFeKDvwLPHovZRCxK3cYlwzqI9Vp+Gg==" + "integrity": "sha1-AW6M/Xwg7gXK/neV6JK9BwL6ozk=" }, "use": { "version": "3.1.1", @@ -50544,7 +50526,7 @@ "word-wrapper": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/word-wrapper/-/word-wrapper-1.0.7.tgz", - "integrity": "sha512-VOPBFCm9b6FyYKQYfn9AVn2dQvdR/YOVFV6IBRA1TBMJWKffvhEX1af6FMGrttILs2Q9ikCRhLqkbY2weW6dOQ==" + "integrity": "sha1-HxSv6/Zt/fD+9V79NxhO+9CMKLY=" }, "workbox-background-sync": { "version": "5.1.4", diff --git a/package.json b/package.json index 152daf8b..1a5f6d49 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "dependencies": { "@engaging-computing/aframe-physics-system": "^4.0.0", "@material-ui/core": "^4.12.3", - "aframe": "1.2", + "aframe": "^1.3.0", "aframe-animation-component": "^5.0.0", "aframe-environment-component": "^1.3.1", "aframe-extras": "^4.1.2", From 7eb76577e72f3d6ae77748b6649c8c92a19cd8d7 Mon Sep 17 00:00:00 2001 From: RJMaradiaga Date: Sun, 14 May 2023 23:35:59 -0400 Subject: [PATCH 14/16] Updating styles for the footer and course select When we updated bootstrap, the elements in the footer became misaligned. To fix this, I used the classes from the current 5.1 version of bootstrap. Additionally, when selecting courses, the current version of MYR makes the header and paragraph of each course underlined. I just changed the style for this so that each part of the card does not have an underline upon opening the course menu. Then, when someone hovers over the course, only the header becomes underlined. --- src/components/structural/Footer.js | 18 +++++++++--------- src/css/CourseSelect.css | 11 ++++++----- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/components/structural/Footer.js b/src/components/structural/Footer.js index c6b0f8d2..f3f4a41a 100644 --- a/src/components/structural/Footer.js +++ b/src/components/structural/Footer.js @@ -9,39 +9,39 @@ class Footer extends Component {