diff --git a/package.json b/package.json
index fd68ae5ca0c1f8c8d48939fa1bad6c13755d5c75..b5e610ad3fcfb56c647ab65d05d300c7ebd0ed21 100644
--- a/package.json
+++ b/package.json
@@ -35,11 +35,8 @@
"react": "^16.1.1",
"react-dom": "^16.1.1",
"react-router-dom": "^4.2.2",
-<<<<<<< HEAD
"uuid": "^3.2.1",
-=======
"super-hands": "https://github.com/infinitelee/aframe-super-hands-component#mr-social-client/master",
->>>>>>> 4d9a358c4781cb3c98ae6a2d42e8b0ccbad12e47
"webrtc-adapter": "^6.0.2"
},
"devDependencies": {
diff --git a/src/room.html b/src/room.html
index 3ba276eeb80442ceb346b6a40f82f78c4a3157e3..67ec8d223ea6b7bdd2532f1902bed2811b7bd866 100644
--- a/src/room.html
+++ b/src/room.html
@@ -159,10 +159,6 @@
camera
position="0 1.6 0"
personal-space-bubble
-<<<<<<< HEAD
- ></a-entity>
-=======
- look-controls="pointerLockEnabled: true;"
>
<a-entity
id="super-cursor"
@@ -171,7 +167,6 @@
raycaster="objects: .collidable; direction: 0 0 -1;"
></a-entity>
</a-entity>
->>>>>>> 4d9a358c4781cb3c98ae6a2d42e8b0ccbad12e47
<a-entity
id="player-left-controller"
diff --git a/src/room.js b/src/room.js
index 7f4c3e0b9f7a79039d7116df3ebed5d58f35cd96..72c52d26bb2dffcc7640db2d9ff14dc6c1b45b73 100644
--- a/src/room.js
+++ b/src/room.js
@@ -63,8 +63,6 @@ if (qs.quality) {
import "./elements/a-progressive-asset";
-<<<<<<< HEAD
-=======
import "aframe-physics-system";
import "aframe-physics-extras";
import "super-hands";
@@ -74,8 +72,6 @@ import "./components/super-spawner";
import "./components/super-cursor";
import "./components/event-repeater";
-import { promptForName, getCookie, parseJwt } from "./utils/identity";
->>>>>>> 4d9a358c4781cb3c98ae6a2d42e8b0ccbad12e47
import registerNetworkSchemas from "./network-schemas";
import { inGameActions, config as inputConfig } from "./input-mappings";
import registerTelemetry from "./telemetry";
@@ -145,7 +141,7 @@ async function enterScene(mediaStream, enterInVR) {
AFRAME.registerInputActivator("reverseY", ReverseY);
AFRAME.registerInputActions(inGameActions, "default");
AFRAME.registerInputMappings(inputConfig);
- document.querySelector("#player-camera").setAttribute("look-controls", "");
+ document.querySelector("#player-camera").setAttribute("look-controls", "pointerLockEnabled: true;");
const qs = queryString.parse(location.search);
diff --git a/yarn.lock b/yarn.lock
index 1b57e6bcc4f94f449bb713ff985a34d16cf869c5..8a575dc6c2b1035b06b4bbcf3c4135263289f7fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,8 +1,6 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1
-
-<<<<<<< HEAD
"@babel/code-frame@7.0.0-beta.40", "@babel/code-frame@^7.0.0-beta.40":
version "7.0.0-beta.40"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.40.tgz#37e2b0cf7c56026b4b21d3927cadf81adec32ac6"
@@ -71,14 +69,13 @@
esutils "^2.0.2"
lodash "^4.2.0"
to-fast-properties "^2.0.0"
-=======
+
JSONStream@^1.0.3:
version "1.3.2"
resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"
dependencies:
jsonparse "^1.2.0"
through ">=2.2.7 <3"
->>>>>>> 4d9a358c4781cb3c98ae6a2d42e8b0ccbad12e47
abbrev@1:
version "1.1.1"
@@ -3502,11 +3499,7 @@ glob@^6.0.1, glob@^6.0.4:
once "^1.3.0"
path-is-absolute "^1.0.0"
-<<<<<<< HEAD
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.2, glob@~7.1.1:
-=======
glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.2:
->>>>>>> 4d9a358c4781cb3c98ae6a2d42e8b0ccbad12e47
version "7.1.2"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
dependencies:
@@ -4503,7 +4496,6 @@ jsonify@~0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-<<<<<<< HEAD
jsonpointer@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
@@ -4511,11 +4503,10 @@ jsonpointer@^4.0.0:
jsonschema@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.2.tgz#83ab9c63d65bf4d596f91d81195e78772f6452bc"
-=======
+
jsonparse@^1.2.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
->>>>>>> 4d9a358c4781cb3c98ae6a2d42e8b0ccbad12e47
jsprim@^1.2.2:
version "1.4.1"
@@ -4711,15 +4702,13 @@ lodash.memoize@^4.1.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-<<<<<<< HEAD
lodash.mergewith@^4.6.0:
version "4.6.1"
resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
-=======
+
lodash.memoize@~3.0.3:
version "3.0.4"
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
->>>>>>> 4d9a358c4781cb3c98ae6a2d42e8b0ccbad12e47
lodash.startswith@^4.2.1:
version "4.2.1"
@@ -6965,7 +6954,6 @@ sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4:
inherits "^2.0.1"
safe-buffer "^5.0.1"
-<<<<<<< HEAD
shallow-clone@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
@@ -6973,14 +6961,13 @@ shallow-clone@^1.0.0:
is-extendable "^0.1.1"
kind-of "^5.0.0"
mixin-object "^2.0.1"
-=======
+
shasum@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/shasum/-/shasum-1.0.2.tgz#e7012310d8f417f4deb5712150e5678b87ae565f"
dependencies:
json-stable-stringify "~0.0.0"
sha.js "~2.4.4"
->>>>>>> 4d9a358c4781cb3c98ae6a2d42e8b0ccbad12e47
shebang-command@^1.2.0:
version "1.2.0"
@@ -7162,11 +7149,7 @@ source-map-url@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
-<<<<<<< HEAD
-source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0:
-=======
source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0, source-map@~0.5.3:
->>>>>>> 4d9a358c4781cb3c98ae6a2d42e8b0ccbad12e47
version "0.5.7"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
@@ -7285,11 +7268,7 @@ stdout-stream@^1.4.0:
dependencies:
readable-stream "^2.0.1"
-<<<<<<< HEAD
stream-browserify@^2.0.1:
-=======
-stream-browserify@^2.0.0, stream-browserify@^2.0.1:
->>>>>>> 4d9a358c4781cb3c98ae6a2d42e8b0ccbad12e47
version "2.0.1"
resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
dependencies:
@@ -8217,11 +8196,7 @@ which-module@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-<<<<<<< HEAD
-which@1, which@^1.2.14, which@^1.2.9:
-=======
which@^1.2.14, which@^1.2.4, which@^1.2.9:
->>>>>>> 4d9a358c4781cb3c98ae6a2d42e8b0ccbad12e47
version "1.3.0"
resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
dependencies: