Merge branch 'master' into matthewbcool-patch-1

Author: DougReeder

.github/pull_request_template.md

@@ -0,0 +1,40 @@
+## What?
+<!-- REQUIRED FOR ALL PULL REQUESTS — Explain what your pull request does -->
+
+
+## Why?
+<!-- REQUIRED FOR ALL PULL REQUESTS — Explain why you're opening this pull request, what limitations does it address, etc..  If you're fixing a bug with an open bug report you can just link to the bug report -->
+
+
+
+## Examples
+<!-- DO NOT INCLUDE FOR HUBS DOCUMENTATION UPDATES — If applicable, give examples of your changes, screenshots, videos, etc. -->
+
+
+## How to test
+<!-- REQUIRED FOR TECHNICAL PULL REQUESTS; DO NOT INCLUDE FOR HUBS DOCUMENTATION UPDATES — Give the steps required to test your pull request -->
+
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See '....'
+
+## Documentation of functionality
+<!-- REQUIRED FOR TECHNICAL PULL REQUESTS; DO NOT INCLUDE FOR HUBS DOCUMENTATION UPDATES — Link to the accompanying documentation pull request or identify where the documentation is located in this pull request.  If no documentation is needed, please specify this here -->
+
+
+## Limitations
+<!-- List anything that isn't addressed, e.g. corner cases, and why they weren't addressed -->
+
+
+## Alternatives considered
+<!-- If there are any alternative ways of implementing this that you thought of, but decided against, list them here along with why they were discarded -->
+
+
+## Open questions
+<!-- List any questions you have -->
+
+
+## Additional details or related context
+<!-- Give any other details that you think the reviewers should be aware of -->
+

.github/workflows/hubs-docs.yml

@@ -7,8 +7,8 @@ on:
 
 jobs:
   turkeyGitops:
-    uses: mozilla/hubs-ops/.github/workflows/turkeyGitops.yml@master
+    uses: Hubs-Foundation/hubs-ops/.github/workflows/turkeyGitops.yml@master
     with:
-      registry: mozillareality
+      registry: hubsfoundation
     secrets:
-      DOCKER_HUB_PWD: ${{ secrets.DOCKER_HUB_PWD }}
+      DOCKER_HUB_PWD: ${{ secrets.DOCKER_HUB_PWD }}

.github/workflows/publish.yml

@@ -0,0 +1,39 @@
+name: publish
+on:
+  push:
+    paths-ignore: ["README.md", "CONTRIBUTING.md", "LICENSE"]
+  pull_request:
+    paths-ignore: ["README.md", "CONTRIBUTING.md", "LICENSE"]
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  build_sync:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./website
+    steps:
+      - name: checkout repo
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      - name: include dependencies
+        run: npm ci
+      - name: build HTML
+        run: npm run build
+      - name: sync publish
+        if: ${{ github.ref == 'refs/heads/master' && github.repository == 'Hubs-Foundation/hubs-docs' }}
+        env:
+          source: build/hubs-docs/
+          dest: [email protected]:wordpress/hubs-docs
+        run: |
+          env
+          mkdir -p ~/.ssh
+          echo "${{ secrets.WEBCONTAINERS_KEY }}" >  ~/.ssh/WEBCONTAINERS_KEY
+          chmod 600 ~/.ssh/WEBCONTAINERS_KEY
+          echo "${{ vars.KNOWN_HOSTS }}" > ~/.ssh/known_hosts
+          rsync -v --rsh='ssh -i  ~/.ssh/WEBCONTAINERS_KEY' --archive --delete-after $source $dest

.gitignore

@@ -12,3 +12,5 @@ website/node_modules
 website/i18n/*
 
 results
+
+.env

README.md

@@ -1,6 +1,6 @@
-# Mozilla Hubs Docs
+# Hubs Docs
 
-This repo is for the documentation for [Mozilla Hubs](http://hubs.mozilla.com), and related products such as Hubs Cloud and Spoke. 
+This repo is for the documentation for Hubs, and related products such as Hubs Cloud and Spoke. 
 
 The documentation is under active development. If there are any changes or updates you recommend, feel free to submit a pull request or let us know in our [Discord Server](http://discord.gg/wHmY4nd).
 

docs/creators-advanced-avatar-customization.md

@@ -9,8 +9,8 @@ As described in the [creating custom avatars](intro-avatars.html) page, the most
 
 For more advanced customization, you can use the following resources:
 
-* [Photoshop PSD Templates](https://github.com/MozillaReality/hubs-avatar-pipelines/blob/master/Photoshop) - Photoshop templates for a custom Hubs base color skin. You can also use Photoshop's 3D painting tools, using the [Robot OBJ/MAT file](https://github.com/j-conrad/hubs-avatar-pipelines/tree/master/Other%20model%20formats).
-* [Substance Painter Project](https://github.com/MozillaReality/hubs-avatar-pipelines/blob/master/Substance)- Full Substance Painter projects for advanced custom skinning. You can also download and modify any of our example texture sets.
+* [Photoshop PSD Templates](https://github.com/Hubs-Foundation/hubs-avatar-pipelines/tree/master/Photoshop) - Photoshop templates for a custom Hubs base color skin. You can also use Photoshop's 3D painting tools, using the [Robot OBJ/MAT file](https://github.com/j-conrad/hubs-avatar-pipelines/tree/master/Other%20model%20formats).
+* [Substance Painter Project](https://github.com/Hubs-Foundation/hubs-avatar-pipelines/blob/master/Substance)- Full Substance Painter projects for advanced custom skinning. You can also download and modify any of our example texture sets.
 
 ![UV Layout example](img/UVLayout.jpg)
 
@@ -42,23 +42,25 @@ When you upload textures into Hubs The preview will be updated. You do not need
 
 To customize your avatar's shape, you can modify our basic robot template, or upload a .glb file of your choice. If you use the robot template, your avatar will have hands and a body and a head that grows/shrinks when you speak. If you use a plain .glb file, this item is considered the head of the avatar and the whole object will grow and shrink when you speak. 
 
+<!-- You can follow along with Jim and Dom in this recorded live stream here to walk through the whole process: https://youtu.be/qBvZhh6KVcg?t=561 -->
+
 ### Modify Base Robot Template
 
 We offer the following resources if you'd like to modify our base Robot avatar:
 
-* [Blender Source Files](https://github.com/MozillaReality/hubs-avatar-pipelines/tree/master/Blender/AvatarBot) are available of our Robot avatar. **For specific information about how to use these .blend files, be sure to check out the readme within the [Blender/AvatarBot](https://github.com/MozillaReality/hubs-avatar-pipelines/tree/master/Blender/AvatarBot) folder.**
+* [Blender Source Files](https://github.com/Hubs-Foundation/hubs-avatar-pipelines/tree/master/Blender/AvatarBot) are available of our Robot avatar. **For specific information about how to use these .blend files, be sure to check out the readme within the [Blender/AvatarBot](https://github.com/Hubs-Foundation/hubs-avatar-pipelines/tree/master/Blender/AvatarBot) folder.**
 
-* [Exported GLBs](Exported%20GLB%20models)/[Exported OBJ](https://github.com/MozillaReality/hubs-avatar-pipelines/tree/master/Other%20model%20formats) are available if you'd like to bring them into your editor of choice.
+* [Exported OBJ Files](https://github.com/Hubs-Foundation/hubs-avatar-pipelines/tree/master/Other%20model%20formats) are available if you'd like to bring them into your editor of choice.
 
 We recommend using [Blender 2.83](https://builder.blender.org/download/) (or whatever the most recent release is) for custom models since we have provided example files that you may use as a guide. (Typically, skeleton setup varies between modeling appications which can make importing/exporting skeletons a bit tricky due to unexpected changes in bone rotations, but it is still possible to use something other than Blender.) Note: the .blend files were created with [Blender 2.8](https://builder.blender.org/download/) due to the built-in glTF exporter. The glTF importer/exporter for Blender is currently in development. Expect some bugs and [please report them!](https://github.com/KhronosGroup/glTF-Blender-IO/issues)
 
 Hubs avatars are meant for VR, which means that you should work in real world units. A typical avatar height is roughly 1.7 meters. Note: This is typically a 'standing height'. The lack of legs shown here is a part of that overall height.
 
 ![avatar height diagram](img/avatarHeight.jpg)
 
-Files with the suffix *_base* refer to the most barebones, basic robot avatar template that can be used as a reference when creating new avatar models. Typically, the Blender workflow would be to either 'Link' or 'Append' the objects from [AvatarBot_base_for_export.blend](https://github.com/MozillaReality/hubs-avatar-pipelines/tree/master/Blender/AvatarBot) in order to use the existing armature (skeleton) and any animations that go along with it, using them as a basis for your own model that you would attach to it.
+Files with the suffix *_base* refer to the most barebones, basic robot avatar template that can be used as a reference when creating new avatar models. Typically, the Blender workflow would be to either 'Link' or 'Append' the objects from [AvatarBot_base_for_export.blend](https://github.com/Hubs-Foundation/hubs-avatar-pipelines/tree/master/Blender/AvatarBot) in order to use the existing armature (skeleton) and any animations that go along with it, using them as a basis for your own model that you would attach to it.
 
-The armature is based largely upon the same hierarchy and naming conventions of the skeleton provided by [High Fidelity](https://docs.highfidelity.com/en/rc80/create/avatars/avatar-standards.html#skeleton). This also happens to have a similar structure to VRChat in terms of bone orientations.
+The armature is based largely upon the same hierarchy and naming conventions of the skeleton originally provided by High Fidelity. This also happens to have a similar structure to VRChat in terms of bone orientations.
 However, in our current implementation in Hubs, we have eliminated some of the bones within the hierarchy, namely the lower body and arm joints since we are not using any sort of inverse kinematics (IK) at the moment. This may change in future iterations.
 
 ### Use a Regular .glb File