Merge branch 'master' into room-ui-redesign

Author: robertlong

.babelrc

@@ -1,29 +1,32 @@
 {
   "presets": [
     "@babel/react",
-    ["@babel/env", {
-      "exclude": ["transform-regenerator"],
-      "targets": {
-        "browsers": [
-          "last 2 major versions",
-          "not <= 0.5%",
-          "not dead",
-
-          // No WebRTC support (including datachannels)
-          "not ios_saf < 11",
-          "not safari < 11",
-          "not ie >= 0",
-          "not edge >= 0",
-          "not ie_mob >= 0",
-          "not and_uc >= 0",
-
-          // No WebGL or WebRTC support
-          "not op_mini all"
-        ]
-      },
-      // false = do not polyfill stuff unneccessarily
-      "useBuiltIns": false
-    }]
+    [
+      "@babel/env",
+      {
+        "exclude": [
+          "transform-regenerator"
+        ],
+        "targets": {
+          "browsers": [
+            "last 2 major versions",
+            "not <= 0.5%",
+            "not dead",
+            // No WebRTC support (including datachannels)
+            "not ios_saf < 11",
+            "not safari < 11",
+            "not ie >= 0",
+            "not edge >= 0",
+            "not ie_mob >= 0",
+            "not and_uc >= 0",
+            // No WebGL or WebRTC support
+            "not op_mini all"
+          ]
+        },
+        // false = do not polyfill stuff unneccessarily
+        "useBuiltIns": false
+      }
+    ]
   ],
   "plugins": [
     [ "react-intl", { "messagesDir": "./dist/messages", "enforceDescriptions": false } ],
@@ -32,6 +35,7 @@
     "@babel/proposal-object-rest-spread",
     // Samsung Internet on the Oculus Go version is stuck at version 5.2, which is a 
     // Chromium 51, as of this writing. It needs babel to transpile async/await.
-    "@babel/plugin-transform-async-to-generator"
+    "@babel/plugin-transform-async-to-generator",
+    "@babel/plugin-proposal-optional-chaining"
   ]
-}
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -26,7 +26,7 @@ If applicable, add screenshots to help explain your problem.
 **Hardware** <!-- Please complete the following information -->
  - Device: [e.g. Desktop, phone, VR headset]
  - OS: [e.g. Windows, iOS, Linux]
- - Browser [e.g. Firefox]
+ - Browser: [e.g. Firefox]
 
 **Additional context**
 Add any other context about the problem here.

CONTRIBUTING.md

@@ -122,7 +122,13 @@ The testing process for Hubs is mostly a manual one. You need to test your chang
 
 The Hubs team has a more in-depth testing and release process internally, but we don't have any additional testing process for external contributors at this time.
 
-### 5. High Level Project Organization
+
+### 5. Modifying The 2-D Sprite Graphics
+
+To update the 2-D sprite graphics, you must (manually) install [ImageMagick](https://imagemagick.org/script/download.php) to your command line.  See `doc/spritesheet-generation.md` for further details
+
+
+### 6. High Level Project Organization
 
 ```
 hubs/
@@ -153,11 +159,11 @@ hubs/
     scene.html <- Scene Page html template
     scene.js <- Scene Page js entry point
 ```
-### 6. Testing on an HMD
+### 7. Testing on an HMD
 
 The simplest way to test on an HMD is to use `npm run dev` from Step 2 above while having 8080 port traffic on your device point to you local dev instance's port 8080. In order to do that, you'll need to do a few things that will vary per device. 
 
-### Oculus Quest
+#### Oculus Quest
 
 These steps are what's necessary to enable development on your device
 
@@ -174,25 +180,37 @@ These steps are what's necessary to enable development on your device
     `adb devices -l`
     Lists all connected devices. The -l flag will list device specific details, one of which should be: `model:Quest`
 
-    `adb -s model:Quest reverse tcp:8080 tcp:8080`
-    `adb reverse tcp:8080 tcp:8080`
+    `adb -s model:Quest reverse tcp:8080 tcp:8080`  
+    `adb reverse tcp:8080 tcp:8080`  
     This command routes all port 8080 requests from the Quest device to port 8080 on your local web server. The first one is if you want to do things wirelessly, while the second is a quicker (albeit tethered) solution that is less prone to the error below.
 
     If you encounter the following error:
     adb: error: more than one device/emulator
 
-    Try killing and restarting adb with the following commands:
-     `adb kill-server`
-     `adb start-server`
-    Then retry the reverse command above again
+    Try killing adb with the following commands:
+     `adb kill-server` 
+    Then try the reverse command above again (the server will be restarted).
 
-3. Open a browser on the Quest device and test.
-    Go to the following url: `https://localhost:8080` in the Oculus broswer or Firefox Reality browser
+3. Open a browser on the Quest device and test. Either  
+    `adb shell am start -a android.intent.action.VIEW -d 'https://localhost:8080'`  
+    or launch the Oculus browser or Firefox Reality browser and go to the following url: `https://localhost:8080`
 
     > Note the client runs over https with a self-signed SSL certificate. You'll be presented with a warning the first time you open the page. You can accept the SSL certificate warning and continue onto the site.
 
 4. You should see the Hubs index page, the same one you see in a browser on your development machine.
 
-### Other Devices
+You may find the tool [scrcpy](https://github.com/Genymobile/scrcpy) useful to display the screen of your headset on your development computer. It doesn't require the headset user to accept, so it's less hassle than casting to a phone or tablet, in some circumstances.
+
+#### Pico G2 / Neo 2
+
+Follow the directions for the Quest, except
+
+* Setup the Pico device for development. (You may need to press the Confirm and Volume Down buttons on the headset simultaneously to enter the system settings.)  
+    `https://developer.pico-interactive.com/question/neo` 
+
+* Open Hubs in the Firefox Reality browser:  
+    `adb shell am start -a android.intent.action.VIEW -d 'https://localhost:8080/hub.html' org.mozilla.vrbrowser/org.mozilla.vrbrowser.VRBrowserActivity`
+
+#### Other Devices
 
 Please feel free to contribute setup instructions for additional devices.

admin/.babelrc

@@ -1,22 +1,34 @@
 {
   "presets": [
     "@babel/react",
-    ["@babel/env", {
-      "exclude": ["transform-regenerator"],
-      "targets": {
-        "browsers": [
-          "last 2 major versions",
-          "not <= 0.5%",
-          "not dead"
-        ]
-      },
-      "useBuiltIns": false
-    }]
+    [
+      "@babel/env",
+      {
+        "exclude": [
+          "transform-regenerator"
+        ],
+        "targets": {
+          "browsers": [
+            "last 2 major versions",
+            "not <= 0.5%",
+            "not dead"
+          ]
+        },
+        "useBuiltIns": false
+      }
+    ]
   ],
   "plugins": [
-    [ "react-intl", { "messagesDir": "./public/messages", "enforceDescriptions": false } ],
+    [
+      "react-intl",
+      {
+        "messagesDir": "./public/messages",
+        "enforceDescriptions": false
+      }
+    ],
     "transform-react-jsx-img-import",
     "@babel/proposal-class-properties",
-    "@babel/proposal-object-rest-spread"
+    "@babel/proposal-object-rest-spread",
+    "@babel/plugin-proposal-optional-chaining"
   ]
-}
+}