Merge remote-tracking branch 'upstream/lcs-v0.7.2'

public/core/app.js

@@ -76,6 +76,7 @@ class App {
     page('/settings', this.HandleSettingsIndex);
     page('/profile', this.HandleUserIndex);
     page('/worlds', this.HandleIndex);
+    page('/:user', this.HandleUserWorlds);
     page('/:user/worlds', this.HandleUserWorlds);
     page('/:user/:type/:name/edit/:file', this.HandleFileEdit);
     page('/:user/:space', this.HandleParsableRequestWithID);

public/core/luminary.js

@@ -180,7 +180,7 @@ class Luminary {
         } else if (message.action == "getState") {
 
             let state = message.result; //JSON.stringify(message.result);
-            let toClient = message.parameters[0];
+            let toClient = message.parameters[2];
 
             let newMsg =
                 JSON.stringify({
@@ -478,7 +478,7 @@ class Luminary {
                 respond: true,
                 time: 'tick',
                 explicit: masterID,
-                parameters: [self.clientID]
+                parameters: [null, null, self.clientID]
             })
 
 

public/drivers/model/aframe/aframe-master.js

@@ -65042,6 +65042,7 @@ module.exports.Component = registerComponent('wasd-controls', {
 
     // Bind methods and add event listeners.
     this.onBlur = bind(this.onBlur, this);
+    this.onContextMenu = bind(this.onContextMenu, this);
     this.onFocus = bind(this.onFocus, this);
     this.onKeyDown = bind(this.onKeyDown, this);
     this.onKeyUp = bind(this.onKeyUp, this);
@@ -65156,6 +65157,7 @@ module.exports.Component = registerComponent('wasd-controls', {
   })(),
 
   attachVisibilityEventListeners: function () {
+    window.oncontextmenu = this.onContextMenu;
     window.addEventListener('blur', this.onBlur);
     window.addEventListener('focus', this.onFocus);
     document.addEventListener('visibilitychange', this.onVisibilityChange);
@@ -65177,6 +65179,13 @@ module.exports.Component = registerComponent('wasd-controls', {
     window.removeEventListener('keyup', this.onKeyUp);
   },
 
+  onContextMenu: function () {
+    var keys = Object.keys(this.keys);
+    for (var i = 0; i < keys.length; i++) {
+      delete this.keys[keys[i]];
+    }
+  },
+
   onBlur: function () {
     this.pause();
   },
@@ -71409,7 +71418,7 @@ _dereq_('./core/a-mixin');
 _dereq_('./extras/components/');
 _dereq_('./extras/primitives/');
 
-console.log('A-Frame Version: 1.1.0 (Date 2020-12-30, Commit #579473b8)');
+console.log('A-Frame Version: 1.1.0 (Date 2021-01-11, Commit #60a23326)');
 console.log('THREE Version (https://github.com/supermedium/three.js):',
             pkg.dependencies['super-three']);
 console.log('WebVR Polyfill Version:', pkg.dependencies['webvr-polyfill']);

public/index.js

@@ -11,7 +11,7 @@ loadjs([
 
 loadjs([
     '/index.css',
-    '/lib/socket.io.js',
+    '/lib/socket.io.min.js',
     '/lib/he.js',
     '/lib/locale/polyglot.min.js',
     '/lib/hashids.min.js',