Merge remote-tracking branch 'refs/remotes/vircadia/feature/qt-update'

Fix merge-conflicts
2025-04-05 22:32:49 +02:00 · 2021-02-27 20:39:11 +01:00 · 2021-02-27 20:39:11 +01:00 · f56161363a
commit f56161363a
parent 9222348863 d7f7acec34
54 changed files with 590 additions and 295 deletions
--- a/BUILD.md
+++ b/BUILD.md
@ -1,6 +1,6 @@
 # General Build Information

-*Last Updated on August 26, 2020*
+*Last Updated on January 16, 2021*

 ### OS Specific Build Guides

@ -11,7 +11,7 @@

 ### Dependencies
 - [git](https://git-scm.com/downloads): >= 1.6  
- [cmake](https://cmake.org/download/):  3.9
+- [cmake](https://cmake.org/download/):  3.9 (or greater up to 3.18.x)
 - [Python](https://www.python.org/downloads/): 3.6 or higher
 - [Node.JS](https://nodejs.org/en/): >= 12.13.1 LTS
    - Used to build the Screen Sharing executable.
@ -41,26 +41,50 @@ These are not placed in your normal build tree when doing an out of source build
 Vircadia uses CMake to generate build files and project files for your platform.

 #### Qt
-CMake will download Qt 5.12.3 using vcpkg.  
+CMake will download Qt 5.15.2 using vcpkg.

-To override this (i.e. use an installed Qt configuration - you will need to set a QT_CMAKE_PREFIX_PATH environment variable pointing to your Qt **lib/cmake** folder.  
-This can either be entered directly into your shell session before you build or in your shell profile (e.g.: ~/.bash_profile, ~/.bashrc, ~/.zshrc - this depends on your shell and environment).  The path it needs to be set to will depend on where and how Qt5 was installed. e.g.
+To override this (i.e., use an installed Qt configuration - you need to set a QT_CMAKE_PREFIX_PATH environment variable pointing to your Qt **lib/cmake** folder.  
+This can either be entered directly into your shell session before you build or in your shell profile (e.g.: ~/.bash_profile, ~/.bashrc, ~/.zshrc - this depends on your shell and environment).  The path it needs to be set to will depend on where and how Qt5 was installed. 

-    export QT_CMAKE_PREFIX_PATH=/usr/local/Qt5.12.3/gcc_64/lib/cmake
-    export QT_CMAKE_PREFIX_PATH=/usr/local/qt/5.12.3/clang_64/lib/cmake/
-    export QT_CMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.12.3/lib/cmake
+For example, under Linux:
+
+    export QT_CMAKE_PREFIX_PATH=/usr/local/Qt5.15.2/gcc_64/lib/cmake
+    export QT_CMAKE_PREFIX_PATH=/usr/local/qt/5.15.2/clang_64/lib/cmake/
+    export QT_CMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.15.2/lib/cmake
    export QT_CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake

+For example, under Windows:
+
+    set QT_CMAKE_PREFIX_PATH=C:\Qt\5.15.2\msvc2019_64\lib\cmake
+
+For example, under OSX:
+
+    export QT_CMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.15.2/lib/cmake
+
+Note: You only need the following components checked under Qt 5.15.2 (select the "Custom Installation" option): 
+		"MSVC 2019 64-bit", "Qt WebEngine", and "Qt Script (Deprecated)".
+
+Note: Installing the sources is optional but recommended if you have room for them (~3GB). You may also want the Qt debug 
+information files (~7GB).
+
+Note: Installing Qt Creator is optional but recommended if you will be editing QML files.
+
 #### VCPKG

 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.
-However, those files can potentially get cleaned up by the OS, so in order to avoid this and having to redo the lengthy build step, you can set the following environment variable:
+However, those files can potentially get cleaned up by the OS, so in order to avoid this and having to redo the lengthy build step, you can set an environment variable.
+
+Linux:

    export HIFI_VCPKG_BASE=/path/to/directory

+Windows:
+
+    set 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
--- a/BUILD_OSX.md
+++ b/BUILD_OSX.md
@ -1,6 +1,6 @@
 # Build OSX

-*Last Updated on August 26, 2020*
+*Last Updated on January 16, 2021*

 Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only macOS specific instructions are found in this document.

@ -10,6 +10,8 @@ Please read the [general build guide](BUILD.md) for information on dependencies

    brew install cmake openssl npm

+Note: cmake versions > 3.18.x have known problems building Vircadia, so alternatively you can download cmake 3.18.4 (or earlier versions) from [Github](https://github.com/Kitware/CMake/releases).   
+
 ### Python 3

 Download an install Python 3.6.6 or higher from [here](https://www.python.org/downloads/).  
--- a/BUILD_WIN.md
+++ b/BUILD_WIN.md
@ -1,30 +1,25 @@
 # Build Windows

-*Last Updated on May 17, 2020*
+*Last Updated on 23 Feb 2021*

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

-Note: We are now using Visual Studio 2017 or 2019 and Qt 5.12.3.  
+Note: We are now using Visual Studio 2019 and Qt 5.15.2.
 If you are upgrading from previous versions, do a clean uninstall of those versions before going through this guide.  

 **Note: The prerequisites will require about 10 GB of space on your drive. You will also need a system with at least 8GB of main memory.**

 ### Step 1. Visual Studio & Python 3.x

-If you don’t have Community or Professional edition of Visual Studio, download [Visual Studio Community 2019](https://visualstudio.microsoft.com/vs/). If you have Visual Studio 2017, you are not required to download Visual Studio 2019.
+If you don't have Community or Professional edition of Visual Studio 2019, download [Visual Studio Community 2019](https://visualstudio.microsoft.com/vs/). If you have Visual Studio 2017, you need to download Visual Studio 2019.

 When selecting components, check "Desktop development with C++". 

 If you do not already have a Python 3.x development environment installed and want to install it with Visual Studio, check "Python Development". If you already have Visual Studio installed and need to add Python, open the "Add or remove programs" control panel and find the "Microsoft Visual Studio Installer". Select it and click "Modify". In the installer, select "Modify" again, then check "Python Development" and allow the installer to apply the changes.

-On the right on the Summary toolbar, select the following components based on your Visual Studio version.
+#### Visual Studio 2019

-#### If you're installing Visual Studio 2017
-
-* Windows 8.1 SDK and UCRT SDK
-* VC++ 2015.3 v14.00 (v140) toolset for desktop
-
-#### If you're installing Visual Studio 2019
+On the right on the Summary toolbar, select the following components.

 * MSVC v142 - VS 2019 C++ X64/x86 build tools
 * MSVC v141 - VS 2017 C++ x64/x86 build tools
@ -63,10 +58,10 @@ To create this variable:
 * Set "Variable name" to `HIFI_VCPKG_BASE`
 * Set "Variable value" to any directory that you have control over.

-Additionally, if you have Visual Studio 2019 installed and _only_ Visual Studio 2019 (i.e. you do not have Visual Studio 2017 installed) you must add an additional environment variable `HIFI_VCPKG_BOOTSTRAP` that will fix a bug in our `vcpkg` pre-build step.
+Additionally, if you have Visual Studio 2019 installed and _only_ Visual Studio 2019 (i.e., you do not have Visual Studio 2017 installed) you must add an additional environment variable `HIFI_VCPKG_BOOTSTRAP` that will fix a bug in our `vcpkg` pre-build step.

 To create this variable:
-* Naviagte to 'Edit the System Environment Variables' Through the start menu.
+* Navigate to 'Edit the System Environment Variables' through the Start menu.
 * Click on 'Environment Variables'
 * Select 'New' 
 * Set "Variable name" to `HIFI_VCPKG_BOOTSTRAP`
@ -79,10 +74,7 @@ Run Command Prompt from Start and run the following commands:
 `mkdir build`  
 `cd build`  

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

 Where `%VIRCADIA_DIR%` is the directory for the Vircadia repository.
--- a/cmake/macros/ManuallyInstallOpenSSLForQt.cmake
+++ b/cmake/macros/ManuallyInstallOpenSSLForQt.cmake
@ -3,6 +3,7 @@
 #
 #  Created by Stephen Birarda on 1/15/16.
 #  Copyright 2014 High Fidelity, Inc.
+#  Copyright 2020 Vircadia contributors.
 #
 #  Distributed under the Apache License, Version 2.0.
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -19,13 +20,13 @@ macro(manually_install_openssl_for_qt)
    find_package(OpenSSL REQUIRED)

    install(
-      FILES "${VCPKG_INSTALL_ROOT}/bin/ssleay32.dll"
+      FILES "${VCPKG_INSTALL_ROOT}/bin/libcrypto-1_1-x64.dll"
      DESTINATION ${TARGET_INSTALL_DIR}
      COMPONENT ${TARGET_INSTALL_COMPONENT}
    )

    install(
-      FILES "${VCPKG_INSTALL_ROOT}/bin/libeay32.dll"
+      FILES "${VCPKG_INSTALL_ROOT}/bin/libssl-1_1-x64.dll"
      DESTINATION ${TARGET_INSTALL_DIR}
      COMPONENT ${TARGET_INSTALL_COMPONENT}
    )
--- a/cmake/macros/SetupQt.cmake
+++ b/cmake/macros/SetupQt.cmake
@ -18,7 +18,7 @@ endfunction()

 function(calculate_qt5_version result _QT_DIR)
  # All Qt5 packages have little "private" include directories named with the actual Qt version such as:
-  #   .../include/QtCore/5.12.3/QtCore/private
+  #   .../include/QtCore/5.15.2/QtCore/private
  # Sometimes we need to include these private headers for debug hackery.
  # Hence we find one of these directories and pick apart its path to determine the actual QT_VERSION.
  if (APPLE)
--- a/cmake/ports/openssl-windows/CONTROL
+++ b/cmake/ports/openssl-windows/CONTROL
@ -1,3 +1,3 @@
 Source: openssl-windows
-Version: 1.0.2p-1
+Version: 1.1.1h
 Description: OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.
--- a/cmake/ports/openssl-windows/ConfigureIncludeQuotesFix.patch
+++ b/cmake/ports/openssl-windows/ConfigureIncludeQuotesFix.patch
@ -1,13 +0,0 @@
-diff --git a/Configure b/Configure
-index c98107a..77ad9d3 100644
--- a/Configure
-+++ b/Configure
-@@ -972,7 +972,7 @@ PROCESS_ARGS:
- 				}
- 			elsif (/^--with-zlib-include=(.*)$/)
- 				{
-				$withargs{"zlib-include"}="-I$1";
-+				$withargs{"zlib-include"}="-I\"$1\"";
- 				}
- 			elsif (/^--with-fipsdir=(.*)$/)
- 				{
--- a/cmake/ports/openssl-windows/EmbedSymbolsInStaticLibsZ7.patch
+++ b/cmake/ports/openssl-windows/EmbedSymbolsInStaticLibsZ7.patch
@ -1,25 +0,0 @@
-diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
-index dba96cb..5722f6e 100644
--- a/util/pl/VC-32.pl
-+++ b/util/pl/VC-32.pl
-@@ -154,9 +154,17 @@ else
- 	$cflags=$opt_cflags.$base_cflags;
- 	}
- 
-# generate symbols.pdb unconditionally
-$app_cflag.=" /Zi /Fd\$(TMP_D)/app";
-$lib_cflag.=" /Zi /Fd\$(TMP_D)/lib";
-+# generate symbols.pdb when building dlls and embed symbols when building static libs
-+if ($shlib)
-+	{
-+	$app_cflag.=" /Zi /Fd\$(TMP_D)/app.pdb";
-+	$lib_cflag.=" /Zi /Fd\$(TMP_D)/lib.pdb";
-+	}
-+else
-+	{
-+	$app_cflag.=" /Z7";
-+	$lib_cflag.=" /Z7";
-+	}
- $lflags.=" /debug";
- 
- $obj='.obj';
--- a/cmake/ports/openssl-windows/STRINGIFYPatch.patch
+++ b/cmake/ports/openssl-windows/STRINGIFYPatch.patch
@ -1,23 +0,0 @@
-diff --git a/crypto/cversion.c b/crypto/cversion.c
-index bfff699..17b7912 100644
--- a/crypto/cversion.c
-+++ b/crypto/cversion.c
-@@ -56,6 +56,9 @@
-  * [including the GNU Public Licence.]
-  */
- 
-+#define STRINGIFY2(x) #x
-+#define STRINGIFY(x) STRINGIFY2(x)
-+
- #include "cryptlib.h"
- 
- #ifndef NO_WINDOWS_BRAINDEATH
-@@ -79,7 +82,7 @@ const char *SSLeay_version(int t)
-     }
-     if (t == SSLEAY_CFLAGS) {
- #ifdef CFLAGS
-        return (CFLAGS);
-+        return STRINGIFY(CFLAGS);
- #else
-         return ("compiler: information not available");
- #endif
--- a/cmake/ports/openssl-windows/portfile.cmake
+++ b/cmake/ports/openssl-windows/portfile.cmake
@ -3,7 +3,7 @@ if(VCPKG_CMAKE_SYSTEM_NAME)
 endif()

 include(vcpkg_common_functions)
-set(OPENSSL_VERSION 1.0.2p)
+set(OPENSSL_VERSION 1.1.1h)
 set(MASTER_COPY_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/openssl-${OPENSSL_VERSION})

 vcpkg_find_acquire_program(PERL)
@ -12,18 +12,12 @@ get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
 set(ENV{PATH} "$ENV{PATH};${PERL_EXE_PATH}")

 vcpkg_download_distfile(OPENSSL_SOURCE_ARCHIVE
-    URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz"
+    URLS "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" "https://www.openssl.org/source/old/1.1.1/openssl-${OPENSSL_VERSION}.tar.gz"
    FILENAME "openssl-${OPENSSL_VERSION}.tar.gz"
-    SHA512 958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16
+    SHA512 da50fd99325841ed7a4367d9251c771ce505a443a73b327d8a46b2c6a7d2ea99e43551a164efc86f8743b22c2bdb0020bf24a9cbd445e9d68868b2dc1d34033a
 )

 vcpkg_extract_source_archive(${OPENSSL_SOURCE_ARCHIVE})
-vcpkg_apply_patches(
-    SOURCE_PATH ${MASTER_COPY_SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/ConfigureIncludeQuotesFix.patch
-            ${CMAKE_CURRENT_LIST_DIR}/STRINGIFYPatch.patch
-            ${CMAKE_CURRENT_LIST_DIR}/EmbedSymbolsInStaticLibsZ7.patch
-)

 vcpkg_find_acquire_program(NASM)
 get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
@ -40,39 +34,26 @@ set(CONFIGURE_COMMAND ${PERL} Configure

 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
    set(OPENSSL_ARCH VC-WIN32)
-    set(OPENSSL_DO "ms\\do_nasm.bat")
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
    set(OPENSSL_ARCH VC-WIN64A)
-    set(OPENSSL_DO "ms\\do_win64a.bat")
 else()
    message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}")
 endif()

-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    set(OPENSSL_MAKEFILE "ms\\ntdll.mak")
-else()
-    set(OPENSSL_MAKEFILE "ms\\nt.mak")
-endif()
-
 file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg)


 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+    message(STATUS "Configure ${TARGET_TRIPLET}-rel")
    file(COPY ${MASTER_COPY_SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel)
    set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/openssl-${OPENSSL_VERSION})
    set(OPENSSLDIR_RELEASE ${CURRENT_PACKAGES_DIR})

-    message(STATUS "Configure ${TARGET_TRIPLET}-rel")
    vcpkg_execute_required_process(
        COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_RELEASE}" "--openssldir=${OPENSSLDIR_RELEASE}" -FS
        WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
        LOGNAME configure-perl-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-rel
    )
-    vcpkg_execute_required_process(
-        COMMAND ${OPENSSL_DO}
-        WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
-        LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-rel
-    )
    message(STATUS "Configure ${TARGET_TRIPLET}-rel done")

    message(STATUS "Build ${TARGET_TRIPLET}-rel")
@ -80,16 +61,16 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
    # This is ok; we just do as much work as we can in parallel first, then follow up with a single-threaded build.
    make_directory(${SOURCE_PATH_RELEASE}/inc32/openssl)
    execute_process(
-        COMMAND ${JOM} -k -j $ENV{NUMBER_OF_PROCESSORS} -f ${OPENSSL_MAKEFILE}
+        COMMAND ${JOM} -k -j $ENV{NUMBER_OF_PROCESSORS}
        WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
        OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-out.log
        ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-rel-0-err.log
    )
    vcpkg_execute_required_process(
-        COMMAND nmake -f ${OPENSSL_MAKEFILE} install
+        COMMAND nmake install
        WORKING_DIRECTORY ${SOURCE_PATH_RELEASE}
-        LOGNAME build-${TARGET_TRIPLET}-rel-1)
-
+        LOGNAME build-${TARGET_TRIPLET}-rel-1
+    )
    message(STATUS "Build ${TARGET_TRIPLET}-rel done")
 endif()

@ -101,39 +82,46 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
    set(OPENSSLDIR_DEBUG ${CURRENT_PACKAGES_DIR}/debug)

    vcpkg_execute_required_process(
-        COMMAND ${CONFIGURE_COMMAND} debug-${OPENSSL_ARCH} "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}" -FS
+        COMMAND ${CONFIGURE_COMMAND} ${OPENSSL_ARCH} --debug "--prefix=${OPENSSLDIR_DEBUG}" "--openssldir=${OPENSSLDIR_DEBUG}" -FS
        WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
        LOGNAME configure-perl-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-dbg
    )
-    vcpkg_execute_required_process(
-        COMMAND ${OPENSSL_DO}
-        WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
-        LOGNAME configure-do-${TARGET_TRIPLET}-${CMAKE_BUILD_TYPE}-dbg
-    )
    message(STATUS "Configure ${TARGET_TRIPLET}-dbg done")

    message(STATUS "Build ${TARGET_TRIPLET}-dbg")
    make_directory(${SOURCE_PATH_DEBUG}/inc32/openssl)
    execute_process(
-        COMMAND ${JOM} -k -j $ENV{NUMBER_OF_PROCESSORS} -f ${OPENSSL_MAKEFILE}
+        COMMAND ${JOM} -k -j $ENV{NUMBER_OF_PROCESSORS}
        WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
        OUTPUT_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-out.log
        ERROR_FILE ${CURRENT_BUILDTREES_DIR}/build-${TARGET_TRIPLET}-dbg-0-err.log
    )
    vcpkg_execute_required_process(
-        COMMAND nmake -f ${OPENSSL_MAKEFILE} install
+        COMMAND nmake install
        WORKING_DIRECTORY ${SOURCE_PATH_DEBUG}
-        LOGNAME build-${TARGET_TRIPLET}-dbg-1)
-
+        LOGNAME build-${TARGET_TRIPLET}-dbg-1
+    )
    message(STATUS "Build ${TARGET_TRIPLET}-dbg done")
 endif()


+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/certs)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/engines-1_1)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/private)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/certs)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/engines-1_1)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/private)
 file(REMOVE
-    ${CURRENT_PACKAGES_DIR}/debug/bin/openssl.exe
-    ${CURRENT_PACKAGES_DIR}/debug/openssl.cnf
    ${CURRENT_PACKAGES_DIR}/openssl.cnf
+    ${CURRENT_PACKAGES_DIR}/openssl.cnf.dist
+    ${CURRENT_PACKAGES_DIR}/ct_log_list.cnf
+    ${CURRENT_PACKAGES_DIR}/ct_log_list.cnf.dist
+    ${CURRENT_PACKAGES_DIR}/debug/openssl.cnf
+    ${CURRENT_PACKAGES_DIR}/debug/openssl.cnf.dist
+    ${CURRENT_PACKAGES_DIR}/debug/ct_log_list.cnf
+    ${CURRENT_PACKAGES_DIR}/debug/ct_log_list.cnf.dist
+    ${CURRENT_PACKAGES_DIR}/debug/bin/openssl.exe
 )

 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/openssl/)
@ -147,14 +135,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/)
 endif()

-file(READ "${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h" _contents)
-string(REPLACE "<winsock.h>" "<winsock2.h>" _contents "${_contents}")
-file(WRITE "${CURRENT_PACKAGES_DIR}/include/openssl/dtls1.h" "${_contents}")
-
-file(READ "${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" _contents)
-string(REPLACE "#  include <windows.h>" "#ifndef _WINSOCKAPI_\n#define _WINSOCKAPI_\n#endif\n#  include <windows.h>" _contents "${_contents}")
-file(WRITE "${CURRENT_PACKAGES_DIR}/include/openssl/rand.h" "${_contents}")
-
 vcpkg_copy_pdbs()

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
--- a/hifi_qt.py
+++ b/hifi_qt.py
@ -27,7 +27,7 @@ endif()
    def __init__(self, args):
        self.args = args
        self.configFilePath = os.path.join(args.build_root, 'qt.cmake')
-        self.version = os.getenv('VIRCADIA_USE_QT_VERSION', '5.12.3')
+        self.version = os.getenv('VIRCADIA_USE_QT_VERSION', '5.15.2')

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

@ -55,9 +55,9 @@ endif()
        system = platform.system()

        if 'Windows' == system:
-            self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-windows3.tar.gz%3FversionId=5ADqP0M0j5ZfimUHrx4zJld6vYceHEsI'
+            self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.15.2-windows.tar.gz'
        elif 'Darwin' == system:
-            self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-macos.tar.gz%3FversionId=bLAgnoJ8IMKpqv8NFDcAu8hsyQy3Rwwz'
+            self.qtUrl = self.assets_url + '/dependencies/vcpkg/qt5-install-5.15.2-macos.tar.gz'
        elif 'Linux' == system:
            import distro
            dist = distro.linux_distribution()
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
@ -33,7 +33,6 @@ SkeletonModel::SkeletonModel(Avatar* owningAvatar, QObject* parent) :
 {
    // SkeletonModels, and by extention Avatars, use Dual Quaternion skinning.
    _useDualQuaternionSkinning = true;
-    _forceOffset = true;

    // Avatars all cast shadow
    setCanCastShadow(true);
--- a/libraries/entities-renderer/src/RenderableEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableEntityItem.cpp
@ -368,6 +368,11 @@ bool EntityRenderer::needsRenderUpdate() const {
    return needsRenderUpdateFromEntity(_entity);
 }

+Transform EntityRenderer::getTransformToCenterWithMaybeOnlyLocalRotation(const EntityItemPointer& entity, bool& success) const {
+    return entity->getBillboardMode() == BillboardMode::NONE ? entity->getTransformToCenter(success) :
+        entity->getTransformToCenterWithOnlyLocalRotation(success);
+}
+
 // Returns true if the item in question needs to have updateInScene called because of changes in the entity
 bool EntityRenderer::needsRenderUpdateFromEntity(const EntityItemPointer& entity) const {
    if (entity->needsRenderUpdate()) {
@ -379,12 +384,12 @@ bool EntityRenderer::needsRenderUpdateFromEntity(const EntityItemPointer& entity
    }

    bool success = false;
-    auto bound = _entity->getAABox(success);
+    auto bound = entity->getAABox(success);
    if (success && _bound != bound) {
        return true;
    }

-    auto newModelTransform = _entity->getTransformToCenter(success);
+    auto newModelTransform = getTransformToCenterWithMaybeOnlyLocalRotation(entity, success);
    // FIXME can we use a stale model transform here?
    if (success && newModelTransform != _modelTransform) {
        return true;
@ -401,15 +406,15 @@ bool EntityRenderer::needsRenderUpdateFromEntity(const EntityItemPointer& entity
    return false;
 }

-void EntityRenderer::updateModelTransformAndBound() {
+void EntityRenderer::updateModelTransformAndBound(const EntityItemPointer& entity) {
    bool success = false;
-    auto newModelTransform = _entity->getTransformToCenter(success);
+    auto newModelTransform = getTransformToCenterWithMaybeOnlyLocalRotation(entity, success);
    if (success) {
        _modelTransform = newModelTransform;
    }

    success = false;
-    auto bound = _entity->getAABox(success);
+    auto bound = entity->getAABox(success);
    if (success) {
        _bound = bound;
    }
@ -429,7 +434,7 @@ void EntityRenderer::doRenderUpdateSynchronous(const ScenePointer& scene, Transa

        _prevIsTransparent = transparent;

-        updateModelTransformAndBound();
+        updateModelTransformAndBound(entity);

        _moving = entity->isMovingRelativeToParent();
        _visible = entity->getVisible();
--- a/libraries/entities-renderer/src/RenderableEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableEntityItem.h
@ -101,7 +101,7 @@ protected:
    virtual void doRender(RenderArgs* args) = 0;

    virtual bool isFading() const { return _isFading; }
-    virtual void updateModelTransformAndBound();
+    virtual void updateModelTransformAndBound(const EntityItemPointer& entity);
    virtual bool isTransparent() const { return _isFading ? Interpolate::calculateFadeRatio(_fadeStartTime) < 1.0f : false; }
    inline bool isValidRenderItem() const { return _renderItemID != Item::INVALID_ITEM_ID; }

@ -109,16 +109,14 @@ protected:
    virtual void setRenderLayer(RenderLayer value) { _renderLayer = value; }
    virtual void setCullWithParent(bool value) { _cullWithParent = value; }

-signals:
-    void requestRenderUpdate();
-
-protected:
    template<typename T>
    std::shared_ptr<T> asTypedEntity() { return std::static_pointer_cast<T>(_entity); }

    static void makeStatusGetters(const EntityItemPointer& entity, Item::Status::Getters& statusGetters);
    const Transform& getModelTransform() const;

+    Transform getTransformToCenterWithMaybeOnlyLocalRotation(const EntityItemPointer& entity, bool& success) const;
+
    Item::Bound _bound;
    SharedSoundPointer _collisionSound;
    QUuid _changeHandlerId;
@ -154,6 +152,9 @@ protected:
    const EntityItemPointer _entity;

    QUuid _entityID;
+
+signals:
+    void requestRenderUpdate();
 };

 template <typename T>
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@ -115,11 +115,12 @@ bool RenderableModelEntityItem::needsUpdateModelBounds() const {
    }

    bool success;
-    auto transform = getTransform(success);
+    auto transform = getBillboardMode() == BillboardMode::NONE ? getTransform(success) : getTransformWithOnlyLocalRotation(success);
    if (success) {
        if (model->getTranslation() != transform.getTranslation()) {
            return true;
        }
+
        if (model->getRotation() != transform.getRotation()) {
            return true;
        }
@ -171,7 +172,7 @@ void RenderableModelEntityItem::updateModelBounds() {
    }

    bool success;
-    auto transform = getTransform(success);
+    auto transform = getBillboardMode() == BillboardMode::NONE ? getTransform(success) : getTransformWithOnlyLocalRotation(success);
    if (success && (model->getTranslation() != transform.getTranslation() ||
            model->getRotation() != transform.getRotation())) {
        model->setTransformNoUpdateRenderItems(transform);
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@ -41,13 +41,13 @@ PolyLineEntityRenderer::PolyLineEntityRenderer(const EntityItemPointer& entity)
    }
 }

-void PolyLineEntityRenderer::updateModelTransformAndBound() {
+void PolyLineEntityRenderer::updateModelTransformAndBound(const EntityItemPointer& entity) {
    bool success = false;
-    auto newModelTransform = _entity->getTransformToCenter(success);
+    auto newModelTransform = getTransformToCenterWithMaybeOnlyLocalRotation(entity, success);
    if (success) {
        _modelTransform = newModelTransform;

-        auto lineEntity = std::static_pointer_cast<PolyLineEntityItem>(_entity);
+        auto lineEntity = std::static_pointer_cast<PolyLineEntityItem>(entity);
        AABox bound;
        lineEntity->computeTightLocalBoundingBox(bound);
        bound.transform(newModelTransform);
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.h
@ -25,7 +25,7 @@ class PolyLineEntityRenderer : public TypedEntityRenderer<PolyLineEntityItem> {
 public:
    PolyLineEntityRenderer(const EntityItemPointer& entity);

-    void updateModelTransformAndBound() override;
+    void updateModelTransformAndBound(const EntityItemPointer& entity) override;

    virtual bool isTransparent() const override;

--- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
@ -1785,8 +1785,9 @@ void PolyVoxEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& s

 void PolyVoxEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) {
    _lastVoxelToLocalMatrix = entity->voxelToLocalMatrix();
-    _position = entity->getWorldPosition();
-    _orientation = entity->getWorldOrientation();
+    bool success;
+    _position = entity->getCenterPosition(success);
+    _orientation = entity->getBillboardMode() == BillboardMode::NONE ? entity->getWorldOrientation() : entity->getLocalOrientation();
    _lastVoxelVolumeSize = entity->getVoxelVolumeSize();
    _params->setSubData(0, vec4(_lastVoxelVolumeSize, 0.0));
    graphics::MeshPointer newMesh;
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.cpp
@ -56,15 +56,12 @@ void ShapeEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& sce
    AbstractViewStateInterface::instance()->pushPostUpdateLambda(key, [this, entity] {
        withWriteLock([&] {
            _shape = entity->getShape();
-            _position = entity->getWorldPosition();
-            _dimensions = entity->getUnscaledDimensions(); // get unscaled to avoid scaling twice
-            _orientation = entity->getWorldOrientation();
            _renderTransform = getModelTransform(); // contains parent scale, if this entity scales with its parent
            if (_shape == entity::Sphere) {
                _renderTransform.postScale(SPHERE_ENTITY_SCALE);
            }

-            _renderTransform.postScale(_dimensions);
+            _renderTransform.postScale(entity->getUnscaledDimensions());
        });
    });
 }
@ -248,7 +245,7 @@ void ShapeEntityRenderer::doRender(RenderArgs* args) {
        outColor = procedural->getColor(outColor);
        outColor.a *= procedural->isFading() ? Interpolate::calculateFadeRatio(procedural->getFadeStartTime()) : 1.0f;
        withReadLock([&] {
-            procedural->prepare(batch, _position, _dimensions, _orientation, _created, ProceduralProgramKey(outColor.a < 1.0f));
+            procedural->prepare(batch, transform.getTranslation(), transform.getScale(), transform.getRotation(), _created, ProceduralProgramKey(outColor.a < 1.0f));
        });

        if (render::ShapeKey(args->_globalShapeKey).isWireframe() || _primitiveMode == PrimitiveMode::LINES) {
--- a/libraries/entities-renderer/src/RenderableShapeEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableShapeEntityItem.h
@ -45,10 +45,6 @@ private:
    std::shared_ptr<graphics::ProceduralMaterial> _material { std::make_shared<graphics::ProceduralMaterial>() };
    glm::vec3 _color { NAN };
    float _alpha { NAN };
-
-    glm::vec3 _position;
-    glm::vec3 _dimensions;
-    glm::quat _orientation;
 };

 } } 
--- a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp
@ -109,6 +109,7 @@ void TextEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPointe
    _effect = entity->getTextEffect();
    _effectColor = toGlm(entity->getTextEffectColor());
    _effectThickness = entity->getTextEffectThickness();
+    _alignment = entity->getAlignment();
    updateTextRenderItem();
 }

@ -292,12 +293,12 @@ void entities::TextPayload::render(RenderArgs* args) {
    }
    auto textRenderable = std::static_pointer_cast<TextEntityRenderer>(renderable);

-    Transform modelTransform;
+    Transform transform;
    glm::vec3 dimensions;

    glm::vec4 textColor;
    textRenderable->withReadLock([&] {
-        modelTransform = textRenderable->_renderTransform;
+        transform = textRenderable->_renderTransform;
        dimensions = textRenderable->_dimensions;

        float fadeRatio = textRenderable->_isFading ? Interpolate::calculateFadeRatio(textRenderable->_fadeStartTime) : 1.0f;
@ -313,18 +314,18 @@ void entities::TextPayload::render(RenderArgs* args) {
        return;
    }

-    modelTransform.setRotation(BillboardModeHelpers::getBillboardRotation(modelTransform.getTranslation(), modelTransform.getRotation(), textRenderable->_billboardMode,
+    transform.setRotation(BillboardModeHelpers::getBillboardRotation(transform.getTranslation(), transform.getRotation(), textRenderable->_billboardMode,
        args->_renderMode == RenderArgs::RenderMode::SHADOW_RENDER_MODE ? BillboardModeHelpers::getPrimaryViewFrustumPosition() : args->getViewFrustum().getPosition()));

    float scale = textRenderable->_lineHeight / textRenderer->getFontSize();
-    modelTransform.postTranslate(glm::vec3(-0.5, 0.5, 1.0f + EPSILON / dimensions.z));
-    modelTransform.setScale(scale);
-    batch.setModelTransform(modelTransform);
+    transform.postTranslate(glm::vec3(-0.5, 0.5, 1.0f + EPSILON / dimensions.z));
+    transform.setScale(scale);
+    batch.setModelTransform(transform);

    glm::vec2 bounds = glm::vec2(dimensions.x - (textRenderable->_leftMargin + textRenderable->_rightMargin), dimensions.y - (textRenderable->_topMargin + textRenderable->_bottomMargin));
    textRenderer->draw(batch, textRenderable->_leftMargin / scale, -textRenderable->_topMargin / scale, bounds / scale, scale,
                       textRenderable->_text, textRenderable->_font, textColor, effectColor, textRenderable->_effectThickness, textRenderable->_effect,
-                       textRenderable->_unlit, forward);
+                       textRenderable->_alignment, textRenderable->_unlit, forward);
 }

 namespace render {
--- a/libraries/entities-renderer/src/RenderableTextEntityItem.h
+++ b/libraries/entities-renderer/src/RenderableTextEntityItem.h
@ -65,6 +65,7 @@ private:
    glm::vec3 _dimensions;

    QString _font { "" };
+    TextAlignment _alignment { TextAlignment::LEFT };
    TextEffect _effect { TextEffect::NO_EFFECT };
    glm::vec3 _effectColor { 0 };
    float _effectThickness { 0.0f };
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@ -1620,6 +1620,19 @@ const Transform EntityItem::getTransformToCenter(bool& success) const {
    return result;
 }

+const Transform EntityItem::getTransformToCenterWithOnlyLocalRotation(bool& success) const {
+    Transform result = getTransformWithOnlyLocalRotation(success);
+    glm::vec3 pivot = getPivot();
+    if (pivot != ENTITY_ITEM_ZERO_VEC3) {
+        result.postTranslate(pivot);
+    }
+    glm::vec3 registrationPoint = getRegistrationPoint();
+    if (registrationPoint != ENTITY_ITEM_HALF_VEC3) { // If it is not already centered, translate to center
+        result.postTranslate((ENTITY_ITEM_HALF_VEC3 - registrationPoint) * getScaledDimensions()); // Position to center
+    }
+    return result;
+}
+
 /// The maximum bounding cube for the entity, independent of it's rotation.
 /// This accounts for the registration point (upon which rotation occurs around).
 ///
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@ -190,6 +190,7 @@ public:
    void setCenterPosition(const glm::vec3& position);

    const Transform getTransformToCenter(bool& success) const;
+    const Transform getTransformToCenterWithOnlyLocalRotation(bool& success) const;

    void requiresRecalcBoxes();

--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@ -309,7 +309,6 @@ void EntityItemProperties::setScreenshareFromString(const QString& mode) {
    }
 }

-
 inline void addTextEffect(QHash<QString, TextEffect>& lookup, TextEffect effect) { lookup[TextEffectHelpers::getNameForTextEffect(effect)] = effect; }
 const QHash<QString, TextEffect> stringToTextEffectLookup = [] {
    QHash<QString, TextEffect> toReturn;
@ -328,6 +327,23 @@ void EntityItemProperties::setTextEffectFromString(const QString& effect) {
    }
 }

+inline void addTextAlignment(QHash<QString, TextAlignment>& lookup, TextAlignment alignment) { lookup[TextAlignmentHelpers::getNameForTextAlignment(alignment)] = alignment; }
+const QHash<QString, TextAlignment> stringToTextAlignmentLookup = [] {
+    QHash<QString, TextAlignment> toReturn;
+    addTextAlignment(toReturn, TextAlignment::LEFT);
+    addTextAlignment(toReturn, TextAlignment::CENTER);
+    addTextAlignment(toReturn, TextAlignment::RIGHT);
+    return toReturn;
+}();
+QString EntityItemProperties::getAlignmentAsString() const { return TextAlignmentHelpers::getNameForTextAlignment(_alignment); }
+void EntityItemProperties::setAlignmentFromString(const QString& alignment) {
+    auto textAlignmentItr = stringToTextAlignmentLookup.find(alignment.toLower());
+    if (textAlignmentItr != stringToTextAlignmentLookup.end()) {
+        _alignment = textAlignmentItr.value();
+        _alignmentChanged = true;
+    }
+}
+
 QString getCollisionGroupAsString(uint16_t group) {
    switch (group) {
        case USER_COLLISION_GROUP_DYNAMIC:
@ -564,6 +580,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
    CHECK_PROPERTY_CHANGE(PROP_TEXT_EFFECT, textEffect);
    CHECK_PROPERTY_CHANGE(PROP_TEXT_EFFECT_COLOR, textEffectColor);
    CHECK_PROPERTY_CHANGE(PROP_TEXT_EFFECT_THICKNESS, textEffectThickness);
+    CHECK_PROPERTY_CHANGE(PROP_TEXT_ALIGNMENT, alignment);

    // Zone
    changedProperties += _keyLight.getChangedProperties();
@ -1339,6 +1356,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
 * @property {Entities.TextEffect} textEffect="none" - The effect that is applied to the text.
 * @property {Color} textEffectColor=255,255,255 - The color of the effect.
 * @property {number} textEffectThickness=0.2 - The magnitude of the text effect, range <code>0.0</code> &ndash; <code>0.5</code>.
+ * @property {Entities.TextAlignment} alignment="left" - How the text is aligned against its background.
 * @property {boolean} faceCamera - <code>true</code> if <code>billboardMode</code> is <code>"yaw"</code>, <code>false</code>
 *     if it isn't. Setting this property to <code>false</code> sets the <code>billboardMode</code> to <code>"none"</code>.
 *     <p class="important">Deprecated: This property is deprecated and will be removed.</p>
@ -1791,6 +1809,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
        COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_TEXT_EFFECT, textEffect, getTextEffectAsString());
        COPY_PROPERTY_TO_QSCRIPTVALUE_TYPED(PROP_TEXT_EFFECT_COLOR, textEffectColor, u8vec3Color);
        COPY_PROPERTY_TO_QSCRIPTVALUE(PROP_TEXT_EFFECT_THICKNESS, textEffectThickness);
+        COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER(PROP_TEXT_ALIGNMENT, alignment, getAlignmentAsString());
    }

    // Zones only
@ -2175,6 +2194,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
    COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(textEffect, TextEffect);
    COPY_PROPERTY_FROM_QSCRIPTVALUE(textEffectColor, u8vec3Color, setTextEffectColor);
    COPY_PROPERTY_FROM_QSCRIPTVALUE(textEffectThickness, float, setTextEffectThickness);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE_ENUM(alignment, Alignment);

    // Zone
    _keyLight.copyFromScriptValue(object, _defaultSettings);
@ -2469,6 +2489,7 @@ void EntityItemProperties::merge(const EntityItemProperties& other) {
    COPY_PROPERTY_IF_CHANGED(textEffect);
    COPY_PROPERTY_IF_CHANGED(textEffectColor);
    COPY_PROPERTY_IF_CHANGED(textEffectThickness);
+    COPY_PROPERTY_IF_CHANGED(alignment);

    // Zone
    _keyLight.merge(other._keyLight);
@ -2838,6 +2859,7 @@ bool EntityItemProperties::getPropertyInfo(const QString& propertyName, EntityPr
        ADD_PROPERTY_TO_MAP(PROP_TEXT_EFFECT, TextEffect, textEffect, TextEffect);
        ADD_PROPERTY_TO_MAP(PROP_TEXT_EFFECT_COLOR, TextEffectColor, textEffectColor, u8vec3Color);
        ADD_PROPERTY_TO_MAP_WITH_RANGE(PROP_TEXT_EFFECT_THICKNESS, TextEffectThickness, textEffectThickness, float, 0.0, 0.5);
+        ADD_PROPERTY_TO_MAP(PROP_TEXT_ALIGNMENT, Alignment, alignment, TextAlignment);

        // Zone
        { // Keylight
@ -3280,6 +3302,7 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy
                APPEND_ENTITY_PROPERTY(PROP_TEXT_EFFECT, (uint32_t)properties.getTextEffect());
                APPEND_ENTITY_PROPERTY(PROP_TEXT_EFFECT_COLOR, properties.getTextEffectColor());
                APPEND_ENTITY_PROPERTY(PROP_TEXT_EFFECT_THICKNESS, properties.getTextEffectThickness());
+                APPEND_ENTITY_PROPERTY(PROP_TEXT_ALIGNMENT, (uint32_t)properties.getAlignment());
            }

            if (properties.getType() == EntityTypes::Zone) {
@ -3767,6 +3790,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_TEXT_EFFECT, TextEffect, setTextEffect);
        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_TEXT_EFFECT_COLOR, u8vec3Color, setTextEffectColor);
        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_TEXT_EFFECT_THICKNESS, float, setTextEffectThickness);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_TEXT_ALIGNMENT, TextAlignment, setAlignment);
    }

    if (properties.getType() == EntityTypes::Zone) {
@ -4168,6 +4192,7 @@ void EntityItemProperties::markAllChanged() {
    _textEffectChanged = true;
    _textEffectColorChanged = true;
    _textEffectThicknessChanged = true;
+    _alignmentChanged = true;

    // Zone
    _keyLight.markAllChanged();
@ -4784,6 +4809,9 @@ QList<QString> EntityItemProperties::listChangedProperties() {
    if (textEffectThicknessChanged()) {
        out += "textEffectThickness";
    }
+    if (alignmentChanged()) {
+        out += "alignment";
+    }

    // Zone
    getKeyLight().listChangedProperties(out);
--- a/libraries/entities/src/EntityItemProperties.h
+++ b/libraries/entities/src/EntityItemProperties.h
@ -67,6 +67,7 @@
 #include "WebInputMode.h"
 #include "GizmoType.h"
 #include "TextEffect.h"
+#include "TextAlignment.h"

 const quint64 UNKNOWN_CREATED_TIME = 0;

@ -328,6 +329,7 @@ public:
    DEFINE_PROPERTY_REF_ENUM(PROP_TEXT_EFFECT, TextEffect, textEffect, TextEffect, TextEffect::NO_EFFECT);
    DEFINE_PROPERTY_REF(PROP_TEXT_EFFECT_COLOR, TextEffectColor, textEffectColor, u8vec3Color, TextEntityItem::DEFAULT_TEXT_COLOR);
    DEFINE_PROPERTY(PROP_TEXT_EFFECT_THICKNESS, TextEffectThickness, textEffectThickness, float, TextEntityItem::DEFAULT_TEXT_EFFECT_THICKNESS);
+    DEFINE_PROPERTY_REF_ENUM(PROP_TEXT_ALIGNMENT, Alignment, alignment, TextAlignment, TextAlignment::LEFT);

    // Zone
    DEFINE_PROPERTY_GROUP(KeyLight, keyLight, KeyLightPropertyGroup);
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@ -253,6 +253,7 @@ enum EntityPropertyList {
    PROP_TEXT_EFFECT = PROP_DERIVED_12,
    PROP_TEXT_EFFECT_COLOR = PROP_DERIVED_13,
    PROP_TEXT_EFFECT_THICKNESS = PROP_DERIVED_14,
+    PROP_TEXT_ALIGNMENT = PROP_DERIVED_15,

    // Zone
    // Keylight
--- a/libraries/entities/src/EntityTreeElement.cpp
+++ b/libraries/entities/src/EntityTreeElement.cpp
@ -218,8 +218,9 @@ EntityItemID EntityTreeElement::evalDetailedRayIntersection(const glm::vec3& ori
        // extents is the entity relative, scaled, centered extents of the entity
        glm::vec3 position = entity->getWorldPosition();
        glm::mat4 translation = glm::translate(position);
-        glm::quat orientation = entity->getWorldOrientation();
-        glm::mat4 rotation = glm::mat4_cast(BillboardModeHelpers::getBillboardRotation(position, orientation, entity->getBillboardMode(),
+        BillboardMode billboardMode = entity->getBillboardMode();
+        glm::quat orientation = billboardMode == BillboardMode::NONE ? entity->getWorldOrientation() : entity->getLocalOrientation();
+        glm::mat4 rotation = glm::mat4_cast(BillboardModeHelpers::getBillboardRotation(position, orientation, billboardMode,
            viewFrustumPos, entity->getRotateForPicking()));
        glm::mat4 entityToWorldMatrix = translation * rotation;
        glm::mat4 worldToEntityMatrix = glm::inverse(entityToWorldMatrix);
@ -368,8 +369,9 @@ EntityItemID EntityTreeElement::evalDetailedParabolaIntersection(const glm::vec3
        // extents is the entity relative, scaled, centered extents of the entity
        glm::vec3 position = entity->getWorldPosition();
        glm::mat4 translation = glm::translate(position);
-        glm::quat orientation = entity->getWorldOrientation();
-        glm::mat4 rotation = glm::mat4_cast(BillboardModeHelpers::getBillboardRotation(position, orientation, entity->getBillboardMode(),
+        BillboardMode billboardMode = entity->getBillboardMode();
+        glm::quat orientation = billboardMode == BillboardMode::NONE ? entity->getWorldOrientation() : entity->getLocalOrientation();
+        glm::mat4 rotation = glm::mat4_cast(BillboardModeHelpers::getBillboardRotation(position, orientation, billboardMode,
            viewFrustumPos, entity->getRotateForPicking()));
        glm::mat4 entityToWorldMatrix = translation * rotation;
        glm::mat4 worldToEntityMatrix = glm::inverse(entityToWorldMatrix);
--- a/libraries/entities/src/GizmoEntityItem.cpp
+++ b/libraries/entities/src/GizmoEntityItem.cpp
@ -108,10 +108,11 @@ bool GizmoEntityItem::findDetailedRayIntersection(const glm::vec3& origin, const
                                                  QVariantMap& extraInfo, bool precisionPicking) const {
    glm::vec3 dimensions = getScaledDimensions();
    glm::vec2 xyDimensions(dimensions.x, dimensions.z);
-    glm::quat rotation = getWorldOrientation();
+    BillboardMode billboardMode = getBillboardMode();
+    glm::quat rotation = billboardMode == BillboardMode::NONE ? getWorldOrientation() : getLocalOrientation();
    rotation *= glm::angleAxis(-(float)M_PI_2, Vectors::RIGHT);
    glm::vec3 position = getWorldPosition() + rotation * (dimensions * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint()));
-    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, getBillboardMode(), viewFrustumPos);
+    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, billboardMode, viewFrustumPos);

    if (findRayRectangleIntersection(origin, direction, rotation, position, xyDimensions, distance)) {
        glm::vec3 hitPosition = origin + (distance * direction);
@ -143,10 +144,11 @@ bool GizmoEntityItem::findDetailedParabolaIntersection(const glm::vec3& origin,
    //// Scale the dimensions by the diameter
    glm::vec3 dimensions = getScaledDimensions();
    glm::vec2 xyDimensions(dimensions.x, dimensions.z);
-    glm::quat rotation = getWorldOrientation();
+    BillboardMode billboardMode = getBillboardMode();
+    glm::quat rotation = billboardMode == BillboardMode::NONE ? getWorldOrientation() : getLocalOrientation();
    rotation *= glm::angleAxis(-(float)M_PI_2, Vectors::RIGHT);
    glm::vec3 position = getWorldPosition();
-    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, getBillboardMode(), viewFrustumPos);
+    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, billboardMode, viewFrustumPos);

    glm::quat inverseRot = glm::inverse(rotation);
    glm::vec3 localOrigin = inverseRot * (origin - position);
--- a/libraries/entities/src/ModelEntityItem.cpp
+++ b/libraries/entities/src/ModelEntityItem.cpp
@ -330,6 +330,19 @@ const Transform ModelEntityItem::getTransform(bool& success, int depth) const {

    return worldTransform;
 }
+
+const Transform ModelEntityItem::getTransformWithOnlyLocalRotation(bool& success, int depth) const {
+    const Transform parentTransform = getParentTransform(success, depth);
+    Transform localTransform = getLocalTransform();
+    localTransform.postScale(getModelScale());
+
+    Transform worldTransform;
+    Transform::mult(worldTransform, parentTransform, localTransform);
+    worldTransform.setRotation(localTransform.getRotation());
+
+    return worldTransform;
+}
+
 void ModelEntityItem::setCompoundShapeURL(const QString& url) {
    withWriteLock([&] {
        if (_compoundShapeURL.get() != url) {
--- a/libraries/entities/src/ModelEntityItem.h
+++ b/libraries/entities/src/ModelEntityItem.h
@ -71,6 +71,7 @@ public:
    virtual void setScaledDimensions(const glm::vec3& value) override;

    virtual const Transform getTransform(bool& success, int depth = 0) const override;
+    virtual const Transform getTransformWithOnlyLocalRotation(bool& success, int depth = 0) const override;
    virtual const Transform getTransform() const override;

    static const QString DEFAULT_COMPOUND_SHAPE_URL;
--- a/libraries/entities/src/PolyVoxEntityItem.cpp
+++ b/libraries/entities/src/PolyVoxEntityItem.cpp
@ -378,14 +378,15 @@ glm::mat4 PolyVoxEntityItem::localToVoxelMatrix() const {
 }

 glm::mat4 PolyVoxEntityItem::voxelToWorldMatrix(bool includeBillboard) const {
-    glm::quat orientation = getWorldOrientation();
    glm::vec3 position = getWorldPosition();
    glm::mat4 translation = glm::translate(position);
    glm::mat4 rotation;
    if (includeBillboard) {
-        rotation = glm::mat4_cast(BillboardModeHelpers::getBillboardRotation(position, orientation, getBillboardMode(), BillboardModeHelpers::getPrimaryViewFrustumPosition()));
+        BillboardMode billboardMode = getBillboardMode();
+        glm::quat orientation = billboardMode == BillboardMode::NONE ? getWorldOrientation() : getLocalOrientation();
+        rotation = glm::mat4_cast(BillboardModeHelpers::getBillboardRotation(position, orientation, billboardMode, BillboardModeHelpers::getPrimaryViewFrustumPosition()));
    } else {
-        rotation = glm::mat4_cast(orientation);
+        rotation = glm::mat4_cast(getWorldOrientation());
    }
    return translation * rotation * voxelToLocalMatrix();
 }
--- a/libraries/entities/src/ShapeEntityItem.cpp
+++ b/libraries/entities/src/ShapeEntityItem.cpp
@ -277,9 +277,10 @@ bool ShapeEntityItem::findDetailedRayIntersection(const glm::vec3& origin, const
                                                  float& distance, BoxFace& face, glm::vec3& surfaceNormal,
                                                  QVariantMap& extraInfo, bool precisionPicking) const {
    glm::vec3 dimensions = getScaledDimensions();
-    glm::quat rotation = getWorldOrientation();
+    BillboardMode billboardMode = getBillboardMode();
+    glm::quat rotation = billboardMode == BillboardMode::NONE ? getWorldOrientation() : getLocalOrientation();
    glm::vec3 position = getWorldPosition() + rotation * (dimensions * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint()));
-    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, getBillboardMode(), viewFrustumPos);
+    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, billboardMode, viewFrustumPos);

    // determine the ray in the frame of the entity transformed from a unit sphere
    glm::mat4 entityToWorldMatrix = glm::translate(position) * glm::mat4_cast(rotation) * glm::scale(dimensions);
@ -309,9 +310,10 @@ bool ShapeEntityItem::findDetailedParabolaIntersection(const glm::vec3& origin,
                                                       BoxFace& face, glm::vec3& surfaceNormal,
                                                       QVariantMap& extraInfo, bool precisionPicking) const {
    glm::vec3 dimensions = getScaledDimensions();
-    glm::quat rotation = getWorldOrientation();
+    BillboardMode billboardMode = getBillboardMode();
+    glm::quat rotation = billboardMode == BillboardMode::NONE ? getWorldOrientation() : getLocalOrientation();
    glm::vec3 position = getWorldPosition() + rotation * (dimensions * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint()));
-    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, getBillboardMode(), viewFrustumPos);
+    rotation = BillboardModeHelpers::getBillboardRotation(position, rotation, billboardMode, viewFrustumPos);

    // determine the parabola in the frame of the entity transformed from a unit sphere
    glm::mat4 entityToWorldMatrix = glm::translate(position) * glm::mat4_cast(rotation) * glm::scale(dimensions);
--- a/libraries/entities/src/TextEntityItem.cpp
+++ b/libraries/entities/src/TextEntityItem.cpp
@ -69,6 +69,7 @@ EntityItemProperties TextEntityItem::getProperties(const EntityPropertyFlags& de
    COPY_ENTITY_PROPERTY_TO_PROPERTIES(textEffect, getTextEffect);
    COPY_ENTITY_PROPERTY_TO_PROPERTIES(textEffectColor, getTextEffectColor);
    COPY_ENTITY_PROPERTY_TO_PROPERTIES(textEffectThickness, getTextEffectThickness);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(alignment, getAlignment);
    return properties;
 }

@ -96,7 +97,8 @@ bool TextEntityItem::setSubClassProperties(const EntityItemProperties& propertie
    SET_ENTITY_PROPERTY_FROM_PROPERTIES(textEffect, setTextEffect);
    SET_ENTITY_PROPERTY_FROM_PROPERTIES(textEffectColor, setTextEffectColor);
    SET_ENTITY_PROPERTY_FROM_PROPERTIES(textEffectThickness, setTextEffectThickness);
-    
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(alignment, setAlignment);
+
    return somethingChanged;
 }

@ -131,6 +133,7 @@ int TextEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
    READ_ENTITY_PROPERTY(PROP_TEXT_EFFECT, TextEffect, setTextEffect);
    READ_ENTITY_PROPERTY(PROP_TEXT_EFFECT_COLOR, glm::u8vec3, setTextEffectColor);
    READ_ENTITY_PROPERTY(PROP_TEXT_EFFECT_THICKNESS, float, setTextEffectThickness);
+    READ_ENTITY_PROPERTY(PROP_TEXT_ALIGNMENT, TextAlignment, setAlignment);

    return bytesRead;
 }
@ -155,6 +158,7 @@ EntityPropertyFlags TextEntityItem::getEntityProperties(EncodeBitstreamParams& p
    requestedProperties += PROP_TEXT_EFFECT;
    requestedProperties += PROP_TEXT_EFFECT_COLOR;
    requestedProperties += PROP_TEXT_EFFECT_THICKNESS;
+    requestedProperties += PROP_TEXT_ALIGNMENT;

    return requestedProperties;
 }
@ -189,6 +193,7 @@ void TextEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBits
    APPEND_ENTITY_PROPERTY(PROP_TEXT_EFFECT, (uint32_t)getTextEffect());
    APPEND_ENTITY_PROPERTY(PROP_TEXT_EFFECT_COLOR, getTextEffectColor());
    APPEND_ENTITY_PROPERTY(PROP_TEXT_EFFECT_THICKNESS, getTextEffectThickness());
+    APPEND_ENTITY_PROPERTY(PROP_TEXT_ALIGNMENT, (uint32_t)getAlignment());
 }

 void TextEntityItem::setText(const QString& value) {
@ -388,8 +393,21 @@ float TextEntityItem::getTextEffectThickness() const {
    });
 }

+void TextEntityItem::setAlignment(TextAlignment value) {
+    withWriteLock([&] {
+        _needsRenderUpdate |= _alignment != value;
+        _alignment = value;
+    });
+}
+
+TextAlignment TextEntityItem::getAlignment() const {
+    return resultWithReadLock<TextAlignment>([&] {
+        return _alignment;
+    });
+}
+
 PulsePropertyGroup TextEntityItem::getPulseProperties() const {
    return resultWithReadLock<PulsePropertyGroup>([&] {
        return _pulseProperties;
    });
-}
+}
--- a/libraries/entities/src/TextEntityItem.h
+++ b/libraries/entities/src/TextEntityItem.h
@ -15,7 +15,6 @@
 #include "EntityItem.h"

 #include "PulsePropertyGroup.h"
-#include "TextEffect.h"

 class TextEntityItem : public EntityItem {
 public:
@ -100,6 +99,9 @@ public:
    float getTextEffectThickness() const;
    void setTextEffectThickness(float value);

+    TextAlignment getAlignment() const;
+    void setAlignment(TextAlignment value);
+
    PulsePropertyGroup getPulseProperties() const;

 private:
@ -117,6 +119,7 @@ private:
    bool _unlit;

    QString _font;
+    TextAlignment _alignment;
    TextEffect _effect;
    glm::u8vec3 _effectColor;
    float _effectThickness;
--- a/libraries/networking/src/udt/PacketHeaders.h
+++ b/libraries/networking/src/udt/PacketHeaders.h
@ -286,6 +286,7 @@ enum class EntityVersion : PacketVersion {
    UseOriginalPivot,
    UserAgent,
    AllBillboardMode,
+    TextAlignment,

    // Add new versions above here
    NUM_PACKET_TYPE,
--- a/libraries/octree/src/OctreePacketData.h
+++ b/libraries/octree/src/OctreePacketData.h
@ -41,6 +41,7 @@
 #include "PulseMode.h"
 #include "GizmoType.h"
 #include "TextEffect.h"
+#include "TextAlignment.h"

 #include "OctreeConstants.h"
 #include "OctreeElement.h"
@ -278,6 +279,7 @@ public:
    static int unpackDataFromBytes(const unsigned char* dataBytes, PulseMode& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
    static int unpackDataFromBytes(const unsigned char* dataBytes, GizmoType& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
    static int unpackDataFromBytes(const unsigned char* dataBytes, TextEffect& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
+    static int unpackDataFromBytes(const unsigned char* dataBytes, TextAlignment& result) { memcpy(&result, dataBytes, sizeof(result)); return sizeof(result); }
    static int unpackDataFromBytes(const unsigned char* dataBytes, glm::vec2& result);
    static int unpackDataFromBytes(const unsigned char* dataBytes, glm::vec3& result);
    static int unpackDataFromBytes(const unsigned char* dataBytes, glm::u8vec3& result);
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@ -114,7 +114,8 @@ Transform Model::getTransform() const {
        return transform;
    } else if (_spatiallyNestableOverride) {
        bool success;
-        Transform transform = _spatiallyNestableOverride->getTransform(success);
+        Transform transform = _billboardMode == BillboardMode::NONE ? _spatiallyNestableOverride->getTransform(success) :
+            _spatiallyNestableOverride->getTransformWithOnlyLocalRotation(success);
        if (success) {
            transform.setScale(getScale());
            return transform;
@ -151,6 +152,7 @@ void Model::setOffset(const glm::vec3& offset) {
    // if someone manually sets our offset, then we are no longer snapped to center
    _snapModelToRegistrationPoint = false;
    _snappedToRegistrationPoint = false;
+    _forceOffset = true;
 }

 void Model::calculateTextureInfo() {
--- a/libraries/render-utils/src/TextRenderer3D.cpp
+++ b/libraries/render-utils/src/TextRenderer3D.cpp
@ -43,18 +43,18 @@ float TextRenderer3D::getFontSize() const {
 void TextRenderer3D::draw(gpu::Batch& batch, float x, float y, const glm::vec2& bounds,
                          const QString& str, const glm::vec4& color, bool unlit, bool forward) {
    if (_font) {
-        _font->drawString(batch, _drawInfo, str, color, glm::vec3(0.0f), 0, TextEffect::NO_EFFECT, { x, y }, bounds, 1.0f, unlit, forward);
+        _font->drawString(batch, _drawInfo, str, color, glm::vec3(0.0f), 0, TextEffect::NO_EFFECT, TextAlignment::LEFT, { x, y }, bounds, 1.0f, unlit, forward);
    }
 }

 void TextRenderer3D::draw(gpu::Batch& batch, float x, float y, const glm::vec2& bounds, float scale,
                          const QString& str, const QString& font, const glm::vec4& color, const glm::vec3& effectColor,
-                          float effectThickness, TextEffect effect, bool unlit, bool forward) {
+                          float effectThickness, TextEffect effect, TextAlignment alignment, bool unlit, bool forward) {
    if (font != _family) {
        _family = font;
        _font = Font::load(_family);
    }
    if (_font) {
-        _font->drawString(batch, _drawInfo, str, color, effectColor, effectThickness, effect, { x, y }, bounds, scale, unlit, forward);
+        _font->drawString(batch, _drawInfo, str, color, effectColor, effectThickness, effect, alignment, { x, y }, bounds, scale, unlit, forward);
    }
 }
--- a/libraries/render-utils/src/TextRenderer3D.h
+++ b/libraries/render-utils/src/TextRenderer3D.h
@ -17,6 +17,7 @@

 #include "text/Font.h"
 #include "TextEffect.h"
+#include "TextAlignment.h"
 #include "FontFamilies.h"

 class TextRenderer3D {
@ -30,7 +31,7 @@ public:
              const QString& str, const glm::vec4& color, bool unlit, bool forward);
    void draw(gpu::Batch& batch, float x, float y, const glm::vec2& bounds, float scale,
              const QString& str, const QString& font, const glm::vec4& color, const glm::vec3& effectColor,
-              float effectThickness, TextEffect effect, bool unlit, bool forward);
+              float effectThickness, TextEffect effect, TextAlignment alignment, bool unlit, bool forward);

 private:
    TextRenderer3D(const char* family);
--- a/libraries/render-utils/src/text/Font.cpp
+++ b/libraries/render-utils/src/text/Font.cpp
@ -65,7 +65,6 @@ struct QuadBuilder {
        vertices[3] = TextureVertex(min + size,
                                    texMin + glm::vec2(texSize.x, 0.0f), bounds);
    }
-
 };

 Font::Pointer Font::load(QIODevice& fontFile) {
@ -303,7 +302,18 @@ void Font::setupGPU() {
    }
 }

-void Font::buildVertices(Font::DrawInfo& drawInfo, const QString& str, const glm::vec2& origin, const glm::vec2& bounds, float scale, bool enlargeForShadows) {
+inline QuadBuilder adjustedQuadBuilderForAlignmentMode(const Glyph& glyph, glm::vec2 advance, float scale, float enlargeForShadows,
+                                                TextAlignment alignment, float rightSpacing) {
+    if (alignment == TextAlignment::RIGHT) {
+        advance.x += rightSpacing;
+    } else if (alignment == TextAlignment::CENTER) {
+        advance.x += 0.5f * rightSpacing;
+    }
+    return QuadBuilder(glyph, advance, scale, enlargeForShadows);
+}
+
+void Font::buildVertices(Font::DrawInfo& drawInfo, const QString& str, const glm::vec2& origin, const glm::vec2& bounds, float scale, bool enlargeForShadows,
+                         TextAlignment alignment) {
    drawInfo.verticesBuffer = std::make_shared<gpu::Buffer>();
    drawInfo.indicesBuffer = std::make_shared<gpu::Buffer>();
    drawInfo.indexCount = 0;
@ -314,15 +324,17 @@ void Font::buildVertices(Font::DrawInfo& drawInfo, const QString& str, const glm
    drawInfo.origin = origin;

    float enlargedBoundsX = bounds.x - 0.5f * DOUBLE_MAX_OFFSET_PIXELS * float(enlargeForShadows);
+    float rightEdge = origin.x + enlargedBoundsX;

    // Top left of text
    glm::vec2 advance = origin;
+    std::vector<std::pair<Glyph, vec2>> glyphsAndCorners;
    foreach(const QString& token, tokenizeForWrapping(str)) {
        bool isNewLine = (token == QString('\n'));
        bool forceNewLine = false;

        // Handle wrapping
-        if (!isNewLine && (bounds.x != -1) && (advance.x + computeExtent(token).x > origin.x + enlargedBoundsX)) {
+        if (!isNewLine && (bounds.x != -1) && (advance.x + computeExtent(token).x > rightEdge)) {
            // We are out of the x bound, force new line
            forceNewLine = true;
        }
@ -347,38 +359,8 @@ void Font::buildVertices(Font::DrawInfo& drawInfo, const QString& str, const glm
        if (!isNewLine) {
            for (auto c : token) {
                auto glyph = _glyphs[c];
-                quint16 verticesOffset = numVertices;

-                QuadBuilder qd(glyph, advance - glm::vec2(0.0f, _ascent), scale, enlargeForShadows);
-                drawInfo.verticesBuffer->append(qd);
-                numVertices += VERTICES_PER_QUAD;
-
-                // Sam's recommended triangle slices
-                // Triangle tri1 = { v0, v1, v3 };
-                // Triangle tri2 = { v1, v2, v3 };
-                // NOTE: Random guy on the internet's recommended triangle slices
-                // Triangle tri1 = { v0, v1, v2 };
-                // Triangle tri2 = { v2, v3, v0 };
-
-                // The problem here being that the 4 vertices are { ll, lr, ul, ur }, a Z pattern
-                // Additionally, you want to ensure that the shared side vertices are used sequentially
-                // to improve cache locality
-                //
-                //  2 -- 3
-                //  |    |
-                //  |    |
-                //  0 -- 1
-                //
-                //  { 0, 1, 2 } -> { 2, 1, 3 }
-                quint16 indices[NUMBER_OF_INDICES_PER_QUAD];
-                indices[0] = verticesOffset + 0;
-                indices[1] = verticesOffset + 1;
-                indices[2] = verticesOffset + 2;
-                indices[3] = verticesOffset + 2;
-                indices[4] = verticesOffset + 1;
-                indices[5] = verticesOffset + 3;
-                drawInfo.indicesBuffer->append(sizeof(indices), (const gpu::Byte*)indices);
-                drawInfo.indexCount += NUMBER_OF_INDICES_PER_QUAD;
+                glyphsAndCorners.emplace_back(glyph, advance - glm::vec2(0.0f, _ascent));

                // Advance by glyph size
                advance.x += glyph.d;
@ -388,10 +370,71 @@ void Font::buildVertices(Font::DrawInfo& drawInfo, const QString& str, const glm
            advance.x += _spaceWidth;
        }
    }
+
+    std::vector<QuadBuilder> quadBuilders;
+    quadBuilders.reserve(glyphsAndCorners.size());
+    {
+        int i = glyphsAndCorners.size() - 1;
+        while (i >= 0) {
+            auto nextGlyphAndCorner = glyphsAndCorners[i];
+            float rightSpacing = rightEdge - (nextGlyphAndCorner.second.x + nextGlyphAndCorner.first.d);
+            quadBuilders.push_back(adjustedQuadBuilderForAlignmentMode(nextGlyphAndCorner.first, nextGlyphAndCorner.second, scale, enlargeForShadows,
+                                                                       alignment, rightSpacing));
+            i--;
+            while (i >= 0) {
+                auto prevGlyphAndCorner = glyphsAndCorners[i];
+                // We're to the right of the last character we checked, which means we're on a previous line, so we need to
+                // recalculate the spacing, so we exit this loop
+                if (prevGlyphAndCorner.second.x >= nextGlyphAndCorner.second.x) {
+                    break;
+                }
+
+                quadBuilders.push_back(adjustedQuadBuilderForAlignmentMode(prevGlyphAndCorner.first, prevGlyphAndCorner.second, scale, enlargeForShadows,
+                                                                           alignment, rightSpacing));
+
+                nextGlyphAndCorner = prevGlyphAndCorner;
+                i--;
+            }
+        }
+    }
+
+    // The quadBuilders is backwards now because we looped over the glyphs backwards to adjust their alignment
+    for (int i = quadBuilders.size() - 1; i >= 0; i--) {
+        quint16 verticesOffset = numVertices;
+        drawInfo.verticesBuffer->append(quadBuilders[i]);
+        numVertices += VERTICES_PER_QUAD;
+
+        // Sam's recommended triangle slices
+        // Triangle tri1 = { v0, v1, v3 };
+        // Triangle tri2 = { v1, v2, v3 };
+        // NOTE: Random guy on the internet's recommended triangle slices
+        // Triangle tri1 = { v0, v1, v2 };
+        // Triangle tri2 = { v2, v3, v0 };
+
+        // The problem here being that the 4 vertices are { ll, lr, ul, ur }, a Z pattern
+        // Additionally, you want to ensure that the shared side vertices are used sequentially
+        // to improve cache locality
+        //
+        //  2 -- 3
+        //  |    |
+        //  |    |
+        //  0 -- 1
+        //
+        //  { 0, 1, 2 } -> { 2, 1, 3 }
+        quint16 indices[NUMBER_OF_INDICES_PER_QUAD];
+        indices[0] = verticesOffset + 0;
+        indices[1] = verticesOffset + 1;
+        indices[2] = verticesOffset + 2;
+        indices[3] = verticesOffset + 2;
+        indices[4] = verticesOffset + 1;
+        indices[5] = verticesOffset + 3;
+        drawInfo.indicesBuffer->append(sizeof(indices), (const gpu::Byte*)indices);
+        drawInfo.indexCount += NUMBER_OF_INDICES_PER_QUAD;
+    }
 }

 void Font::drawString(gpu::Batch& batch, Font::DrawInfo& drawInfo, const QString& str, const glm::vec4& color,
-                      const glm::vec3& effectColor, float effectThickness, TextEffect effect,
+                      const glm::vec3& effectColor, float effectThickness, TextEffect effect, TextAlignment alignment,
                      const glm::vec2& origin, const glm::vec2& bounds, float scale, bool unlit, bool forward) {
    if (!_loaded || str == "") {
        return;
@ -401,11 +444,12 @@ void Font::drawString(gpu::Batch& batch, Font::DrawInfo& drawInfo, const QString
    const int SHADOW_EFFECT = (int)TextEffect::SHADOW_EFFECT;

    // If we're switching to or from shadow effect mode, we need to rebuild the vertices
-    if (str != drawInfo.string || bounds != drawInfo.bounds || origin != drawInfo.origin ||
+    if (str != drawInfo.string || bounds != drawInfo.bounds || origin != drawInfo.origin || alignment != _alignment ||
            (drawInfo.params.effect != textEffect && (textEffect == SHADOW_EFFECT || drawInfo.params.effect == SHADOW_EFFECT)) ||
            (textEffect == SHADOW_EFFECT && scale != _scale)) {
        _scale = scale;
-        buildVertices(drawInfo, str, origin, bounds, scale, textEffect == SHADOW_EFFECT);
+        _alignment = alignment;
+        buildVertices(drawInfo, str, origin, bounds, scale, textEffect == SHADOW_EFFECT, alignment);
    }

    setupGPU();
--- a/libraries/render-utils/src/text/Font.h
+++ b/libraries/render-utils/src/text/Font.h
@ -14,6 +14,7 @@

 #include "Glyph.h"
 #include "TextEffect.h"
+#include "TextAlignment.h"
 #include <gpu/Batch.h>
 #include <gpu/Pipeline.h>

@ -58,7 +59,7 @@ public:

    // Render string to batch
    void drawString(gpu::Batch& batch, DrawInfo& drawInfo, const QString& str, const glm::vec4& color,
-                    const glm::vec3& effectColor, float effectThickness, TextEffect effect, 
+                    const glm::vec3& effectColor, float effectThickness, TextEffect effect, TextAlignment alignment,
                    const glm::vec2& origin, const glm::vec2& bound, float scale, bool unlit, bool forward);

    static Pointer load(const QString& family);
@ -76,7 +77,8 @@ private:
    glm::vec2 computeTokenExtent(const QString& str) const;

    const Glyph& getGlyph(const QChar& c) const;
-    void buildVertices(DrawInfo& drawInfo, const QString& str, const glm::vec2& origin, const glm::vec2& bounds, float scale, bool enlargeForShadows);
+    void buildVertices(DrawInfo& drawInfo, const QString& str, const glm::vec2& origin, const glm::vec2& bounds, float scale, bool enlargeForShadows,
+                       TextAlignment alignment);

    void setupGPU();

@ -96,6 +98,7 @@ private:
    float _spaceWidth { 0.0f };

    float _scale { 0.0f };
+    TextAlignment _alignment;

    bool _loaded { true };

--- a/libraries/shared/src/SpatiallyNestable.cpp
+++ b/libraries/shared/src/SpatiallyNestable.cpp
@ -754,6 +754,17 @@ const Transform SpatiallyNestable::getTransform(bool& success, int depth) const
    return result;
 }

+const Transform SpatiallyNestable::getTransformWithOnlyLocalRotation(bool& success, int depth) const {
+    Transform result;
+    // return a world-space transform for this object's location
+    Transform parentTransform = getParentTransform(success, depth);
+    _transformLock.withReadLock([&] {
+        Transform::mult(result, parentTransform, _transform);
+        result.setRotation(_transform.getRotation());
+    });
+    return result;
+}
+
 const Transform SpatiallyNestable::getTransform() const {
    bool success;
    Transform result = getTransform(success);
--- a/libraries/shared/src/SpatiallyNestable.h
+++ b/libraries/shared/src/SpatiallyNestable.h
@ -82,6 +82,7 @@ public:

    // world frame
    virtual const Transform getTransform(bool& success, int depth = 0) const;
+    virtual const Transform getTransformWithOnlyLocalRotation(bool& success, int depth = 0) const;
    virtual const Transform getTransform() const;
    virtual void setTransform(const Transform& transform, bool& success);
    virtual bool setTransform(const Transform& transform);
--- a/libraries/shared/src/TextAlignment.cpp
+++ b/libraries/shared/src/TextAlignment.cpp
@ -0,0 +1,25 @@
+//
+//  Created by HifiExperiments on 2/9/21
+//  Copyright 2021 Vircadia contributors.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include "TextAlignment.h"
+
+const char* textAlignmentNames[] = {
+    "left",
+    "center",
+    "right"
+};
+
+static const size_t TEXT_ALIGNMENT_NAMES = (sizeof(textAlignmentNames) / sizeof(textAlignmentNames[0]));
+
+QString TextAlignmentHelpers::getNameForTextAlignment(TextAlignment alignment) {
+    if (((int)alignment <= 0) || ((int)alignment >= (int)TEXT_ALIGNMENT_NAMES)) {
+        alignment = (TextAlignment)0;
+    }
+
+    return textAlignmentNames[(int)alignment];
+}
--- a/libraries/shared/src/TextAlignment.h
+++ b/libraries/shared/src/TextAlignment.h
@ -0,0 +1,40 @@
+//
+//  Created by HifiExperiments on 2/9/21
+//  Copyright 2021 Vircadia contributors.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_TextAlignment_h
+#define hifi_TextAlignment_h
+
+#include "QString"
+
+/**jsdoc
+ * <p>A {@link Entities.EntityProperties-Text|Text} entity may use one of the following alignments:</p>
+ * <table>
+ *   <thead>
+ *     <tr><th>Value</th><th>Description</th></tr>
+ *   </thead>
+ *   <tbody>
+ *     <tr><td><code>"left"</code></td><td>Text is aligned to the left side.</td></tr>
+ *     <tr><td><code>"center"</code></td><td>Text is centered.</td></tr>
+ *     <tr><td><code>"right"</code></td><td>Text is aligned to the right side.</td></tr>
+ *   </tbody>
+ * </table>
+ * @typedef {string} Entities.TextAlignment
+ */
+
+enum class TextAlignment {
+    LEFT = 0,
+    CENTER,
+    RIGHT
+};
+
+class TextAlignmentHelpers {
+public:
+    static QString getNameForTextAlignment(TextAlignment alignment);
+};
+
+#endif // hifi_TextAlignment_h
--- a/libraries/shared/src/TextEffect.h
+++ b/libraries/shared/src/TextEffect.h
@ -20,7 +20,7 @@
 *   <tbody>
 *     <tr><td><code>"none"</code></td><td>No effect.</td></tr>
 *     <tr><td><code>"outline"</code></td><td>An outline effect.</td></tr>
- *     <tr><td><code>"outlineFill"</code></td><td>An outline effect, with fill.</td></tr>
+ *     <tr><td><code>"outline fill"</code></td><td>An outline effect, with fill.</td></tr>
 *     <tr><td><code>"shadow"</code></td><td>A shadow effect.</td></tr>
 *   </tbody>
 * </table>
--- a/scripts/system/create/assets/data/createAppTooltips.json
+++ b/scripts/system/create/assets/data/createAppTooltips.json
@ -38,6 +38,9 @@
    "textEffectThickness": {
        "tooltip": "The magnitude of the text effect."
    },
+    "textAlignment": {
+        "tooltip": "How the text is aligned within its left and right bounds."
+    },
    "topMargin": {
        "tooltip": "The top margin, in meters."
    },
--- a/scripts/system/create/entityList/html/entityList.html
+++ b/scripts/system/create/entityList/html/entityList.html
@ -25,9 +25,10 @@
    </head>
    <body onload='loaded();' id="entity-list-body">
        <div id="entity-list-menubar">
-            <input type="button" class="normal" id="selection" value="Select&#9662;" />
-            <input type="button" class="normal" id="actions" value="Edit&#9662;" />
-            <input type="button" class="normal" id="tools" value="Tools&#9662;" />            
+            <input type="button" class="entity-list-menutitle" id="actions" value="Edit&#9662;" />
+            <input type="button" class="entity-list-menutitle" id="selection" value="Select&#9662;" />
+            <input type="button" class="entity-list-menutitle" id="transform" value="Transform&#9662;" />
+            <input type="button" class="entity-list-menutitle" id="tools" value="Tools&#9662;" />
        </div>
        <div id="entity-list-header">
            <input type="button" class="glyph" id="refresh" value="F" />
@ -146,35 +147,22 @@
                </div>
            </button>
            <div class="menu-separator"></div>
-            <button class="menu-button" id="moveEntitySelectionToAvatar" >
+            <button class="menu-button" id="exportSelectedEntities" >
                <div class = "menu-item">
-                    <div class = "menu-item-caption">Move Selected Entities to Avatar</div>
+                    <div class = "menu-item-caption">Export Selected Entities</div>
                    <div class = "menu-item-shortcut"></div>
                </div>
            </button>
-            <div class="menu-separator"></div>
-            <button class="menu-button" id="rotateAsTheNextClickedSurface" >
+            <button class="menu-button" id="importEntitiesFromFile" >
                <div class = "menu-item">
-                    <div class = "menu-item-caption">Snap To Next Clicked Surface</div>
-                    <div class = "menu-item-shortcut">0</div>
+                    <div class = "menu-item-caption">Import Entities (.json) From a File</div>
+                    <div class = "menu-item-shortcut"></div>
                </div>
            </button>
-            <button class="menu-button" id="quickRotate90x" >
+            <button class="menu-button" id="importEntitiesFromUrl" >
                <div class = "menu-item">
-                    <div class = "menu-item-caption">Rotate 90&deg; on X axis</div>
-                    <div class = "menu-item-shortcut">7</div>
-                </div>
-            </button>
-            <button class="menu-button" id="quickRotate90y" >
-                <div class = "menu-item">
-                    <div class = "menu-item-caption">Rotate 90&deg; on Y axis</div>
-                    <div class = "menu-item-shortcut">8</div>
-                </div>
-            </button>
-            <button class="menu-button" id="quickRotate90z" >
-                <div class = "menu-item">
-                    <div class = "menu-item-caption">Rotate 90&deg; on Z axis</div>
-                    <div class = "menu-item-shortcut">9</div>
+                    <div class = "menu-item-caption">Import Entities (.json) From a URL</div>
+                    <div class = "menu-item-shortcut"></div>
                </div>
            </button>
        </div>
@ -242,6 +230,40 @@
                </div>
            </button>
        </div>
+        <div class="entity-list-menu" id="transform-menu" >
+            <button class="menu-button" id="moveEntitySelectionToAvatar" >
+                <div class = "menu-item">
+                    <div class = "menu-item-caption">Move Selected Entities to Avatar</div>
+                    <div class = "menu-item-shortcut"></div>
+                </div>
+            </button>
+            <div class="menu-separator"></div>
+            <button class="menu-button" id="rotateAsTheNextClickedSurface" >
+                <div class = "menu-item">
+                    <div class = "menu-item-caption">Snap To Next Clicked Surface</div>
+                    <div class = "menu-item-shortcut">0</div>
+                </div>
+            </button>
+            <div class="menu-separator"></div>            
+            <button class="menu-button" id="quickRotate90x" >
+                <div class = "menu-item">
+                    <div class = "menu-item-caption">Rotate 90&deg; on X axis</div>
+                    <div class = "menu-item-shortcut">7</div>
+                </div>
+            </button>
+            <button class="menu-button" id="quickRotate90y" >
+                <div class = "menu-item">
+                    <div class = "menu-item-caption">Rotate 90&deg; on Y axis</div>
+                    <div class = "menu-item-shortcut">8</div>
+                </div>
+            </button>
+            <button class="menu-button" id="quickRotate90z" >
+                <div class = "menu-item">
+                    <div class = "menu-item-caption">Rotate 90&deg; on Z axis</div>
+                    <div class = "menu-item-shortcut">9</div>
+                </div>
+            </button>        
+        </div>
        <div class="entity-list-menu" id="tools-menu" >
            <button class="menu-button" id="setCameraFocusToSelection" >
                <div class = "menu-item">
@ -261,25 +283,6 @@
                    <div class = "menu-item-caption">Toggle Local/World Mode</div>
                    <div class = "menu-item-shortcut">T</div>
                </div>
-            </button>
-            <div class="menu-separator"></div>
-            <button class="menu-button" id="exportSelectedEntities" >
-                <div class = "menu-item">
-                    <div class = "menu-item-caption">Export Selected Entities</div>
-                    <div class = "menu-item-shortcut"></div>
-                </div>
-            </button>
-            <button class="menu-button" id="importEntitiesFromFile" >
-                <div class = "menu-item">
-                    <div class = "menu-item-caption">Import Entities (.json) From a File</div>
-                    <div class = "menu-item-shortcut"></div>
-                </div>
-            </button>
-            <button class="menu-button" id="importEntitiesFromUrl" >
-                <div class = "menu-item">
-                    <div class = "menu-item-caption">Import Entities (.json) From a URL</div>
-                    <div class = "menu-item-shortcut"></div>
-                </div>
            </button>            
            <div class="menu-separator"></div>
            <button class="menu-button" id="gridActivator" >
--- a/scripts/system/create/entityList/html/js/entityList.js
+++ b/scripts/system/create/entityList/html/js/entityList.js
@ -155,7 +155,15 @@ const COLUMNS = {
        propertyID: "lastEdited",
        initialWidth: 0.38,
        defaultSortOrder: DESCENDING_SORT,
-    },    
+    },
+    urlWithPath: {
+        columnHeader: "URL",
+        dropdownLabel: "URL",
+        propertyID: "urlWithPath",
+        initialWidth: 0.54,
+        initiallyShown: false,
+        defaultSortOrder: ASCENDING_SORT,
+    },
 };

 const FILTER_TYPES = [
@ -226,9 +234,10 @@ let elEntityTable,
    elToggleVisible,
    elActionsMenu,
    elSelectionMenu,
-    elToolsMenu,    
+    elTransformMenu,
+    elToolsMenu,
    elMenuBackgroundOverlay,
-    elHmdMultiSelect, 
+    elHmdMultiSelect,
    elHmdCopy,
    elHmdCut,
    elHmdPaste,
@ -313,6 +322,7 @@ function loaded() {
        elHmdMultiSelect = document.getElementById("hmdmultiselect");
        elActionsMenu = document.getElementById("actions");
        elSelectionMenu = document.getElementById("selection");
+        elTransformMenu = document.getElementById("transform");
        elToolsMenu = document.getElementById("tools");
        elMenuBackgroundOverlay = document.getElementById("menuBackgroundOverlay");
        elHmdCopy = document.getElementById("hmdcopy");
@ -395,6 +405,10 @@ function loaded() {
            document.getElementById("menuBackgroundOverlay").style.display = "block";
            document.getElementById("selection-menu").style.display = "block";
        };
+        elTransformMenu.onclick = function() {
+            document.getElementById("menuBackgroundOverlay").style.display = "block";
+            document.getElementById("transform-menu").style.display = "block";
+        };        
        elToolsMenu.onclick = function() {
            document.getElementById("menuBackgroundOverlay").style.display = "block";
            document.getElementById("tools-menu").style.display = "block";
@ -919,7 +933,7 @@ function loaded() {
                entityIds: selection,
            }));
        }
-        
+
        function updateEntityData(entityData) {
            entities = [];
            entitiesByID = {};
@ -929,13 +943,14 @@ function loaded() {
                entityData.forEach(function(entity) {
                    let type = entity.type;
                    let filename = getFilename(entity.url);
-            
+
                    let entityData = {
                        id: entity.id,
                        name: entity.name,
                        type: type,
                        url: entity.certificateID === "" ? filename : "<i>" + CERTIFIED_PLACEHOLDER + "</i>",
                        fullUrl: entity.certificateID === "" ? filename : CERTIFIED_PLACEHOLDER,
+                        urlWithPath: entity.certificateID === "" ? entity.url : "<i>" + CERTIFIED_PLACEHOLDER + "</i>",
                        locked: entity.locked,
                        visible: entity.visible,
                        certificateID: entity.certificateID,
@ -975,11 +990,13 @@ function loaded() {
                        let searchFilter = searchTerm === '' || (e.name.toLowerCase().indexOf(searchTerm) > -1 ||
                                                                 e.type.toLowerCase().indexOf(searchTerm) > -1 ||
                                                                 e.fullUrl.toLowerCase().indexOf(searchTerm) > -1 ||
+                                                                 (e.urlWithPath.toLowerCase().indexOf(searchTerm) > -1 && 
+                                                                 columnsByID["urlWithPath"].elTh.style.visibility === "visible") ||
                                                                 e.id.toLowerCase().indexOf(searchTerm) > -1);
                        return typeFilter && searchFilter;
                    });
                });
-                
+
                PROFILE("sort", function() {
                    let isAscendingSort = currentSortOrder === ASCENDING_SORT;
                    let isDefaultSort = currentSortOrder === COLUMNS[currentSortColumnID].defaultSortOrder;
@ -1850,6 +1867,7 @@ function loaded() {
        document.getElementById("menuBackgroundOverlay").style.display = "none";
        document.getElementById("selection-menu").style.display = "none";
        document.getElementById("actions-menu").style.display = "none";
+        document.getElementById("transform-menu").style.display = "none";
        document.getElementById("tools-menu").style.display = "none";
    }

--- a/scripts/system/create/entityProperties/html/js/entityProperties.js
+++ b/scripts/system/create/entityProperties/html/js/entityProperties.js
@ -239,6 +239,17 @@ const GROUPS = [
                decimals: 2,
                propertyID: "textEffectThickness",
            },
+            {
+                label: "Alignment",
+                type: "dropdown",
+                options: {
+                    left: "Left",
+                    center: "Center",
+                    right: "Right"
+                },
+                propertyID: "textAlignment",
+                propertyName: "alignment", // actual entity property name
+            },
            {
                label: "Top Margin",
                type: "number-draggable",
--- a/scripts/system/html/css/edit-style.css
+++ b/scripts/system/html/css/edit-style.css
@ -1364,10 +1364,46 @@ div#grid-section, body#entity-list-body {
 }
 #entity-list-menubar {
    margin: 0px -8px 6px -8px;
-    padding: 0px 8px 0px 8px;
+    padding: 0px 9px 0px 9px;
    border: none;
    background-color: #000;
-    background: linear-gradient(#343434 20%, #000 100%);
+    background: linear-gradient(#343434 30%, #000 100%);
+}
+input[type=button].entity-list-menutitle {
+    font-family: FiraSans-SemiBold;
+    font-size: 15px;
+    text-transform: none;
+    vertical-align: top;
+    height: 28px;
+    min-width: 30px;
+    padding: 0px 8px;
+    margin-right: 6px;
+    border-radius: 5px;
+    border: none;
+    color: #fff;
+    background-color: #000;
+    background: linear-gradient(#343434 30%, #000 100%);
+    cursor: pointer;
+}
+input[type=button].entity-list-menutitle:enabled:hover {
+    background: linear-gradient(#000, #000);
+    border: none;
+}
+input[type=button].entity-list-menutitle:active {
+    background: linear-gradient(#343434, #343434);
+}
+input[type=button].entity-list-menutitle:disabled {
+    color: #252525;
+    background: linear-gradient(#575757 30%, #252525 100%);
+}
+input[type=button].entity-list-menutitle[pressed=pressed] {
+    color: #00b4ef;
+}
+input[type=button].entity-list-menutitle:focus {
+  outline: none;
+  color: #000000;
+  background: linear-gradient(#c0c0c0, #c0c0c0);
+  border-radius: 5px 5px 0px 0px;
 }
 .icon-input-radius input {
    position: relative;
--- a/tools/qt-builder/patches/win-qtwebengine.diff
+++ b/tools/qt-builder/patches/win-qtwebengine.diff
@ -0,0 +1,67 @@
+From 138a7203f16cf356e9d4dac697920a22437014b0 Mon Sep 17 00:00:00 2001
+From: Peter Varga <pvarga@inf.u-szeged.hu>
+Date: Fri, 13 Nov 2020 11:09:23 +0100
+Subject: [PATCH] Fix build with msvc2019 16.8.0
+
+Fixes: QTBUG-88708
+Change-Id: I3554ceec0437801b4861f68edd504d01fc01cf93
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/mathutil.cpp b/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/mathutil.cpp
+index 306cde1..d4f1034 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/mathutil.cpp
+++ b/qtwebengine/src/3rdparty/chromium/third_party/angle/src/common/mathutil.cpp
+@@ -72,11 +72,11 @@
+     const RGB9E5Data *inputData = reinterpret_cast<const RGB9E5Data *>(&input);
+ 
+     *red =
+-        inputData->R * pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
+        inputData->R * (float)pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
+     *green =
+-        inputData->G * pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
+        inputData->G * (float)pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
+     *blue =
+-        inputData->B * pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
+        inputData->B * (float)pow(2.0f, (int)inputData->E - g_sharedexp_bias - g_sharedexp_mantissabits);
+ }
+ 
+ }  // namespace gl
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h
+index 78c316e..136c796 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h
+++ b/qtwebengine/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/lab_color_space.h
+@@ -130,7 +130,7 @@
+   // https://en.wikipedia.org/wiki/CIELAB_color_space#Forward_transformation.
+   FloatPoint3D toXYZ(const FloatPoint3D& lab) const {
+     auto invf = [](float x) {
+-      return x > kSigma ? pow(x, 3) : 3 * kSigma2 * (x - 4.0f / 29.0f);
+      return x > kSigma ? (float)pow(x, 3) : 3 * kSigma2 * (x - 4.0f / 29.0f);
+     };
+ 
+     FloatPoint3D v = {clamp(lab.X(), 0.0f, 100.0f),
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/timestamped_trace_piece.h b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/timestamped_trace_piece.h
+index 02363d0..8860287 100644
+--- a/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/timestamped_trace_piece.h
+++ b/qtwebengine/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/timestamped_trace_piece.h
+@@ -198,6 +198,20 @@
+     return *this;
+   }
+ 
+#if PERFETTO_BUILDFLAG(PERFETTO_COMPILER_MSVC)
+  TimestampedTracePiece& operator=(TimestampedTracePiece&& ttp) const
+  {
+    if (this != &ttp) {
+      // First invoke the destructor and then invoke the move constructor
+      // inline via placement-new to implement move-assignment.
+      this->~TimestampedTracePiece();
+      new (const_cast<TimestampedTracePiece*>(this)) TimestampedTracePiece(std::move(ttp));
+    }
+
+    return const_cast<TimestampedTracePiece&>(*this);
+  }
+#endif  // PERFETTO_BUILDFLAG(PERFETTO_COMPILER_MSVC)
+
+   ~TimestampedTracePiece() {
+     switch (type) {
+       case Type::kInvalid:
--- a/tools/qt-builder/qt5vars.bat
+++ b/tools/qt-builder/qt5vars.bat
@ -1,9 +1,9 @@
@echo off

-REM Set up \Microsoft Visual Studio 2017, where <arch> is \c amd64, \c x86, etc.
-CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+REM Set up \Microsoft Visual Studio 2019, where <arch> is \c amd64, \c x86, etc.
+CALL "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64

-REM Edit this location to point to the source code of Qt
+REM Edit the following line to point to the drive and path of the Qt source code
 SET _ROOT=..\qt5

 SET PATH=%_ROOT%\qtbase\bin;%_ROOT%\gnuwin32\bin;%PATH%