Merge remote-tracking branch 'upstream/master' into parenting

2025-03-27 23:52:03 +01:00 · 2020-06-14 17:30:26 -07:00 · 2020-06-14 17:30:26 -07:00 · 56d359f2ba
commit 56d359f2ba
parent ebc9dae78d f68810f766
291 changed files with 5105 additions and 4363 deletions
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@ -9,7 +9,8 @@ env:
  BUILD_TYPE: Release
  CI_BUILD: Github
  GIT_COMMIT: ${{ github.sha }}
-  HIFI_VCPKG_BOOTSTRAP: true
+  # VCPKG did not build well on OSX disabling HIFI_VCPKG_BOOTSTRAP, which invokes a download to a working version of vcpkg
+  # HIFI_VCPKG_BOOTSTRAP: true
  RELEASE_TYPE: PR
  RELEASE_NUMBER: ${{ github.event.number }}
  VERSION_CODE: ${{ github.event.number }}
@ -28,8 +29,12 @@ jobs:
  build:
    strategy:
        matrix:
-          os: [windows-latest, macOS-latest]
+          os: [windows-latest, macOS-latest, ubuntu-18.04]
          build_type: [full]
+          include:
+            - os: ubuntu-18.04
+              build_type: full
+              apt-dependencies: mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0
        fail-fast: false
    runs-on: ${{matrix.os}}
    if: github.event.action != 'labeled' || github.event.label.name == 'rebuild'
@ -39,10 +44,14 @@ jobs:
      id: buildenv1
      run: |
        echo ::set-env name=GIT_COMMIT_SHORT::`echo $GIT_COMMIT | cut -c1-7`
+        echo ::set-env name=JOB_NAME::"build (${{matrix.os}}, ${{matrix.build_type}})"
+
        # Linux build variables
-        if [ "${{ matrix.os }}" = "ubuntu-latest" ]; then
+        if [[ "${{ matrix.os }}" = "ubuntu-"* ]]; then
          echo ::set-env name=PYTHON_EXEC::python3
-          echo ::set-env name=INSTALLER_EXT::tgz
+          echo ::set-env name=INSTALLER_EXT::*
+          echo ::set-env name=CMAKE_BUILD_EXTRA::"-- -j3"
+          echo ::set-env name=CMAKE_EXTRA::"-DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)"
        fi
        # Mac build variables
        if [ "${{ matrix.os }}" = "macOS-latest" ]; then
@ -61,11 +70,11 @@ jobs:
      shell: bash
      run: |
        echo "${{ steps.buildenv1.outputs.symbols_archive }}"
-        echo ::set-env name=ARTIFACT_PATTERN::HighFidelity-Beta-*.$INSTALLER_EXT
+        echo ::set-env name=ARTIFACT_PATTERN::Vircadia-Alpha-PR${{ github.event.number }}-*.$INSTALLER_EXT
        # Build type variables
-        echo ::set-env name=INSTALLER::HighFidelity-Beta-$RELEASE_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT
+        echo ::set-env name=INSTALLER::Vircadia-Alpha-$RELEASE_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT
    - name: Clear Working Directory
-      if: matrix.os[1] == 'windows'
+      if: startsWith(matrix.os, 'windows')
      shell: bash
      working-directory: ${{runner.workspace}}
      run: rm -rf ./*
@ -73,61 +82,83 @@ jobs:
      with: 
        submodules: true
        fetch-depth: 1
+    - name: Install dependencies
+      shell: bash
+      if: startsWith(matrix.os, 'ubuntu')
+      run: |
+        echo "Installing Python Modules:"
+        pip3 install distro || exit 1
+
+        echo "Updating apt repository index"
+        sudo apt update || exit 1
+
+        echo "Installing apt packages"
+        sudo apt install -y ${{ matrix.apt-dependencies }} || exit 1
    - name: Create Build Environment
      shell: bash
      run: cmake -E make_directory "${{runner.workspace}}/build"
    - name: Configure CMake
      working-directory: ${{runner.workspace}}/build
      shell: bash
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CMAKE_EXTRA
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DVCPKG_BUILD_TYPE=release $CMAKE_EXTRA
    - name: Build Application
      working-directory: ${{runner.workspace}}/build
      shell: bash
-      run: cmake --build . --config $BUILD_TYPE --target $APP_NAME
+      run: cmake --build . --config $BUILD_TYPE --target $APP_NAME $CMAKE_BUILD_EXTRA
    - name: Build Domain Server
      working-directory: ${{runner.workspace}}/build
      shell: bash
-      run: cmake --build . --config $BUILD_TYPE --target domain-server
+      run: cmake --build . --config $BUILD_TYPE --target domain-server $CMAKE_BUILD_EXTRA
    - name: Build Assignment Client
      working-directory: ${{runner.workspace}}/build
      shell: bash
-      run: cmake --build . --config $BUILD_TYPE --target assignment-client
+      run: cmake --build . --config $BUILD_TYPE --target assignment-client $CMAKE_BUILD_EXTRA
    - name: Build Console
      working-directory: ${{runner.workspace}}/build
      shell: bash
-      run: cmake --build . --config $BUILD_TYPE --target packaged-server-console
+      run: cmake --build . --config $BUILD_TYPE --target packaged-server-console $CMAKE_BUILD_EXTRA
    - name: Build Installer
      working-directory: ${{runner.workspace}}/build
      shell: bash
-      run: cmake --build . --config $BUILD_TYPE --target package
+      run: |
+        echo "Retry code from https://unix.stackexchange.com/a/137639"
+        function fail {
+          echo $1 >&2
+          exit 1
+        }
+
+        function retry {
+          local n=1
+          local max=5
+          local delay=15
+          while true; do
+            "$@" && break || {
+              if [[ $n -lt $max ]]; then
+                ((n++))
+                echo "Command failed. Attempt $n/$max:"
+                sleep $delay;
+              else
+                fail "The command has failed after $n attempts."
+              fi
+            }
+          done
+        }
+        retry cmake --build . --config $BUILD_TYPE --target package $CMAKE_BUILD_EXTRA
+    - name: Output system stats
+      if: ${{ always() }}
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: |
+        echo "Disk usage:"
+        df -h
    - name: Output Installer Logs
      if: failure() && matrix.os == 'windows-latest'
      shell: bash
      working-directory: ${{runner.workspace}}/build
      run: cat ./_CPack_Packages/win64/NSIS/NSISOutput.log
-
-  build_full_linux:
-    runs-on: ubuntu-latest
-    if: github.event.action != 'labeled' || github.event.label.name == 'rebuild'
-    steps:
-    - uses: actions/checkout@v1
-      with: 
-        submodules: true
-        fetch-depth: 1
-    - name: Update apt repository index
-      run: sudo apt update
-    - name: Install apt packages
-      run: sudo apt install -y mesa-common-dev libegl1 libglvnd-dev libdouble-conversion1 libpulse0
-    - name: Install python modules
-      shell: bash
-      run: pip install boto3 distro PyGithub
-    - name: Create Build Environment
-      run: cmake -E make_directory ${{runner.workspace}}/build
-    - name: Configure CMake
-      working-directory: ${{runner.workspace}}/build
-      shell: bash
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_TOOLS:BOOLEAN=FALSE
-    - name:
+    - name: Upload Artifact
      shell: bash
      working-directory: ${{runner.workspace}}/build
-      run: cmake --build . -- -j3
+      env:
+        GITHUB_CONTEXT: ${{ toJson(github) }}
+      run: $PYTHON_EXEC "$GITHUB_WORKSPACE/tools/ci-scripts/upload_to_publish_server.py"
--- a/BUILD.md
+++ b/BUILD.md
@ -1,6 +1,6 @@
 # General Build Information

-*Last Updated on December 21, 2019*
+*Last Updated on May 17, 2020*

 ### OS Specific Build Guides

@ -22,7 +22,7 @@ These dependencies need not be installed manually. They are automatically downlo
 - [Bullet Physics Engine](https://github.com/bulletphysics/bullet3/releases):  2.83  
 - [glm](https://glm.g-truc.net/0.9.8/index.html):  0.9.8  
 - [Oculus SDK](https://developer.oculus.com/downloads/):   1.11 (Win32) / 0.5 (Mac)  
- [OpenVR](https://github.com/ValveSoftware/openvr):   1.0.6 (Win32 only)  
+- [OpenVR](https://github.com/ValveSoftware/openvr):   1.11.11 (Win32 only)  
 - [Polyvox](http://www.volumesoffun.com/):   0.2.1  
 - [QuaZip](https://sourceforge.net/projects/quazip/files/quazip/):   0.7.3  
 - [SDL2](https://www.libsdl.org/download-2.0.php):   2.0.3  
@ -38,7 +38,7 @@ These are not placed in your normal build tree when doing an out of source build

 #### CMake

-Athena uses CMake to generate build files and project files for your platform.
+Vircadia uses CMake to generate build files and project files for your platform.

 #### Qt
 CMake will download Qt 5.12.3 using vcpkg.  
@ -51,9 +51,9 @@ This can either be entered directly into your shell session before you build or
    export QT_CMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.12.3/lib/cmake
    export QT_CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake

-#### Vcpkg
+#### VCPKG

-Athena uses vcpkg to download and build dependencies.
+Vircadia uses vcpkg to download and build dependencies.
 You do not need to install vcpkg.

 Building the dependencies can be lengthy and the resulting files will be stored in your OS temp directory.
@ -63,7 +63,33 @@ export HIFI_VCPKG_BASE=/path/to/directory

 Where /path/to/directory is the path to a directory where you wish the build files to get stored.

-#### Generating build files
+#### Generating Build Files
+
+##### Possible Environment Variables
+
+    // The URL to post the dump to.
+    CMAKE_BACKTRACE_URL
+    // The identifying tag of the release.
+    CMAKE_BACKTRACE_TOKEN
+    
+    // The release version.
+    RELEASE_NUMBER
+    // The build commit.
+    BUILD_NUMBER
+
+    // The type of release.
+    RELEASE_TYPE=PRODUCTION|PR
+    RELEASE_BUILD=PRODUCTION|PR
+    
+    // TODO: What do these do?
+    PRODUCTION_BUILD=0|1
+    STABLE_BUILD=0|1
+    
+    // TODO: What do these do?
+    USE_STABLE_GLOBAL_SERVICES=1
+    BUILD_GLOBAL_SERVICES=STABLE
+    
+##### Generate Files

 Create a build directory in the root of your checkout and then run the CMake build from there. This will keep the rest of the directory clean.

@ -71,7 +97,19 @@ Create a build directory in the root of your checkout and then run the CMake bui
    cd build
    cmake ..

-If cmake gives you the same error message repeatedly after the build fails, try removing `CMakeCache.txt`.
+If CMake gives you the same error message repeatedly after the build fails, try removing `CMakeCache.txt`.
+
+##### Generating a release/debug only vcpkg build
+
+In order to generate a release or debug only vcpkg package, you could use the use the `VCPKG_BUILD_TYPE` define in your cmake generate command. Building a release only vcpkg can drastically decrease the total build time.
+
+For release only vcpkg:
+
+`cmake .. -DVCPKG_BUILD_TYPE=release`
+
+For debug only vcpkg:
+
+`cmake .. -DVCPKG_BUILD_TYPE=debug`

 #### Variables

@ -85,13 +123,13 @@ For example, to pass the QT_CMAKE_PREFIX_PATH variable (if not using the vcpkg'e

 The following applies for dependencies we do not grab via CMake ExternalProject (OpenSSL is an example), or for dependencies you have opted not to grab as a CMake ExternalProject (via -DUSE_LOCAL_$NAME=0). The list of dependencies we grab by default as external projects can be found in [the CMake External Project Dependencies section](#cmake-external-project-dependencies).

-You can point our [Cmake find modules](cmake/modules/) to the correct version of dependencies by setting one of the three following variables to the location of the correct version of the dependency.
+You can point our [CMake find modules](cmake/modules/) to the correct version of dependencies by setting one of the three following variables to the location of the correct version of the dependency.

 In the examples below the variable $NAME would be replaced by the name of the dependency in uppercase, and $name would be replaced by the name of the dependency in lowercase (ex: OPENSSL_ROOT_DIR, openssl).

 * $NAME_ROOT_DIR - pass this variable to Cmake with the -DNAME_ROOT_DIR= flag when running Cmake to generate build files
 * $NAME_ROOT_DIR - set this variable in your ENV
-* HIFI_LIB_DIR - set this variable in your ENV to your High Fidelity lib folder, should contain a folder '$name'
+* HIFI_LIB_DIR - set this variable in your ENV to your Vircadia lib folder, should contain a folder '$name'

 ### Optional Components

--- a/BUILD_LINUX_CHEATSHEET.md
+++ b/BUILD_LINUX_CHEATSHEET.md
@ -1,4 +1,7 @@
 ## This guide is specific to Ubuntu 16.04.
+
+THIS DOCUMENT IS OUTDATED.
+
 Deb packages of High Fidelity domain server and assignment client are stored on debian.highfidelity.com

 ```
--- a/BUILD_OSX.md
+++ b/BUILD_OSX.md
@ -6,7 +6,7 @@ Please read the [general build guide](BUILD.md) for information on dependencies

 ### Homebrew

-[Homebrew](https://brew.sh/) is an excellent package manager for macOS. It makes install of some High Fidelity dependencies very simple.
+[Homebrew](https://brew.sh/) is an excellent package manager for macOS. It makes install of some Vircadia dependencies very simple.

    brew install cmake openssl

--- a/BUILD_WIN.md
+++ b/BUILD_WIN.md
@ -1,6 +1,6 @@
 # Build Windows

-*Last Updated on January 13, 2020*
+*Last Updated on May 17, 2020*

 This is a stand-alone guide for creating your first Vircadia build for Windows 64-bit.  

@ -47,7 +47,7 @@ Download and install the latest version of CMake 3.15.
 Download the file named win64-x64 Installer from the [CMake Website](https://cmake.org/download/). You can access the installer on this [3.15 Version page](https://cmake.org/files/v3.15/). During installation, make sure to check "Add CMake to system PATH for all users" when prompted.

 ### Step 4. Create VCPKG environment variable
-In the next step, you will use CMake to build Project Athena. By default, the CMake process builds dependency files in Windows' `%TEMP%` directory, which is periodically cleared by the operating system. To prevent you from having to re-build the dependencies in the event that Windows clears that directory, we recommend that you create a `HIFI_VCPKG_BASE` environment variable linked to a directory somewhere on your machine. That directory will contain all dependency files until you manually remove them.
+In the next step, you will use CMake to build Vircadia. By default, the CMake process builds dependency files in Windows' `%TEMP%` directory, which is periodically cleared by the operating system. To prevent you from having to re-build the dependencies in the event that Windows clears that directory, we recommend that you create a `HIFI_VCPKG_BASE` environment variable linked to a directory somewhere on your machine. That directory will contain all dependency files until you manually remove them.

 To create this variable:
 * Naviagte to 'Edit the System Environment Variables' Through the start menu.
@ -68,7 +68,7 @@ To create this variable:
 ### Step 5. Running CMake to Generate Build Files

 Run Command Prompt from Start and run the following commands:  
-`cd "%HIFI_DIR%"`  
+`cd "%VIRCADIA_DIR%"`  
 `mkdir build`  
 `cd build`  

@ -78,11 +78,11 @@ Run `cmake .. -G "Visual Studio 15 Win64"`.
 #### If you're using Visual Studio 2019,
 Run `cmake .. -G "Visual Studio 16 2019" -A x64`.

-Where `%HIFI_DIR%` is the directory for the highfidelity repository.
+Where `%VIRCADIA_DIR%` is the directory for the Vircadia repository.

 ### Step 6. Making a Build

-Open `%HIFI_DIR%\build\athena.sln` using Visual Studio.
+Open `%VIRCADIA_DIR%\build\vircadia.sln` using Visual Studio.

 Change the Solution Configuration (menu ribbon under the menu bar, next to the green play button) from "Debug" to "Release" for best performance.

@ -98,22 +98,22 @@ Restart Visual Studio again.

 In Visual Studio, right+click "interface" under the Apps folder in Solution Explorer and select "Set as Startup Project". Run from the menu bar `Debug > Start Debugging`.

-Now, you should have a full build of Project Athena and be able to run the Interface using Visual Studio. Please check our [Docs](https://wiki.highfidelity.com/wiki/Main_Page) for more information regarding the programming workflow.
+Now, you should have a full build of Vircadia and be able to run the Interface using Visual Studio.

-Note: You can also run Interface by launching it from command line or File Explorer from `%HIFI_DIR%\build\interface\Release\interface.exe`
+Note: You can also run Interface by launching it from command line or File Explorer from `%VIRCADIA_DIR%\build\interface\Release\interface.exe`

 ## Troubleshooting

 For any problems after Step #6, first try this:  
-* Delete your locally cloned copy of the highfidelity repository  
+* Delete your locally cloned copy of the Vircadia repository  
 * Restart your computer  
 * Redownload the [repository](https://github.com/kasenvr/project-athena)  
 * Restart directions from Step #6  

 #### CMake gives you the same error message repeatedly after the build fails

-Remove `CMakeCache.txt` found in the `%HIFI_DIR%\build` directory.
+Remove `CMakeCache.txt` found in the `%VIRCADIA_DIR%\build` directory.

 #### CMake can't find OpenSSL

-Remove `CMakeCache.txt` found in the `%HIFI_DIR%\build` directory.  Verify that your HIFI_VCPKG_BASE environment variable is set and pointing to the correct location.  Verify that the file `${HIFI_VCPKG_BASE}/installed/x64-windows/include/openssl/ssl.h` exists.
+Remove `CMakeCache.txt` found in the `%VIRCADIA_DIR%\build` directory.  Verify that your HIFI_VCPKG_BASE environment variable is set and pointing to the correct location. Verify that the file `${HIFI_VCPKG_BASE}/installed/x64-windows/include/openssl/ssl.h` exists.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -67,8 +67,12 @@ if (HIFI_ANDROID)
        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
    )
 else()
+    set(VCPKG_BUILD_TYPE_PARAM "")
+    if (VCPKG_BUILD_TYPE)
+      set(VCPKG_BUILD_TYPE_PARAM --vcpkg-build-type ${VCPKG_BUILD_TYPE})
+    endif()
    execute_process(
-        COMMAND ${HIFI_PYTHON_EXEC} ${CMAKE_CURRENT_SOURCE_DIR}/prebuild.py --release-type ${RELEASE_TYPE} --build-root ${CMAKE_BINARY_DIR}
+        COMMAND ${HIFI_PYTHON_EXEC} ${CMAKE_CURRENT_SOURCE_DIR}/prebuild.py --release-type ${RELEASE_TYPE} --build-root ${CMAKE_BINARY_DIR} ${VCPKG_BUILD_TYPE_PARAM}
        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
    )
    # squelch the Policy CMP0074 warning without requiring an update to cmake 3.12.
@ -93,7 +97,7 @@ endif()

 option(VCPKG_APPLOCAL_DEPS OFF)

-project(athena)
+project(vircadia)
 include("cmake/init.cmake")
 include("cmake/compiler.cmake")
 option(VCPKG_APPLOCAL_DEPS OFF)
@ -266,7 +270,6 @@ find_package( Threads )
 add_definitions(-DGLM_FORCE_RADIANS)
 add_definitions(-DGLM_ENABLE_EXPERIMENTAL)
 add_definitions(-DGLM_FORCE_CTOR_INIT)
-add_definitions(-DGLM_LANG_STL11_FORCED) # Workaround for GLM not detecting support for C++11 templates on Android

 if (WIN32)
    # Deal with fakakta Visual Studo 2017 bug
--- a/CODING_STANDARD.md
+++ b/CODING_STANDARD.md
@ -976,18 +976,17 @@ while (true) {

 #### [4.3.4] Source files (header and implementation) must include a boilerplate.

-Boilerplates should include the filename, location, creator, copyright Project Athena contributors, and Apache 2.0 License 
-information. This should be placed at the top of the file. If editing an existing file that is copyright High Fidelity, add a 
-second copyright line, copyright Project Athena contributors.
+Boilerplates should include the filename, creator, copyright Vircadia contributors, and Apache 2.0 License information. 
+This should be placed at the top of the file. If editing an existing file that is copyright High Fidelity, add a second 
+copyright line, copyright Vircadia contributors.

 ```cpp
 //
 //  NodeList.h
-//  libraries/shared/src
 //
 //  Created by Stephen Birarda on 15 Feb 2013.
 //  Copyright 2013 High Fidelity, Inc.
-//  Copyright 2020 Project Athena contributors.
+//  Copyright 2020 Vircadia contributors.
 //
 //  This is where you could place an optional one line comment about the file.
 //
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -21,7 +21,7 @@ Contributing
  
  ```
  git remote add upstream https://github.com/kasenvr/project-athena
-  git pull upstream kasen/core
+  git pull upstream master
  ```
  
  Resolve any conflicts that arise with this step.
@ -29,7 +29,7 @@ Contributing
 7. Push to your fork
  
  ```
-  git push origin kasen/core
+  git push origin new_branch_name
  ```
 8. Submit a pull request

--- a/INSTALL.md
+++ b/INSTALL.md
@ -1,10 +1,10 @@
 # Creating an Installer

-Follow the [build guide](BUILD.md) to figure out how to build Project Athena for your platform.
+Follow the [build guide](BUILD.md) to figure out how to build Vircadia for your platform.

 During generation, CMake should produce an `install` target and a `package` target.

-The `install` target will copy the Project Athena targets and their dependencies to your `CMAKE_INSTALL_PREFIX`.  
+The `install` target will copy the Vircadia targets and their dependencies to your `CMAKE_INSTALL_PREFIX`.  
 This variable is set by the `project(hifi)` command in `CMakeLists.txt` to `C:/Program Files/hifi` and stored in `build/CMakeCache.txt`

 ### Packaging
@ -15,7 +15,7 @@ To produce an installer, run the `package` target.

 To produce an executable installer on Windows, the following are required:

-1.  [7-zip](<https://www.7-zip.org/download.html>)  
+1. [7-zip](<https://www.7-zip.org/download.html>)  

 1. [Nullsoft Scriptable Install System](http://nsis.sourceforge.net/Download) - 3.04  
  Install using defaults (will install to `C:\Program Files (x86)\NSIS`)
@ -56,22 +56,23 @@ To produce an executable installer on Windows, the following are required:
   1.  Copy `Release\ApplicationID.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-ansi\`
   1.  Copy `ReleaseUnicode\ApplicationID.dll` to `C:\Program Files (x86)\NSIS\Plugins\x86-unicode\`

-1. [npm](<https://www.npmjs.com/get-npm>)
+1. [Node.JS and NPM](<https://www.npmjs.com/get-npm>)
    1.  Install version 10.15.0 LTS
    
 1.  Perform a clean cmake from a new terminal.
-1.  Open the `athena.sln` solution and select the Release configuration.
+1.  Open the `vircadia.sln` solution with elevated (administrator) permissions on Visual Studio and select the **Release** configuration.
 1.  Build the solution.
+1.  Build CMakeTargets->INSTALL
 1.  Build `packaged-server-console-npm-install` (found under **hidden/Server Console**)
 1.  Build `packaged-server-console` (found under **Server Console**)  
    This will add 2 folders to `build\server-console\` -  
    `server-console-win32-x64` and `x64`
-1.  Build CMakeTargets->PACKAGE  
-    Installer is now available in `build\_CPack_Packages\win64\NSIS`
+1.  Build CMakeTargets->PACKAGE   
+    The installer is now available in `build\_CPack_Packages\win64\NSIS`

 #### OS X
 1.   [npm](<https://www.npmjs.com/get-npm>)
-      Install version 10.15.0 LTS
+      Install version 12.16.3 LTS
   
 1.  Perform a clean CMake.
 1.  Perform a Release build of ALL_BUILD
@ -80,3 +81,9 @@ To produce an executable installer on Windows, the following are required:
     Sandbox-darwin-x64
 1.  Perform a Release build of `package`
      Installer is now available in `build/_CPack_Packages/Darwin/DragNDrop
+      
+### FAQ
+
+1. **Problem:** Failure to open a file. ```File: failed opening file "\FOLDERSHARE\XYZSRelease\...\Credits.rtf" Error in script "C:\TFS\XYZProject\Releases\NullsoftInstaller\XYZWin7Installer.nsi" on line 77 -- aborting creation process```
+    1. **Cause:** The complete path (current directory + relative path) has to be < 260 characters to any of the relevant files.
+    1. **Solution:** Move your build and packaging folder as high up in the drive as possible to prevent an overage.
--- a/4
+++ b/4
@ -1,7 +1,7 @@
 Copyright (c) 2013-2019, High Fidelity, Inc.
-Copyright (c) 2019-2020, Project Athena Contributors.
+Copyright (c) 2019-2020, Vircadia contributors.
 All rights reserved.
-https://projectathena.io
+https://vircadia.com

 Licensed under the Apache License version 2.0 (the "License");
 You may not use this software except in compliance with the License.
--- a/README.md
+++ b/README.md
@ -12,23 +12,31 @@ Vircadia is a 3D social software project seeking to incrementally bring about a

 ### How to build the Interface

-[For Windows](https://github.com/kasenvr/project-athena/blob/kasen/core/BUILD_WIN.md)
+[For Windows](https://github.com/kasenvr/project-athena/blob/master/BUILD_WIN.md)

-[For Linux](https://github.com/kasenvr/project-athena/blob/kasen/core/BUILD_LINUX.md)
+[For Mac](https://github.com/kasenvr/project-athena/blob/master/BUILD_OSX.md)

-[For Linux - Athena Builder](https://github.com/daleglass/athena-builder)
+[For Linux](https://github.com/kasenvr/project-athena/blob/master/BUILD_LINUX.md)
+
+[For Linux - Vircadia Builder](https://github.com/kasenvr/vircadia-builder)

 ### How to deploy a Server

-[For Windows and Linux](https://vircadia.com/download-vircadia/#server)
+[For Windows and Linux](https://vircadia.com/deploy-a-server/)

 ### How to build a Server

-[For Linux - Athena Builder](https://github.com/daleglass/athena-builder)
+[For Linux - Vircadia Builder](https://github.com/kasenvr/vircadia-builder)
+
+### How to generate an Installer
+
+[For Windows](https://github.com/kasenvr/project-athena/blob/master/INSTALL.md)
+
+[For Linux - AppImage - Vircadia Builder](https://github.com/kasenvr/vircadia-builder/blob/master/README.md#building-appimages)

 ### Boot to Metaverse: The Goal

-Having a place to experience adventure, a place to relax with calm breath, that's a world to live in. An engine to support infinite combinations and possibilities of worlds without censorship and interruption, that's a metaverse. Finding a way to make infinite realities our reality, that's the dream.
+Having a place to experience adventure, a place to relax with calm breath, that's a world to live in. An engine to support infinite combinations and possibilities of worlds without censorship and interruption, that's a metaverse. Finding a way to make infinite realities our reality is the dream.

 ### Boot to Metaverse: The Technicals

--- a/README_hifi.md
+++ b/README_hifi.md
@ -1,3 +1,5 @@
+# THIS DOCUMENT IS OUTDATED
+
 High Fidelity (hifi) is an early-stage technology lab experimenting with Virtual Worlds and VR. 

 This repository contains the source to many of the components in our 
@ -15,7 +17,7 @@ Come chat with us in [our Gitter](https://gitter.im/highfidelity/hifi) if you ha

 Documentation
 =========
-Documentation is available at [docs.highfidelity.com](https://docs.highfidelity.com), if something is missing, please suggest it via a new job on Worklist (add to the hifi-docs project).
+Documentation is available at [docs.highfidelity.com](https://docs.highfidelity.com/), if something is missing, please suggest it via a new job on Worklist (add to the hifi-docs project).

 There is also detailed [documentation on our coding standards](CODING_STANDARD.md).

--- a/android/apps/interface/src/main/res/values/strings.xml
+++ b/android/apps/interface/src/main/res/values/strings.xml
@ -27,9 +27,9 @@
    <string name="online">Online</string>
    <string name="signup">Sign Up</string>
    <string name="signup_uppercase">SIGN UP</string>
-    <string name="creating_account">Creating your High Fidelity account</string>
+    <string name="creating_account">Creating your Vircadia account</string>
    <string name="signup_email_username_or_password_incorrect">Email, username or password incorrect.</string>
-    <string name="signedin_welcome">You are now signed into High Fidelity</string>
+    <string name="signedin_welcome">You are now signed into Vircadia</string>
    <string name="logged_in_welcome">You are now logged in!</string>
    <string name="welcome">Welcome</string>
    <string name="cancel">Cancel</string>
--- a/assignment-client/src/avatars/ScriptableAvatar.cpp
+++ b/assignment-client/src/avatars/ScriptableAvatar.cpp
@ -144,10 +144,10 @@ void ScriptableAvatar::update(float deltatime) {
            }
            _animationDetails.currentFrame = currentFrame;

-            const std::vector<HFMJoint>& modelJoints = _bind->getHFMModel().joints;
+            const QVector<HFMJoint>& modelJoints = _bind->getHFMModel().joints;
            QStringList animationJointNames = _animation->getJointNames();

-            const auto nJoints = (int)modelJoints.size();
+            const int nJoints = modelJoints.size();
            if (_jointData.size() != nJoints) {
                _jointData.resize(nJoints);
            }
--- a/cmake/installer/installer-header.bmp
+++ b/cmake/installer/installer-header.bmp
--- a/cmake/installer/installer.ico
+++ b/cmake/installer/installer.ico
--- a/cmake/installer/uninstaller-header.bmp
+++ b/cmake/installer/uninstaller-header.bmp
--- a/cmake/macros/GenerateInstallers.cmake
+++ b/cmake/macros/GenerateInstallers.cmake
@ -18,20 +18,20 @@ macro(GENERATE_INSTALLERS)
  if (CLIENT_ONLY)
    set(_PACKAGE_NAME_EXTRA "-Interface")
    set(INSTALLER_TYPE "client_only")
-    string(REGEX REPLACE "Project Athena" "Project Athena Interface" _DISPLAY_NAME ${BUILD_ORGANIZATION})
+    string(REGEX REPLACE "Vircadia" "Vircadia Interface" _DISPLAY_NAME ${BUILD_ORGANIZATION})
  elseif (SERVER_ONLY)
    set(_PACKAGE_NAME_EXTRA "-Sandbox")
    set(INSTALLER_TYPE "server_only")
-    string(REGEX REPLACE "Project Athena" "Project Athena Sandbox" _DISPLAY_NAME ${BUILD_ORGANIZATION})
+    string(REGEX REPLACE "Vircadia" "Vircadia Sandbox" _DISPLAY_NAME ${BUILD_ORGANIZATION})
  else ()
    set(_DISPLAY_NAME ${BUILD_ORGANIZATION})
    set(INSTALLER_TYPE "full")
  endif ()

  set(CPACK_PACKAGE_NAME ${_DISPLAY_NAME})
-  set(CPACK_PACKAGE_VENDOR "Project Athena")
+  set(CPACK_PACKAGE_VENDOR "Vircadia")
  set(CPACK_PACKAGE_VERSION ${BUILD_VERSION})
-  set(CPACK_PACKAGE_FILE_NAME "ProjectAthena-Alpha${_PACKAGE_NAME_EXTRA}-${BUILD_VERSION}")
+  set(CPACK_PACKAGE_FILE_NAME "Vircadia-Alpha${_PACKAGE_NAME_EXTRA}-${BUILD_VERSION}")
  set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})
  set(CPACK_NSIS_PACKAGE_NAME ${_DISPLAY_NAME})
  if (PR_BUILD)
@ -118,11 +118,11 @@ macro(GENERATE_INSTALLERS)
  set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")

  if (BUILD_CLIENT)
-    cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "Project Athena Interface")
+    cpack_add_component(${CLIENT_COMPONENT} DISPLAY_NAME "Vircadia Interface")
  endif ()

  if (BUILD_SERVER)
-    cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "Project Athena Sandbox")
+    cpack_add_component(${SERVER_COMPONENT} DISPLAY_NAME "Vircadia Sandbox")
  endif ()

  include(CPack)
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@ -35,7 +35,7 @@ macro(SET_PACKAGING_PARAMETERS)
    set(DEPLOY_PACKAGE TRUE)
    set(PRODUCTION_BUILD 1)
    set(BUILD_VERSION ${RELEASE_NUMBER})
-    set(BUILD_ORGANIZATION "Project Athena")
+    set(BUILD_ORGANIZATION "Vircadia")
    set(HIGH_FIDELITY_PROTOCOL "hifi")
    set(HIGH_FIDELITY_APP_PROTOCOL "hifiapp")
    set(INTERFACE_BUNDLE_NAME "interface")
@ -60,7 +60,7 @@ macro(SET_PACKAGING_PARAMETERS)
    set(DEPLOY_PACKAGE TRUE)
    set(PR_BUILD 1)
    set(BUILD_VERSION "PR${RELEASE_NUMBER}")
-    set(BUILD_ORGANIZATION "Project Athena - PR${RELEASE_NUMBER}")
+    set(BUILD_ORGANIZATION "Vircadia - PR${RELEASE_NUMBER}")
    set(INTERFACE_BUNDLE_NAME "interface")
    set(INTERFACE_ICON_PREFIX "interface-beta")

@ -69,7 +69,7 @@ macro(SET_PACKAGING_PARAMETERS)
  else ()
    set(DEV_BUILD 1)
    set(BUILD_VERSION "dev")
-    set(BUILD_ORGANIZATION "Project Athena - ${BUILD_VERSION}")
+    set(BUILD_ORGANIZATION "Vircadia - ${BUILD_VERSION}")
    set(INTERFACE_BUNDLE_NAME "interface")
    set(INTERFACE_ICON_PREFIX "interface-beta")

@ -171,21 +171,21 @@ macro(SET_PACKAGING_PARAMETERS)

    # shortcut names
    if (PRODUCTION_BUILD)
-      set(INTERFACE_SHORTCUT_NAME "Project Athena")
+      set(INTERFACE_SHORTCUT_NAME "Vircadia")
      set(CONSOLE_SHORTCUT_NAME "Console")
      set(SANDBOX_SHORTCUT_NAME "Sandbox")
      set(APP_USER_MODEL_ID "com.highfidelity.console")
    else ()
-      set(INTERFACE_SHORTCUT_NAME "Project Athena - ${BUILD_VERSION_NO_SHA}")
+      set(INTERFACE_SHORTCUT_NAME "Vircadia - ${BUILD_VERSION_NO_SHA}")
      set(CONSOLE_SHORTCUT_NAME "Console - ${BUILD_VERSION_NO_SHA}")
      set(SANDBOX_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION_NO_SHA}")
    endif ()

    set(INTERFACE_HF_SHORTCUT_NAME "${INTERFACE_SHORTCUT_NAME}")
-    set(CONSOLE_HF_SHORTCUT_NAME "Project Athena ${CONSOLE_SHORTCUT_NAME}")
-    set(SANDBOX_HF_SHORTCUT_NAME "Project Athena ${SANDBOX_SHORTCUT_NAME}")
+    set(CONSOLE_HF_SHORTCUT_NAME "Vircadia ${CONSOLE_SHORTCUT_NAME}")
+    set(SANDBOX_HF_SHORTCUT_NAME "Vircadia ${SANDBOX_SHORTCUT_NAME}")
 	
-    set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "Project Athena")
+    set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "Vircadia")
    set(PRE_SANDBOX_CONSOLE_SHORTCUT_NAME "Server Console")

    # check if we need to find signtool
--- a/cmake/macros/TargetDraco.cmake
+++ b/cmake/macros/TargetDraco.cmake
@ -1,6 +1,5 @@
 macro(TARGET_DRACO)
    set(LIBS draco dracodec dracoenc)
-    find_library(LIBPATH ${LIB} PATHS )
    if (ANDROID)
        set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/draco)
        set(DRACO_INCLUDE_DIRS "${INSTALL_DIR}/include" CACHE STRING INTERNAL)
@ -12,6 +11,8 @@ macro(TARGET_DRACO)
    else()
        set(LIB_SEARCH_PATH_RELEASE ${VCPKG_INSTALL_ROOT}/lib/)
        set(LIB_SEARCH_PATH_DEBUG ${VCPKG_INSTALL_ROOT}/debug/lib/)
+        set(DRACO_LIBRARY_RELEASE "")
+        set(DRACO_LIBRARY_DEBUG "")
        foreach(LIB ${LIBS}) 
            find_library(${LIB}_LIBPATH ${LIB} PATHS ${LIB_SEARCH_PATH_RELEASE} NO_DEFAULT_PATH)
            list(APPEND DRACO_LIBRARY_RELEASE ${${LIB}_LIBPATH})
--- a/cmake/macros/TargetOpenEXR.cmake
+++ b/cmake/macros/TargetOpenEXR.cmake
@ -28,6 +28,8 @@ macro(TARGET_OPENEXR)
            string(REGEX MATCHALL "[0-9]" OPENEXR_MINOR_VERSION ${TMP})
        endif()

+        set(OPENEXR_LIBRARY_RELEASE "")
+        set(OPENEXR_LIBRARY_DEBUG "")
        foreach(OPENEXR_LIB
            IlmImf
            IlmImfUtil
--- a/cmake/macros/TargetPython.cmake
+++ b/cmake/macros/TargetPython.cmake
@ -19,4 +19,5 @@ macro(TARGET_PYTHON)
            message(FATAL_ERROR "Unable to locate Python interpreter 3.5 or higher")
        endif()
    endif()
-endmacro()
+    message("Using the Python interpreter located at: " ${HIFI_PYTHON_EXEC})
+endmacro()
--- a/cmake/ports/glad/portfile.cmake
+++ b/cmake/ports/glad/portfile.cmake
@ -1,17 +1,19 @@
 include(vcpkg_common_functions)
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

+file(READ "${VCPKG_ROOT_DIR}/_env/EXTERNAL_BUILD_ASSETS.txt" EXTERNAL_BUILD_ASSETS)
+
 if (ANDROID)
    vcpkg_download_distfile(
        SOURCE_ARCHIVE
-        URLS https://athena-public.s3.amazonaws.com/dependencies/glad/glad32es.zip
+        URLS ${EXTERNAL_BUILD_ASSETS}/dependencies/glad/glad32es.zip
        SHA512 2e02ac633eed8f2ba2adbf96ea85d08998f48dd2e9ec9a88ec3c25f48eaf1405371d258066327c783772fcb3793bdb82bd7375fdabb2ba5e2ce0835468b17f65
    )
 else()
    # else Linux desktop
    vcpkg_download_distfile(
        SOURCE_ARCHIVE
-        URLS https://athena-public.s3.amazonaws.com/dependencies/glad/glad45.zip
+        URLS ${EXTERNAL_BUILD_ASSETS}/dependencies/glad/glad45.zip
        SHA512 653a7b873f9fbc52e0ab95006cc3143bc7b6f62c6e032bc994e87669273468f37978525c9af5efe36f924cb4acd221eb664ad9af0ce4bf711b4f1be724c0065e
        FILENAME glad45.zip
    )
@ -33,4 +35,3 @@ vcpkg_install_cmake()

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/glad)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
--- a/cmake/ports/glm/disable_warnings_as_error.patch
+++ b/cmake/ports/glm/disable_warnings_as_error.patch
@ -1,7 +1,16 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 756673a3..5fbc8906 100644
+index 756673a..9b3aa07 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
+@@ -194,7 +194,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ 		message("GLM: Clang - ${CMAKE_CXX_COMPILER_ID} compiler")
+ 	endif()
+ 
+-	add_compile_options(-Werror -Weverything)
+	add_compile_options(-Weverything)
+ 	add_compile_options(-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-c++11-long-long -Wno-padded -Wno-gnu-anonymous-struct -Wno-nested-anon-types)
+ 	add_compile_options(-Wno-undefined-reinterpret-cast -Wno-sign-conversion -Wno-unused-variable -Wno-missing-prototypes -Wno-unreachable-code -Wno-missing-variable-declarations -Wno-sign-compare -Wno-global-constructors -Wno-unused-macros -Wno-format-nonliteral)
+ 
@@ -216,7 +216,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
 		message("GLM: Visual C++ - ${CMAKE_CXX_COMPILER_ID} compiler")
 	endif()
--- a/cmake/ports/hifi-deps/CONTROL
+++ b/cmake/ports/hifi-deps/CONTROL
@ -1,4 +1,4 @@
 Source: hifi-deps
-Version: 0.1.4-github-actions
+Version: 0.1.5-github-actions
 Description: Collected dependencies for High Fidelity applications
 Build-Depends: bullet3, draco, etc2comp, glad, glm, nvtt, openexr (!android), openssl (windows), opus, polyvox, tbb (!android), vhacd, webrtc (!android), zlib
--- a/cmake/ports/openvr/portfile.cmake
+++ b/cmake/ports/openvr/portfile.cmake
@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO ValveSoftware/openvr
-    REF v1.0.16
-    SHA512 967356563ba4232da5361510c7519d3058e09eced4571aadc00d8a75ab1f299a0aebda2b0b10b0ffb6c6a443fd718634d0c0103964e289961449c93e8d7b9d02
+    REF v1.11.11
+    SHA512 25bddb0e82eea091fe5101d0d3de1de7bb81b4504adc0c8d8e687d2502c0167bc5a11e68bc343d7563fb4db7c917e9d0e2ea99bc1d8016d479874b0c6bd7f121
    HEAD_REF master
 )

--- a/cmake/ports/opus/portfile.cmake
+++ b/cmake/ports/opus/portfile.cmake
@ -6,9 +6,9 @@ vcpkg_from_github(
  REPO
  xiph/opus
  REF
-  e85ed7726db5d677c9c0677298ea0cb9c65bdd23
+  72a3a6c13329869000b34a12ba27d8bfdfbc22b3
  SHA512
-  a8c7e5bf383c06f1fdffd44d9b5f658f31eb4800cb59d12da95ddaeb5646f7a7b03025f4663362b888b1374d4cc69154f006ba07b5840ec61ddc1a1af01d6c54
+  590b852e966a497e33d129b58bc07d1205fe8fea9b158334cd8a3c7f539332ef9702bba4a37bd0be83eb5f04a218cef87645251899f099695d01c1eb8ea6e2fd
  HEAD_REF
  master)

--- a/cmake/ports/polyvox/portfile.cmake
+++ b/cmake/ports/polyvox/portfile.cmake
@ -1,9 +1,11 @@
 include(vcpkg_common_functions)

+file(READ "${VCPKG_ROOT_DIR}/_env/EXTERNAL_BUILD_ASSETS.txt" EXTERNAL_BUILD_ASSETS)
+
 # else Linux desktop
 vcpkg_download_distfile(
    SOURCE_ARCHIVE
-    URLS https://athena-public.s3.amazonaws.com/dependencies/polyvox-master-2015-7-15.zip
+    URLS ${EXTERNAL_BUILD_ASSETS}/dependencies/polyvox-master-2015-7-15.zip
    SHA512 cc04cd43ae74b9c7bb065953540c0048053fcba6b52dc4218b3d9431fba178d65ad4f6c53cc1122ba61d0ab4061e99a7ebbb15db80011d607c5070ebebf8eddc
    FILENAME polyvox.zip
 )
@ -23,33 +25,45 @@ vcpkg_install_cmake()

 file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/polyvox RENAME copyright)
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/include)
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib)
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib)
+if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib)
+endif()
+if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib)
+endif()
 if(WIN32)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/PolyVoxCore/lib/Release/PolyVoxCore.lib ${CURRENT_PACKAGES_DIR}/lib/PolyVoxCore.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/PolyVoxCore/lib/Debug/PolyVoxCore.lib ${CURRENT_PACKAGES_DIR}/debug/lib/PolyVoxCore.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/PolyVoxUtil/lib/PolyVoxUtil.lib ${CURRENT_PACKAGES_DIR}/lib/PolyVoxUtil.lib)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/PolyVoxUtil/lib/PolyVoxUtil.lib ${CURRENT_PACKAGES_DIR}/debug/lib/PolyVoxUtil.lib)
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(RENAME ${CURRENT_PACKAGES_DIR}/PolyVoxCore/lib/Release/PolyVoxCore.lib ${CURRENT_PACKAGES_DIR}/lib/PolyVoxCore.lib)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/PolyVoxUtil/lib/PolyVoxUtil.lib ${CURRENT_PACKAGES_DIR}/lib/PolyVoxUtil.lib)
+    endif()
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/PolyVoxCore/lib/Debug/PolyVoxCore.lib ${CURRENT_PACKAGES_DIR}/debug/lib/PolyVoxCore.lib)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/PolyVoxUtil/lib/PolyVoxUtil.lib ${CURRENT_PACKAGES_DIR}/debug/lib/PolyVoxUtil.lib)
+    endif()
    file(RENAME ${CURRENT_PACKAGES_DIR}/PolyVoxCore/include/PolyVoxCore ${CURRENT_PACKAGES_DIR}/include/PolyVoxCore)
    file(RENAME ${CURRENT_PACKAGES_DIR}/PolyVoxUtil/include/PolyVoxUtil ${CURRENT_PACKAGES_DIR}/include/PolyVoxUtil)
    file(RENAME ${CURRENT_PACKAGES_DIR}/cmake/PolyVoxConfig.cmake ${CURRENT_PACKAGES_DIR}/share/polyvox/polyvoxConfig.cmake)
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/cmake)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake)
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/PolyVoxCore)
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/PolyVoxUtil)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/PolyVoxUtil)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/cmake)
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/PolyVoxCore)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/PolyVoxUtil)
 else()
-    file(GLOB LIBS ${CURRENT_PACKAGES_DIR}/lib/Release/*)
-    foreach(_lib ${LIBS})
-        file(RELATIVE_PATH _libName ${CURRENT_PACKAGES_DIR}/lib/Release ${_lib})
-        file(RENAME ${_lib} ${CURRENT_PACKAGES_DIR}/lib/${_libName})
-    endforeach()
-    file(GLOB LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/Debug/*)
-    foreach(_lib ${LIBS})
-        file(RELATIVE_PATH _libName ${CURRENT_PACKAGES_DIR}/debug/lib/Debug ${_lib})
-        file(RENAME ${_lib} ${CURRENT_PACKAGES_DIR}/debug/lib/${_libName})
-    endforeach()
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(GLOB LIBS ${CURRENT_PACKAGES_DIR}/lib/Release/*)
+        foreach(_lib ${LIBS})
+            file(RELATIVE_PATH _libName ${CURRENT_PACKAGES_DIR}/lib/Release ${_lib})
+            file(RENAME ${_lib} ${CURRENT_PACKAGES_DIR}/lib/${_libName})
+        endforeach()
+    endif()
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(GLOB LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/Debug/*)
+        foreach(_lib ${LIBS})
+            file(RELATIVE_PATH _libName ${CURRENT_PACKAGES_DIR}/debug/lib/Debug ${_lib})
+            file(RENAME ${_lib} ${CURRENT_PACKAGES_DIR}/debug/lib/${_libName})
+        endforeach()
+    endif()
    file(RENAME ${CURRENT_PACKAGES_DIR}/include/PolyVoxCore ${CURRENT_PACKAGES_DIR}/include/PolyVoxCore.temp)
    file(RENAME ${CURRENT_PACKAGES_DIR}/include/PolyVoxCore.temp/PolyVoxCore ${CURRENT_PACKAGES_DIR}/include/PolyVoxCore)
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/PolyVoxCore.temp)
--- a/cmake/ports/quazip/portfile.cmake
+++ b/cmake/ports/quazip/portfile.cmake
@ -1,10 +1,11 @@
 include(vcpkg_common_functions)

 file(READ "${VCPKG_ROOT_DIR}/_env/QT_CMAKE_PREFIX_PATH.txt" QT_CMAKE_PREFIX_PATH)
+file(READ "${VCPKG_ROOT_DIR}/_env/EXTERNAL_BUILD_ASSETS.txt" EXTERNAL_BUILD_ASSETS)

 vcpkg_download_distfile(
    SOURCE_ARCHIVE
-    URLS https://athena-public.s3.amazonaws.com/dependencies/quazip-0.7.3.zip
+    URLS ${EXTERNAL_BUILD_ASSETS}/dependencies/quazip-0.7.3.zip
    SHA512 b2d812b6346317fd6d8f4f1344ad48b721d697c429acc8b7e7cb776ce5cba15a59efd64b2c5ae1f31b5a3c928014f084aa1379fd55d8a452a6cf4fd510b3afcc
    FILENAME quazip.zip
 )
@ -24,10 +25,14 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()

 if (WIN32)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/quazip5.dll ${CURRENT_PACKAGES_DIR}/bin/quazip5.dll)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/quazip5d.dll ${CURRENT_PACKAGES_DIR}/debug/bin/quazip5.dll)
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/quazip5.dll ${CURRENT_PACKAGES_DIR}/bin/quazip5.dll)
+    endif()
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/quazip5d.dll ${CURRENT_PACKAGES_DIR}/debug/bin/quazip5.dll)
+    endif()
 elseif(DEFINED VCPKG_TARGET_IS_LINUX)
    # We only want static libs.
    file(GLOB QUAZIP5_DYNAMIC_LIBS ${CURRENT_PACKAGES_DIR}/lib/libquazip5.so* ${CURRENT_PACKAGES_DIR}/debug/lib/libquazip5d.so*)
--- a/cmake/ports/tbb/CONTROL
+++ b/cmake/ports/tbb/CONTROL
@ -1,4 +1,4 @@
 Source: tbb
 Version: 2019_U8-1
-Homepage: https://github.com/01org/tbb
+Homepage: https://github.com/oneapi-src/oneTBB
 Description: Intel's Threading Building Blocks.
--- a/cmake/ports/vhacd/portfile.cmake
+++ b/cmake/ports/vhacd/portfile.cmake
@ -1,10 +1,12 @@
 include(vcpkg_common_functions)
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

+file(READ "${VCPKG_ROOT_DIR}/_env/EXTERNAL_BUILD_ASSETS.txt" EXTERNAL_BUILD_ASSETS)
+
 # else Linux desktop
 vcpkg_download_distfile(
    SOURCE_ARCHIVE
-    URLS https://athena-public.s3.amazonaws.com/dependencies/v-hacd-master.zip
+    URLS ${EXTERNAL_BUILD_ASSETS}/dependencies/v-hacd-master.zip
    SHA512 5d9bd4872ead9eb3574e4806d6c4f490353a04036fd5f571e1e44f47cb66b709e311abcd53af30bae0015a690152170aeed93209a626c28ebcfd6591f3bb036f
    FILENAME vhacd.zip
 )
@ -22,10 +24,17 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/vhacd)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+endif()
+
 if (WIN32)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Release/VHACD_LIB.lib ${CURRENT_PACKAGES_DIR}/lib/VHACD.lib)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/Release)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Debug/VHACD_LIB.lib ${CURRENT_PACKAGES_DIR}/debug/lib/VHACD.lib)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/Debug)
-endif()
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        file(RENAME ${CURRENT_PACKAGES_DIR}/lib/Release/VHACD_LIB.lib ${CURRENT_PACKAGES_DIR}/lib/VHACD.lib)
+        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/Release)
+    endif()
+    if (NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Debug/VHACD_LIB.lib ${CURRENT_PACKAGES_DIR}/debug/lib/VHACD.lib)
+        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/Debug)
+    endif()
+endif()
--- a/cmake/ports/zlib/CONTROL
+++ b/cmake/ports/zlib/CONTROL
@ -1,4 +1,4 @@
 Source: zlib
-Version: 1.2.11-5
+Version: 1.2.11-6
 Homepage: https://www.zlib.net/
 Description: A compression library
--- a/cmake/ports/zlib/cmake_dont_build_more_than_needed.patch
+++ b/cmake/ports/zlib/cmake_dont_build_more_than_needed.patch
@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0fe939d..8d2f5f1 100644
+index 0fe939d..a1291d5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ set(VERSION "1.2.11")
@ -10,24 +10,56 @@ index 0fe939d..8d2f5f1 100644
 
 set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
 set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
-@@ -211,7 +212,15 @@ elseif(BUILD_SHARED_LIBS AND WIN32)
+@@ -124,9 +125,11 @@ set(ZLIB_SRCS
+ )
+ 
+ if(NOT MINGW)
+-    set(ZLIB_DLL_SRCS
+-        win32/zlib1.rc # If present will override custom build rule below.
+-    )
+    if(BUILD_SHARED_LIBS)
+        set(ZLIB_DLL_SRCS
+            win32/zlib1.rc # If present will override custom build rule below.
+        )
+    endif()
+ endif()
+ 
+ if(CMAKE_COMPILER_IS_GNUCC)
+@@ -180,11 +183,12 @@ if(MINGW)
+                             -I ${CMAKE_CURRENT_BINARY_DIR}
+                             -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj
+                             -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
+-    set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+    if(BUILD_SHARED_LIBS)
+        set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
+    endif()
+ endif(MINGW)
+ 
+-add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+-add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(zlib ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+ set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
+ set_target_properties(zlib PROPERTIES SOVERSION 1)
+ 
+@@ -201,7 +205,7 @@ endif()
+ 
+ if(UNIX)
+     # On unix-like platforms the library is almost always called libz
+-   set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
+   set_target_properties(zlib PROPERTIES OUTPUT_NAME z)
+    if(NOT APPLE)
+      set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
+    endif()
+@@ -211,7 +215,7 @@ elseif(BUILD_SHARED_LIBS AND WIN32)
 endif()
 
 if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL )
 -    install(TARGETS zlib zlibstatic
-+    if (BUILD_SHARED_LIBS)
-+        set(ZLIB_TARGETS zlib)
-+        set_target_properties(zlibstatic PROPERTIES EXCLUDE_FROM_ALL ON)
-+    else()
-+        set(ZLIB_TARGETS zlibstatic)
-+        set_target_properties(zlib PROPERTIES EXCLUDE_FROM_ALL ON)
-+    endif()
-+
-+    install(TARGETS ${ZLIB_TARGETS}
+    install(TARGETS zlib
         RUNTIME DESTINATION "${INSTALL_BIN_DIR}"
         ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
         LIBRARY DESTINATION "${INSTALL_LIB_DIR}" )
-@@ -230,6 +239,7 @@ endif()
+@@ -230,6 +234,7 @@ endif()
 # Example binaries
 #============================================================================
 
@ -35,7 +67,7 @@ index 0fe939d..8d2f5f1 100644
 add_executable(example test/example.c)
 target_link_libraries(example zlib)
 add_test(example example)
-@@ -247,3 +257,4 @@ if(HAVE_OFF64_T)
+@@ -247,3 +252,4 @@ if(HAVE_OFF64_T)
     target_link_libraries(minigzip64 zlib)
     set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
 endif()
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@ -720,7 +720,7 @@ Function InstallTypesPage
  StrCpy $OffsetUnits u
  StrCpy $Express "0"

-  ${NSD_CreateRadioButton} 30% $CurrentOffset$OffsetUnits 100% 10u "Express Install (Recommended)"; $\nInstalls Project Athena Interface and Project Athena Sandbox"
+  ${NSD_CreateRadioButton} 30% $CurrentOffset$OffsetUnits 100% 10u "Express Install (Recommended)"; $\nInstalls Vircadia Interface and Vircadia Sandbox"
  pop $ExpressInstallRadioButton
  ${NSD_OnClick} $ExpressInstallRadioButton ChangeExpressLabel
  IntOp $CurrentOffset $CurrentOffset + 15
@ -973,7 +973,7 @@ Function ReadPostInstallOptions
  
  ${If} @CLIENT_COMPONENT_CONDITIONAL@
    ${LogText} "Option: Install Client"
-    ; check if the user asked for a desktop shortcut to Project Athena
+    ; check if the user asked for a desktop shortcut to Vircadia
    ${NSD_GetState} $DesktopClientCheckbox $DesktopClientState
    ${LogText} "Option: Create Client Desktop Shortcut: $DesktopClientState"
  ${EndIf}
@ -1027,7 +1027,7 @@ Function HandlePostInstallOptions
  ${EndIf}

  ${If} @CLIENT_COMPONENT_CONDITIONAL@
-    ; check if the user asked for a desktop shortcut to Project Athena
+    ; check if the user asked for a desktop shortcut to Vircadia
    ${If} $DesktopClientState == ${BST_CHECKED}
      CreateShortCut "$DESKTOP\@INTERFACE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"
      !insertmacro WriteInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES
@ -1088,7 +1088,7 @@ Function HandlePostInstallOptions
      ClearErrors

      ; copy the data from production build to this PR build
-      CopyFiles "$APPDATA\Project Athena\*" $0
+      CopyFiles "$APPDATA\Vircadia\*" $0

      ; handle an error in copying files
      IfErrors 0 NoError
--- a/domain-server/resources/web/wizard/index.shtml
+++ b/domain-server/resources/web/wizard/index.shtml
@ -24,7 +24,7 @@
  <div class="row">
    <div class="col-md-12">
      <span class='step-description'>
-        <a target='_blank' href='https://docs.highfidelity.com/create-and-explore/start-working-in-your-sandbox/place-names'>Place names</a> are similar to web addresses. Users who want to visit your domain can
+        <a target='_blank' href='https://docs.vircadia.dev/create-and-explore/start-working-in-your-sandbox/place-names'>Place names</a> are similar to web addresses. Users who want to visit your domain can
        enter its Place Name in High Fidelity's Interface. You can choose a Place Name for your domain.</br>
        Your domain may also be reachable by <b>IP address</b>.
      </span>
--- a/hifi_qt.py
+++ b/hifi_qt.py
@ -29,7 +29,7 @@ endif()
        self.configFilePath = os.path.join(args.build_root, 'qt.cmake')
        self.version = os.getenv('VIRCADIA_USE_QT_VERSION', '5.12.3')

-        self.assets_url = self.readVar('EXTERNAL_BUILD_ASSETS')
+        self.assets_url = hifi_utils.readEnviromentVariableFromFile(args.build_root, 'EXTERNAL_BUILD_ASSETS')

        defaultBasePath = os.path.expanduser('~/hifi/qt')
        self.basePath = os.getenv('HIFI_QT_BASE', defaultBasePath)
@ -74,10 +74,10 @@ endif()
                    self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.6-ubuntu-19.10.tar.xz'
                elif u_major > 18 and ( u_major != 19 and u_minor != 4):
                    print("We don't support " + distro.name(pretty=True) + " yet. Perhaps consider helping us out?")
-                    raise Exception('UNSUPPORTED LINUX VERSION!!!')
+                    raise Exception('LINUX DISTRO IS NOT SUPPORTED YET!!!')
                else:
                    print("Sorry, " + distro.name(pretty=True) + " is old and won't be officially supported. Please consider upgrading.");
-                    raise Exception('UNSUPPORTED LINUX VERSION!!!')
+                    raise Exception('UNKNOWN LINUX DISTRO VERSION!!!')
            else:
                print("Sorry, " + distro.name(pretty=True) + " is not supported. Please consider helping us out.")
                print("It's also possible to build Qt for your distribution, please see the documentation at:")
@ -89,10 +89,6 @@ endif()
            print("Machine     : " + platform.machine())
            raise Exception('UNKNOWN OPERATING SYSTEM!!!')

-    def readVar(self, var):
-        with open(os.path.join(self.args.build_root, '_env', var + ".txt")) as fp:
-            return fp.read()
-
    def writeConfig(self):
        print("Writing cmake config to {}".format(self.configFilePath))
        # Write out the configuration for use by CMake
--- a/hifi_utils.py
+++ b/hifi_utils.py
@ -121,3 +121,7 @@ def downloadAndExtract(url, destPath, hash=None, hasher=hashlib.sha512(), isZip=
        with tarfile.open(tempFileName, 'r:*') as tgz:
            tgz.extractall(destPath)
    os.remove(tempFileName)
+
+def readEnviromentVariableFromFile(buildRootDir, var):
+    with open(os.path.join(buildRootDir, '_env', var + ".txt")) as fp:
+        return fp.read()
--- a/hifi_vcpkg.py
+++ b/hifi_vcpkg.py
@ -21,6 +21,7 @@ get_filename_component(CMAKE_TOOLCHAIN_FILE "{}" ABSOLUTE CACHE)
 get_filename_component(CMAKE_TOOLCHAIN_FILE_UNCACHED "{}" ABSOLUTE)
 set(VCPKG_INSTALL_ROOT "{}")
 set(VCPKG_TOOLS_DIR "{}")
+set(VCPKG_TARGET_TRIPLET "{}")
 """

    CMAKE_TEMPLATE_NON_ANDROID = """
@ -34,7 +35,11 @@ endif()
        self.args = args
        # our custom ports, relative to the script location
        self.sourcePortsPath = args.ports_path
-        self.id = hifi_utils.hashFolder(self.sourcePortsPath)[:8]
+        self.vcpkgBuildType = args.vcpkg_build_type
+        if (self.vcpkgBuildType):
+            self.id = hifi_utils.hashFolder(self.sourcePortsPath)[:8] + "-" + self.vcpkgBuildType
+        else:
+            self.id = hifi_utils.hashFolder(self.sourcePortsPath)[:8]
        self.configFilePath = os.path.join(args.build_root, 'vcpkg.cmake')
        self.assets_url = self.readVar('EXTERNAL_BUILD_ASSETS')

@ -78,27 +83,31 @@ endif()
        self.bootstrapEnv = os.environ.copy()
        self.buildEnv = os.environ.copy()
        self.prebuiltArchive = None
-        usePrebuilt = ('CI_BUILD' in os.environ) and os.environ["CI_BUILD"] == "Github" and (not self.noClean)
+        usePrebuilt = False
+        # usePrebuild Disabled, to re-enabled using the prebuilt archives for GitHub action builds uncomment the following line:
+        # usePrebuilt = ('CI_BUILD' in os.environ) and os.environ["CI_BUILD"] == "Github" and (not self.noClean)

        if 'Windows' == system:
            self.exe = os.path.join(self.path, 'vcpkg.exe')
-            self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.bat') ]
+            self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.bat'), '-disableMetrics' ]
            self.vcpkgUrl = self.assets_url + '/dependencies/vcpkg/builds/vcpkg-win32-client.zip%3FversionId=tSFzbw01VkkVFeRQ6YuAY4dro2HxJR9U'
            self.vcpkgHash = 'a650db47a63ccdc9904b68ddd16af74772e7e78170b513ea8de5a3b47d032751a3b73dcc7526d88bcb500753ea3dd9880639ca842bb176e2bddb1710f9a58cd3'
            self.hostTriplet = 'x64-windows'
            if usePrebuilt:
-               self.prebuiltArchive = self.assets_url + "/dependencies/vcpkg/builds/vcpkg-win32.zip%3FversionId=3SF3mDC8dkQH1JP041m88xnYmWNzZflx"
+                self.prebuiltArchive = self.assets_url + "/dependencies/vcpkg/builds/vcpkg-win32.zip%3FversionId=3SF3mDC8dkQH1JP041m88xnYmWNzZflx"
        elif 'Darwin' == system:
            self.exe = os.path.join(self.path, 'vcpkg')
-            self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.sh'), '--allowAppleClang' ]
+            self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.sh'), '--allowAppleClang', '-disableMetrics' ]
            self.vcpkgUrl = self.assets_url + '/dependencies/vcpkg/builds/vcpkg-osx-client.tgz%3FversionId=j0b4azo_zTlH_Q9DElEWOz1UMYZ2nqQw'
            self.vcpkgHash = '519d666d02ef22b87c793f016ca412e70f92e1d55953c8f9bd4ee40f6d9f78c1df01a6ee293907718f3bbf24075cc35492fb216326dfc50712a95858e9cbcb4d'
            self.hostTriplet = 'x64-osx'
+            # Potential fix for a vcpkg build issue on OSX (see https://github.com/microsoft/vcpkg/issues/9029)
+            self.bootstrapEnv['CXXFLAGS'] = '-D_CTERMID_H_'
            if usePrebuilt:
                self.prebuiltArchive = self.assets_url + "/dependencies/vcpkg/builds/vcpkg-osx.tgz%3FversionId=6JrIMTdvpBF3MAsjA92BMkO79Psjzs6Z"
        else:
            self.exe = os.path.join(self.path, 'vcpkg')
-            self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.sh') ]
+            self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.sh'), '-disableMetrics' ]
            self.vcpkgUrl = self.assets_url + '/dependencies/vcpkg/builds/vcpkg-linux-client.tgz%3FversionId=y7mct0gFicEXz5hJy3KROBugcLR56YWf'
            self.vcpkgHash = '6a1ce47ef6621e699a4627e8821ad32528c82fce62a6939d35b205da2d299aaa405b5f392df4a9e5343dd6a296516e341105fbb2dd8b48864781d129d7fba10d'
            self.hostTriplet = 'x64-linux'
@ -206,6 +215,19 @@ endif()
        print(actualCommands)
        hifi_utils.executeSubprocess(actualCommands, folder=self.path, env=self.buildEnv)

+    def copyTripletForBuildType(self, triplet):
+        print('Copying triplet ' + triplet + ' to have build type ' + self.vcpkgBuildType)
+        tripletPath = os.path.join(self.path, 'triplets', triplet + '.cmake')
+        tripletForBuildTypePath = os.path.join(self.path, 'triplets', self.getTripletWithBuildType(triplet) + '.cmake')
+        shutil.copy(tripletPath, tripletForBuildTypePath)
+        with open(tripletForBuildTypePath, "a") as tripletForBuildTypeFile:
+            tripletForBuildTypeFile.write("set(VCPKG_BUILD_TYPE " + self.vcpkgBuildType + ")\n")
+
+    def getTripletWithBuildType(self, triplet):
+        if (not self.vcpkgBuildType):
+            return triplet
+        return triplet + '-' + self.vcpkgBuildType
+
    def setupDependencies(self, qt=None):
        if self.prebuiltArchive:
            if not os.path.isfile(self.prebuildTagFile):
@ -224,12 +246,16 @@ endif()
            self.setupAndroidDependencies()

        print("Installing host tools")
-        self.run(['install', '--triplet', self.hostTriplet, 'hifi-host-tools'])
+        if (self.vcpkgBuildType):
+            self.copyTripletForBuildType(self.hostTriplet)
+        self.run(['install', '--triplet', self.getTripletWithBuildType(self.hostTriplet), 'hifi-host-tools'])

        # If not android, install the hifi-client-deps libraries
        if not self.args.android:
            print("Installing build dependencies")
-            self.run(['install', '--triplet', self.triplet, 'hifi-client-deps'])
+            if (self.vcpkgBuildType):
+                self.copyTripletForBuildType(self.triplet)
+            self.run(['install', '--triplet', self.getTripletWithBuildType(self.triplet), 'hifi-client-deps'])

    def cleanBuilds(self):
        if self.noClean:
@ -240,6 +266,12 @@ endif()
            print("Wiping build trees")
            shutil.rmtree(builddir, ignore_errors=True)

+    # Removes large files used to build the vcpkg, for CI purposes.
+    def cleanupDevelopmentFiles(self):
+        shutil.rmtree(os.path.join(self.path, "downloads"), ignore_errors=True)
+        shutil.rmtree(os.path.join(self.path, "packages"), ignore_errors=True)
+
+
    def setupAndroidDependencies(self):
        # vcpkg prebuilt
        if not os.path.isdir(os.path.join(self.path, 'installed', 'arm64-android')):
@ -276,12 +308,32 @@ endif()
        with open(self.prebuildTagFile, 'w') as f:
            f.write(self.tagContents)

+    def fixupCmakeScript(self):
+        cmakeScript = os.path.join(self.path, 'scripts/buildsystems/vcpkg.cmake')
+        newCmakeScript = cmakeScript + '.new'
+        isFileChanged = False
+        removalPrefix = "set(VCPKG_TARGET_TRIPLET "
+        # Open original file in read only mode and dummy file in write mode
+        with open(cmakeScript, 'r') as read_obj, open(newCmakeScript, 'w') as write_obj:
+            # Line by line copy data from original file to dummy file
+            for line in read_obj:
+                if not line.startswith(removalPrefix):
+                    write_obj.write(line)
+                else:
+                    isFileChanged = True
+     
+        if isFileChanged:
+            shutil.move(newCmakeScript, cmakeScript)
+        else:
+            os.remove(newCmakeScript)
+ 
+
    def writeConfig(self):
        print("Writing cmake config to {}".format(self.configFilePath))
        # Write out the configuration for use by CMake
        cmakeScript = os.path.join(self.path, 'scripts/buildsystems/vcpkg.cmake')
-        installPath = os.path.join(self.path, 'installed', self.triplet)
-        toolsPath = os.path.join(self.path, 'installed', self.hostTriplet, 'tools')
+        installPath = os.path.join(self.path, 'installed', self.getTripletWithBuildType(self.triplet))
+        toolsPath = os.path.join(self.path, 'installed', self.getTripletWithBuildType(self.hostTriplet), 'tools')

        cmakeTemplate = VcpkgRepo.CMAKE_TEMPLATE
        if self.args.android:
@ -289,7 +341,7 @@ endif()
            cmakeTemplate += 'set(HIFI_ANDROID_PRECOMPILED "{}")\n'.format(precompiled)
        else:
            cmakeTemplate += VcpkgRepo.CMAKE_TEMPLATE_NON_ANDROID
-        cmakeConfig = cmakeTemplate.format(cmakeScript, cmakeScript, installPath, toolsPath).replace('\\', '/')
+        cmakeConfig = cmakeTemplate.format(cmakeScript, cmakeScript, installPath, toolsPath, self.getTripletWithBuildType(self.hostTriplet)).replace('\\', '/')
        with open(self.configFilePath, 'w') as f:
            f.write(cmakeConfig)

--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@ -159,7 +159,7 @@ elseif (WIN32)
  set(CONFIGURE_ICON_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Icon.rc")
  configure_file("${HF_CMAKE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT})

-  set(APP_FULL_NAME "Project Athena")
+  set(APP_FULL_NAME "Vircadia")
  set(CONFIGURE_VERSION_INFO_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.rc")
  configure_file("${HF_CMAKE_DIR}/templates/VersionInfo.rc.in" ${CONFIGURE_VERSION_INFO_RC_OUTPUT})

--- a/interface/icon/interface-beta.icns
+++ b/interface/icon/interface-beta.icns
--- a/interface/icon/interface-beta.ico
+++ b/interface/icon/interface-beta.ico
--- a/interface/icon/interface.icns
+++ b/interface/icon/interface.icns
--- a/interface/icon/interface.ico
+++ b/interface/icon/interface.ico
--- a/interface/resources/html/commerce/backup_instructions.html
+++ b/interface/resources/html/commerce/backup_instructions.html
@ -596,7 +596,7 @@

        <h2>Want to learn more?</h2>
        <p>You can find out much more about the blockchain and about commerce in High Fidelity by visiting our Docs site:</p>
-        <p><a href="http://docs.highfidelity.com" class="btn">Visit High Fidelity's Docs</a></p>
+        <p><a href="http://docs.vircadia.dev" class="btn">Visit High Fidelity's Docs</a></p>
        <hr>

      </div>
--- a/interface/resources/html/img/tablet-help-gamepad.jpg
+++ b/interface/resources/html/img/tablet-help-gamepad.jpg
--- a/interface/resources/html/img/tablet-help-keyboard.jpg
+++ b/interface/resources/html/img/tablet-help-keyboard.jpg
--- a/interface/resources/html/img/tablet-help-oculus.jpg
+++ b/interface/resources/html/img/tablet-help-oculus.jpg
--- a/interface/resources/html/img/tablet-help-vive.jpg
+++ b/interface/resources/html/img/tablet-help-vive.jpg
--- a/interface/resources/html/img/tablet-help-windowsMR.jpg
+++ b/interface/resources/html/img/tablet-help-windowsMR.jpg
--- a/interface/resources/html/tabletHelp.html
+++ b/interface/resources/html/tabletHelp.html
@ -77,9 +77,9 @@
            var handControllerImageURL = null;
            var index = 0;
            var count = 3;
-            var handControllerRefURL = "https://docs.projectathena.dev/explore/get-started/vr-controls.html#vr-controls";
-            var keyboardRefURL = "https://docs.projectathena.dev/explore/get-started/desktop.html#movement-controls";
-			var gamepadRefURL = "https://docs.projectathena.dev/explore/get-started/vr-controls.html#gamepad";
+            var handControllerRefURL = "https://docs.vircadia.dev/explore/get-started/vr-controls.html#vr-controls";
+            var keyboardRefURL = "https://docs.vircadia.dev/explore/get-started/desktop.html#movement-controls";
+            var gamepadRefURL = "https://docs.vircadia.dev/explore/get-started/vr-controls.html#gamepad";

            function showKbm() {
                document.getElementById("main_image").setAttribute("src", "img/tablet-help-keyboard.jpg");
@ -189,7 +189,7 @@
            <a href="#" id="right_button" onmousedown="cycleRight()"></a>
 			<a href="#" id="image_button"></a>
        </div>
-        <a href="mailto:support@projectathena.io" id="report_problem">Report Problem</a>
+        <a href="mailto:support@vircadia.com" id="report_problem">Report Problem</a>
    </body>

 </html>
--- a/interface/resources/images/about-vircadia.png
+++ b/interface/resources/images/about-vircadia.png
--- a/interface/resources/images/vircadia-logo.svg
+++ b/interface/resources/images/vircadia-logo.svg
@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="1880" height="320" viewBox="0 0 1880.00 320.00" enable-background="new 0 0 1880.00 320.00" xml:space="preserve">
+	<radialGradient id="SVGID_Fill1_" cx="-571.529" cy="-604.157" r="3176.39" gradientUnits="userSpaceOnUse">
+		<stop offset="0.451163" stop-color="#01BDFF" stop-opacity="1"/>
+		<stop offset="0.827907" stop-color="#8C1AFF" stop-opacity="1"/>
+	</radialGradient>
+	<path fill="url(#SVGID_Fill1_)" stroke-width="0.2" stroke-linejoin="round" d="M 28.723,5.00146L 1706.72,5.00146C 1726.61,5.00146 1750.24,21.1192 1759.51,41.0015L 1870.49,278.999C 1879.76,298.881 1871.16,314.999 1851.28,314.999L 173.277,314.999C 153.395,314.999 129.761,298.881 120.49,278.999L 9.51012,41.0015C 0.238872,21.1192 8.84079,5.00146 28.723,5.00146 Z "/>
+	<path fill="#36393F" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 678.939,23.013L 1697.3,23.0124C 1723.4,22.9324 1739.32,35.2514 1749.85,58.4911L 1844.51,261.508C 1860.58,289.515 1859.52,298.385 1825.06,296.987L 677.061,296.987"/>
+	<g>
+		<path fill="#FAFAFA" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 699.7,159.966C 699.7,145.281 702.032,131.093 706.698,117.404C 711.363,103.714 718.063,91.58 726.796,81.0016C 735.529,70.4231 745.996,61.9604 758.199,55.6133C 770.401,49.2663 784.039,46.0927 799.112,46.0927L 906.779,46.0927L 906.779,93.8823L 800.189,93.8823C 794.686,93.8823 789.003,95.7491 783.142,99.4827C 777.28,103.216 771.896,108.132 766.992,114.23C 762.087,120.328 758.019,127.36 754.789,135.325C 751.559,143.29 749.944,151.379 749.944,159.593C 749.944,167.807 751.499,175.896 754.61,183.861C 757.72,191.826 761.788,198.92 766.812,205.142C 771.837,211.365 777.459,216.343 783.68,220.077C 789.901,223.81 796.122,225.677 802.342,225.677L 906.779,225.677L 906.779,273.467L 798.036,273.467C 782.244,273.467 768.248,270.044 756.045,263.199C 743.843,256.354 733.555,247.456 725.181,236.504C 716.807,225.553 710.466,213.356 706.16,199.915C 701.853,186.475 699.7,173.158 699.7,159.966 Z "/>
+		<rect x="1464.81" y="46.0927" fill="#FAFAFA" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" width="55.9871" height="227.374"/>
+	</g>
+	<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 493.02,97.6159L 493.02,139.602L 493,139.602L 493,199.602L 493.02,199.602L 493.02,273.467L 439.123,273.467L 439.123,46.0928L 566.737,46.0928C 578.327,46.0928 588.237,48.2707 596.467,52.6265C 604.696,56.9823 611.419,62.7071 616.635,69.8009C 621.851,76.8946 625.618,84.9218 627.936,93.8824C 630.254,102.843 631.413,111.928 631.413,121.137C 631.413,128.604 630.428,136.009 628.457,143.352C 626.487,150.695 623.763,157.54 620.286,163.887C 616.809,170.234 612.578,175.896 607.594,180.874C 602.61,185.852 597.104,189.71 591.077,192.448L 654.363,273.467L 588.295,273.467L 521,188.288L 521,149.512L 566.737,149.512C 568.359,149.512 569.982,148.517 571.605,146.526C 573.227,144.534 574.618,142.17 575.777,139.432C 576.937,136.694 577.922,133.894 578.733,131.031C 579.544,128.169 579.95,125.991 579.95,124.498C 579.95,122.257 579.718,119.644 579.255,116.657C 578.791,113.67 578.038,110.746 576.995,107.883C 575.951,105.021 574.56,102.594 572.822,100.603C 571.083,98.6115 569.055,97.6159 566.737,97.6159L 493.02,97.6159 Z "/>
+	<g>
+		<rect x="340.465" y="46.0927" fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" width="54.9846" height="227.374"/>
+	</g>
+	<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 55.5166,46.093L 161.961,273.467L 214.479,273.467L 216.626,269.689L 115.436,46.093L 55.5166,46.093 Z "/>
+	<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 231.92,235.709L 319.513,46.0926L 259.594,46.0926L 202.957,171.669L 231.92,235.709 Z "/>
+	<path fill="#FAFAFA" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 987.874,273.467L 926.863,273.467L 1034.17,46.0927L 1088,46.0927L 1195.67,273.467L 1134.66,273.467L 1106.67,212.983L 1047.45,212.983L 1044.83,212.918L 1065.94,164.447L 1087.65,164.447L 1060.73,106.576"/>
+	<path fill="#FAFAFA" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 1605.13,273.467L 1544.12,273.467L 1651.43,46.0927L 1705.26,46.0927L 1812.93,273.467L 1751.91,273.467L 1723.92,212.983L 1664.7,212.983L 1662,212.918L 1683.24,164.447L 1704.9,164.447L 1677.98,106.576"/>
+	<path fill="#FAFAFA" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 1438.98,159.966C 1438.98,173.158 1436.83,186.475 1432.52,199.915C 1428.22,213.356 1421.88,225.553 1413.5,236.504C 1405.13,247.456 1394.84,256.354 1382.64,263.199C 1370.43,270.044 1356.44,273.467 1340.65,273.467L 1217.91,273.467L 1217.91,121.9L 1272.1,121.9L 1272.1,225.677L 1335.98,225.677C 1342.2,225.677 1348.42,223.81 1354.64,220.077C 1360.86,216.343 1366.49,211.365 1371.51,205.142C 1376.54,198.92 1380.6,191.826 1383.71,183.861C 1386.82,175.896 1388.38,167.807 1388.38,159.593C 1388.38,150.632 1386.58,142.17 1383,134.205C 1379.41,126.24 1375.04,119.271 1369.9,113.297C 1364.75,107.323 1359.31,102.594 1353.57,99.1094C 1347.82,95.6247 1342.8,93.8824 1338.49,93.8824L 1272.1,93.8824L 1272.1,93.9001L 1217.91,93.9001L 1217.91,46.0927L 1332.03,46.0927C 1350.46,46.0927 1366.43,49.0796 1379.95,55.0533C 1393.46,61.0269 1404.59,69.1163 1413.32,79.3215C 1422.06,89.5265 1428.52,101.536 1432.7,115.35C 1436.89,129.165 1438.98,144.037 1438.98,159.966 Z "/>
+</svg>
--- a/interface/resources/qml/+webengine/BrowserWebView.qml
+++ b/interface/resources/qml/+webengine/BrowserWebView.qml
@ -6,7 +6,7 @@ import controlsUit 1.0

 WebView {
    id: webview
-    url: "https://projectathena.io/"
+    url: "https://vircadia.com/"
    profile: FileTypeProfile;

    property var parentRoot: null
--- a/interface/resources/qml/LoginDialog.qml
+++ b/interface/resources/qml/LoginDialog.qml
@ -85,7 +85,9 @@ FocusScope {
        Image {
            id: banner
            anchors.centerIn: parent
-            source: "../images/project-athena-banner-color2.svg"
+            sourceSize.width: 500
+            sourceSize.height: 91
+            source: "../images/vircadia-logo.svg"
            horizontalAlignment: Image.AlignHCenter
        }
    }
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@ -402,7 +402,7 @@ Item {
                font.pixelSize: linkAccountBody.textFieldFontSize
                font.bold: linkAccountBody.fontBold

-                text: "<a href='metaverse.projectathena.io/users/password/new'> Can't access your account?</a>"
+                text: "<a href='metaverse.vircadia.com/users/password/new'> Can't access your account?</a>"

                verticalAlignment: Text.AlignVCenter
                horizontalAlignment: Text.AlignHCenter
@ -527,7 +527,7 @@ Item {
                     leftMargin: hifi.dimensions.contentSpacing.x
                }

-                text: "<a href='metaverse.projectathena.io/users/register'>Sign Up</a>"
+                text: "<a href='metaverse.vircadia.com/users/register'>Sign Up</a>"

                linkColor: hifi.colors.blueAccent
                onLinkActivated: {
--- a/interface/resources/qml/LoginDialog/SignUpBody.qml
+++ b/interface/resources/qml/LoginDialog/SignUpBody.qml
@ -23,7 +23,7 @@ Item {
    clip: true
    height: root.height
    width: root.width
-    readonly property string termsContainerText: qsTr("By signing up, you agree to Project Athena's Terms of Service")
+    readonly property string termsContainerText: qsTr("By signing up, you agree to Vircadia's Terms of Service")
    property int textFieldHeight: 31
    property string fontFamily: "Raleway"
    property int fontSize: 15
@ -395,7 +395,7 @@ Item {
                    text: signUpBody.termsContainerText
                    Component.onCompleted: {
                        // with the link.
-                        termsText.text = qsTr("By signing up, you agree to <a href='https://projectathena.io/termsofservice'>Project Athena's Terms of Service</a>")
+                        termsText.text = qsTr("By signing up, you agree to <a href='https://vircadia.com/termsofservice'>Vircadia's Terms of Service</a>")
                    }
                }

--- a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
+++ b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
@ -19,7 +19,7 @@ import TabletScriptingInterface 1.0
 Item {
    id: usernameCollisionBody
    clip: true
-    readonly property string termsContainerText: qsTr("By creating this user profile, you agree to Project Athena's Terms of Service")
+    readonly property string termsContainerText: qsTr("By creating this user profile, you agree to Vircadia's Terms of Service")
    width: root.width
    height: root.height
    readonly property string fontFamily: "Raleway"
@ -218,7 +218,7 @@ Item {
                text: usernameCollisionBody.termsContainerText
                Component.onCompleted: {
                    // with the link.
-                    termsText.text = qsTr("By creating this user profile, you agree to <a href='https://projectathena.io/termsofservice'>Project Athena's Terms of Service</a>")
+                    termsText.text = qsTr("By creating this user profile, you agree to <a href='https://vircadia.com/termsofservice'>Vircadia's Terms of Service</a>")
                }
            }

--- a/interface/resources/qml/OverlayLoginDialog.qml
+++ b/interface/resources/qml/OverlayLoginDialog.qml
@ -81,7 +81,9 @@ FocusScope {
        Image {
            id: banner
            anchors.centerIn: parent
-            source: "../images/high-fidelity-banner.svg"
+            sourceSize.width: 500
+            sourceSize.height: 91
+            source: "../images/vircadia-logo.svg"
            horizontalAlignment: Image.AlignHCenter
        }
    }
--- a/interface/resources/qml/controlsUit/SpinBox.qml
+++ b/interface/resources/qml/controlsUit/SpinBox.qml
@ -109,7 +109,7 @@ SpinBox {
        id: spinboxText
        z: 2
        color: isLightColorScheme
-               ? (spinBox.activeFocus ? hifi.colors.black : hifi.colors.faintGray)
+               ? (spinBox.activeFocus ? hifi.colors.black : hifi.colors.baseGrayHighlight)
               : (spinBox.activeFocus ? hifi.colors.white : hifi.colors.lightGrayText)
        selectedTextColor: hifi.colors.black
        selectionColor: hifi.colors.primaryHighlight
@ -130,7 +130,7 @@ SpinBox {
            }

            color: isLightColorScheme
-                   ? (spinBox.activeFocus ? hifi.colors.black : hifi.colors.faintGray)
+                   ? (spinBox.activeFocus ? hifi.colors.black : hifi.colors.baseGrayHighlight)
                   : (spinBox.activeFocus ? hifi.colors.white : hifi.colors.lightGrayText)
            text: suffix
            verticalAlignment: Qt.AlignVCenter
--- a/interface/resources/qml/dialogs/TabletLoginDialog.qml
+++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml
@ -129,7 +129,9 @@ FocusScope {
        Image {
            id: banner
            anchors.centerIn: parent
-            source: "../../images/project-athena-banner-color2.svg"
+            sourceSize.width: 400
+            sourceSize.height: 73
+            source: "../../images/vircadia-logo.svg"
            horizontalAlignment: Image.AlignHCenter
        }
    }
--- a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml
+++ b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml
@ -229,7 +229,7 @@ Item {
        }

        function openDocs() {
-            Qt.openUrlExternally("https://docs.projectathena.dev/create/avatars/package-avatar.html");
+            Qt.openUrlExternally("https://docs.vircadia.dev/create/avatars/package-avatar.html");
        }

        function openVideo() {
--- a/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml
+++ b/interface/resources/qml/hifi/avatarPackager/AvatarProject.qml
@ -318,7 +318,7 @@ Item {
        text: "This item is not for sale yet, <a href='#'>learn more</a>."

        onLinkActivated: {
-            Qt.openUrlExternally("https://docs.projectathena.dev/sell/add-item/upload-avatar.html");
+            Qt.openUrlExternally("https://docs.vircadia.dev/sell/add-item/upload-avatar.html");
        }
    }

--- a/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
+++ b/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
@ -403,7 +403,6 @@ Rectangle {

            Vector3 {
                id: positionVector
-                backgroundColor: "lightgray"
                enabled: getCurrentWearable() !== null

                function set(localPosition) {
@ -463,7 +462,6 @@ Rectangle {

            Vector3 {
                id: rotationVector
-                backgroundColor: "lightgray"
                enabled: getCurrentWearable() !== null

                function set(localRotationAngles) {
@ -550,7 +548,7 @@ Rectangle {
                    realFrom: 0.1
                    realTo: 3.0
                    realValue: 1.0
-                    backgroundColor: "lightgray"
+                    backgroundColor: activeFocus ? "white" : "lightgray"
                    width: positionVector.spinboxWidth
                    colorScheme: hifi.colorSchemes.light

--- a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
+++ b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
@ -7,7 +7,7 @@ MessageBox {
        popup.onButton2Clicked = callback;
        popup.titleText = 'Specify Avatar URL'
        popup.bodyText = 'This will not overwrite your existing favorite if you are wearing one.<br>' +
-                '<a href="https://docs.vircadia.dev/create/avatars.html">' +
+                '<a href="https://docs.vircadia.dev/create/avatars/create-avatars.html">' +
                'Learn to make a custom avatar by opening this link on your desktop.' +
                '</a>'
        popup.inputText.visible = true;
--- a/interface/resources/qml/hifi/avatarapp/Vector3.qml
+++ b/interface/resources/qml/hifi/avatarapp/Vector3.qml
@ -29,7 +29,7 @@ Row {
        id: xspinner
        width: parent.spinboxWidth
        labelInside: "X:"
-        backgroundColor: parent.backgroundColor
+        backgroundColor: activeFocus ? "white" : "lightgray"
        colorLabelInside: hifi.colors.redHighlight
        colorScheme: hifi.colorSchemes.light
        decimals: root.decimals;
@ -43,7 +43,7 @@ Row {
        id: yspinner
        width: parent.spinboxWidth
        labelInside: "Y:"
-        backgroundColor: parent.backgroundColor
+        backgroundColor: activeFocus ? "white" : "lightgray"
        colorLabelInside: hifi.colors.greenHighlight
        colorScheme: hifi.colorSchemes.light
        decimals: root.decimals;
@ -57,7 +57,7 @@ Row {
        id: zspinner
        width: parent.spinboxWidth
        labelInside: "Z:"
-        backgroundColor: parent.backgroundColor
+        backgroundColor: activeFocus ? "white" : "lightgray"
        colorLabelInside: hifi.colors.primaryHighlight
        colorScheme: hifi.colorSchemes.light
        decimals: root.decimals;
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@ -778,7 +778,7 @@ Rectangle {
                    lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain. " +
                        "If you want to save the state of the content in this domain, create a backup before proceeding.<br><br>" +
                        "For more information about backing up and restoring content, " +
-                        "<a href='https://docs.projectathena.dev/host/maintain-domain/backup-domain.html'>" +
+                        "<a href='https://docs.vircadia.dev/host/maintain-domain/backup-domain.html'>" +
                        "click here to open info on your desktop browser.";
                    lightboxPopup.button1text = "CANCEL";
                    lightboxPopup.button1method = function() {
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@ -602,7 +602,7 @@ Rectangle {
                            lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain. " +
                                "If you want to save the state of the content in this domain, create a backup before proceeding.<br><br>" +
                                "For more information about backing up and restoring content, " +
-                                "<a href='https://docs.projectathena.dev/host/maintain-domain/backup-domain.html'>" +
+                                "<a href='https://docs.vircadia.dev/host/maintain-domain/backup-domain.html'>" +
                                "click here to open info on your desktop browser.";
                            lightboxPopup.button1text = "CANCEL";
                            lightboxPopup.button1method = function() {
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@ -207,7 +207,7 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
                        if (link === "#privateKeyPath") {
                            Qt.openUrlExternally("file:///" + root.keyFilePath.substring(0, root.keyFilePath.lastIndexOf('/')));
                        } else if (link === "#blockchain") {
-                            Qt.openUrlExternally("https://docs.projectathena.dev/explore/shop.html");
+                            Qt.openUrlExternally("https://docs.vircadia.dev/explore/shop.html");
                        } else if (link === "#bank") {
                            if ((Account.metaverseServerURL).toString().indexOf("staging") >= 0) {
                                Qt.openUrlExternally("hifi://hifiqa-master-metaverse-staging"); // So that we can test in staging.
--- a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
@ -23,9 +23,9 @@ Rectangle {
        spacing: 5

        Image {
-            sourceSize.width: 295
-            sourceSize.height: 75
-            source: "../../../images/about-projectathena.png"
+            width: 400; height: 73
+            fillMode: Image.PreserveAspectFit
+            source: "../../../images/vircadia-logo.svg"
        }
        Item { height: 30; width: 1 }
        Column {
@ -53,7 +53,7 @@ Rectangle {
            textFormat: Text.StyledText
            linkColor: "#00B4EF"
            color: "white"
-            text: "<a href=\"https:/github.com/kasenvr/hifi-community\">Project Athena Github</a>."
+            text: "<a href=\"https:/github.com/kasenvr/project-athena\">Vircadia Github</a>."
            size: 20
            onLinkActivated: {
                HiFiAbout.openUrl("https:/github.com/kasenvr/project-athena");
@ -116,7 +116,7 @@ Rectangle {
        Item { height: 20; width: 1 }
        RalewayRegular {
            color: "white"
-            text: "© 2019 - 2020 Project Athena Contributors."
+            text: "© 2019-2020 Vircadia contributors."
            size: 14
        }
        RalewayRegular {
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@ -656,8 +656,8 @@ private:
 /**jsdoc
 * <p>The <code>Controller.Hardware.Application</code> object has properties representing Interface's state. The property
 * values are integer IDs, uniquely identifying each output. <em>Read-only.</em></p>
- * <p>These states can be mapped to actions or functions or <code>Controller.Standard</code> items in a {@link RouteObject} 
- * mapping (e.g., using the {@link RouteObject#when} method). Each data value is either <code>1.0</code> for "true" or 
+ * <p>These states can be mapped to actions or functions or <code>Controller.Standard</code> items in a {@link RouteObject}
+ * mapping (e.g., using the {@link RouteObject#when} method). Each data value is either <code>1.0</code> for "true" or
 * <code>0.0</code> for "false".</p>
 * <table>
 *   <thead>
@ -679,7 +679,7 @@ private:
 *     <tr><td><code>CameraIndependent</code></td><td>number</td><td>number</td><td>The camera is in independent mode.</td></tr>
 *     <tr><td><code>CameraEntity</code></td><td>number</td><td>number</td><td>The camera is in entity mode.</td></tr>
 *     <tr><td><code>InHMD</code></td><td>number</td><td>number</td><td>The user is in HMD mode.</td></tr>
- *     <tr><td><code>AdvancedMovement</code></td><td>number</td><td>number</td><td>Advanced movement (walking) controls are 
+ *     <tr><td><code>AdvancedMovement</code></td><td>number</td><td>number</td><td>Advanced movement (walking) controls are
 *       enabled.</td></tr>
 *     <tr><td><code>StrafeEnabled</code></td><td>number</td><td>number</td><td>Strafing is enabled</td></tr>
 *     <tr><td><code>LeftHandDominant</code></td><td>number</td><td>number</td><td>Dominant hand set to left.</td></tr>
@ -829,7 +829,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
        audioDLLPath += "/audioWin7";
    }
    QCoreApplication::addLibraryPath(audioDLLPath);
-#endif 
+#endif

    QString defaultScriptsOverrideOption = getCmdOption(argc, constArgv, "--defaultScriptsOverride");

@ -949,7 +949,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
    DependencyManager::set<AvatarPackager>();
    DependencyManager::set<ScreenshareScriptingInterface>();
    PlatformHelper::setup();
-    
+
    QObject::connect(PlatformHelper::instance(), &PlatformHelper::systemWillWake, [] {
        QMetaObject::invokeMethod(DependencyManager::get<NodeList>().data(), "noteAwakening", Qt::QueuedConnection);
        QMetaObject::invokeMethod(DependencyManager::get<AudioClient>().data(), "noteAwakening", Qt::QueuedConnection);
@ -1092,8 +1092,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
    {
        // identify gpu as early as possible to help identify OpenGL initialization errors.
        auto gpuIdent = GPUIdent::getInstance();
-        setCrashAnnotation("gpu_name", gpuIdent->getName().toStdString());
-        setCrashAnnotation("gpu_driver", gpuIdent->getDriver().toStdString());
+        setCrashAnnotation("sentry[contexts][gpu][name]", gpuIdent->getName().toStdString());
+        setCrashAnnotation("sentry[contexts][gpu][version]", gpuIdent->getDriver().toStdString());
        setCrashAnnotation("gpu_memory", std::to_string(gpuIdent->getMemory()));
    }

@ -1139,7 +1139,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-SemiBold.ttf");
    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Regular.ttf");
    QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Medium.ttf");
-    _window->setWindowTitle("Project Athena");
+    _window->setWindowTitle("Vircadia");

    Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us

@ -1162,7 +1162,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
        deadlockWatchdogThread->setMainThreadID(QThread::currentThreadId());
        deadlockWatchdogThread->start();

-        // Pause the deadlock watchdog when we sleep, or it might 
+        // Pause the deadlock watchdog when we sleep, or it might
        // trigger a false positive when we wake back up
        auto platformHelper = PlatformHelper::instance();

@ -3166,7 +3166,7 @@ void Application::showLoginScreen() {
        QJsonObject loginData = {};
        loginData["action"] = "login dialog popped up";
        UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData);
-        _window->setWindowTitle("Project Athena");
+        _window->setWindowTitle("Vircadia");
    } else {
        resumeAfterLoginDialogActionTaken();
    }
@ -3177,7 +3177,7 @@ void Application::showLoginScreen() {
 #endif
 }

-static const QUrl AUTHORIZED_EXTERNAL_QML_SOURCE { "https://content.highfidelity.com/Experiences/Releases" };
+static const QUrl AUTHORIZED_EXTERNAL_QML_SOURCE { "https://cdn.vircadia.com/community-apps/applications" };

 void Application::initializeUi() {

@ -3196,14 +3196,16 @@ void Application::initializeUi() {
            safeURLS += settingsSafeURLS;

            // END PULL SAFEURLS FROM INTERFACE.JSON Settings
-
-            bool isInWhitelist = false;  // assume unsafe
-            for (const auto& str : safeURLS) {
-                if (!str.isEmpty() && str.endsWith(".qml") && url.toString().endsWith(".qml") &&
-                    url.toString().startsWith(str)) {
-                    qCDebug(interfaceapp) << "Found matching url!" << url.host();
-                    isInWhitelist = true;
-                    return true;
+            
+            if (AUTHORIZED_EXTERNAL_QML_SOURCE.isParentOf(url)) {
+                return true;
+            } else {
+                for (const auto& str : safeURLS) {
+                    if (!str.isEmpty() && str.endsWith(".qml") && url.toString().endsWith(".qml") &&
+                        url.toString().startsWith(str)) {
+                        qCDebug(interfaceapp) << "Found matching url!" << url.host();
+                        return true;
+                    }
                }
            }

@ -3788,9 +3790,8 @@ void Application::setPreferredCursor(const QString& cursorName) {

    if (_displayPlugin && _displayPlugin->isHmd()) {
        _preferredCursor.set(cursorName.isEmpty() ? DEFAULT_CURSOR_NAME : cursorName);
-    }
-    else { 
-        _preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName); 
+    } else {
+        _preferredCursor.set(cursorName.isEmpty() ? Cursor::Manager::getIconName(Cursor::Icon::SYSTEM) : cursorName);
    }

    showCursor(Cursor::Manager::lookupIcon(_preferredCursor.get()));
@ -3977,7 +3978,7 @@ void Application::handleSandboxStatus(QNetworkReply* reply) {
        DependencyManager::get<AddressManager>()->loadSettings(addressLookupString);
        sentTo = SENT_TO_PREVIOUS_LOCATION;
    }
-    
+
    UserActivityLogger::getInstance().logAction("startup_sent_to", {
        { "sent_to", sentTo },
        { "sandbox_is_running", sandboxIsRunning },
@ -4212,7 +4213,7 @@ bool Application::event(QEvent* event) {
            idle();

 #ifdef DEBUG_EVENT_QUEUE_DEPTH
-            // The event queue may very well grow beyond 400, so 
+            // The event queue may very well grow beyond 400, so
            // this code should only be enabled on local builds
            {
                int count = ::hifi::qt::getEventQueueSize(QThread::currentThread());
@ -4251,7 +4252,7 @@ bool Application::event(QEvent* event) {
        { //testing to see if we can set focus when focus is not set to root window.
            _glWidget->activateWindow();
            _glWidget->setFocus();
-            return true; 
+            return true;
        }

        case QEvent::TouchBegin:
@ -5236,7 +5237,7 @@ void Application::idle() {
        }
    }
 #endif
-    
+
    checkChangeCursor();

 #if !defined(DISABLE_QML)
@ -5489,7 +5490,7 @@ void Application::loadSettings() {
    RenderScriptingInterface::getInstance()->loadSettings();

    // Setup the PerformanceManager which will enforce the several settings to match the Preset
-    // On the first run, the Preset is evaluated from the 
+    // On the first run, the Preset is evaluated from the
    getPerformanceManager().setupPerformancePresetSettings(_firstRun.get());

    // finish initializing the camera, based on everything we checked above. Third person camera will be used if no settings
@ -5535,7 +5536,7 @@ bool Application::importEntities(const QString& urlOrFilename, const bool isObse
    _entityClipboard->withWriteLock([&] {
        _entityClipboard->eraseAllOctreeElements();

-        // FIXME: readFromURL() can take over the main event loop which may cause problems, especially if downloading the JSON 
+        // FIXME: readFromURL() can take over the main event loop which may cause problems, especially if downloading the JSON
        // from the Web.
        success = _entityClipboard->readFromURL(urlOrFilename, isObservable, callerId);
        if (success) {
@ -7063,7 +7064,7 @@ void Application::updateWindowTitle() const {
    auto accountManager = DependencyManager::get<AccountManager>();
    auto isInErrorState = nodeList->getDomainHandler().isInErrorState();

-    QString buildVersion = " - Project Athena v0.86.0 K2 - "
+    QString buildVersion = " - Vircadia - "
        + (BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable ? QString("Version") : QString("Build"))
        + " " + applicationVersion();

@ -7073,7 +7074,7 @@ void Application::updateWindowTitle() const {
        nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED)";
    QString username = accountManager->getAccountInfo().getUsername();

-    setCrashAnnotation("username", username.toStdString());
+    setCrashAnnotation("sentry[user][username]", username.toStdString());

    QString currentPlaceName;
    if (isServerlessMode()) {
@ -7747,7 +7748,7 @@ bool Application::askToReplaceDomainContent(const QString& url) {
            static const QString infoText = simpleWordWrap("Your domain's content will be replaced with a new content set. "
                "If you want to save what you have now, create a backup before proceeding. For more information about backing up "
                "and restoring content, visit the documentation page at: ", MAX_CHARACTERS_PER_LINE) +
-                "\nhttps://docs.projectathena.dev/host/maintain-domain/backup-domain.html";
+                "\nhttps://docs.vircadia.dev/host/maintain-domain/backup-domain.html";

            ModalDialogListener* dig = OffscreenUi::asyncQuestion("Are you sure you want to replace this domain's content set?",
                                                                  infoText, QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
@ -8735,7 +8736,7 @@ bool Application::isThrottleRendering() const {
 bool Application::hasFocus() const {
    bool result = (QApplication::activeWindow() != nullptr);

-    
+
 #if defined(Q_OS_WIN)
    // On Windows, QWidget::activateWindow() - as called in setFocus() - makes the application's taskbar icon flash but doesn't
    // take user focus away from their current window. So also check whether the application is the user's current foreground
--- a/interface/src/CrashHandler_Crashpad.cpp
+++ b/interface/src/CrashHandler_Crashpad.cpp
@ -84,10 +84,9 @@ bool startCrashHandler(std::string appPath) {
    std::vector<std::string> arguments;

    std::map<std::string, std::string> annotations;
-    annotations["token"] = BACKTRACE_TOKEN;
-    annotations["format"] = "minidump";
-    annotations["version"] = BuildInfo::VERSION.toStdString();
-    annotations["build_number"] = BuildInfo::BUILD_NUMBER.toStdString();
+    annotations["sentry[release]"] = BACKTRACE_TOKEN;
+    annotations["sentry[contexts][app][app_version]"] = BuildInfo::VERSION.toStdString();
+    annotations["sentry[contexts][app][app_build]"] = BuildInfo::BUILD_NUMBER.toStdString();
    annotations["build_type"] = BuildInfo::BUILD_TYPE_STRING.toStdString();

    auto machineFingerPrint = uuidStringWithoutCurlyBraces(FingerprintUtils::getMachineFingerprint());
--- a/interface/src/FancyCamera.h
+++ b/interface/src/FancyCamera.h
@ -20,7 +20,7 @@ class FancyCamera : public Camera {

    /**jsdoc
     * The <code>Camera</code> API provides access to the "camera" that defines your view in desktop and HMD display modes.
-     * The High Fidelity camera has axes <code>x</code> = right, <code>y</code> = up, <code>-z</code> = forward.
+     * The Vircadia camera has axes <code>x</code> = right, <code>y</code> = up, <code>-z</code> = forward.
     *
     * @namespace Camera
     *
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@ -223,9 +223,9 @@ Menu::Menu() {
    MenuWrapper* startupLocationMenu = navigateMenu->addMenu(MenuOption::StartUpLocation);
    QActionGroup* startupLocatiopnGroup = new QActionGroup(startupLocationMenu);
    startupLocatiopnGroup->setExclusive(true);
-    startupLocatiopnGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::HomeLocation, 0, 
+    startupLocatiopnGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::HomeLocation, 0,
        false));
-    startupLocatiopnGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::LastLocation, 0, 
+    startupLocatiopnGroup->addAction(addCheckableActionToQMenuAndActionHash(startupLocationMenu, MenuOption::LastLocation, 0,
        true));

    // Settings menu ----------------------------------
@ -288,13 +288,13 @@ Menu::Menu() {
 			hmd->toggleShouldShowTablet();
 		}
    });
-    
+
    // Settings > Entity Script / QML Whitelist
    action = addActionToQMenuAndActionHash(settingsMenu, "Entity Script / QML Whitelist");
    connect(action, &QAction::triggered, [] {
        auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
        auto hmd = DependencyManager::get<HMDScriptingInterface>();
-        
+
        tablet->pushOntoStack("hifi/dialogs/security/EntityScriptQMLWhitelist.qml");

        if (!hmd->getShouldShowTablet()) {
@ -310,10 +310,10 @@ Menu::Menu() {

    // Developer menu ----------------------------------
    MenuWrapper* developerMenu = addMenu("Developer", "Developer");
-    
+
    // Developer > Scripting >>>
    MenuWrapper* scriptingOptionsMenu = developerMenu->addMenu("Scripting");
-    
+
    // Developer > Scripting > Console...
    addActionToQMenuAndActionHash(scriptingOptionsMenu, MenuOption::Console, Qt::CTRL | Qt::ALT | Qt::Key_J,
                                  DependencyManager::get<StandAloneJSConsole>().data(),
@ -328,7 +328,7 @@ Menu::Menu() {
        defaultScriptsLoc.setPath(defaultScriptsLoc.path() + "developer/utilities/tools/currentAPI.js");
        DependencyManager::get<ScriptEngines>()->loadScript(defaultScriptsLoc.toString());
    });
-    
+
    // Developer > Scripting > Entity Script Server Log
    auto essLogAction = addActionToQMenuAndActionHash(scriptingOptionsMenu, MenuOption::EntityScriptServerLog, 0,
                                                      qApp, SLOT(toggleEntityScriptServerLogDialog()));
@ -348,7 +348,7 @@ Menu::Menu() {
    // Developer > Scripting > Verbose Logging
    addCheckableActionToQMenuAndActionHash(scriptingOptionsMenu, MenuOption::VerboseLogging, 0, false,
                                           qApp, SLOT(updateVerboseLogging()));
-    
+
    // Developer > Scripting > Enable Speech Control API
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
    auto speechRecognizer = DependencyManager::get<SpeechRecognizer>();
@ -360,20 +360,20 @@ Menu::Menu() {
        UNSPECIFIED_POSITION);
    connect(speechRecognizer.data(), SIGNAL(enabledUpdated(bool)), speechRecognizerAction, SLOT(setChecked(bool)));
 #endif
-    
+
    // Developer > UI >>>
    MenuWrapper* uiOptionsMenu = developerMenu->addMenu("UI");
    action = addCheckableActionToQMenuAndActionHash(uiOptionsMenu, MenuOption::DesktopTabletToToolbar, 0,
                                                    qApp->getDesktopTabletBecomesToolbarSetting());
-    
+
    // Developer > UI > Show Overlays
    addCheckableActionToQMenuAndActionHash(uiOptionsMenu, MenuOption::Overlays, 0, true);
-    
+
    // Developer > UI > Desktop Tablet Becomes Toolbar
    connect(action, &QAction::triggered, [action] {
        qApp->setDesktopTabletBecomesToolbarSetting(action->isChecked());
    });
-    
+
     // Developer > UI > HMD Tablet Becomes Toolbar
    action = addCheckableActionToQMenuAndActionHash(uiOptionsMenu, MenuOption::HMDTabletToToolbar, 0,
                                                    qApp->getHmdTabletBecomesToolbarSetting());
@ -614,9 +614,15 @@ Menu::Menu() {
    addCheckableActionToQMenuAndActionHash(networkMenu,
        MenuOption::DisableActivityLogger,
        0,
-        false,
+        true,
        &UserActivityLogger::getInstance(),
        SLOT(disable(bool)));
+    addCheckableActionToQMenuAndActionHash(networkMenu,
+        MenuOption::DisableCrashLogger,
+        0,
+        true,
+        &UserActivityLogger::getInstance(),
+        SLOT(crashMonitorDisable(bool)));
    addActionToQMenuAndActionHash(networkMenu, MenuOption::ShowDSConnectTable, 0,
        qApp, SLOT(loadDomainConnectionDialog()));

@ -702,7 +708,7 @@ Menu::Menu() {
    result = QProcessEnvironment::systemEnvironment().contains(HIFI_SHOW_DEVELOPER_CRASH_MENU);
    if (result) {
        MenuWrapper* crashMenu = developerMenu->addMenu("Crash");
-    
+
        // Developer > Crash > Display Crash Options
        addCheckableActionToQMenuAndActionHash(crashMenu, MenuOption::DisplayCrashOptions, 0, true);

@ -741,7 +747,7 @@ Menu::Menu() {

        addActionToQMenuAndActionHash(crashMenu, MenuOption::CrashOnShutdown, 0, qApp, SLOT(crashOnShutdown()));
    }
-    
+

    // Developer > Show Statistics
    addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats, 0, true);
@ -782,21 +788,21 @@ Menu::Menu() {
    // Help/Application menu ----------------------------------
    MenuWrapper * helpMenu = addMenu("Help");

-    // Help > About Project Athena
-    action = addActionToQMenuAndActionHash(helpMenu, "About Project Athena");
+    // Help > About Vircadia
+    action = addActionToQMenuAndActionHash(helpMenu, "About Vircadia");
    connect(action, &QAction::triggered, [] {
        qApp->showDialog(QString("hifi/dialogs/AboutDialog.qml"),
            QString("hifi/dialogs/TabletAboutDialog.qml"), "AboutDialog");
    });
    helpMenu->addSeparator();

-    // Help > Athena Docs
+    // Help > Vircadia Docs
    action = addActionToQMenuAndActionHash(helpMenu, "Online Documentation");
    connect(action, &QAction::triggered, qApp, [] {
-        QDesktopServices::openUrl(QUrl("https://docs.projectathena.dev/"));
+        QDesktopServices::openUrl(QUrl("https://docs.vircadia.dev/"));
    });

-    // Help > Athena Forum
+    // Help > Vircadia Forum
    /* action = addActionToQMenuAndActionHash(helpMenu, "Online Forums");
    connect(action, &QAction::triggered, qApp, [] {
        QDesktopServices::openUrl(QUrl("https://forums.highfidelity.com/"));
@ -805,7 +811,7 @@ Menu::Menu() {
    // Help > Scripting Reference
    action = addActionToQMenuAndActionHash(helpMenu, "Online Script Reference");
    connect(action, &QAction::triggered, qApp, [] {
-        QDesktopServices::openUrl(QUrl("https://apidocs.projectathena.dev/"));
+        QDesktopServices::openUrl(QUrl("https://apidocs.vircadia.dev/"));
    });

    addActionToQMenuAndActionHash(helpMenu, "Controls Reference", 0, qApp, SLOT(showHelp()));
@ -815,7 +821,7 @@ Menu::Menu() {
    // Help > Release Notes
    action = addActionToQMenuAndActionHash(helpMenu, "Release Notes");
    connect(action, &QAction::triggered, qApp, [] {
-        QDesktopServices::openUrl(QUrl("https://docs.projectathena.dev/release-notes.html"));
+        QDesktopServices::openUrl(QUrl("https://docs.vircadia.dev/release-notes.html"));
    });

    // Help > Report a Bug!
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@ -86,6 +86,7 @@ namespace MenuOption {
    const QString DeleteAvatarEntitiesBookmark = "Delete Avatar Entities Bookmark";
    const QString DeleteBookmark = "Delete Bookmark...";
    const QString DisableActivityLogger = "Disable Activity Logger";
+    const QString DisableCrashLogger = "Disable Crash Reporter";
    const QString DisableEyelidAdjustment = "Disable Eyelid Adjustment";
    const QString DisableLightEntities = "Disable Light Entities";
    const QString DisplayCrashOptions = "Display Crash Options";
--- a/interface/src/ModelPropertiesDialog.cpp
+++ b/interface/src/ModelPropertiesDialog.cpp
@ -80,7 +80,7 @@ QVariantHash ModelPropertiesDialog::getMapping() const {

    // update the joint indices
    QVariantHash jointIndices;
-    for (size_t i = 0; i < _hfmModel.joints.size(); i++) {
+    for (int i = 0; i < _hfmModel.joints.size(); i++) {
        jointIndices.insert(_hfmModel.joints.at(i).name, QString::number(i));
    }
    mapping.insert(JOINT_INDEX_FIELD, jointIndices);
--- a/interface/src/avatar/AvatarDoctor.cpp
+++ b/interface/src/avatar/AvatarDoctor.cpp
@ -55,7 +55,7 @@ static QStringList HAND_MAPPING_SUFFIXES = {
    "HandThumb1",
 };

-const QUrl PACKAGE_AVATAR_DOCS_BASE_URL = QUrl("https://docs.projectathena.dev/create/avatars/package-avatar.html");
+const QUrl PACKAGE_AVATAR_DOCS_BASE_URL = QUrl("https://docs.vircadia.dev/create/avatars/package-avatar.html");

 AvatarDoctor::AvatarDoctor(const QUrl& avatarFSTFileUrl) :
    _avatarFSTFileUrl(avatarFSTFileUrl) {
@ -79,7 +79,7 @@ void AvatarDoctor::startDiagnosing() {
    _missingTextureCount = 0;
    _unsupportedTextureCount = 0;

-    const auto resource = DependencyManager::get<ModelCache>()->getModelResource(_avatarFSTFileUrl);
+    const auto resource = DependencyManager::get<ModelCache>()->getGeometryResource(_avatarFSTFileUrl);
    resource->refresh();

    const auto resourceLoaded = [this, resource](bool success) {
@ -99,12 +99,12 @@ void AvatarDoctor::startDiagnosing() {
        }

        // RIG
-        if (avatarModel.joints.empty()) {
+        if (avatarModel.joints.isEmpty()) {
            addError("Avatar has no rig.", "no-rig");
        } else {
            auto jointNames = avatarModel.getJointNames();

-            if (avatarModel.joints.size() > NETWORKED_JOINTS_LIMIT) {
+            if (avatarModel.joints.length() > NETWORKED_JOINTS_LIMIT) {
                addError(tr( "Avatar has over %n bones.", "", NETWORKED_JOINTS_LIMIT), "maximum-bone-limit");
            }
            // Avatar does not have Hips bone mapped	
@ -297,7 +297,7 @@ void AvatarDoctor::startDiagnosing() {
        if (resource->isLoaded()) {
            resourceLoaded(!resource->isFailed());
        } else {
-            connect(resource.data(), &ModelResource::finished, this, resourceLoaded);
+            connect(resource.data(), &GeometryResource::finished, this, resourceLoaded);
        }
    } else {
        addError("Model file cannot be opened", "missing-file");
--- a/interface/src/avatar/AvatarDoctor.h
+++ b/interface/src/avatar/AvatarDoctor.h
@ -53,7 +53,7 @@ private:
    int _materialMappingCount = 0;
    int _materialMappingLoadedCount = 0;

-    ModelResource::Pointer _model;
+    GeometryResource::Pointer _model;

    bool _isDiagnosing = false;
 };
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@ -972,7 +972,7 @@ void MyAvatar::simulate(float deltaTime, bool inView) {
        recorder->recordFrame(FRAME_TYPE, toFrame(*this));
    }

-    locationChanged(true, false);
+    locationChanged(true, true);
    // if a entity-child of this avatar has moved outside of its queryAACube, update the cube and tell the entity server.
    auto entityTreeRenderer = qApp->getEntities();
    EntityTreePointer entityTree = entityTreeRenderer ? entityTreeRenderer->getTree() : nullptr;
@ -981,16 +981,7 @@ void MyAvatar::simulate(float deltaTime, bool inView) {
        entityTree->withWriteLock([&] {
            zoneInteractionProperties = entityTreeRenderer->getZoneInteractionProperties();
            EntityEditPacketSender* packetSender = qApp->getEntityEditPacketSender();
-            forEachDescendant([&](SpatiallyNestablePointer object) {
-                locationChanged(true, false);
-                // we need to update attached queryAACubes in our own local tree so point-select always works
-                // however we don't want to flood the update pipeline with AvatarEntity updates, so we assume
-                // others have all info required to properly update queryAACube of AvatarEntities on their end
-                EntityItemPointer entity = std::dynamic_pointer_cast<EntityItem>(object);
-                bool iShouldTellServer = !(entity && entity->isAvatarEntity());
-                const bool force = false;
-                entityTree->updateEntityQueryAACube(object, packetSender, force, iShouldTellServer);
-            });
+            entityTree->updateEntityQueryAACube(shared_from_this(), packetSender, false, true);
        });
        bool isPhysicsEnabled = qApp->isPhysicsEnabled();
        bool zoneAllowsFlying = zoneInteractionProperties.first;
@ -1988,7 +1979,7 @@ void MyAvatar::loadData() {

    // Flying preferences must be loaded before calling setFlyingEnabled()
    Setting::Handle<bool> firstRunVal { Settings::firstRun, true };
-    setFlyingHMDPref(firstRunVal.get() ? false : _flyingHMDSetting.get());
+    setFlyingHMDPref(firstRunVal.get() ? true : _flyingHMDSetting.get());
    setMovementReference(firstRunVal.get() ? false : _movementReferenceSetting.get());
    setDriveGear1(firstRunVal.get() ? DEFAULT_GEAR_1 : _driveGear1Setting.get());
    setDriveGear2(firstRunVal.get() ? DEFAULT_GEAR_2 : _driveGear2Setting.get());
@ -2483,7 +2474,7 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {

            if (_fullAvatarModelName.isEmpty()) {
                // Store the FST file name into preferences
-                const auto& mapping = _skeletonModel->getNetworkModel()->getMapping();
+                const auto& mapping = _skeletonModel->getGeometry()->getMapping();
                if (mapping.value("name").isValid()) {
                    _fullAvatarModelName = mapping.value("name").toString();
                }
@ -2491,7 +2482,7 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {

            initHeadBones();
            _skeletonModel->setCauterizeBoneSet(_headBoneSet);
-            _fstAnimGraphOverrideUrl = _skeletonModel->getNetworkModel()->getAnimGraphOverrideUrl();
+            _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl();
            initAnimGraph();
            initFlowFromFST();
        }
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@ -762,7 +762,7 @@ public:
     * <p>Note: When using pre-built animation data, it's critical that the joint orientation of the source animation and target
     * rig are equivalent, since the animation data applies absolute values onto the joints. If the orientations are different,
     * the avatar will move in unpredictable ways. For more information about avatar joint orientation standards, see 
-     * <a href="https://docs.projectathena.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.
+     * <a href="https://docs.vircadia.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.
     * @function MyAvatar.overrideRoleAnimation
     * @param {string} role - The animation role to override
     * @param {string} url - The URL to the animation file. Animation files need to be in glTF or FBX format, but only need to 
@ -1920,7 +1920,7 @@ public:

    /**jsdoc
     * Enables and disables flow simulation of physics on the avatar's hair, clothes, and body parts. See 
-     * {@link https://docs.projectathena.dev/create/avatars/add-flow.html|Add Flow to Your Avatar} for more 
+     * {@link https://docs.vircadia.dev/create/avatars/add-flow.html|Add Flow to Your Avatar} for more 
     * information.
     * @function MyAvatar.useFlow
     * @param {boolean} isActive - <code>true</code> if flow simulation is enabled on the joint, <code>false</code> if it isn't.
@ -2285,7 +2285,7 @@ public slots:

    /**jsdoc
     * Gets the URL of the override animation graph.
-     * <p>See {@link https://docs.projectathena.dev/create/avatars/custom-animations.html|Custom Avatar Animations} for
+     * <p>See {@link https://docs.vircadia.dev/create/avatars/custom-animations.html|Custom Avatar Animations} for
     * information on animation graphs.</p>
     * @function MyAvatar.getAnimGraphOverrideUrl
     * @returns {string} The URL of the override animation graph JSON file. <code>""</code> if there is no override animation 
@ -2295,7 +2295,7 @@ public slots:

    /**jsdoc
     * Sets the animation graph to use in preference to the default animation graph.
-     * <p>See {@link https://docs.projectathena.dev/create/avatars/custom-animations.html|Custom Avatar Animations} for
+     * <p>See {@link https://docs.vircadia.dev/create/avatars/custom-animations.html|Custom Avatar Animations} for
     * information on animation graphs.</p>
     * @function MyAvatar.setAnimGraphOverrideUrl
     * @param {string} url - The URL of the animation graph JSON file to use. Set to <code>""</code> to clear an override.
@ -2304,7 +2304,7 @@ public slots:

    /**jsdoc
     * Gets the URL of animation graph (i.e., the avatar animation JSON) that's currently being used for avatar animations.
-     * <p>See {@link https://docs.projectathena.dev/create/avatars/custom-animations.html|Custom Avatar Animations} for 
+     * <p>See {@link https://docs.vircadia.dev/create/avatars/custom-animations.html|Custom Avatar Animations} for 
     * information on animation graphs.</p>
     * @function MyAvatar.getAnimGraphUrl
     * @returns {string} The URL of the current animation graph JSON file.
@ -2315,7 +2315,7 @@ public slots:

    /**jsdoc
     * Sets the current animation graph  (i.e., the avatar animation JSON) to use for avatar animations and makes it the default.
-     * <p>See {@link https://docs.projectathena.dev/create/avatars/custom-animations.html|Custom Avatar Animations} for
+     * <p>See {@link https://docs.vircadia.dev/create/avatars/custom-animations.html|Custom Avatar Animations} for
     * information on animation graphs.</p>
     * @function MyAvatar.setAnimGraphUrl
     * @param {string} url - The URL of the animation graph JSON file to use.
@ -2702,7 +2702,7 @@ private:

    bool _enableFlying { false };
    bool _flyingPrefDesktop { true };
-    bool _flyingPrefHMD { false };
+    bool _flyingPrefHMD { true };
    bool _wasPushing { false };
    bool _isPushing { false };
    bool _isBeingPushed { false };
--- a/interface/src/graphics/WorldBox.h
+++ b/interface/src/graphics/WorldBox.h
@ -19,8 +19,6 @@
 #include <GeometryCache.h>
 #include "Menu.h"

-
-
 class WorldBoxRenderData {
 public:
    typedef render::Payload<WorldBoxRenderData> Payload;
@ -29,8 +27,6 @@ public:
    int _val = 0;
    static render::ItemID _item; // unique WorldBoxRenderData

-
-
    static void renderWorldBox(RenderArgs* args, gpu::Batch& batch);
 };

--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@ -72,7 +72,7 @@ int main(int argc, const char* argv[]) {
    }

    QCommandLineParser parser;
-    parser.setApplicationDescription("High Fidelity");
+    parser.setApplicationDescription("Vircadia");
    QCommandLineOption versionOption = parser.addVersionOption();
    QCommandLineOption helpOption = parser.addHelpOption();

@ -218,12 +218,12 @@ int main(int argc, const char* argv[]) {
    }
    qDebug() << "UserActivityLogger is enabled:" << ual.isEnabled();

-    if (ual.isEnabled()) {
+    qDebug() << "Crash handler logger is enabled:" << ual.isCrashMonitorEnabled();
+    if (ual.isCrashMonitorEnabled()) {
        auto crashHandlerStarted = startCrashHandler(argv[0]);
        qDebug() << "Crash handler started:" << crashHandlerStarted;
    }

-
    const QString& applicationName = getInterfaceSharedMemoryName();
    bool instanceMightBeRunning = true;
 #ifdef Q_OS_WIN
--- a/interface/src/raypick/CollisionPick.cpp
+++ b/interface/src/raypick/CollisionPick.cpp
@ -121,9 +121,8 @@ bool CollisionPick::isLoaded() const {
 bool CollisionPick::getShapeInfoReady(const CollisionRegion& pick) {
    if (_mathPick.shouldComputeShapeInfo()) {
        if (_cachedResource && _cachedResource->isLoaded()) {
-            // TODO: Model CollisionPick support
-            //computeShapeInfo(pick, *_mathPick.shapeInfo, _cachedResource);
-            //_mathPick.loaded = true;
+            computeShapeInfo(pick, *_mathPick.shapeInfo, _cachedResource);
+            _mathPick.loaded = true;
        } else {
            _mathPick.loaded = false;
        }
@ -135,7 +134,7 @@ bool CollisionPick::getShapeInfoReady(const CollisionRegion& pick) {
    return _mathPick.loaded;
 }

-void CollisionPick::computeShapeInfoDimensionsOnly(const CollisionRegion& pick, ShapeInfo& shapeInfo, QSharedPointer<ModelResource> resource) {
+void CollisionPick::computeShapeInfoDimensionsOnly(const CollisionRegion& pick, ShapeInfo& shapeInfo, QSharedPointer<GeometryResource> resource) {
    ShapeType type = shapeInfo.getType();
    glm::vec3 dimensions = pick.transform.getScale();
    QString modelURL = (resource ? resource->getURL().toString() : "");
@ -148,12 +147,241 @@ void CollisionPick::computeShapeInfoDimensionsOnly(const CollisionRegion& pick,
    }
 }

+void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& shapeInfo, QSharedPointer<GeometryResource> resource) {
+    // This code was copied and modified from RenderableModelEntityItem::computeShapeInfo
+    // TODO: Move to some shared code area (in entities-renderer? model-networking?)
+    // after we verify this is working and do a diff comparison with RenderableModelEntityItem::computeShapeInfo
+    // to consolidate the code.
+    // We may also want to make computeShapeInfo always abstract away from the gpu model mesh, like it does here.
+    const uint32_t TRIANGLE_STRIDE = 3;
+    const uint32_t QUAD_STRIDE = 4;
+
+    ShapeType type = shapeInfo.getType();
+    glm::vec3 dimensions = pick.transform.getScale();
+    if (type == SHAPE_TYPE_COMPOUND) {
+        // should never fall in here when collision model not fully loaded
+        // TODO: assert that all geometries exist and are loaded
+        //assert(_model && _model->isLoaded() && _compoundShapeResource && _compoundShapeResource->isLoaded());
+        const HFMModel& collisionModel = resource->getHFMModel();
+
+        ShapeInfo::PointCollection& pointCollection = shapeInfo.getPointCollection();
+        pointCollection.clear();
+        uint32_t i = 0;
+
+        // the way OBJ files get read, each section under a "g" line is its own meshPart.  We only expect
+        // to find one actual "mesh" (with one or more meshParts in it), but we loop over the meshes, just in case.
+        foreach (const HFMMesh& mesh, collisionModel.meshes) {
+            // each meshPart is a convex hull
+            foreach (const HFMMeshPart &meshPart, mesh.parts) {
+                pointCollection.push_back(QVector<glm::vec3>());
+                ShapeInfo::PointList& pointsInPart = pointCollection[i];
+
+                // run through all the triangles and (uniquely) add each point to the hull
+                uint32_t numIndices = (uint32_t)meshPart.triangleIndices.size();
+                // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
+                //assert(numIndices % TRIANGLE_STRIDE == 0);
+                numIndices -= numIndices % TRIANGLE_STRIDE; // WORKAROUND lack of sanity checking in FBXSerializer
+
+                for (uint32_t j = 0; j < numIndices; j += TRIANGLE_STRIDE) {
+                    glm::vec3 p0 = mesh.vertices[meshPart.triangleIndices[j]];
+                    glm::vec3 p1 = mesh.vertices[meshPart.triangleIndices[j + 1]];
+                    glm::vec3 p2 = mesh.vertices[meshPart.triangleIndices[j + 2]];
+                    if (!pointsInPart.contains(p0)) {
+                        pointsInPart << p0;
+                    }
+                    if (!pointsInPart.contains(p1)) {
+                        pointsInPart << p1;
+                    }
+                    if (!pointsInPart.contains(p2)) {
+                        pointsInPart << p2;
+                    }
+                }
+
+                // run through all the quads and (uniquely) add each point to the hull
+                numIndices = (uint32_t)meshPart.quadIndices.size();
+                // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
+                //assert(numIndices % QUAD_STRIDE == 0);
+                numIndices -= numIndices % QUAD_STRIDE; // WORKAROUND lack of sanity checking in FBXSerializer
+
+                for (uint32_t j = 0; j < numIndices; j += QUAD_STRIDE) {
+                    glm::vec3 p0 = mesh.vertices[meshPart.quadIndices[j]];
+                    glm::vec3 p1 = mesh.vertices[meshPart.quadIndices[j + 1]];
+                    glm::vec3 p2 = mesh.vertices[meshPart.quadIndices[j + 2]];
+                    glm::vec3 p3 = mesh.vertices[meshPart.quadIndices[j + 3]];
+                    if (!pointsInPart.contains(p0)) {
+                        pointsInPart << p0;
+                    }
+                    if (!pointsInPart.contains(p1)) {
+                        pointsInPart << p1;
+                    }
+                    if (!pointsInPart.contains(p2)) {
+                        pointsInPart << p2;
+                    }
+                    if (!pointsInPart.contains(p3)) {
+                        pointsInPart << p3;
+                    }
+                }
+
+                if (pointsInPart.size() == 0) {
+                    qCDebug(scriptengine) << "Warning -- meshPart has no faces";
+                    pointCollection.pop_back();
+                    continue;
+                }
+                ++i;
+            }
+        }
+
+        // We expect that the collision model will have the same units and will be displaced
+        // from its origin in the same way the visual model is.  The visual model has
+        // been centered and probably scaled.  We take the scaling and offset which were applied
+        // to the visual model and apply them to the collision model (without regard for the
+        // collision model's extents).
+
+        glm::vec3 scaleToFit = dimensions / resource->getHFMModel().getUnscaledMeshExtents().size();
+        // multiply each point by scale
+        for (int32_t i = 0; i < pointCollection.size(); i++) {
+            for (int32_t j = 0; j < pointCollection[i].size(); j++) {
+                // back compensate for registration so we can apply that offset to the shapeInfo later
+                pointCollection[i][j] = scaleToFit * pointCollection[i][j];
+            }
+        }
+        shapeInfo.setParams(type, dimensions, resource->getURL().toString());
+    } else if (type >= SHAPE_TYPE_SIMPLE_HULL && type <= SHAPE_TYPE_STATIC_MESH) {
+        const HFMModel& hfmModel = resource->getHFMModel();
+        int numHFMMeshes = hfmModel.meshes.size();
+        int totalNumVertices = 0;
+        for (int i = 0; i < numHFMMeshes; i++) {
+            const HFMMesh& mesh = hfmModel.meshes.at(i);
+            totalNumVertices += mesh.vertices.size();
+        }
+        const int32_t MAX_VERTICES_PER_STATIC_MESH = 1e6;
+        if (totalNumVertices > MAX_VERTICES_PER_STATIC_MESH) {
+            qWarning() << "model" << "has too many vertices" << totalNumVertices << "and will collide as a box.";
+            shapeInfo.setParams(SHAPE_TYPE_BOX, 0.5f * dimensions);
+            return;
+        }
+
+        auto& meshes = resource->getHFMModel().meshes;
+        int32_t numMeshes = (int32_t)(meshes.size());
+
+        const int MAX_ALLOWED_MESH_COUNT = 1000;
+        if (numMeshes > MAX_ALLOWED_MESH_COUNT) {
+            // too many will cause the deadlock timer to throw...
+            shapeInfo.setParams(SHAPE_TYPE_BOX, 0.5f * dimensions);
+            return;
+        }
+
+        ShapeInfo::PointCollection& pointCollection = shapeInfo.getPointCollection();
+        pointCollection.clear();
+        if (type == SHAPE_TYPE_SIMPLE_COMPOUND) {
+            pointCollection.resize(numMeshes);
+        } else {
+            pointCollection.resize(1);
+        }
+
+        ShapeInfo::TriangleIndices& triangleIndices = shapeInfo.getTriangleIndices();
+        triangleIndices.clear();
+
+        Extents extents;
+        int32_t meshCount = 0;
+        int32_t pointListIndex = 0;
+        for (auto& mesh : meshes) {
+            if (!mesh.vertices.size()) {
+                continue;
+            }
+            QVector<glm::vec3> vertices = mesh.vertices;
+
+            ShapeInfo::PointList& points = pointCollection[pointListIndex];
+
+            // reserve room
+            int32_t sizeToReserve = (int32_t)(vertices.count());
+            if (type == SHAPE_TYPE_SIMPLE_COMPOUND) {
+                // a list of points for each mesh
+                pointListIndex++;
+            } else {
+                // only one list of points
+                sizeToReserve += (int32_t)points.size();
+            }
+            points.reserve(sizeToReserve);
+
+            // copy points
+            const glm::vec3* vertexItr = vertices.cbegin();
+            while (vertexItr != vertices.cend()) {
+                glm::vec3 point = *vertexItr;
+                points.push_back(point);
+                extents.addPoint(point);
+                ++vertexItr;
+            }
+
+            if (type == SHAPE_TYPE_STATIC_MESH) {
+                // copy into triangleIndices
+                size_t triangleIndicesCount = 0;
+                for (const HFMMeshPart& meshPart : mesh.parts) {
+                    triangleIndicesCount += meshPart.triangleIndices.count();
+                }
+                triangleIndices.reserve((int)triangleIndicesCount);
+
+                for (const HFMMeshPart& meshPart : mesh.parts) {
+                    const int* indexItr = meshPart.triangleIndices.cbegin();
+                    while (indexItr != meshPart.triangleIndices.cend()) {
+                        triangleIndices.push_back(*indexItr);
+                        ++indexItr;
+                    }
+                }
+            } else if (type == SHAPE_TYPE_SIMPLE_COMPOUND) {
+                // for each mesh copy unique part indices, separated by special bogus (flag) index values
+                for (const HFMMeshPart& meshPart : mesh.parts) {
+                    // collect unique list of indices for this part
+                    std::set<int32_t> uniqueIndices;
+                    auto numIndices = meshPart.triangleIndices.count();
+                    // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
+                    //assert(numIndices% TRIANGLE_STRIDE == 0);
+                    numIndices -= numIndices % TRIANGLE_STRIDE; // WORKAROUND lack of sanity checking in FBXSerializer
+
+                    auto indexItr = meshPart.triangleIndices.cbegin();
+                    while (indexItr != meshPart.triangleIndices.cend()) {
+                        uniqueIndices.insert(*indexItr);
+                        ++indexItr;
+                    }
+
+                    // store uniqueIndices in triangleIndices
+                    triangleIndices.reserve(triangleIndices.size() + (int32_t)uniqueIndices.size());
+                    for (auto index : uniqueIndices) {
+                        triangleIndices.push_back(index);
+                    }
+                    // flag end of part
+                    triangleIndices.push_back(END_OF_MESH_PART);
+                }
+                // flag end of mesh
+                triangleIndices.push_back(END_OF_MESH);
+            }
+            ++meshCount;
+        }
+
+        // scale and shift
+        glm::vec3 extentsSize = extents.size();
+        glm::vec3 scaleToFit = dimensions / extentsSize;
+        for (int32_t i = 0; i < 3; ++i) {
+            if (extentsSize[i] < 1.0e-6f) {
+                scaleToFit[i] = 1.0f;
+            }
+        }
+        for (auto points : pointCollection) {
+            for (int32_t i = 0; i < points.size(); ++i) {
+                points[i] = (points[i] * scaleToFit);
+            }
+        }
+
+        shapeInfo.setParams(type, 0.5f * dimensions, resource->getURL().toString());
+    }
+}
+
 CollisionPick::CollisionPick(const PickFilter& filter, float maxDistance, bool enabled, bool scaleWithParent, CollisionRegion collisionRegion, PhysicsEnginePointer physicsEngine) :
    Pick(collisionRegion, filter, maxDistance, enabled),
    _scaleWithParent(scaleWithParent),
    _physicsEngine(physicsEngine) {
    if (collisionRegion.shouldComputeShapeInfo()) {
-        _cachedResource = DependencyManager::get<ModelCache>()->getCollisionModelResource(collisionRegion.modelURL);
+        _cachedResource = DependencyManager::get<ModelCache>()->getCollisionGeometryResource(collisionRegion.modelURL);
    }
    _mathPick.loaded = isLoaded();
 }
--- a/interface/src/raypick/CollisionPick.h
+++ b/interface/src/raypick/CollisionPick.h
@ -63,13 +63,14 @@ protected:
    bool isLoaded() const;
    // Returns true if _mathPick.shapeInfo is valid. Otherwise, attempts to get the _mathPick ready for use.
    bool getShapeInfoReady(const CollisionRegion& pick);
-    void computeShapeInfoDimensionsOnly(const CollisionRegion& pick, ShapeInfo& shapeInfo, QSharedPointer<ModelResource> resource);
+    void computeShapeInfo(const CollisionRegion& pick, ShapeInfo& shapeInfo, QSharedPointer<GeometryResource> resource);
+    void computeShapeInfoDimensionsOnly(const CollisionRegion& pick, ShapeInfo& shapeInfo, QSharedPointer<GeometryResource> resource);
    void filterIntersections(std::vector<ContactTestResult>& intersections) const;

    bool _scaleWithParent;

    PhysicsEnginePointer _physicsEngine;
-    QSharedPointer<ModelResource> _cachedResource;
+    QSharedPointer<GeometryResource> _cachedResource;

    // Options for what information to get from collision results
    bool _includeNormals;
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@ -254,7 +254,15 @@ void setupPreferences() {
        auto setter = [](bool value) { Menu::getInstance()->setIsOptionChecked(MenuOption::DisableActivityLogger, !value); };
        preferences->addPreference(new CheckPreference("Privacy", "Send data - High Fidelity uses information provided by your "
                                "client to improve the product through the logging of errors, tracking of usage patterns, "
-                                "installation and system details, and crash events. By allowing High Fidelity to collect "
+                                "installation and system details. By allowing High Fidelity to collect this information "
+                                "you are helping to improve the product. ", getter, setter));
+    }
+
+    {
+        auto getter = []()->bool { return !Menu::getInstance()->isOptionChecked(MenuOption::DisableCrashLogger); };
+        auto setter = [](bool value) { Menu::getInstance()->setIsOptionChecked(MenuOption::DisableCrashLogger, !value); };
+        preferences->addPreference(new CheckPreference("Privacy", "Send crashes - Vircadia uses information provided by your "
+                                "client to improve the product through crash reports. By allowing Vircadia to collect "
                                "this information you are helping to improve the product. ", getter, setter));
    }

--- a/launchers/qt/src/BuildsRequest.h
+++ b/launchers/qt/src/BuildsRequest.h
@ -4,10 +4,10 @@
 #include <QNetworkAccessManager>

 struct Build {
-    QString tag{ QString::null };
+    QString tag;
    int latestVersion{ 0 };
    int buildNumber{ 0 };
-    QString installerZipURL{ QString::null };
+    QString installerZipURL;
 };

 struct Builds {
--- a/launchers/qt/src/LauncherState.cpp
+++ b/launchers/qt/src/LauncherState.cpp
@ -244,7 +244,7 @@ void LauncherState::getCurrentClientVersion() {
    if (match.hasMatch()) {
        _currentClientVersion = match.captured("version");
    } else {
-        _currentClientVersion = QString::null;
+        _currentClientVersion.clear();
    }
    qDebug() << "Current client version is: " << _currentClientVersion;

--- a/launchers/qt/src/LauncherState.h
+++ b/launchers/qt/src/LauncherState.h
@ -176,7 +176,7 @@ private:
    QString _displayName;
    QString _applicationErrorMessage;
    QString _currentClientVersion;
-    QString _buildTag { QString::null };
+    QString _buildTag;
    QString _contentCacheURL;
    QString _loginTokenResponse;
    QFile _clientZipFile;
--- a/launchers/qt/src/UserSettingsRequest.h
+++ b/launchers/qt/src/UserSettingsRequest.h
@ -6,7 +6,7 @@
 #include "LoginRequest.h"

 struct UserSettings {
-    QString homeLocation{ QString::null };
+    QString homeLocation;
 };

 class UserSettingsRequest : public QObject {
--- a/libraries/animation/src/AnimSkeleton.cpp
+++ b/libraries/animation/src/AnimSkeleton.cpp
@ -20,17 +20,24 @@ AnimSkeleton::AnimSkeleton(const HFMModel& hfmModel) {

    _geometryOffset = hfmModel.offset;

-    buildSkeletonFromJoints(hfmModel.joints, hfmModel.jointRotationOffsets);
+    // convert to std::vector of joints
+    std::vector<HFMJoint> joints;
+    joints.reserve(hfmModel.joints.size());
+    for (auto& joint : hfmModel.joints) {
+        joints.push_back(joint);
+    }
+    buildSkeletonFromJoints(joints, hfmModel.jointRotationOffsets);

    // we make a copy of the inverseBindMatrices in order to prevent mutating the model bind pose
    // when we are dealing with a joint offset in the model
-    for (uint32_t i = 0; i < (uint32_t)hfmModel.skinDeformers.size(); i++) {
-        const auto& deformer = hfmModel.skinDeformers[i];
+    for (int i = 0; i < (int)hfmModel.meshes.size(); i++) {
+        const HFMMesh& mesh = hfmModel.meshes.at(i);
        std::vector<HFMCluster> dummyClustersList;

-        for (uint32_t j = 0; j < (uint32_t)deformer.clusters.size(); j++) {
+        for (int j = 0; j < mesh.clusters.size(); j++) {
+            std::vector<glm::mat4> bindMatrices;
            // cast into a non-const reference, so we can mutate the FBXCluster
-            HFMCluster& cluster = const_cast<HFMCluster&>(deformer.clusters.at(j));
+            HFMCluster& cluster = const_cast<HFMCluster&>(mesh.clusters.at(j));

            HFMCluster localCluster;
            localCluster.jointIndex = cluster.jointIndex;
--- a/libraries/animation/src/AnimSkeleton.h
+++ b/libraries/animation/src/AnimSkeleton.h
@ -68,7 +68,7 @@ public:
    void dump(const AnimPoseVec& poses) const;

    std::vector<int> lookUpJointIndices(const std::vector<QString>& jointNames) const;
-    const HFMCluster getClusterBindMatricesOriginalValues(int skinDeformerIndex, int clusterIndex) const { return _clusterBindMatrixOriginalValues[skinDeformerIndex][clusterIndex]; }
+    const HFMCluster getClusterBindMatricesOriginalValues(const int meshIndex, const int clusterIndex) const { return _clusterBindMatrixOriginalValues[meshIndex][clusterIndex]; }

 protected:
    void buildSkeletonFromJoints(const std::vector<HFMJoint>& joints, const QMap<int, glm::quat> jointOffsets);
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@ -943,7 +943,7 @@ void Avatar::simulateAttachments(float deltaTime) {
        bool texturesLoaded = _attachmentModelsTexturesLoaded.at(i);

        // Watch for texture loading
-        if (!texturesLoaded && model->getNetworkModel() && model->getNetworkModel()->areTexturesLoaded()) {
+        if (!texturesLoaded && model->getGeometry() && model->getGeometry()->areTexturesLoaded()) {
            _attachmentModelsTexturesLoaded[i] = true;
            model->updateRenderItems();
        }
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
@ -207,7 +207,7 @@ public:
    /**jsdoc
     * Gets the default rotation of a joint (in the current avatar) relative to its parent.
     * <p>For information on the joint hierarchy used, see
-     * <a href="https://docs.projectathena.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
+     * <a href="https://docs.vircadia.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
     * @function MyAvatar.getDefaultJointRotation
     * @param {number} index - The joint index.
     * @returns {Quat} The default rotation of the joint if the joint index is valid, otherwise {@link Quat(0)|Quat.IDENTITY}.
@ -218,7 +218,7 @@ public:
     * Gets the default translation of a joint (in the current avatar) relative to its parent, in model coordinates.
     * <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
     * <p>For information on the joint hierarchy used, see
-     * <a href="https://docs.projectathena.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
+     * <a href="https://docs.vircadia.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
     * @function MyAvatar.getDefaultJointTranslation
     * @param {number} index - The joint index.
     * @returns {Vec3} The default translation of the joint (in model coordinates) if the joint index is valid, otherwise 
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
@ -171,7 +171,7 @@ void SkeletonModel::simulate(float deltaTime, bool fullUpdate) {

    // FIXME: This texture loading logic should probably live in Avatar, to mirror RenderableModelEntityItem,
    // but Avatars don't get updates in the same way
-    if (!_texturesLoaded && getNetworkModel() && getNetworkModel()->areTexturesLoaded()) {
+    if (!_texturesLoaded && getGeometry() && getGeometry()->areTexturesLoaded()) {
        _texturesLoaded = true;
        updateRenderItems();
    }
@ -326,7 +326,7 @@ void SkeletonModel::computeBoundingShape() {
    }

    const HFMModel& hfmModel = getHFMModel();
-    if (hfmModel.joints.empty() || _rig.indexOfJoint("Hips") == -1) {
+    if (hfmModel.joints.isEmpty() || _rig.indexOfJoint("Hips") == -1) {
        // rootJointIndex == -1 if the avatar model has no skeleton
        return;
    }
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@ -796,7 +796,7 @@ public:
     * @param {Quat} rotation - The rotation of the joint relative to its parent.
     * @param {Vec3} translation - The translation of the joint relative to its parent, in model coordinates.
     * @example <caption>Set your avatar to it's default T-pose for a while.<br />
-     * <img alt="Avatar in T-pose" src="https://apidocs.projectathena.dev/images/t-pose.png" /></caption>
+     * <img alt="Avatar in T-pose" src="https://apidocs.vircadia.dev/images/t-pose.png" /></caption>
     * // Set all joint translations and rotations to defaults.
     * var i, length, rotation, translation;
     * for (i = 0, length = MyAvatar.getJointNames().length; i < length; i++) {
@ -860,7 +860,7 @@ public:

    /**jsdoc
     * Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see 
-     * <a href="https://docs.projectathena.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.
+     * <a href="https://docs.vircadia.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.
     * @function Avatar.getJointRotation
     * @param {number} index - The index of the joint.
     * @returns {Quat} The rotation of the joint relative to its parent.
@ -871,7 +871,7 @@ public:
     * Gets the translation of a joint relative to its parent, in model coordinates.
     * <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
     * <p>For information on the joint hierarchy used, see 
-     * <a href="https://docs.projectathena.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
+     * <a href="https://docs.vircadia.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
     * @function Avatar.getJointTranslation
     * @param {number} index - The index of the joint.
     * @returns {Vec3} The translation of the joint relative to its parent, in model coordinates.
@ -904,7 +904,7 @@ public:
     * @param {string} name - The name of the joint.
     * @param {Quat} rotation - The rotation of the joint relative to its parent.
     * @example <caption>Set your avatar to its default T-pose then rotate its right arm.<br />
-     * <img alt="Avatar in T-pose with arm rotated" src="https://apidocs.projectathena.dev/images/armpose.png" /></caption>
+     * <img alt="Avatar in T-pose with arm rotated" src="https://apidocs.vircadia.dev/images/armpose.png" /></caption>
     * // Set all joint translations and rotations to defaults.
     * var i, length, rotation, translation;
     * for (i = 0, length = MyAvatar.getJointNames().length; i < length; i++) {
@ -939,7 +939,7 @@ public:
     * @param {Vec3} translation - The translation of the joint relative to its parent, in model coordinates.
     * @example <caption>Stretch your avatar's neck. Depending on the avatar you are using, you will either see a gap between 
     * the head and body or you will see the neck stretched.<br />
-     * <img alt="Avatar with neck stretched" src="https://apidocs.projectathena.dev/images/stretched-neck.png" /></caption>
+     * <img alt="Avatar with neck stretched" src="https://apidocs.vircadia.dev/images/stretched-neck.png" /></caption>
     * // Stretch your avatar's neck.
     * MyAvatar.setJointTranslation("Neck", Vec3.multiply(2, MyAvatar.getJointTranslation("Neck")));
     * 
@ -981,7 +981,7 @@ public:

    /**jsdoc
     * Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see 
-     * <a href="https://docs.projectathena.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.
+     * <a href="https://docs.vircadia.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.
     * @function Avatar.getJointRotation
     * @param {string} name - The name of the joint.
     * @returns {Quat} The rotation of the joint relative to its parent.
@ -996,7 +996,7 @@ public:
     * Gets the translation of a joint relative to its parent, in model coordinates.
     * <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
     * <p>For information on the joint hierarchy used, see
-     * <a href="https://docs.projectathena.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
+     * <a href="https://docs.vircadia.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
     * @function Avatar.getJointTranslation
     * @param {number} name - The name of the joint.
     * @returns {Vec3} The translation of the joint relative to its parent, in model coordinates.
@ -1041,7 +1041,7 @@ public:
     * @param {Quat[]} jointRotations - The rotations for all joints in the avatar. The values are in the same order as the 
     * array returned by {@link MyAvatar.getJointNames}, or {@link Avatar.getJointNames} if using the <code>Avatar</code> API.
     * @example <caption>Set your avatar to its default T-pose then rotate its right arm.<br />
-     * <img alt="Avatar in T-pose" src="https://apidocs.projectathena.dev/images/armpose.png" /></caption>
+     * <img alt="Avatar in T-pose" src="https://apidocs.vircadia.dev/images/armpose.png" /></caption>
     * // Set all joint translations and rotations to defaults.
     * var i, length, rotation, translation;
     * for (i = 0, length = MyAvatar.getJointNames().length; i < length; i++) {
@ -1138,7 +1138,7 @@ public:
     * set <code>hasScriptedBlendshapes</code> back to <code>false</code> when the animation is complete. 
     * @function Avatar.setBlendshape
     * @param {string} name - The name of the blendshape, per the 
-     *     {@link https://docs.projectathena.dev/create/avatars/avatar-standards.html#blendshapes Avatar Standards}.
+     *     {@link https://docs.vircadia.dev/create/avatars/avatar-standards.html#blendshapes Avatar Standards}.
     * @param {number} value - A value between <code>0.0</code> and <code>1.0</code>.
     * @example <caption>Open your avatar's mouth wide.</caption>
     * MyAvatar.hasScriptedBlendshapes = true;
--- a/libraries/avatars/src/HeadData.cpp
+++ b/libraries/avatars/src/HeadData.cpp
@ -34,7 +34,6 @@ HeadData::HeadData(AvatarData* owningAvatar) :
 {
    _userProceduralAnimationFlags.assign((size_t)ProceduralAnimaitonTypeCount, true);
    _suppressProceduralAnimationFlags.assign((size_t)ProceduralAnimaitonTypeCount, false);
-    computeBlendshapesLookupMap();
 }

 glm::quat HeadData::getRawOrientation() const {
@ -72,12 +71,6 @@ void HeadData::setOrientation(const glm::quat& orientation) {
    setHeadOrientation(orientation);
 }

-void HeadData::computeBlendshapesLookupMap(){
-    for (int i = 0; i < (int)Blendshapes::BlendshapeCount; i++) {
-        _blendshapeLookupMap[FACESHIFT_BLENDSHAPES[i]] = i;
-    }
-}
-
 int HeadData::getNumSummedBlendshapeCoefficients() const {
    int maxSize = std::max(_blendshapeCoefficients.size(), _transientBlendshapeCoefficients.size());
    return maxSize;
@ -109,8 +102,8 @@ const QVector<float>& HeadData::getSummedBlendshapeCoefficients() {
 void HeadData::setBlendshape(QString name, float val) {

    // Check to see if the named blendshape exists, and then set its value if it does
-    auto it = _blendshapeLookupMap.find(name);
-    if (it != _blendshapeLookupMap.end()) {
+    auto it = BLENDSHAPE_LOOKUP_MAP.find(name);
+    if (it != BLENDSHAPE_LOOKUP_MAP.end()) {
        if (_blendshapeCoefficients.size() <= it.value()) {
            _blendshapeCoefficients.resize(it.value() + 1);
        }
@ -135,8 +128,8 @@ void HeadData::setBlendshape(QString name, float val) {
 }

 int HeadData::getBlendshapeIndex(const QString& name) {
-    auto it = _blendshapeLookupMap.find(name);
-    int index = it != _blendshapeLookupMap.end() ? it.value() : -1;
+    auto it = BLENDSHAPE_LOOKUP_MAP.find(name);
+    int index = it != BLENDSHAPE_LOOKUP_MAP.end() ? it.value() : -1;
    return index;
 }

@ -155,8 +148,8 @@ static const QString JSON_AVATAR_HEAD_LOOKAT = QStringLiteral("lookAt");
 QJsonObject HeadData::toJson() const {
    QJsonObject headJson;
    QJsonObject blendshapesJson;
-    for (auto name : _blendshapeLookupMap.keys()) {
-        auto index = _blendshapeLookupMap[name];
+    for (auto name : BLENDSHAPE_LOOKUP_MAP.keys()) {
+        auto index = BLENDSHAPE_LOOKUP_MAP[name];
        float value = 0.0f;
        if (index < _blendshapeCoefficients.size()) {
            value += _blendshapeCoefficients[index];
--- a/libraries/avatars/src/HeadData.h
+++ b/libraries/avatars/src/HeadData.h
@ -125,7 +125,6 @@ protected:
    QVector<float> _blendshapeCoefficients;
    QVector<float> _transientBlendshapeCoefficients;
    QVector<float> _summedBlendshapeCoefficients;
-    QMap<QString, int> _blendshapeLookupMap;
    AvatarData* _owningAvatar;

 private:
@ -134,7 +133,6 @@ private:
    HeadData& operator= (const HeadData&);

    void setHeadOrientation(const glm::quat& orientation);
-    void computeBlendshapesLookupMap();
 };

 #endif // hifi_HeadData_h
--- a/libraries/baking/src/FBXBaker.cpp
+++ b/libraries/baking/src/FBXBaker.cpp
@ -90,11 +90,11 @@ void FBXBaker::replaceMeshNodeWithDraco(FBXNode& meshNode, const QByteArray& dra
    }
 }

-void FBXBaker::rewriteAndBakeSceneModels(const std::vector<hfm::Mesh>& meshes, const std::vector<hifi::ByteArray>& dracoMeshes, const std::vector<std::vector<hifi::ByteArray>>& dracoMaterialLists) {
+void FBXBaker::rewriteAndBakeSceneModels(const QVector<hfm::Mesh>& meshes, const std::vector<hifi::ByteArray>& dracoMeshes, const std::vector<std::vector<hifi::ByteArray>>& dracoMaterialLists) {
    std::vector<int> meshIndexToRuntimeOrder;
-    auto meshCount = (uint32_t)meshes.size();
+    auto meshCount = (int)meshes.size();
    meshIndexToRuntimeOrder.resize(meshCount);
-    for (uint32_t i = 0; i < meshCount; i++) {
+    for (int i = 0; i < meshCount; i++) {
        meshIndexToRuntimeOrder[meshes[i].meshIndex] = i;
    }
    
--- a/libraries/baking/src/FBXBaker.h
+++ b/libraries/baking/src/FBXBaker.h
@ -33,7 +33,7 @@ protected:
    virtual void bakeProcessedSource(const hfm::Model::Pointer& hfmModel, const std::vector<hifi::ByteArray>& dracoMeshes, const std::vector<std::vector<hifi::ByteArray>>& dracoMaterialLists) override;

 private:
-    void rewriteAndBakeSceneModels(const std::vector<hfm::Mesh>& meshes, const std::vector<hifi::ByteArray>& dracoMeshes, const std::vector<std::vector<hifi::ByteArray>>& dracoMaterialLists);
+    void rewriteAndBakeSceneModels(const QVector<hfm::Mesh>& meshes, const std::vector<hifi::ByteArray>& dracoMeshes, const std::vector<std::vector<hifi::ByteArray>>& dracoMaterialLists);
    void replaceMeshNodeWithDraco(FBXNode& meshNode, const QByteArray& dracoMeshBytes, const std::vector<hifi::ByteArray>& dracoMaterialList);
 };

--- a/libraries/baking/src/MaterialBaker.cpp
+++ b/libraries/baking/src/MaterialBaker.cpp
@ -258,9 +258,9 @@ void MaterialBaker::addTexture(const QString& materialName, image::TextureUsage:
    }
 };

-void MaterialBaker::setMaterials(const std::vector<hfm::Material>& materials, const QString& baseURL) {
+void MaterialBaker::setMaterials(const QHash<QString, hfm::Material>& materials, const QString& baseURL) {
    _materialResource = NetworkMaterialResourcePointer(new NetworkMaterialResource(), [](NetworkMaterialResource* ptr) { ptr->deleteLater(); });
-    for (const auto& material : materials) {
+    for (auto& material : materials) {
        _materialResource->parsedMaterials.names.push_back(material.name.toStdString());
        _materialResource->parsedMaterials.networkMaterials[material.name.toStdString()] = std::make_shared<NetworkMaterial>(material, baseURL);

--- a/libraries/baking/src/MaterialBaker.h
+++ b/libraries/baking/src/MaterialBaker.h
@ -32,7 +32,7 @@ public:
    bool isURL() const { return _isURL; }
    QString getBakedMaterialData() const { return _bakedMaterialData; }

-    void setMaterials(const std::vector<hfm::Material>& materials, const QString& baseURL);
+    void setMaterials(const QHash<QString, hfm::Material>& materials, const QString& baseURL);
    void setMaterials(const NetworkMaterialResourcePointer& materialResource);

    NetworkMaterialResourcePointer getNetworkMaterialResource() const { return _materialResource; }
--- a/Show more
+++ b/Show more