Merge remote-tracking branch 'overte/master' into master_to_protocol_changes2

.github/workflows/linux_server_build.yml

@@ -10,8 +10,6 @@ on:
   pull_request:
     types: [opened, synchronize, reopened, labeled]
   push:
-    branches:
-      - master
     tags:
       # Release tags. E.g. 2024.06.1
       # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
@@ -28,8 +26,8 @@ env:
 
 jobs:
   build:
-    # Only run master or tagged builds, or PRs if labeled as "server"
-    if: contains( github.event.pull_request.labels.*.name, 'server') || github.event_name != 'pull_request'
+    # Only run master or tagged builds, or PRs when labeled as "server"
+    if: github.event.label.name == 'server'|| github.event_name != 'pull_request'
     name: "${{matrix.os}}, ${{matrix.arch}}"
     strategy:
       matrix:
@@ -95,12 +93,12 @@ jobs:
             runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
 
           - os: fedora-40
-            image: docker.io/overte/overte-server-build:0.1.4-fedora-39-amd64
+            image: docker.io/overte/overte-server-build:0.1.4-fedora-40-amd64
             arch: amd64
             runner: [self_hosted, type-cx52, image-x86-app-docker-ce]
 
           - os: fedora-40
-            image: docker.io/overte/overte-server-build:0.1.4-fedora-39-aarch64
+            image: docker.io/overte/overte-server-build:0.1.4-fedora-40-aarch64
             arch: aarch64
             runner: [self_hosted, type-cax41, image-arm-app-docker-ce]
 
@@ -134,6 +132,8 @@ jobs:
           echo "GIT_COMMIT_SHORT=`echo ${{ github.sha }} | cut -c1-7`" >> $GITHUB_ENV
         fi
 
+        echo "REFNAME=${{ github.ref_name }}" >> $GITHUB_ENV
+
         echo "JOB_NAME=${{matrix.os}}, ${{matrix.arch}}" >> $GITHUB_ENV
 
         echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV
@@ -186,7 +186,8 @@ jobs:
           echo "RELEASE_NUMBER=${{ github.run_number }}" >> $GITHUB_ENV
         else # tagged
           echo "DEBVERSION=${{ github.ref_name }}-$GIT_COMMIT_SHORT-${{ matrix.os }}" >> $GITHUB_ENV
-          echo "RPMVERSION=${{ github.ref_name }}.$GIT_COMMIT_SHORT" >> $GITHUB_ENV
+          # We remove all dash characters from RPM versions, because rpmbuild doesn't allow dashes in version numbers.
+          echo "RPMVERSION=${REFNAME//-}.$GIT_COMMIT_SHORT" >> $GITHUB_ENV
         fi
 
         if [ "${{ github.ref_type }}" == "tag" ]; then  # tagged
@@ -201,15 +202,13 @@ jobs:
 
         echo "BUILD_NUMBER=$GIT_COMMIT_SHORT" >> $GITHUB_ENV
 
-        if [ -z "$CMAKE_BACKTRACE_URL" ]; then
-          if [ "${{ github.ref_type }}" == "tag" ]; then
-            export CMAKE_BACKTRACE_URL="${{ secrets.SENTRY_MINIDUMP_ENDPOINT }}"
-            export CMAKE_BACKTRACE_TOKEN="${{ github.ref_name }}_${{ matrix.os }}_${{ github.sha }}"
-          else
-            # We're building a PR, default to the PR endpoint
-            export CMAKE_BACKTRACE_URL="https://o4504831972343808.ingest.sentry.io/api/4504832427950080/minidump/?sentry_key=f511de295975461b8f92a36f4a4a4f32"
-            export CMAKE_BACKTRACE_TOKEN="server_pr_${{ github.event.number }}_${{ github.sha }}"
-          fi
+        if [ "${{ github.ref_type }}" == "tag" ]; then
+          export CMAKE_BACKTRACE_URL="${{ secrets.SENTRY_MINIDUMP_ENDPOINT }}"
+          export CMAKE_BACKTRACE_TOKEN="${{ github.ref_name }}_${{ matrix.os }}_${{ github.sha }}"
+        else
+          # We're building a PR, default to the PR endpoint
+          export CMAKE_BACKTRACE_URL="https://o4504831972343808.ingest.sentry.io/api/4504832427950080/minidump/?sentry_key=f511de295975461b8f92a36f4a4a4f32"
+          export CMAKE_BACKTRACE_TOKEN="server_pr_${{ github.event.number }}_${{ github.sha }}"
         fi
 
     - name: Configure Build Environment 3

.github/workflows/master_build.yml

@@ -244,14 +244,12 @@ jobs:
       working-directory: ${{runner.workspace}}/build
       run: cat ./_CPack_Packages/win64/NSIS/NSISOutput.log
 
-    - name: Upload artifact
-      if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS') || matrix.build_type == 'android'  # Automatic Linux packaging is not implemented
-      shell: bash
-      working-directory: ${{runner.workspace}}/build
-      env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.s3_access_key_id }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.s3_secret_access_key }}
-      run: $PYTHON_EXEC $GITHUB_WORKSPACE/tools/ci-scripts/upload.py
+    - name: Upload artifact to GitHub
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ env.ARTIFACT_PATTERN }}
+        path: ./build/${{ env.ARTIFACT_PATTERN }}
+        if-no-files-found: error
 
     #- name: Archive symbols
     #  if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS')

.github/workflows/release_build.yml

@@ -0,0 +1,212 @@
+# Copyright 2013-2019 High Fidelity, Inc.
+# Copyright 2020-2022 Vircadia contributors
+# Copyright 2021-2024 Overte e.V.
+# SPDX-License-Identifier: Apache-2.0
+
+name: Windows Release Build
+
+on:
+  push:
+    tags:
+      # Release tags. E.g. 2024.06.1
+      # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
+      - "[0-9][0-9][0-9][0-9].[0-9][0-9].**"
+
+env:
+  APP_NAME: interface
+  BUILD_TYPE: Release
+  CI_BUILD: Github
+  GIT_COMMIT: ${{ github.sha }}
+  PRODUCTION_BUILD: true
+  RELEASE_TYPE: PRODUCTION
+  RELEASE_NUMBER: ${{ github.ref_name }}
+  STABLE_BUILD: 1
+  UPLOAD_BUCKET: overte-public
+  UPLOAD_REGION: fra1
+  UPLOAD_ENDPOINT: "https://fra1.digitaloceanspaces.com"
+  CMAKE_BACKTRACE_URL: ${{ secrets.SENTRY_MINIDUMP_ENDPOINT }}
+  CMAKE_BACKTRACE_TOKEN: ${{ github.ref_name }}_Windows_${{ github.sha }}
+  # Disable VCPKG caching to save time.
+  VCPKG_FEATURE_FLAGS: -binarycaching
+
+  # WIN-specific variables
+  PreferredToolArchitecture: X64
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        include:
+          - os: windows-2019
+            build_type: full
+      fail-fast: false
+    runs-on: ${{matrix.os}}
+    steps:
+    - name: Configure build environment 1
+      shell: bash
+      id: buildenv1
+      run: |
+
+        echo "GIT_COMMIT_SHORT=`echo ${{ github.sha }} | cut -c1-7`" >> $GITHUB_ENV
+
+        if [[ "${{ github.ref_name }}" == *"rc"* ]]; then  # release candidate
+            # The uploader already creates a subfolder for each RELEASE_NUMBER.
+            echo "UPLOAD_PREFIX=build/overte/release-candidate/" >> $GITHUB_ENV
+        else  # release
+            echo "UPLOAD_PREFIX=build/overte/release/" >> $GITHUB_ENV
+        fi
+
+        echo ::set-output name=github_sha_short::`echo $GIT_COMMIT | cut -c1-7`
+        echo "JOB_NAME=${{matrix.os}}, ${{matrix.build_type}}" >> $GITHUB_ENV
+        echo "APP_TARGET_NAME=$APP_NAME" >> $GITHUB_ENV
+
+        echo "PYTHON_EXEC=python" >> $GITHUB_ENV
+        echo "ZIP_COMMAND=7z" >> $GITHUB_ENV
+        echo "ZIP_ARGS=a" >> $GITHUB_ENV
+        echo "INSTALLER_EXT=exe" >> $GITHUB_ENV
+        echo "CMAKE_EXTRA=-A x64" >> $GITHUB_ENV
+        echo "SYMBOL_REGEX=\(exe\|dll\|pdb\)" >> $GITHUB_ENV
+        echo "SYMBOLS_ARCHIVE=$RELEASE_NUMBER-${{ github.sha }}-win-symbols.zip" >> $GITHUB_ENV
+        # echo "HF_PFX_PASSPHRASE=${{secrets.pfx_key}}" >> $GITHUB_ENV
+        # echo "HF_PFX_FILE=${{runner.workspace}}\build\codesign.pfx" >> $GITHUB_ENV
+
+    # Configuration is broken into two steps because you can't set an env var and also reference it in the same step
+    - name: Configure build environment 2
+      shell: bash
+      run: |
+
+        echo "BUILD_NUMBER=$GIT_COMMIT_SHORT" >> $GITHUB_ENV
+        echo "ARTIFACT_PATTERN=Overte-$RELEASE_NUMBER.$INSTALLER_EXT" >> $GITHUB_ENV
+        echo "CLIENT_ONLY=FALSE" >> $GITHUB_ENV
+
+    - uses: actions/checkout@v4
+      with:
+        submodules: false
+        fetch-depth: 1
+
+    - name: Override NSIS
+      shell: pwsh
+      if: startsWith(matrix.os, 'windows')
+      run: choco install nsis --allow-downgrade --version=3.06.1
+
+    - name: Install Python modules
+      if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS')
+      shell: bash
+      run: $PYTHON_EXEC -m pip install boto3 PyGithub
+
+    - name: Create build environment
+      shell: bash
+      run: cmake -E make_directory "${{runner.workspace}}/build"
+
+    - name: Configure CMake
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DVCPKG_BUILD_TYPE=release -DCLIENT_ONLY:BOOLEAN=$CLIENT_ONLY -DBYPASS_SIGNING:BOOLEAN=TRUE $CMAKE_EXTRA
+
+    - name: Build application
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: cmake --build . --config $BUILD_TYPE --target $APP_TARGET_NAME $CMAKE_BUILD_EXTRA
+
+    - name: Build domain server
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: cmake --build . --config $BUILD_TYPE --target domain-server $CMAKE_BUILD_EXTRA
+
+    - name: Build assignment client
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: cmake --build . --config $BUILD_TYPE --target assignment-client $CMAKE_BUILD_EXTRA
+
+    - name: Build console
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: cmake --build . --config $BUILD_TYPE --target packaged-server-console $CMAKE_BUILD_EXTRA
+
+    - name: Build installer
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: |
+        echo "Retry code from https://unix.stackexchange.com/a/137639"
+        function fail {
+          echo $1 >&2
+          exit 1
+        }
+        function retry {
+          local n=1
+          local max=5
+          local delay=15
+          while true; do
+            "$@" && break || {
+              if [[ $n -lt $max ]]; then
+                ((n++))
+                echo "Command failed. Attempt $n/$max:"
+                sleep $delay;
+              else
+                fail "The command has failed after $n attempts."
+              fi
+            }
+          done
+        }
+        retry cmake --build . --config $BUILD_TYPE --target package $CMAKE_BUILD_EXTRA
+
+    #- name: Sign installer (Windows)
+    #  if: startsWith(matrix.os, 'windows')
+    #  shell: powershell
+    #  working-directory: C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64
+    #  run: .\signtool.exe sign /fd sha256 /f ${{runner.workspace}}\build\codesign.pfx /p ${{secrets.pfx_key}} /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp /td SHA256 ${{runner.workspace}}\build\${env:ARTIFACT_PATTERN}
+
+    - name: Output system stats
+      if: ${{ always() }}
+      working-directory: ${{runner.workspace}}/build
+      shell: bash
+      run: |
+        echo "Disk usage:"
+        df -h
+
+    - name: Output installer logs
+      if: failure() && startsWith(matrix.os, 'windows')
+      shell: bash
+      working-directory: ${{runner.workspace}}/build
+      run: cat ./_CPack_Packages/win64/NSIS/NSISOutput.log
+
+    - name: Upload artifact to S3
+      shell: bash
+      working-directory: ${{runner.workspace}}/build
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.s3_access_key_id }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.s3_secret_access_key }}
+      run: $PYTHON_EXEC $GITHUB_WORKSPACE/tools/ci-scripts/upload.py
+
+    - name: Upload artifact to GitHub
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ env.ARTIFACT_PATTERN }}
+        path: ${{runner.workspace}}/build/${{ env.ARTIFACT_PATTERN }}
+        if-no-files-found: error
+
+    - name: Archive symbols
+      if: startsWith(matrix.os, 'windows') || startsWith(matrix.os, 'macOS')
+      working-directory: ${{runner.workspace}}
+      shell: bash
+      run: |
+        SYMBOLS_TEMP="symbols-temp"
+        mkdir $SYMBOLS_TEMP
+        find "./build" -regex ".*\.$SYMBOL_REGEX" -exec cp -r {} $SYMBOLS_TEMP \;
+        cd $SYMBOLS_TEMP
+        $ZIP_COMMAND $ZIP_ARGS ../$SYMBOLS_ARCHIVE .
+
+    - name: Upload debug symbols to GitHub
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ env.SYMBOLS_ARCHIVE }}
+        path: ${{runner.workspace}}/${{ env.SYMBOLS_ARCHIVE }}
+        if-no-files-found: error
+
+    - name: Clear Working Directories
+      if: contains(matrix.runner, 'linux_aarch64')
+      shell: bash
+      run: |
+        rm -rf ./*
+        rm -rf ~/overte-files
+        rm -rf ~/.cache

BUILD.md

@@ -111,10 +111,7 @@ CMAKE_BACKTRACE_TOKEN
 
 // The release version, e.g., 2021.3.2.
 RELEASE_NUMBER
-// The release name, e.g., Eos.
-RELEASE_NAME
 // The build commit, e.g., use a Git hash for the most recent commit in the branch - fd6973b.
-
 BUILD_NUMBER
 
 // The type of release.

CHANGELOG.md

@@ -12,14 +12,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 This project does **not** adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-<!-- ## [Unreleased] 2023.07.22 -->
-<!-- ## [2023.07.1] 2023.07.22 -->
+<!-- ## [Unreleased] 2023.07.2 -->
 
-<!--
-### Misc
-- Updated the Unity Avatar Exporter and added Linux support
-- Added Linux support to the Unity Avatar Exporter
--->
+<!-- ## [2023.07.1] 2023.07.2 -->
+
+<!-- ## [2023.06.1] 2023.06.12 -->
+
+## [2023.11.1] 2023.11.24
 
 ### Fixes
 - Fixed color conversion for glTF material colors (PR307)
@@ -36,14 +35,37 @@ This project does **not** adhere to [Semantic Versioning](https://semver.org/spe
 - Hugely improved Create app performance in Domains with many entities (PR498)
 - Fixed an issue that could cause laser pointers to rapidly flash (PR495)
 - Fixed the connection failure dialog mentioning "Explore" instead of "Places" (PR515)
+- Fixed broken documentation and code-completion of the "Script" API namespace (PR450)
+- Fixed warning about ForceHtmlAudioOutputDeviceUpdate (PR473)
+- Fixed Shield bubble dimensions (PR510)
+- Fixed Places app connecting to IP instead of Place name (PR522)
+- Fixed Interface scripts failing to shut down (PR521)
+- Fixed deadlock related to entity script engines (PR540)
+- Fixed leave and join messages in Chat (PR573)
+- Fixed crash when closing script log window (PR520)
+- Fixed some API documentation (PR598)
+- Fixed some missing assets, notably the sound when successfully shaking hands (PR590)
+- Fixed multiple script engine reload and shutdown related crashes (PR574)
+- Fixed flow bones on avatars with scale ≠ 100 (PR604)
+- Fixed curved flow bone chains (PR604)
+- Fixed invisible cursor (PR629)
+- Fixed loading avatars from URLs containing" =" such as Dropbox (PR634)
+- Fixed MicBar type error spam on Windows (PR669)
+- Fixed grabbing local entities in VR (PR671)
+- Fixed memory leak in entity server and improved its performance (PR690)
+- Fixed chat bar appearing in VR (PR672)
+- Fixed issues with third-party apps such as ALVR, Virtual Desktop and Streaming Assistant (PR700,PR714)
+- Fixed custom graphics settings not being saved (PR706)
+- Fixed Script.require behavior  (PR697)
+- Fixed Entities.setLocalJointRotation not updating (PR708)
+- Improved client performance by moving squeezeHands.js to separate thread (PR737)
 
 ### Changes
-- Replaced Vircadia Metaverse Server with a testing server as federation default (PR330)
 - An empty audio device list now throws a warning instead of just a debug message (PR347)
 - Increased the maximum log file size from 512 kiB to 10 MiB (PR342,PR513)
 - Decreased the amount of retained log files from 100 to 20 (PR342)
 - Pressing the Return key with the the address/search bar in the Places App selected now navigates you to that address (PR403)
-- Replaced QT Script with V8 scripting engine (PR185,PR507,PR519)
+- Replaced QT Script with V8 scripting engine (PR185,PR507,PR519,PR566)
 	This is a huge change under the hood, which ended up fixing a lot of issues.
 	Since the new scripting engine does not behave exactly the same as the old one,
 	some scripts might need fixing. The new scripting engine is especially picky when it comes to undefined behaviour.
@@ -54,6 +76,14 @@ This project does **not** adhere to [Semantic Versioning](https://semver.org/spe
 	It will also ask once in case of a non-stable build.
 - Changed the VR overlay to only recenter when moving (PR478)
 - Added a workaround that prevents most users from needing to press down on the thumbstick to move (PR481,PR512)
+- Lowered inertia while moving (PR542)
+- Lowered control delays in VR (PR542)
+	Configurable under Settings → Controls → Calibration
+- Changed Home button in Places app to lead to the tutorial by default (PR560)
+- Rewritten tutorial wizard in QML (PR645,PR737)
+- Disabled Oculus VR plugin by default (PR700,PR714)
+- Changed gravity constant to be more realistic (PR729)
+	This fixes being catapulted into the air when moving up a slope. It also improves taking off, flying, and general movement.
 
 ### Additions
 - Added option to graphics menu for choosing which screen to use for full screen mode (PR302)
@@ -62,12 +92,28 @@ This project does **not** adhere to [Semantic Versioning](https://semver.org/spe
 	This allows typing in languages like Japanese or Chinese that make use of an IME.
 - Added vertical Field Of View setting to graphics menu (PR465)
 - Added crash reporting to the Domain server, Assignment client, and Oven (PR482)
+- Added JavaScript profiling API (PR564)
+- Added require() to global scope in scipting API (PR585)
+- Added support for HDR lightmaps (PR611)
+- Added mouse look (PR607,PR624,PR627,PR662)
+- Dropbox URLs to assets now get rewritten to DDL URLs (PR636)
+- Added development script to configure avatar smoothing (PR579)
+- Added distance based LOD (PR663)
+	Configurable under Settings → Graphics → Target frame rate
+- Added support for QML inside web-entities (PR645)
+	QML files must be whitelisted in the settings.
+- Added Discord rich presence support (PR686,PR723)
+- Added command line arguments to ICE server (PR722)
 
 ### Removals
 - Removed outdated Inventory and Marketplace options from Wearables UI (PR303)
 - Removed outdated Beacon system (PR327)
 - Removed long deprecated styles-uit and controls-uit QML modules (PR380)
 - Removed outdated Marketplace and Wallet code (PR381,PR477,PR487)
+- Removed Appreciate app from defaults (PR563)
+- Removed debug messages from Places app (PR561)
+- Removed JQuery dependency from Emote app (PR560)
+- Removed File API (PR691)
 
 ### Build system
 - Fixed error in configuration step on some rolling release Linux distributions (PR301)
@@ -78,12 +124,21 @@ This project does **not** adhere to [Semantic Versioning](https://semver.org/spe
 - Updated TBB dependency from version 2019_U8-1 to 2021.5.0 (PR412)
 - Fixed NVTT compilation on Visual Studio 2022 (PR374)
 - Disabled libOVR on MSVC 2022 (PR430)
-- Added Qt 5.15.9 package for aarch64 Ubuntu 20.04 (PR409)
 - Fixed build error on aarch64 (PR409)
-- Replaced QT Script with V8/libnode (PR185,PR409,PR443)
+- Replaced QT Script with V8/libnode (PR185,PR409,PR443,PR535,PR566)
 - Updated Qt on Windows to 5.15.10 with KDE patches (PR448)
 - Updated included OpenSSL to 3.0.5 (PR448)
+- Updated OpenSSL Windwos dependency (PR448)
+- Changed libnode dependency to be built from source (PR452)
+- Disabled Crashpad on aarch64 Linux by default (PR526)
+- Added discord-rpc dependency (PR686)
+- Fixed building with memory debugging (PR704)
+- Updated VCPKG on Windows to version 2023.10.19 (PR730)
 
+### Security
+- Updated Qt packages to fix CVE-2023-4863 (PR630,PR631)
+- Updated Qt packages to fix CVE-2023-5217(PR652,PR653)
+- Limited audio recording location (PR691)
 
 
 ## [2022.12.1] 2022.12.24

INSTALLER.md

@@ -106,7 +106,7 @@ For code signing to work, you will need to set the `HF_PFX_FILE` and `HF_PFX_PAS
 1. Ensure you have all the prerequisites fulfilled from the [MacOS Build Guide](BUILD_OSX.md).
 2. Perform a clean CMake in your build folder. e.g.
     ```bash
-    BUILD_GLOBAL_SERVICES=STABLE USE_STABLE_GLOBAL_SERVICES=1 RELEASE_BUILD=PRODUCTION BUILD_NUMBER="Insert Build Identifier here e.g. short hash of your last Git commit" RELEASE_NAME="Insert Release Name Here" STABLE_BUILD=1 PRODUCTION_BUILD=1 RELEASE_NUMBER="Insert Release Version Here e.g. 1.1.0" RELEASE_TYPE=PRODUCTION cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" -DCLIENT_ONLY=1 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOSX_SDK=10.12  ..
+    BUILD_GLOBAL_SERVICES=STABLE USE_STABLE_GLOBAL_SERVICES=1 RELEASE_BUILD=PRODUCTION BUILD_NUMBER="Insert Build Identifier here e.g. short hash of your last Git commit" STABLE_BUILD=1 PRODUCTION_BUILD=1 RELEASE_NUMBER="Insert Release Version Here e.g. 1.1.0" RELEASE_TYPE=PRODUCTION cmake -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" -DCLIENT_ONLY=1 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOSX_SDK=10.12  ..
     ```
 3. Pick a method to build and package your release.
 

LICENSE

@@ -1,6 +1,6 @@
 Copyright (c) 2013-2019, High Fidelity, Inc.
 Copyright (c) 2019-2021, Vircadia contributors.
-Copyright (c) 2022-2023, Overte e.V.
+Copyright (c) 2022-2024, Overte e.V.
 All rights reserved.
 https://overte.org
 

cmake/macros/GenerateInstallers.cmake

@@ -5,7 +5,7 @@
 #  Created by Leonardo Murillo on 12/16/2015.
 #  Copyright 2015 High Fidelity, Inc.
 #  Copyright 2021 Vircadia contributors.
-#  Copyright 2022 Overte e.V.
+#  Copyright 2022-2024 Overte e.V.
 #
 #  Distributed under the Apache License, Version 2.0.
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -33,8 +33,7 @@ macro(GENERATE_INSTALLERS)
   set(CPACK_PACKAGE_NAME ${_DISPLAY_NAME})
   set(CPACK_PACKAGE_VENDOR "Overte")
   set(CPACK_PACKAGE_VERSION ${BUILD_VERSION})
-  # There is some sort of bug which adds a "-" between the BUILD_VERSION and the RELEASE_NAME.
-  set(CPACK_PACKAGE_FILE_NAME "Overte${_PACKAGE_NAME_EXTRA}-${BUILD_VERSION}${RELEASE_NAME}")
+  set(CPACK_PACKAGE_FILE_NAME "Overte${_PACKAGE_NAME_EXTRA}-${BUILD_VERSION}")
   set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})
   set(CPACK_NSIS_PACKAGE_NAME ${_DISPLAY_NAME})
   set(CPACK_NSIS_COMPRESSOR "LZMA")

cmake/macros/SetPackagingParameters.cmake

@@ -23,7 +23,6 @@ macro(SET_PACKAGING_PARAMETERS)
 
   set_from_env(RELEASE_TYPE RELEASE_TYPE "DEV")
   set_from_env(RELEASE_NUMBER RELEASE_NUMBER "")
-  set_from_env(RELEASE_NAME RELEASE_NAME "")
   set_from_env(STABLE_BUILD STABLE_BUILD 0)
 
   set_from_env(PRELOADED_STARTUP_LOCATION PRELOADED_STARTUP_LOCATION "")

cmake/ports/webrtc/README.md

@@ -180,6 +180,8 @@ Also use the path in the `gn gen` commands, below, making sure to escape `\`s as
 
 Use a VS2019 developer command prompt in the *src* directory.
 
+If it complains about the debugger being missing from your Windows SDK, modify your Windows "Software Development Kit" in your installed programs (See: https://stackoverflow.com/questions/46237620/how-to-install-debugging-tools-with-visual-studio-2017-installer).
+
 Create a release build of the WebRTC library:
 - `gn gen --ide=vs2019 out\Release --filters=//:webrtc "--args=is_debug=false is_clang=false use_custom_libcxx=false libcxx_is_shared=true symbol_level=2 use_lld=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false proprietary_codecs=true rtc_use_h264=true enable_libaom=false rtc_enable_protobuf=false rtc_build_ssl=false rtc_ssl_root=\"<path>\""`
 - `ninja -C out\Release`

cmake/templates/BuildInfo.h.in

@@ -25,7 +25,6 @@ namespace BuildInfo {
     const QString MODIFIED_ORGANIZATION = "@BUILD_ORGANIZATION@";
     const QString ORGANIZATION_DOMAIN = "overte.org";
     const QString VERSION = "@BUILD_VERSION@";
-    const QString RELEASE_NAME = "@RELEASE_NAME@";
     const QString BUILD_NUMBER = "@BUILD_NUMBER@";
     const QString BUILD_GLOBAL_SERVICES = "@BUILD_GLOBAL_SERVICES@";
     const QString BUILD_TIME = "@BUILD_TIME@";

cmake/templates/NSIS.template.in

@@ -1207,53 +1207,8 @@ Section "-Core installation"
   ; 2016-02-25 - The following delete blocks are temporary and can be removed once users who had the initial installer have updated
   ; 2019-09-10 - (3 and a half years later) Sure they are buddy.  Sure they are.
 
-  ; MessageBox MB_OK|MB_ICONEXCLAMATION "installer type is @INSTALLER_TYPE@"
-
-  ;Delete any server executables that might have been installed by bad versions of the client-only installer, but ONLY if we are a client-only installer
-  ${If} "@INSTALLER_TYPE@" == "client_only"
-    ; MessageBox MB_OK|MB_ICONEXCLAMATION "trying to delete server binaries"
-    Delete "$INSTDIR\assignment-client.exe"
-    Delete "$INSTDIR\domain-server.exe"
-  ${EndIf}
-
-  ;Delete any server-console files installed before it was placed in sub-folder
-  Delete "$INSTDIR\server-console.exe"
-  RMDir /r "$INSTDIR\locales"
-  RMDir /r "$INSTDIR\resources\app"
-  RMDir /r "$INSTDIR\client"
-  Delete "$INSTDIR\resources\atom.asar"
-  Delete "$INSTDIR\build-info.json"
-  Delete "$INSTDIR\content_resources_200_percent.pak"
-  Delete "$INSTDIR\content_shell.pak"
-  Delete "$INSTDIR\LICENSE"
-  Delete "$INSTDIR\LICENSES.chromium.html"
-  Delete "$INSTDIR\natives_blob.bin"
-  Delete "$INSTDIR\node.dll"
-  Delete "$INSTDIR\pdf.dll"
-  Delete "$INSTDIR\snapshot_blob.bin"
-  Delete "$INSTDIR\ui_resources_200_percent.pak"
-  Delete "$INSTDIR\vccorlib120.dll"
-  Delete "$INSTDIR\version"
-  Delete "$INSTDIR\xinput1_3.dll"
-
-  ; Delete old desktop shortcuts before they were renamed during Sandbox rename
-  Delete "$DESKTOP\@PRE_SANDBOX_INTERFACE_SHORTCUT_NAME@.lnk"
-  Delete "$DESKTOP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk"
-
-  ; Delete old Start Menu shortcuts before Sandbox rename
-  Delete "$SMPROGRAMS\$STARTMENU_FOLDER\@PRE_SANDBOX_INTERFACE_SHORTCUT_NAME@.lnk"
-  Delete "$SMPROGRAMS\$STARTMENU_FOLDER\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk"
-
-  ; Delete old startup item for Server Console before Sandbox rename
-  SetShellVarContext current
-  Delete "$SMSTARTUP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk"
-  SetShellVarContext all
-
-  ; Rename the incorrectly cased Raleway font
-  Rename "$INSTDIR\resources\qml\styles-uit\RalewaySemibold.qml" "$INSTDIR\resources\qml\styles-uit\RalewaySemiBold.qml"
-
-  ; Remove the Old Interface directory and vcredist_x64.exe (from installs prior to Server Console)
-  RMDir /r "$INSTDIR\Interface"
+  ; Delete old hifiNeuron.dll, since we dropped support for it and it causes a crash on startup.
+  Delete "$INSTDIR\plugins\hifiNeuron.dll"
 
   ;Use the entire tree produced by the INSTALL target.  Keep the
   ;list of directories here in sync with the RMDir commands below.

hifi_qt.py

@@ -157,7 +157,7 @@ endif()
                 u_major = int( distro.major_version() or '0' )
                 if distro.id() == 'ubuntu' or distro.id() == 'linuxmint':
                     if (distro.id() == 'ubuntu' and u_major == 20) or distro.id() == 'linuxmint' and u_major == 20:
-                        self.qtUrl = self.assets_url + '/dependencies/qt5/qt5-install-5.15.10-2023.10.01-kde_d2122ee587cceb5b2f4130b7074f86db9aca570e-ubuntu-20.04-amd64.tar.xz'
+                        self.qtUrl = self.assets_url + '/dependencies/qt5/qt5-install-5.15.14-2024.06.17-kde_570f5b2105df1ea052bec0d6dbf8a00137274371-ubuntu-20.04-amd64.tar.xz'
                     elif (distro.id() == 'ubuntu' and u_major > 20) or (distro.id() == 'linuxmint' and u_major > 20):
                         self.__no_qt_package_error()
                     else:

hifi_vcpkg.py

@@ -101,7 +101,7 @@ endif()
         if 'Windows' == system:
             self.exe = os.path.join(self.path, 'vcpkg.exe')
             self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.bat'), '-disableMetrics' ]
-            self.vcpkgUrl = self.assets_url + '/dependencies/vcpkg/vcpkg-windows_x86_64_2023.10.19.zip'
+            self.vcpkgUrl = self.assets_url + '/dependencies/vcpkg/vcpkg-windows_x86_64_2024.06.15.zip'
             self.vcpkgHash = 'f335234f0722c15376fb10747f558c18c83a3e1e3b6565cf0dabfb18c9625a99234d054457fd05190c0ecd7a59ca43305bc93b50dbf764a4e1f567a15168d051'
             self.hostTriplet = 'x64-windows'
             if usePrebuilt:

interface/resources/qml/LoginDialog/LoggingInBody.qml

@@ -4,6 +4,7 @@
 //  Created by Wayne Chen on 10/18/18
 //  Copyright 2018 High Fidelity, Inc.
 //  Copyright 2020 Vircadia contributors.
+//  Copyright 2024 Overte e.V.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -377,13 +378,13 @@ Item {
             }
         }
 
-        function onHandleLoginCompleted(): {
+        function onHandleLoginCompleted() {
             console.log("Login Succeeded");
             loggingInBody.loadingSuccess();
         }
 
         function onHandleLoginFailed() {
-            console.log("Login Failed")
+            console.log("Login Failed");
             loggingInSpinner.visible = false;
             loggingInGlyph.visible = false;
             var errorString = "";

interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml

@@ -4,6 +4,7 @@
 //  Created by David Rowe on 18 Apr 2017
 //  Copyright 2017 High Fidelity, Inc.
 //  Copyright 2020 Vircadia contributors.
+//  Copyright 2024 Overte e.V.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -39,7 +40,7 @@ Rectangle {
                 color: "white"
             }
             RalewayRegular {
-                text: "Build " + About.buildVersion + " " + About.releaseName
+                text: "Build " + About.buildVersion
                 size: 16
                 color: "white"
             }

interface/src/AboutUtil.cpp

@@ -4,7 +4,6 @@
 //
 //  Created by Vlad Stelmahovsky on 15/5/2018.
 //  Copyright 2018 High Fidelity, Inc.
-//  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
@@ -43,10 +42,6 @@ QString AboutUtil::getBuildVersion() const {
     return BuildInfo::VERSION;
 }
 
-QString AboutUtil::getReleaseName() const {
-    return BuildInfo::RELEASE_NAME;
-}
-
 QString AboutUtil::getQtVersion() const {
     return qVersion();
 }

interface/src/AboutUtil.h

@@ -30,7 +30,6 @@
  *     <em>Read-only.</em>
  * @property {string} buildDate - The build date of Interface that is currently running. <em>Read-only.</em>
  * @property {string} buildVersion - The build version of Interface that is currently running. <em>Read-only.</em>
- * @property {string} releaseName - The release codename of the version that Interface is currently running. <em>Read-only.</em>
  * @property {string} qtVersion - The Qt version used in Interface that is currently running. <em>Read-only.</em>
  * @property {string} qtWebEngineVersion - The Qt WebEngine version used in Interface that is currently running. <em>Read-only.</em>
  * @property {string} qtChromiumVersion - The Qt Chromium version used in Interface that is currently running. <em>Read-only.</em>
@@ -40,7 +39,6 @@
  * print("Interface platform: " + About.platform);
  * print("Interface build date: " + About.buildDate);
  * print("Interface version: " + About.buildVersion);
- * print("Interface release name: " + About.releaseName);
  * print("Qt version: " + About.qtVersion);
  */
 
@@ -71,7 +69,6 @@ class AboutUtil : public QObject {
     Q_PROPERTY(QString platform READ getPlatformName CONSTANT)
     Q_PROPERTY(QString buildDate READ getBuildDate CONSTANT)
     Q_PROPERTY(QString buildVersion READ getBuildVersion CONSTANT)
-    Q_PROPERTY(QString releaseName READ getReleaseName CONSTANT)
     Q_PROPERTY(QString qtVersion READ getQtVersion CONSTANT)
     Q_PROPERTY(QString qtWebEngineVersion READ getQtWebEngineVersion CONSTANT)
     Q_PROPERTY(QString qtChromiumVersion READ getQtChromiumVersion CONSTANT)
@@ -83,7 +80,6 @@ public:
     QString getPlatformName() const { return "Overte"; }
     QString getBuildDate() const;
     QString getBuildVersion() const;
-    QString getReleaseName() const;
     QString getQtVersion() const;
     QString getQtWebEngineVersion() const;
     QString getQtChromiumVersion() const;

interface/src/Application.cpp

@@ -2478,7 +2478,7 @@ void Application::initialize(const QCommandLineParser &parser) {
 
     // Setup the mouse ray pick and related operators
     {
-        auto mouseRayPick = std::make_shared<RayPick>(Vectors::ZERO, Vectors::UP, PickFilter(PickScriptingInterface::getPickEntities() | PickScriptingInterface::getPickLocalEntities()), 0.0f, true);
+        auto mouseRayPick = std::make_shared<RayPick>(Vectors::ZERO, Vectors::UP, PickFilter(PickScriptingInterface::getPickEntities() | PickScriptingInterface::getPickLocalEntities()), 0.0f, 0.0f, true);
         mouseRayPick->parentTransform = std::make_shared<MouseTransformNode>();
         mouseRayPick->setJointState(PickQuery::JOINT_STATE_MOUSE);
         auto mouseRayPickID = DependencyManager::get<PickManager>()->addPick(PickQuery::Ray, mouseRayPick);
@@ -7250,10 +7250,6 @@ void Application::updateWindowTitle() const {
         + (BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable ? QString("Version") : QString("Build"))
         + " " + applicationVersion();
 
-    if (BuildInfo::RELEASE_NAME != "") {
-        buildVersion += " - " + BuildInfo::RELEASE_NAME;
-    }
-
     QString connectionStatus = isInErrorState ? " (ERROR CONNECTING)" :
         nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED)";
 
@@ -8524,6 +8520,14 @@ SharedSoundPointer Application::getSampleSound() const {
     return _sampleSound;
 }
 
+void Application::showVRKeyboardForHudUI(bool show) {
+    if (show) {
+        DependencyManager::get<Keyboard>()->setRaised(true, true);
+    } else {
+        DependencyManager::get<Keyboard>()->setRaised(false);
+    }
+}
+
 void Application::loadLODToolsDialog() {
     auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
     auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));

interface/src/Application.h

@@ -431,6 +431,16 @@ public slots:
     Q_INVOKABLE void loadAddAvatarBookmarkDialog() const;
     Q_INVOKABLE void loadAvatarBrowser() const;
     Q_INVOKABLE SharedSoundPointer getSampleSound() const;
+    /**
+     * @brief Shows/hides VR keyboard input for Overlay windows
+     *
+     * This is used by QML scripts to show and hide VR keyboard. Unlike JS API Keyboard.raised = true,
+     * with showVRKeyboardForHudUI the input is passed to the active window on the overlay first.
+     *
+     * @param show
+     * If set to true, then keyboard is shown, for false it's hidden.
+     */
+    Q_INVOKABLE void showVRKeyboardForHudUI(bool show);
 
     void showDialog(const QUrl& widgetUrl, const QUrl& tabletUrl, const QString& name) const;
 

interface/src/main.cpp

@@ -97,7 +97,7 @@ int main(int argc, const char* argv[]) {
     );
     QCommandLineOption protocolVersionOption(
         "protocolVersion",
-        "Writes the protocol version base64 signature to a file?",
+        "Writes the protocol version base64 signature to a file",
         "path"
     );
     QCommandLineOption noUpdaterOption(
@@ -275,6 +275,14 @@ int main(int argc, const char* argv[]) {
         "abortAfterInit",
         "Debug option. Aborts after initialization, right before the program starts running the event loop."
     );
+    QCommandLineOption getProtocolVersionHashOption(
+        "getProtocolVersionHash",
+        "Debug option. Returns the network protocol version MD5 hash."
+    );
+    QCommandLineOption getProtocolVersionDataOption(
+        "getProtocolVersionData",
+        "Debug option. Returns the network protocol detailed data in JSON."
+    );
 
     // "--qmljsdebugger", which appears in output from "--help-all".
     // Those below don't seem to be optional.
@@ -321,6 +329,8 @@ int main(int argc, const char* argv[]) {
     parser.addOption(abortAfterStartupOption);
     parser.addOption(abortAfterInitOption);
     parser.addOption(getPluginsOption);
+    parser.addOption(getProtocolVersionHashOption);
+    parser.addOption(getProtocolVersionDataOption);
 
 
     QString applicationPath;
@@ -455,6 +465,34 @@ int main(int argc, const char* argv[]) {
             return 1;
         }
     }
+    if (parser.isSet(getProtocolVersionHashOption)) {
+        std::cout << protocolVersionsSignatureHex().toStdString() << std::endl;
+        return 0;
+    }
+    if (parser.isSet(getProtocolVersionDataOption)) {
+        auto protocolMap = protocolVersionsSignatureMap();
+        QMetaEnum packetMetaEnum = QMetaEnum::fromType<PacketTypeEnum::Value>();
+
+        QJsonArray packetTypesList;
+        auto keyList = protocolMap.keys();
+        std::sort(keyList.begin(), keyList.end()); // Sort by numeric value
+
+        for(const auto packet : keyList) {
+            QJsonObject data;
+            int intValue = static_cast<int>(packet);
+            QString keyName = packetMetaEnum.valueToKey(intValue);
+
+            data["name"] = keyName;
+            data["value"] = intValue;
+            data["version"] = versionForPacketType(packet);
+
+            packetTypesList.append(data);
+        }
+
+        std::cout << QJsonDocument(packetTypesList).toJson().toStdString() << std::endl;
+        return 0;
+    }
+
 
     static const QString APPLICATION_CONFIG_FILENAME = "config.json";
     QDir applicationDir(applicationPath);

interface/src/raypick/LaserPointer.cpp

@@ -33,14 +33,19 @@ PickQuery::PickType LaserPointer::getType() const {
 }
 
 void LaserPointer::editRenderStatePath(const std::string& state, const QVariant& pathProps) {
-    //V8TODO pathProps are not a thing anymore
     auto renderState = std::static_pointer_cast<RenderState>(_renderStates[state]);
     if (renderState) {
         updateRenderState(renderState->getPathID(), pathProps);
-        QVariant lineWidth = pathProps.toMap()["lineWidth"];
+        QVariantMap pathPropsMap = pathProps.toMap();
+        QVariant lineWidth = pathPropsMap["lineWidth"];
         if (lineWidth.isValid()) {
             renderState->setLineWidth(lineWidth.toFloat());
         }
+
+        if (pathPropsMap.contains("linePoints")) {
+            QVariantList linePoints = pathPropsMap["linePoints"].toList();
+            renderState->setNumPoints(linePoints.length());
+        }
     }
 }
 
@@ -133,18 +138,18 @@ LaserPointer::RenderState::RenderState(const QUuid& startID, const QUuid& pathID
     StartEndRenderState(startID, endID), _pathID(pathID)
 {
     if (!getPathID().isNull()) {
-        auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
-        {
-            EntityPropertyFlags desiredProperties;
-            desiredProperties += PROP_IGNORE_PICK_INTERSECTION;
-            _pathIgnorePicks = entityScriptingInterface->getEntityPropertiesInternal(getPathID(), desiredProperties, false).getIgnorePickIntersection();
-        }
-        {
-            EntityPropertyFlags desiredProperties;
-            desiredProperties += PROP_STROKE_WIDTHS;
-            auto widths = entityScriptingInterface->getEntityPropertiesInternal(getPathID(), desiredProperties, false).getStrokeWidths();
-            _lineWidth = widths.length() == 0 ? PolyLineEntityItem::DEFAULT_LINE_WIDTH : widths[0];
-        }
+        EntityPropertyFlags desiredProperties;
+        desiredProperties += PROP_IGNORE_PICK_INTERSECTION;
+        desiredProperties += PROP_LINE_POINTS;
+        desiredProperties += PROP_STROKE_WIDTHS;
+        auto properties = DependencyManager::get<EntityScriptingInterface>()->getEntityPropertiesInternal(getPathID(), desiredProperties, false);
+
+        auto widths = properties.getStrokeWidths();
+        _lineWidth = widths.length() == 0 ? PolyLineEntityItem::DEFAULT_LINE_WIDTH : widths[0];
+
+        setNumPoints(properties.getLinePoints().length());
+
+        _pathIgnorePicks = properties.getIgnorePickIntersection();
     }
 }
 
@@ -171,28 +176,52 @@ void LaserPointer::RenderState::update(const glm::vec3& origin, const glm::vec3&
     if (!getPathID().isNull()) {
         EntityItemProperties properties;
         QVector<glm::vec3> points;
+        const size_t numPoints = getNumPoints();
         points.append(glm::vec3(0.0f));
-        points.append(end - origin);
+        const glm::vec3 endPoint = end - origin;
+        if (numPoints > 2) {
+            EntityPropertyFlags desiredProperties;
+            desiredProperties += PROP_VISIBLE;
+            auto oldProperties = DependencyManager::get<EntityScriptingInterface>()->getEntityPropertiesInternal(getPathID(), desiredProperties, false);
+
+            bool hasUnmodifiedEndPoint = false;
+            glm::vec3 unmodifiedEndPoint;
+            float directionLength = glm::length(endPoint);
+            auto rayPickResult = std::static_pointer_cast<RayPickResult>(pickResult);
+            if (rayPickResult && rayPickResult->pickVariant.contains("unmodifiedDirection")) {
+                unmodifiedEndPoint = directionLength * vec3FromVariant(rayPickResult->pickVariant["unmodifiedDirection"]);
+                hasUnmodifiedEndPoint = true;
+            }
+
+            // Segment points are evenly spaced between origin and end
+            for (size_t i = 1; i < numPoints - 1; i++) {
+                const float frac = ((float)i / (numPoints - 1));
+                if (!oldProperties.getVisible() || !_hasSetLinePoints || !hasUnmodifiedEndPoint) {
+                    points.append(frac * endPoint);
+                } else {
+                    points.append(frac * directionLength * glm::normalize(glm::mix(unmodifiedEndPoint, endPoint, frac)));
+                }
+            }
+            _hasSetLinePoints = true;
+        }
+        points.append(endPoint);
         properties.setPosition(origin);
-        properties.setRotation(glm::quat(1.0f, 0.0f ,0.0f ,0.0f));
+        properties.setRotation(glm::quat(1.0f, 0.0f, 0.0f, 0.0f));
         properties.setLinePoints(points);
         properties.setVisible(true);
         properties.setIgnorePickIntersection(doesPathIgnorePicks());
         QVector<glm::vec3> normals;
-        normals.append(glm::vec3(0.0f, 0.0f, 1.0f));
-        normals.append(glm::vec3(0.0f, 0.0f, 1.0f));
+        normals.fill(glm::vec3(0.0f, 0.0f, 1.0f), (int)numPoints);
         properties.setNormals(normals);
         QVector<float> widths;
         float width = getLineWidth() * parentScale;
-        widths.append(width);
-        widths.append(width);
+        widths.fill(width, (int)numPoints);
         properties.setStrokeWidths(widths);
         DependencyManager::get<EntityScriptingInterface>()->editEntity(getPathID(), properties);
     }
 }
 
 std::shared_ptr<StartEndRenderState> LaserPointer::buildRenderState(const QVariantMap& propMap, const QList<EntityItemProperties> &entityProperties) {
-    // FIXME: we have to keep using the Overlays interface here, because existing scripts use overlay properties to define pointers
     QUuid startID;
     if (propMap["startPropertyIndex"].isValid()) {
         int startPropertyIndex = propMap["startPropertyIndex"].toInt();
@@ -205,11 +234,11 @@ std::shared_ptr<StartEndRenderState> LaserPointer::buildRenderState(const QVaria
 
     QUuid pathID;
     if (propMap["pathPropertyIndex"].isValid()) {
-        // laser paths must be PolyLine
         int pathPropertyIndex = propMap["pathPropertyIndex"].toInt();
         if (pathPropertyIndex >= 0 && pathPropertyIndex < entityProperties.length()) {
-            //pathMap["type"].toString() == "PolyLine"
             EntityItemProperties pathProperties(entityProperties[pathPropertyIndex]);
+            // laser paths must be PolyLine
+            pathProperties.setType(EntityTypes::EntityType::PolyLine);
             pathProperties.getGrab().setGrabbable(false);
             pathID = DependencyManager::get<EntityScriptingInterface>()->addEntityInternal(pathProperties, entity::HostType::LOCAL);
         }

interface/src/raypick/LaserPointer.h

@@ -13,7 +13,7 @@
 
 #include "PathPointer.h"
 
-#include<EntityItemProperties.h>
+#include <EntityItemProperties.h>
 
 class LaserPointer : public PathPointer {
     using Parent = PathPointer;
@@ -24,21 +24,29 @@ public:
         RenderState(const QUuid& startID, const QUuid& pathID, const QUuid& endID);
 
         const QUuid& getPathID() const { return _pathID; }
-        const bool& doesPathIgnorePicks() const { return _pathIgnorePicks; }
 
         void setLineWidth(float width) { _lineWidth = width; }
         float getLineWidth() const { return _lineWidth; }
 
+        void setNumPoints(size_t numPoints) { _numPoints = std::max(numPoints, (size_t)2); }
+        size_t getNumPoints() const { return _numPoints; }
+
+        const bool& doesPathIgnorePicks() const { return _pathIgnorePicks; }
+
         void cleanup() override;
         void disable() override;
-        void update(const glm::vec3& origin, const glm::vec3& end, const glm::vec3& surfaceNormal, float parentScale, bool distanceScaleEnd, bool centerEndY,
-                    bool faceAvatar, bool followNormal, float followNormalStrength, float distance, const PickResultPointer& pickResult) override;
+        void update(const glm::vec3& origin, const glm::vec3& end, const glm::vec3& surfaceNormal, float parentScale, bool distanceScaleEnd,
+                    bool centerEndY, bool faceAvatar, bool followNormal, float followNormalStrength, float distance,
+                    const PickResultPointer& pickResult) override;
 
     private:
         QUuid _pathID;
 
-        bool _pathIgnorePicks;
-        float _lineWidth;
+        float _lineWidth { 0.0f };
+        size_t _numPoints { 0 };
+        bool _pathIgnorePicks { false };
+
+        bool _hasSetLinePoints { false };
     };
 
     LaserPointer(const QVariant& rayProps, const RenderStateMap& renderStates, const DefaultRenderStateMap& defaultRenderStates, bool hover, const PointerTriggers& triggers,
@@ -67,7 +75,6 @@ protected:
 
 private:
     static glm::vec3 findIntersection(const PickedObject& pickedObject, const glm::vec3& origin, const glm::vec3& direction);
-
 };
 
 #endif // hifi_LaserPointer_h

interface/src/raypick/ParabolaPointer.cpp

@@ -207,9 +207,11 @@ void ParabolaPointer::RenderState::editParabola(const glm::vec3& color, float al
     }
 }
 
-void ParabolaPointer::RenderState::update(const glm::vec3& origin, const glm::vec3& end, const glm::vec3& surfaceNormal, float parentScale, bool distanceScaleEnd, bool centerEndY,
-                                          bool faceAvatar, bool followNormal, float followNormalStrength, float distance, const PickResultPointer& pickResult) {
-    StartEndRenderState::update(origin, end, surfaceNormal, parentScale, distanceScaleEnd, centerEndY, faceAvatar, followNormal, followNormalStrength, distance, pickResult);
+void ParabolaPointer::RenderState::update(const glm::vec3& origin, const glm::vec3& end, const glm::vec3& surfaceNormal, float parentScale, bool distanceScaleEnd,
+                                          bool centerEndY, bool faceAvatar, bool followNormal, float followNormalStrength, float distance,
+                                          const PickResultPointer& pickResult) {
+    StartEndRenderState::update(origin, end, surfaceNormal, parentScale, distanceScaleEnd, centerEndY, faceAvatar, followNormal, followNormalStrength,
+                                distance, pickResult);
     auto parabolaPickResult = std::static_pointer_cast<ParabolaPickResult>(pickResult);
     if (parabolaPickResult && render::Item::isValidID(_pathID)) {
         render::Transaction transaction;

interface/src/raypick/PathPointer.cpp

@@ -144,13 +144,11 @@ void PathPointer::updateVisuals(const PickResultPointer& pickResult) {
     auto renderState = _renderStates.find(_currentRenderState);
     auto defaultRenderState = _defaultRenderStates.find(_currentRenderState);
     float parentScale = 1.0f;
-    //if (_scaleWithParent) {
     if (_enabled && _scaleWithParent) {
         glm::vec3 dimensions = DependencyManager::get<PickManager>()->getParentTransform(_pickUID).getScale();
         parentScale = glm::max(glm::max(dimensions.x, dimensions.y), dimensions.z);
     }
 
-    //if (!_currentRenderState.empty() && renderState != _renderStates.end() &&
     if (_enabled && !_currentRenderState.empty() && renderState != _renderStates.end() &&
         (type != IntersectionType::NONE || _pathLength > 0.0f)) {
         glm::vec3 origin = getPickOrigin(pickResult);
@@ -162,14 +160,14 @@ void PathPointer::updateVisuals(const PickResultPointer& pickResult) {
             defaultRenderState->second.second->disable();
         }
     } else if (_enabled && !_currentRenderState.empty() && defaultRenderState != _defaultRenderStates.end()) {
-    //} else if (!_currentRenderState.empty() && defaultRenderState != _defaultRenderStates.end()) {
         if (renderState != _renderStates.end() && renderState->second->isEnabled()) {
             renderState->second->disable();
         }
         glm::vec3 origin = getPickOrigin(pickResult);
         glm::vec3 end = getPickEnd(pickResult, defaultRenderState->second.first);
         defaultRenderState->second.second->update(origin, end, Vectors::UP, parentScale, _distanceScaleEnd, _centerEndY,
-                                                  _faceAvatar, _followNormal, _followNormalStrength, defaultRenderState->second.first, pickResult);
+                                                  _faceAvatar, _followNormal, _followNormalStrength, defaultRenderState->second.first,
+                                                  pickResult);
     } else if (!_currentRenderState.empty()) {
         if (renderState != _renderStates.end() && renderState->second->isEnabled()) {
             renderState->second->disable();
@@ -205,12 +203,12 @@ void PathPointer::editRenderState(const std::string& state, const QVariant& star
 }
 
 void PathPointer::updateRenderState(const QUuid& id, const QVariant& props) {
-    // FIXME: we have to keep using the Overlays interface here, because existing scripts use overlay properties to define pointers
-    if (!id.isNull() && props.isValid()) {
-        QVariantMap propMap = props.toMap();
-        propMap.remove("visible");
-        qApp->getOverlays().editOverlay(id, propMap);
-    }
+    // FIXME: updating render state props no longer works since removing 3D Overlays
+    //if (!id.isNull() && props.isValid()) {
+    //    QVariantMap propMap = props.toMap();
+    //    propMap.remove("visible");
+    //    qApp->getOverlays().editOverlay(id, propMap);
+    //}
 }
 
 Pointer::PickedObject PathPointer::getHoveredObject(const PickResultPointer& pickResult) {
@@ -300,8 +298,9 @@ void StartEndRenderState::disable() {
     _enabled = false;
 }
 
-void StartEndRenderState::update(const glm::vec3& origin, const glm::vec3& end, const glm::vec3& surfaceNormal, float parentScale, bool distanceScaleEnd, bool centerEndY,
-                                 bool faceAvatar, bool followNormal, float followNormalStrength, float distance, const PickResultPointer& pickResult) {
+void StartEndRenderState::update(const glm::vec3& origin, const glm::vec3& end, const glm::vec3& surfaceNormal, float parentScale, bool distanceScaleEnd,
+                                 bool centerEndY, bool faceAvatar, bool followNormal, float followNormalStrength, float distance,
+                                 const PickResultPointer& pickResult) {
     auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
     if (!getStartID().isNull()) {
         EntityItemProperties properties;

interface/src/raypick/PathPointer.h

@@ -43,16 +43,17 @@ public:
 
     virtual void cleanup();
     virtual void disable();
-    virtual void update(const glm::vec3& origin, const glm::vec3& end, const glm::vec3& surfaceNormal, float parentScale, bool distanceScaleEnd, bool centerEndY,
-                        bool faceAvatar, bool followNormal, float followNormalStrength, float distance, const PickResultPointer& pickResult);
+    virtual void update(const glm::vec3& origin, const glm::vec3& end, const glm::vec3& surfaceNormal, float parentScale, bool distanceScaleEnd,
+                        bool centerEndY, bool faceAvatar, bool followNormal, float followNormalStrength, float distance,
+                        const PickResultPointer& pickResult);
 
     bool isEnabled() const { return _enabled; }
 
 protected:
     QUuid _startID;
     QUuid _endID;
-    bool _startIgnorePicks;
-    bool _endIgnorePicks;
+    bool _startIgnorePicks { false };
+    bool _endIgnorePicks { false };
 
     glm::vec3 _startDim;
     glm::vec3 _endDim;

interface/src/raypick/PickScriptingInterface.cpp

@@ -121,6 +121,7 @@ PickFilter getPickFilter(unsigned int filter) {
  * @property {Vec3} [dirOffset] - Synonym for <code>direction</code>.
  * @property {Quat} [orientation] - Alternative property for specifying <code>direction</code>. The value is applied to the 
  *     default <code>direction</code> value.
+ * @property {number} [delay=0.0] - The delay, in seconds, to apply to the ray direction.
  * @property {PickType} pickType - The type of pick when getting these properties from {@link Picks.getPickProperties} or 
  *     {@link Picks.getPickScriptParameters}. A ray pick's type is {@link PickType.Ray}.
  * @property {Vec3} baseScale - Returned from {@link Picks.getPickProperties} when the pick has a parent with varying scale 
@@ -173,7 +174,14 @@ std::shared_ptr<PickQuery> PickScriptingInterface::buildRayPick(const QVariantMa
         direction = vec3FromVariant(propMap["dirOffset"]);
     }
 
-    auto rayPick = std::make_shared<RayPick>(position, direction, filter, maxDistance, enabled);
+    float delayHalf = 0.0f;
+    if (propMap["delay"].isValid()) {
+        // We want to be within 0.1% of the target in <delay> seconds
+        // https://twitter.com/FreyaHolmer/status/1757836988495847568
+        delayHalf = -std::max(propMap["delay"].toFloat(), 0.0f) / log2(0.001);
+    }
+
+    auto rayPick = std::make_shared<RayPick>(position, direction, filter, maxDistance, delayHalf, enabled);
     setParentTransform(rayPick, propMap);
 
     return rayPick;
@@ -455,6 +463,10 @@ void PickScriptingInterface::setIncludeItems(unsigned int uid, const ScriptValue
     DependencyManager::get<PickManager>()->setIncludeItems(uid, qVectorQUuidFromScriptValue(includeItems));
 }
 
+void PickScriptingInterface::setDelay(unsigned int uid, float delay) {
+    DependencyManager::get<PickManager>()->setDelay(uid, delay);
+}
+
 bool PickScriptingInterface::isLeftHand(unsigned int uid) {
     return DependencyManager::get<PickManager>()->isLeftHand(uid);
 }
@@ -497,6 +509,15 @@ void PickScriptingInterface::setPerFrameTimeBudget(unsigned int numUsecs) {
     DependencyManager::get<PickManager>()->setPerFrameTimeBudget(numUsecs);
 }
 
+float PickScriptingInterface::getHandLaserDelay() const {
+    return _handLaserDelaySetting.get();
+}
+
+void PickScriptingInterface::setHandLaserDelay(float delay) {
+    _handLaserDelaySetting.set(delay);
+    emit handLaserDelayChanged(delay);
+}
+
 void PickScriptingInterface::setParentTransform(std::shared_ptr<PickQuery> pick, const QVariantMap& propMap) {
     QUuid parentUuid;
     int parentJointIndex = 0;

interface/src/raypick/PickScriptingInterface.h

@@ -16,6 +16,7 @@
 #include <PhysicsEngine.h>
 #include <Pick.h>
 #include <PickFilter.h>
+#include <SettingHandle.h>
 
 class ScriptEngine;
 class ScriptValue;
@@ -72,6 +73,7 @@ class ScriptValue;
  * @property {IntersectionType} INTERSECTED_HUD - Intersected the HUD surface. <em>Read-only.</em>
  *
  * @property {number} perFrameTimeBudget - The maximum time, in microseconds, to spend per frame updating pick results.
+ * @property {number} handLaserDelay - The delay, in seconds, applied to the hand lasers to smooth their movement.
  */
 
 class PickScriptingInterface : public QObject, public Dependency {
@@ -105,6 +107,7 @@ class PickScriptingInterface : public QObject, public Dependency {
     Q_PROPERTY(unsigned int INTERSECTED_AVATAR READ getIntersectedAvatar CONSTANT)
     Q_PROPERTY(unsigned int INTERSECTED_HUD READ getIntersectedHud CONSTANT)
     Q_PROPERTY(unsigned int perFrameTimeBudget READ getPerFrameTimeBudget WRITE setPerFrameTimeBudget)
+    Q_PROPERTY(float handLaserDelay READ getHandLaserDelay WRITE setHandLaserDelay)
     SINGLETON_DEPENDENCY
 
 public:
@@ -263,6 +266,15 @@ public:
      */
     Q_INVOKABLE void setIncludeItems(unsigned int uid, const ScriptValue& includeItems);
 
+    /*@jsdoc
+     * Sets the delay of a Ray pick.
+     * <p><strong>Note:</strong> Not used by other pick types.</p>
+     * @function Picks.setDelay
+     * @param {number} id - The ID of the pointer.
+     * @param {number} delay - The desired delay in seconds.
+     */
+    Q_INVOKABLE void setDelay(unsigned int uid, float delay);
+
     /*@jsdoc
      * Checks if a pick is associated with the left hand: a ray or parabola pick with <code>joint</code> property set to 
      * <code>"_CONTROLLER_LEFTHAND"</code> or <code>"_CAMERA_RELATIVE_CONTROLLER_LEFTHAND"</code>, or a stylus pick with 
@@ -295,6 +307,9 @@ public:
     unsigned int getPerFrameTimeBudget() const;
     void setPerFrameTimeBudget(unsigned int numUsecs);
 
+    float getHandLaserDelay() const;
+    void setHandLaserDelay(float delay);
+
 public slots:
 
     static constexpr unsigned int getPickBypassIgnore() { return PickFilter::getBitMask(PickFilter::FlagBit::PICK_BYPASS_IGNORE); }
@@ -461,6 +476,9 @@ public slots:
      */
     static constexpr unsigned int getIntersectedHud() { return IntersectionType::HUD; }
 
+signals:
+    void handLaserDelayChanged(float delay);
+
 protected:
     static std::shared_ptr<PickQuery> buildRayPick(const QVariantMap& properties);
     static std::shared_ptr<PickQuery> buildStylusPick(const QVariantMap& properties);
@@ -468,6 +486,9 @@ protected:
     static std::shared_ptr<PickQuery> buildParabolaPick(const QVariantMap& properties);
 
     static void setParentTransform(std::shared_ptr<PickQuery> pick, const QVariantMap& propMap);
+
+private:
+    Setting::Handle<float> _handLaserDelaySetting { "handLaserDelay", 0.35f };
 };
 
 #endif // hifi_PickScriptingInterface_h

interface/src/raypick/PointerScriptingInterface.cpp

@@ -25,7 +25,6 @@
 #include <ScriptManager.h>
 
 STATIC_SCRIPT_TYPES_INITIALIZER((+[](ScriptManager* manager){
-    qDebug() << "STATIC_SCRIPT_TYPES_INITIALIZER PointerScriptingInterface";
     auto scriptEngine = manager->engine().get();
     scriptRegisterMetaType<RayPointerProperties, rayPointerPropertiesToScriptValue, rayPointerPropertiesFromScriptValue>(scriptEngine);
     scriptRegisterMetaType<StylusPointerProperties, stylusPointerPropertiesToScriptValue, stylusPointerPropertiesFromScriptValue>(scriptEngine);
@@ -92,7 +91,6 @@ unsigned int PointerScriptingInterface::createParabolaPointer(ParabolaPointerPro
     return createPointerInternal(PickQuery::PickType::Parabola, properties);
 }
 
-
 bool PointerScriptingInterface::isPointerEnabled(unsigned int uid) const {
     return DependencyManager::get<PointerManager>()->isPointerEnabled(uid);
 }
@@ -178,45 +176,45 @@ std::shared_ptr<Pointer> PointerScriptingInterface::buildStylus(const PointerPro
  * Properties that define the visual appearance of a ray pointer when the pointer is intersecting something.
  * @typedef {object} Pointers.RayPointerRenderState
  * @property {string} name - When creating using {@link Pointers.createPointer}, the name of the render state.
- * @property {Overlays.OverlayProperties|Uuid} [start]
+ * @property {Entities.EntityProperties|Uuid} [start]
  *     <p>When creating or editing using {@link Pointers.createPointer} or {@link Pointers.editRenderState}, the properties of 
- *     an overlay to render at the start of the ray pointer. The <code>type</code> property must be specified.</p>
- *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the overlay rendered at the start of the ray;
- *     <code>null</code> if there is no overlay.
+ *     an entity to render at the start of the ray pointer. The <code>type</code> property must be specified.</p>
+ *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the entity rendered at the start of the ray;
+ *     <code>null</code> if there is no entity.
  *
- * @property {Overlays.OverlayProperties|Uuid} [path]
+ * @property {Entities.EntityProperties|Uuid} [path]
  *     <p>When creating or editing using {@link Pointers.createPointer} or {@link Pointers.editRenderState}, the properties of
- *     the overlay rendered for the path of the ray pointer. The <code>type</code> property must be specified and be 
- *     <code>"line3d"</code>.</p>
- *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the overlay rendered for the path of the ray;
- *     <code>null</code> if there is no overlay.
+ *     the entity rendered for the path of the ray pointer. The <code>type</code> property must be specified and be 
+ *     <code>"PolyLine"</code>.</p>  Specify <code>linePoints</code> to control how many segments make up the path.
+ *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the entity rendered for the path of the ray;
+ *     <code>null</code> if there is no entity.
  *
- * @property {Overlays.OverlayProperties|Uuid} [end]
+ * @property {Entities.EntityProperties|Uuid} [end]
  *     <p>When creating or editing using {@link Pointers.createPointer} or {@link Pointers.editRenderState}, the properties of
- *     an overlay to render at the end of the ray pointer. The <code>type</code> property must be specified.</p>
- *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the overlay rendered at the end of the ray; 
- *     <code>null</code> if there is no overlay.
+ *     an entity to render at the end of the ray pointer. The <code>type</code> property must be specified.</p>
+ *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the entity rendered at the end of the ray; 
+ *     <code>null</code> if there is no entity.
  */
 /*@jsdoc
  * The properties of a ray pointer. These include the properties from the underlying ray pick that the pointer uses.
  * @typedef {object} Pointers.RayPointerProperties
- * @property {boolean} [faceAvatar=false] - <code>true</code> if the overlay rendered at the end of the ray rotates about the 
+ * @property {boolean} [faceAvatar=false] - <code>true</code> if the entity rendered at the end of the ray rotates about the 
  *     world y-axis to always face the avatar; <code>false</code> if it maintains its world orientation.
- * @property {boolean} [centerEndY=true] - <code>true</code> if the overlay rendered at the end of the ray is centered on 
- *     the ray end; <code>false</code> if the overlay is positioned against the surface if <code>followNormal</code> is 
+ * @property {boolean} [centerEndY=true] - <code>true</code> if the entity rendered at the end of the ray is centered on 
+ *     the ray end; <code>false</code> if the entity is positioned against the surface if <code>followNormal</code> is 
  *     <code>true</code>, or above the ray end if <code>followNormal</code> is <code>false</code>.
 * @property {boolean} [lockEnd=false] - <code>true</code> if the end of the ray is locked to the center of the object at 
  *     which the ray is pointing; <code>false</code> if the end of the ray is at the intersected surface.
- * @property {boolean} [distanceScaleEnd=false] - <code>true</code> if the dimensions of the overlay at the end of the ray 
+ * @property {boolean} [distanceScaleEnd=false] - <code>true</code> if the dimensions of the entity at the end of the ray 
  *     scale linearly with distance; <code>false</code> if they aren't. 
  * @property {boolean} [scaleWithParent=false] - <code>true</code> if the width of the ray's path and the size of the 
- *     start and end overlays scale linearly with the pointer parent's scale; <code>false</code> if they don't scale.
+ *     start and end entities scale linearly with the pointer parent's scale; <code>false</code> if they don't scale.
  * @property {boolean} [scaleWithAvatar=false] - A synonym for <code>scalewithParent</code>.
  *     <p class="important">Deprecated: This property is deprecated and will be removed.</p>
- * @property {boolean} [followNormal=false] - <code>true</code> if the overlay rendered at the end of the ray rotates to 
+ * @property {boolean} [followNormal=false] - <code>true</code> if the entity rendered at the end of the ray rotates to 
  *     follow the normal of the surface if one is intersected; <code>false</code> if it doesn't.
- * @property {number} [followNormalStrength=0.0] - How quickly the overlay rendered at the end of the ray rotates to follow 
- *     the normal of an intersected surface. If <code>0</code> or <code>1</code>, the overlay rotation follows instantaneously; 
+ * @property {number} [followNormalStrength=0.0] - How quickly the entity rendered at the end of the ray rotates to follow 
+ *     the normal of an intersected surface. If <code>0</code> or <code>1</code>, the entity rotation follows instantaneously; 
  *    for other values, the larger the value the more quickly the rotation follows.
  * @property {Pointers.RayPointerRenderState[]|Object.<string, Pointers.RayPointerRenderState>} [renderStates]
  *     <p>A set of visual states that can be switched among using {@link Pointers.setRenderState}. These define the visual 
@@ -236,7 +234,7 @@ std::shared_ptr<Pointer> PointerScriptingInterface::buildStylus(const PointerPro
  * @property {boolean} [hover=false] - <code>true</code> if the pointer generates {@link Entities} hover events, 
  *     <code>false</code> if it doesn't.
  * @property {Pointers.Trigger[]} [triggers=[]] - A list of ways that a {@link Controller} action or function should trigger 
- *     events on the entity or overlay currently intersected.
+ *     events on the object currently intersected.
  * @property {PickType} pointerType - The type of pointer returned from {@link Pointers.getPointerProperties} or 
  *     {@link Pointers.getPointerScriptParameters}. A laser pointer's type is {@link PickType(0)|PickType.Ray}.
  * @property {number} [pickID] - The ID of the pick created alongside this pointer, returned from 
@@ -378,41 +376,41 @@ std::shared_ptr<Pointer> PointerScriptingInterface::buildLaserPointer(const Poin
  * Properties that define the visual appearance of a parabola pointer when the pointer is intersecting something.
  * @typedef {object} Pointers.ParabolaPointerRenderState
  * @property {string} name - When creating using {@link Pointers.createPointer}, the name of the render state.
- * @property {Overlays.OverlayProperties|Uuid} [start]
+ * @property {Entities.EntityProperties|Uuid} [start]
  *     <p>When creating or editing using {@link Pointers.createPointer} or {@link Pointers.editRenderState}, the properties of
- *     an overlay to render at the start of the parabola pointer. The <code>type</code> property must be specified.</p>
- *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the overlay rendered at the start of the 
- *     parabola; <code>null</code> if there is no overlay.
+ *     an entity to render at the start of the parabola pointer. The <code>type</code> property must be specified.</p>
+ *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the entity rendered at the start of the 
+ *     parabola; <code>null</code> if there is no entity.
  * @property {Pointers.ParabolaPointerPath|Uuid} [path]
  *     <p>When creating or editing using {@link Pointers.createPointer} or {@link Pointers.editRenderState}, the properties of
  *     the rendered path of the parabola pointer.</p>
  *     <p>This property is not provided when getting using {@link Pointers.getPointerProperties}.
- * @property {Overlays.OverlayProperties|Uuid} [end]
+ * @property {Entities.EntityProperties|Uuid} [end]
  *     <p>When creating or editing using {@link Pointers.createPointer} or {@link Pointers.editRenderState}, the properties of
- *     an overlay to render at the end of the ray pointer. The <code>type</code> property must be specified.</p>
- *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the overlay rendered at the end of the parabola;
- *     <code>null</code> if there is no overlay.
+ *     an entity to render at the end of the ray pointer. The <code>type</code> property must be specified.</p>
+ *     <p>When getting using {@link Pointers.getPointerProperties}, the ID of the entity rendered at the end of the parabola;
+ *     <code>null</code> if there is no entity.
  */
 /*@jsdoc
  * The properties of a parabola pointer. These include the properties from the underlying parabola pick that the pointer uses.
  * @typedef {object} Pointers.ParabolaPointerProperties
- * @property {boolean} [faceAvatar=false] - <code>true</code> if the overlay rendered at the end of the ray rotates about the
+ * @property {boolean} [faceAvatar=false] - <code>true</code> if the entity rendered at the end of the ray rotates about the
  *     world y-axis to always face the avatar; <code>false</code> if it maintains its world orientation.
- * @property {boolean} [centerEndY=true] - <code>true</code> if the overlay rendered at the end of the ray is centered on
- *     the ray end; <code>false</code> if the overlay is positioned against the surface if <code>followNormal</code> is
+ * @property {boolean} [centerEndY=true] - <code>true</code> if the entity rendered at the end of the ray is centered on
+ *     the ray end; <code>false</code> if the entity is positioned against the surface if <code>followNormal</code> is
  *     <code>true</code>, or above the ray end if <code>followNormal</code> is <code>false</code>.
 * @property {boolean} [lockEnd=false] - <code>true</code> if the end of the ray is locked to the center of the object at
  *     which the ray is pointing; <code>false</code> if the end of the ray is at the intersected surface.
- * @property {boolean} [distanceScaleEnd=false] - <code>true</code> if the dimensions of the overlay at the end of the ray
+ * @property {boolean} [distanceScaleEnd=false] - <code>true</code> if the dimensions of the entity at the end of the ray
  *     scale linearly with distance; <code>false</code> if they aren't.
  * @property {boolean} [scaleWithParent=false] - <code>true</code> if the width of the ray's path and the size of the
- *     start and end overlays scale linearly with the pointer parent's scale; <code>false</code> if they don't scale.
+ *     start and end entities scale linearly with the pointer parent's scale; <code>false</code> if they don't scale.
  * @property {boolean} [scaleWithAvatar=false] - A synonym for <code>scalewithParent</code>.
  *     <p class="important">Deprecated: This property is deprecated and will be removed.</p>
- * @property {boolean} [followNormal=false] - <code>true</code> if the overlay rendered at the end of the ray rotates to
+ * @property {boolean} [followNormal=false] - <code>true</code> if the entity rendered at the end of the ray rotates to
  *     follow the normal of the surface if one is intersected; <code>false</code> if it doesn't.
- * @property {number} [followNormalStrength=0.0] - How quickly the overlay rendered at the end of the ray rotates to follow
- *     the normal of an intersected surface. If <code>0</code> or <code>1</code>, the overlay rotation follows instantaneously;
+ * @property {number} [followNormalStrength=0.0] - How quickly the entity rendered at the end of the ray rotates to follow
+ *     the normal of an intersected surface. If <code>0</code> or <code>1</code>, the entity rotation follows instantaneously;
  *    for other values, the larger the value the more quickly the rotation follows.
  * @property {Pointers.ParabolaPointerRenderState[]|Object.<string, Pointers.ParabolaPointerRenderState>} [renderStates] 
  *     <p>A set of visual states that can be switched among using {@link Pointers.setRenderState}. These define the visual
@@ -432,7 +430,7 @@ std::shared_ptr<Pointer> PointerScriptingInterface::buildLaserPointer(const Poin
  * @property {boolean} [hover=false] - <code>true</code> if the pointer generates {@link Entities} hover events,
  *     <code>false</code> if it doesn't.
  * @property {Pointers.Trigger[]} [triggers=[]] - A list of ways that a {@link Controller} action or function should trigger
- *     events on the entity or overlay currently intersected.
+ *     events on the object currently intersected.
  * @property {PickType} pointerType - The type of pointer returned from {@link Pointers.getPointerProperties} or 
  *     {@link Pointers.getPointerScriptParameters}. A parabola pointer's type is {@link PickType(0)|PickType.Parabola}.
  * @property {number} [pickID] - The ID of the pick created alongside this pointer, returned from 
@@ -622,7 +620,6 @@ bool rayPointerPropertiesFromScriptValue(const ScriptValue& value, RayPointerPro
             out.properties[*renderStatesName].setValue(renderStates);
         }
     }
-    qDebug() << "rayPointerPropertiesFromScriptValue" << out.properties;
     return true;
 }
 
@@ -675,7 +672,6 @@ bool stylusPointerPropertiesFromScriptValue(const ScriptValue& value, StylusPoin
             out.properties[*renderStatesName].setValue(renderStates);
         }
     }
-    qDebug() << "stylusPointerPropertiesFromScriptValue" << out.properties;
     return true;
 }
 
@@ -714,7 +710,6 @@ bool parabolaPointerPropertiesFromScriptValue(const ScriptValue& value, Parabola
                         pathProperties.copyFromScriptValue(path, false);
                         stateMap.insert("pathPropertyIndex", QVariant(out.entityProperties.length()));
                         out.entityProperties.append(pathProperties);
-                        qDebug() << "parabolaPointerPropertiesFromScriptValue : added path entity";
                     }
 
                     if (stateMap["end"].isValid()) {
@@ -723,7 +718,6 @@ bool parabolaPointerPropertiesFromScriptValue(const ScriptValue& value, Parabola
                         endProperties.copyFromScriptValue(end, false);
                         stateMap.insert("endPropertyIndex", QVariant(out.entityProperties.length()));
                         out.entityProperties.append(endProperties);
-                        qDebug() << "parabolaPointerPropertiesFromScriptValue : added end entity";
                     }
                     renderStates[i].setValue(stateMap);
                 }
@@ -731,6 +725,5 @@ bool parabolaPointerPropertiesFromScriptValue(const ScriptValue& value, Parabola
             out.properties[*renderStatesName].setValue(renderStates);
         }
     }
-    qDebug() << "parabolaPointerPropertiesFromScriptValue" << out.properties;
     return true;
 }

interface/src/raypick/PointerScriptingInterface.h

@@ -103,7 +103,7 @@ public:
      *     ignorePickIntersection: true
      * };
      * var intersectedPath = {
-     *     type: "line3d",
+     *     type: "PolyLine",
      *     color: { red: 0, green: 255, blue: 0 },
      * };
      * var searchEnd = {
@@ -114,7 +114,7 @@ public:
      *     ignorePickIntersection: true
      * };
      * var searchPath = {
-     *     type: "line3d",
+     *     type: "PolyLine",
      *     color: { red: 255, green: 0, blue: 0 },
      * };
      * 
@@ -224,8 +224,8 @@ public:
      * @param {number} id - The ID of the pointer.
      * @param {string} renderState - The name of the render state to edit.
      * @param {Pointers.RayPointerRenderState|Pointers.ParabolaPointerRenderState} properties - The new properties for the 
-     *     render state. Only the overlay properties to change need be specified.
-     * @example <caption>Change the dimensions of a ray pointer's intersecting end overlay.</caption>
+     *     render state. Only the properties to change need be specified.
+     * @example <caption>Change the dimensions of a ray pointer's intersecting end entity.</caption>
      * var intersectEnd = {
      *     type: "sphere",
      *     dimensions: { x: 0.2, y: 0.2, z: 0.2 },
@@ -234,7 +234,7 @@ public:
      *     ignorePickIntersection: true
      * };
      * var intersectedPath = {
-     *     type: "line3d",
+     *     type: "PolyLine",
      *     color: { red: 0, green: 255, blue: 0 },
      * };
      * var searchEnd = {
@@ -245,7 +245,7 @@ public:
      *     ignorePickIntersection: true
      * };
      * var searchPath = {
-     *     type: "line3d",
+     *     type: "PolyLine",
      *     color: { red: 255, green: 0, blue: 0 },
      * };
      * 
@@ -310,7 +310,7 @@ public:
      *     ignorePickIntersection: true
      * };
      * var intersectedPath = {
-     *     type: "line3d",
+     *     type: "PolyLine",
      *     color: { red: 0, green: 255, blue: 0 },
      * };
      * var searchEnd = {
@@ -321,7 +321,7 @@ public:
      *     ignorePickIntersection: true
      * };
      * var searchPath = {
-     *     type: "line3d",
+     *     type: "PolyLine",
      *     color: { red: 255, green: 0, blue: 0 },
      * };
      * 
@@ -423,6 +423,14 @@ public:
      */
     Q_INVOKABLE void setLockEndUUID(unsigned int uid, const QUuid& objectID, bool isAvatar, const glm::mat4& offsetMat = glm::mat4()) const { DependencyManager::get<PointerManager>()->setLockEndUUID(uid, objectID, isAvatar, offsetMat); }
 
+    /*@jsdoc
+     * Sets the delay of a Ray pointer.
+     * <p><strong>Note:</strong> Not used by stylus or parabola pointers.</p>
+     * @function Pointers.setDelay
+     * @param {number} id - The ID of the pointer.
+     * @param {number} delay - The desired delay in seconds.
+     */
+    Q_INVOKABLE void setDelay(unsigned int uid, float delay) const { DependencyManager::get<PointerManager>()->setDelay(uid, delay); }
 
     /*@jsdoc
      * Checks if a pointer is associated with the left hand: a ray or parabola pointer with <code>joint</code> property set to

interface/src/raypick/RayPick.cpp

@@ -19,10 +19,43 @@ PickRay RayPick::getMathematicalPick() const {
         return _mathPick;
     }
 
+    float delayHalf = 0.0f;
+    withReadLock([&] {
+        delayHalf = _delayHalf;
+    });
+    const bool hasDelay = _prevUpdate != 0 && delayHalf > 0.0f && !isNaN(_prevDirection.x);
+    const float now = secTimestampNow();
+    const float dt = now - _prevUpdate;
+    float alpha = 0.0f;
+    if (hasDelay) {
+        // This equation gives a framerate-independent lerp for a moving target
+        // https://twitter.com/FreyaHolmer/status/1757836988495847568
+        alpha = 1 - exp2(-dt / delayHalf);
+    }
+
     Transform currentParentTransform = parentTransform->getTransform();
     glm::vec3 origin = currentParentTransform.transform(_mathPick.origin);
-    glm::vec3 direction = glm::normalize(currentParentTransform.transformDirection(_mathPick.direction));
-    return PickRay(origin, direction);
+
+    glm::vec3 direction;
+    glm::vec3 newDirection = glm::normalize(currentParentTransform.transformDirection(_mathPick.direction));
+    if (hasDelay) {
+        PickResultPointer result = getPrevPickResult();
+        if (!result || !result->doesIntersect()) {
+            direction = glm::normalize(glm::mix(_prevDirection, newDirection, alpha));
+        } else {
+            auto rayResult = std::static_pointer_cast<RayPickResult>(result);
+            glm::vec3 oldDirection = glm::normalize(rayResult->intersection - origin);
+            direction = glm::normalize(glm::mix(oldDirection, newDirection, alpha));
+        }
+    } else {
+        direction = newDirection;
+    }
+
+    _prevUpdate = now;
+    if (!isNaN(direction.x)) {
+        _prevDirection = direction;
+    }
+    return PickRay(origin, direction, newDirection);
 }
 
 PickResultPointer RayPick::getEntityIntersection(const PickRay& pick) {
@@ -65,6 +98,14 @@ PickResultPointer RayPick::getHUDIntersection(const PickRay& pick) {
     return std::make_shared<RayPickResult>(IntersectionType::HUD, QUuid(), glm::distance(pick.origin, hudRes), hudRes, pick);
 }
 
+void RayPick::setDelay(float delay) {
+    withWriteLock([&] {
+        // We want to be within 0.1% of the target in <delay> seconds
+        // https://twitter.com/FreyaHolmer/status/1757836988495847568
+        _delayHalf = -std::max(delay, 0.0f) / log2(0.001);
+    });
+}
+
 Transform RayPick::getResultTransform() const {
     PickResultPointer result = getPrevPickResult();
     if (!result) {
@@ -89,8 +130,6 @@ glm::vec3 RayPick::intersectRayWithEntityXYPlane(const QUuid& entityID, const gl
     return intersectRayWithXYPlane(origin, direction, props.getPosition(), props.getRotation(), props.getRegistrationPoint());
 }
 
-
-
 glm::vec2 RayPick::projectOntoXYPlane(const glm::vec3& worldPos, const glm::vec3& position, const glm::quat& rotation, const glm::vec3& dimensions, const glm::vec3& registrationPoint, bool unNormalized) {
     glm::quat invRot = glm::inverse(rotation);
     glm::vec3 localPos = invRot * (worldPos - position);

interface/src/raypick/RayPick.h

@@ -84,9 +84,8 @@ public:
 class RayPick : public Pick<PickRay> {
 
 public:
-    RayPick(glm::vec3 position, glm::vec3 direction, const PickFilter& filter, float maxDistance, bool enabled) :
-        Pick(PickRay(position, direction), filter, maxDistance, enabled) {
-    }
+    RayPick(glm::vec3 position, glm::vec3 direction, const PickFilter& filter, float maxDistance, float delayHalf, bool enabled) :
+        Pick(PickRay(position, direction), filter, maxDistance, enabled), _delayHalf(delayHalf) {}
 
     PickType getType() const override { return PickType::Ray; }
 
@@ -98,6 +97,8 @@ public:
     PickResultPointer getHUDIntersection(const PickRay& pick) override;
     Transform getResultTransform() const override;
 
+    void setDelay(float delay) override;
+
     // These are helper functions for projecting and intersecting rays
     static glm::vec3 intersectRayWithEntityXYPlane(const QUuid& entityID, const glm::vec3& origin, const glm::vec3& direction);
     static glm::vec2 projectOntoEntityXYPlane(const QUuid& entityID, const glm::vec3& worldPos, bool unNormalized = true);
@@ -107,6 +108,10 @@ public:
 
 private:
     static glm::vec3 intersectRayWithXYPlane(const glm::vec3& origin, const glm::vec3& direction, const glm::vec3& point, const glm::quat& rotation, const glm::vec3& registration);
+
+    float _delayHalf { 0.0f };
+    mutable float _prevUpdate { 0.0f };
+    mutable glm::vec3 _prevDirection { NAN };
 };
 
 #endif // hifi_RayPick_h

interface/src/raypick/StylusPointer.cpp

@@ -48,29 +48,6 @@ PickQuery::PickType StylusPointer::getType() const {
 }
 
 QUuid StylusPointer::buildStylus(const QVariantMap& properties) {
-    // FIXME: we have to keep using the Overlays interface here, because existing scripts use overlay properties to define pointers
-    /*QVariantMap propertiesMap;
-
-    QString modelUrl = DEFAULT_STYLUS_MODEL_URL;
-
-    if (properties["model"].isValid()) {
-        QVariantMap modelData = properties["model"].toMap();
-
-        if (modelData["url"].isValid()) {
-            modelUrl = modelData["url"].toString();
-        }
-    }
-    // TODO: make these configurable per pointer
-    propertiesMap["name"] = "stylus";
-    propertiesMap["url"] = modelUrl;
-    propertiesMap["loadPriority"] = 10.0f;
-    propertiesMap["solid"] = true;
-    propertiesMap["visible"] = false;
-    propertiesMap["ignorePickIntersection"] = true;
-    propertiesMap["drawInFront"] = false;
-
-    return qApp->getOverlays().addOverlay("model", propertiesMap);*/
-
     EntityItemProperties entityProperties;
     QString modelURL = DEFAULT_STYLUS_MODEL_URL;
 

interface/src/ui/Keyboard.cpp

@@ -303,10 +303,13 @@ bool Keyboard::isRaised() const {
     return resultWithReadLock<bool>([&] { return _raised; });
 }
 
-void Keyboard::setRaised(bool raised) {
+void Keyboard::setRaised(bool raised, bool inputToHudUI) {
 
     bool isRaised;
     withReadLock([&] { isRaised = _raised; });
+
+    _inputToHudUI = inputToHudUI;
+
     if (isRaised != raised) {
         raiseKeyboardAnchor(raised);
         raiseKeyboard(raised);
@@ -585,8 +588,13 @@ void Keyboard::handleTriggerBegin(const QUuid& id, const PointerEvent& event) {
 
         QKeyEvent* pressEvent = new QKeyEvent(QEvent::KeyPress, scanCode, Qt::NoModifier, keyString);
         QKeyEvent* releaseEvent = new QKeyEvent(QEvent::KeyRelease, scanCode, Qt::NoModifier, keyString);
-        QCoreApplication::postEvent(QCoreApplication::instance(), pressEvent);
-        QCoreApplication::postEvent(QCoreApplication::instance(), releaseEvent);
+        if (_inputToHudUI) {
+            QCoreApplication::postEvent(qApp->getPrimaryWidget(), pressEvent);
+            QCoreApplication::postEvent(qApp->getPrimaryWidget(), releaseEvent);
+        } else {
+            QCoreApplication::postEvent(QCoreApplication::instance(), pressEvent);
+            QCoreApplication::postEvent(QCoreApplication::instance(), releaseEvent);
+        }
 
         if (!getPreferMalletsOverLasers()) {
             key.startTimer(KEY_PRESS_TIMEOUT_MS);

interface/src/ui/Keyboard.h

@@ -93,7 +93,7 @@ public:
     void createKeyboard();
     void registerKeyboardHighlighting();
     bool isRaised() const;
-    void setRaised(bool raised);
+    void setRaised(bool raised, bool inputToHudUI = false);
     void setResetKeyboardPositionOnRaise(bool reset);
     bool isPassword() const;
     void setPassword(bool password);
@@ -190,6 +190,8 @@ private:
     QSet<QUuid> _itemsToIgnore;
     std::vector<QHash<QUuid, Key>> _keyboardLayers;
 
+    // Send keyboard events to hud UI if true
+    std::atomic<bool> _inputToHudUI { false };
     bool _created { false };
 };
 

interface/src/ui/PreferencesDialog.cpp

@@ -18,6 +18,7 @@
 #include <plugins/PluginManager.h>
 #include <display-plugins/CompositorHelper.h>
 #include <display-plugins/hmd/HmdDisplayPlugin.h>
+#include <raypick/PickScriptingInterface.h>
 #include "scripting/RenderScriptingInterface.h"
 #include "Application.h"
 #include "DialogsManager.h"
@@ -207,6 +208,23 @@ void setupPreferences() {
         preferences->addPreference(preference);
     }
 
+    {
+        auto getter = []() -> bool { return qApp->getPreferAvatarFingerOverStylus(); };
+        auto setter = [](bool value) { qApp->setPreferAvatarFingerOverStylus(value); };
+        preferences->addPreference(new CheckPreference(UI_CATEGORY, "Prefer Avatar Finger Over Stylus", getter, setter));
+    }
+
+    {
+        auto getter = []() -> float { return DependencyManager::get<PickScriptingInterface>()->getHandLaserDelay(); };
+        auto setter = [](float value) { DependencyManager::get<PickScriptingInterface>()->setHandLaserDelay(value); };
+        auto delaySlider = new SpinnerSliderPreference(UI_CATEGORY, "Laser Delay (seconds)", getter, setter);
+        delaySlider->setMin(0.0f);
+        delaySlider->setMax(0.7f);
+        delaySlider->setStep(0.05f);
+        delaySlider->setDecimals(2.0f);
+        preferences->addPreference(delaySlider);
+    }
+
     static const QString VIEW_CATEGORY{ "View" };
     {
         auto getter = [myAvatar]()->float { return myAvatar->getRealWorldFieldOfView(); };
@@ -226,12 +244,6 @@ void setupPreferences() {
         preferences->addPreference(preference);
     }
 
-    {
-        auto getter = []()->bool { return qApp->getPreferAvatarFingerOverStylus(); };
-        auto setter = [](bool value) { qApp->setPreferAvatarFingerOverStylus(value); };
-        preferences->addPreference(new CheckPreference(UI_CATEGORY, "Prefer Avatar Finger Over Stylus", getter, setter));
-    }
-
     // Snapshots
     static const QString SNAPSHOTS { "Snapshots" };
     {

libraries/entities/src/EntityScriptServerLogClient.cpp

@@ -69,7 +69,6 @@ void EntityScriptServerLogClient::handleEntityServerScriptLogPacket(QSharedPoint
     QString messageText = QString::fromUtf8(message->readAll());
     QJsonParseError error;
     QJsonDocument document = QJsonDocument::fromJson(messageText.toUtf8(), &error);
-    emit receivedNewLogLines(messageText);
     if(document.isNull()) {
         qWarning() << "EntityScriptServerLogClient::handleEntityServerScriptLogPacket: Cannot parse JSON: " << error.errorString()
             << " Contents: " << messageText;
@@ -98,21 +97,37 @@ void EntityScriptServerLogClient::handleEntityServerScriptLogPacket(QSharedPoint
             case ScriptMessage::Severity::SEVERITY_INFO:
                 emit scriptEngines->infoEntityMessage(scriptMessage.getMessage(), scriptMessage.getFileName(),
                                                       scriptMessage.getLineNumber(), scriptMessage.getEntityID(), true);
+                emit receivedNewLogLines("[ INFO {" + scriptMessage.getEntityID().toString() + "} "
+                                         + scriptMessage.getFileName() + ":"
+                                         + QString::number(scriptMessage.getLineNumber()) + "] "
+                                         + scriptMessage.getMessage());
             break;
 
             case ScriptMessage::Severity::SEVERITY_PRINT:
                 emit scriptEngines->printedEntityMessage(scriptMessage.getMessage(), scriptMessage.getFileName(),
                                                   scriptMessage.getLineNumber(), scriptMessage.getEntityID(), true);
+                emit receivedNewLogLines("[ WARNING {" + scriptMessage.getEntityID().toString() + "} "
+                                         + scriptMessage.getFileName() + ":"
+                                         + QString::number(scriptMessage.getLineNumber()) + "] "
+                                         + scriptMessage.getMessage());
             break;
 
             case ScriptMessage::Severity::SEVERITY_WARNING:
                 emit scriptEngines->warningEntityMessage(scriptMessage.getMessage(), scriptMessage.getFileName(),
                                                   scriptMessage.getLineNumber(), scriptMessage.getEntityID(), true);
+                emit receivedNewLogLines("[ WARNING {" + scriptMessage.getEntityID().toString() + "} "
+                                         + scriptMessage.getFileName() + ":"
+                                         + QString::number(scriptMessage.getLineNumber()) + "] "
+                                         + scriptMessage.getMessage());
             break;
 
             case ScriptMessage::Severity::SEVERITY_ERROR:
                 emit scriptEngines->errorEntityMessage(scriptMessage.getMessage(), scriptMessage.getFileName(),
                                                   scriptMessage.getLineNumber(), scriptMessage.getEntityID(), true);
+                emit receivedNewLogLines("[ ERROR {" + scriptMessage.getEntityID().toString() + "} "
+                                         + scriptMessage.getFileName() + ":"
+                                         + QString::number(scriptMessage.getLineNumber()) + "] "
+                                         + scriptMessage.getMessage());
             break;
 
             default:

libraries/graphics/src/graphics/MaterialTextures.slh

@@ -465,7 +465,7 @@ float fetchUVAnimationMaskMap(vec2 uv) {
 <@func evalMaterialShadingShift(fetchedShadingShift, materialShadingShift, matKey, shadingShift)@>
 {
     <$shadingShift$> = mix(0.0, <$materialShadingShift$>, float((<$matKey$> & SHADING_SHIFT_VAL_BIT) != 0));
-    <$shadingShift$> += mix(0.0, <$fetchedShadingShift$>.r, float((<$matKey$> & SHADING_SHIFT_MAP_BIT) != 0));
+    <$shadingShift$> += mix(0.0, <$fetchedShadingShift$>, float((<$matKey$> & SHADING_SHIFT_MAP_BIT) != 0));
 }
 <@endfunc@>
 

libraries/networking/src/AccountManager.cpp

@@ -4,7 +4,7 @@
 //
 //  Created by Stephen Birarda on 2/18/2014.
 //  Copyright 2014 High Fidelity, Inc.
-//  Copyright 2023 Overte e.V.
+//  Copyright 2023-2024 Overte e.V.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -696,7 +696,8 @@ void AccountManager::setAccessTokens(const QString& response) {
         if (!rootObject.contains("access_token") || !rootObject.contains("expires_in")
             || !rootObject.contains("token_type")) {
             // TODO: error handling - malformed token response
-            qCDebug(networking) << "Received a response for password grant that is missing one or more expected values.";
+            qCWarning(networking) << "Error setting access token. Received a response for password grant that is missing one or more expected values.";
+            qCWarning(networking) << "Response:" << QJsonDocument(rootObject).toJson(QJsonDocument::Compact);
         } else {
             // clear the path from the response URL so we have the right root URL for this access token
             QUrl rootURL = rootObject.contains("url") ? rootObject["url"].toString() : _authURL;
@@ -714,7 +715,7 @@ void AccountManager::setAccessTokens(const QString& response) {
         }
     } else {
         // TODO: error handling
-        qCDebug(networking) << "Error in response for password grant -" << rootObject["error_description"].toString();
+        qCWarning(networking) << "Error in response for password grant -" << rootObject["error"].toString();
         emit loginFailed();
     }
 }
@@ -731,7 +732,8 @@ void AccountManager::requestAccessTokenFinished() {
         if (!rootObject.contains("access_token") || !rootObject.contains("expires_in")
             || !rootObject.contains("token_type")) {
             // TODO: error handling - malformed token response
-            qCDebug(networking) << "Received a response for password grant that is missing one or more expected values.";
+            qCWarning(networking) << "Error requesting access token. Received a response for password grant that is missing one or more expected values.";
+            qCWarning(networking) << "Response:" << QJsonDocument(rootObject).toJson(QJsonDocument::Compact);
         } else {
             // clear the path from the response URL so we have the right root URL for this access token
             QUrl rootURL = requestReply->url();
@@ -750,7 +752,7 @@ void AccountManager::requestAccessTokenFinished() {
         }
     } else {
         // TODO: error handling
-        qCDebug(networking) <<  "Error in response for password grant -" << rootObject["error_description"].toString();
+        qCWarning(networking) <<  "Error in response for password grant -" << rootObject["error"].toString();
         emit loginFailed();
     }
 }

libraries/networking/src/crash-handler/CrashHandlerBackend_Crashpad.cpp

@@ -457,6 +457,11 @@ bool startCrashHandler(std::string appPath, std::string crashURL, std::string cr
 }
 
 void setCrashReportingEnabled(bool enabled) {
+    if (!crashpadDatabase) {
+        qCCritical(crash_handler) << "Can't set to enabled, crash handler not initialized!";
+        return;
+    }
+
     auto settings = crashpadDatabase->GetSettings();
     settings->SetUploadsEnabled(enabled);
 

libraries/networking/src/udt/PacketHeaders.cpp

@@ -130,6 +130,10 @@ void sendWrongProtocolVersionsSignature(bool sendWrongVersion) {
 
 static QByteArray protocolVersionSignature;
 static QString protocolVersionSignatureBase64;
+static QString protocolVersionSignatureHex;
+static QMap<PacketType, uint8_t> protocolVersionMap;
+
+
 static void ensureProtocolVersionsSignature() {
     static std::once_flag once;
     std::call_once(once, [&] {
@@ -139,12 +143,14 @@ static void ensureProtocolVersionsSignature() {
         stream << numberOfProtocols;
         for (uint8_t packetType = 0; packetType < numberOfProtocols; packetType++) {
             uint8_t packetTypeVersion = static_cast<uint8_t>(versionForPacketType(static_cast<PacketType>(packetType)));
+            protocolVersionMap[static_cast<PacketType>(packetType)] = packetTypeVersion;
             stream << packetTypeVersion;
         }
         QCryptographicHash hash(QCryptographicHash::Md5);
         hash.addData(buffer);
         protocolVersionSignature = hash.result();
         protocolVersionSignatureBase64 = protocolVersionSignature.toBase64();
+        protocolVersionSignatureHex = protocolVersionSignature.toHex(0);
     });
 }
 QByteArray protocolVersionsSignature() {
@@ -161,3 +167,13 @@ QString protocolVersionsSignatureBase64() {
     ensureProtocolVersionsSignature();
     return protocolVersionSignatureBase64;
 }
+
+QString protocolVersionsSignatureHex() {
+    ensureProtocolVersionsSignature();
+    return protocolVersionSignatureHex;
+}
+
+QMap<PacketType, uint8_t> protocolVersionsSignatureMap() {
+    ensureProtocolVersionsSignature();
+    return protocolVersionMap;
+}

libraries/networking/src/udt/PacketHeaders.h

@@ -31,8 +31,15 @@ class PacketTypeEnum {
     Q_GADGET
     Q_ENUMS(Value)
 public:
-    // If adding a new packet packetType, you can replace one marked usable or add at the end.
-    // This enum must hold 256 or fewer packet types (so the value is <= 255) since it is statically typed as a uint8_t
+
+    /**
+     * @brief Packet type identifier
+     *
+     * Identifies the type of packet being sent.
+     *
+     * @note If adding a new packet packetType, you can replace one marked usable or add at the end.
+     * @note This enum must hold 256 or fewer packet types (so the value is <= 255) since it is statically typed as a uint8_t
+     */
     enum class Value : uint8_t {
         Unknown,
         DomainConnectRequestPending,
@@ -143,6 +150,8 @@ public:
         NUM_PACKET_TYPE
     };
 
+    Q_ENUM(Value)
+
     const static QHash<PacketTypeEnum::Value, PacketTypeEnum::Value> getReplicatedPacketMapping() {
         const static QHash<PacketTypeEnum::Value, PacketTypeEnum::Value> REPLICATED_PACKET_MAPPING {
             { PacketTypeEnum::Value::MicrophoneAudioNoEcho, PacketTypeEnum::Value::ReplicatedMicrophoneAudioNoEcho },
@@ -219,10 +228,60 @@ const int NUM_BYTES_MD5_HASH = 16;
 // NOTE: There is a max limit of 255, hopefully we have a better way to manage this by then.
 typedef uint8_t PacketVersion;
 
+/**
+ * @brief Returns the version number of the given packet type
+ *
+ * If the implementation of a packet type is modified in an incompatible way, the implementation
+ * of this function needs to be modified to return an incremented value.
+ *
+ * This is used to determine whether the protocol is compatible between client and server.
+ *
+ * @note Version is limited to a max of 255.
+ *
+ * @param packetType Type of packet
+ * @return PacketVersion Version
+ */
 PacketVersion versionForPacketType(PacketType packetType);
-QByteArray protocolVersionsSignature(); /// returns a unique signature for all the current protocols
+
+/**
+ * @brief Returns a unique signature for all the current protocols
+ *
+ * This computes a MD5 hash that expresses the state of the protocol's specification. The calculation
+ * is done in ensureProtocolVersionsSignature and accounts for the following:
+ *
+ * * Number of known packet types
+ * * versionForPacketType(type) for each packet type.
+ *
+ * There's no provision for backwards compatibility, anything that changes this calculation is a protocol break.
+ *
+ * @return QByteArray MD5 digest as a byte array
+ */
+QByteArray protocolVersionsSignature();
+
+/***
+ * @brief Returns a unique signature for all the current protocols
+ *
+ * Same as protocolVersionsSignature(), in base64.
+ */
 QString protocolVersionsSignatureBase64();
 
+/***
+ * @brief Returns a unique signature for all the current protocols
+ *
+ * Same as protocolVersionsSignature(), in hex;
+ */
+QString protocolVersionsSignatureHex();
+
+/***
+ * @brief Returns the data used to compute the protocol version
+ *
+ * The key is the packet type. The value is the version for that packet type.
+ *
+ * Used for aiding in development.
+ */
+QMap<PacketType, uint8_t> protocolVersionsSignatureMap();
+
+
 #if (PR_BUILD || DEV_BUILD)
 void sendWrongProtocolVersionsSignature(bool sendWrongVersion); /// for debugging version negotiation
 #endif
@@ -439,4 +498,5 @@ enum class AvatarQueryVersion : PacketVersion {
     ConicalFrustums = 22
 };
 
+
 #endif // hifi_PacketHeaders_h

libraries/pointers/src/Pick.h

@@ -170,6 +170,8 @@ public:
     void setIgnoreItems(const QVector<QUuid>& items);
     void setIncludeItems(const QVector<QUuid>& items);
 
+    virtual void setDelay(float delay) {}
+
     virtual QVariantMap toVariantMap() const {
         QVariantMap properties;
 

libraries/pointers/src/PickManager.cpp

@@ -129,6 +129,13 @@ void PickManager::setIncludeItems(unsigned int uid, const QVector<QUuid>& includ
     }
 }
 
+void PickManager::setDelay(unsigned int uid, float delay) const {
+    auto pick = findPick(uid);
+    if (pick) {
+        pick->setDelay(delay);
+    }
+}
+
 Transform PickManager::getParentTransform(unsigned int uid) const {
     auto pick = findPick(uid);
     if (pick) {

libraries/pointers/src/PickManager.h

@@ -48,6 +48,7 @@ public:
     void setPrecisionPicking(unsigned int uid, bool precisionPicking) const;
     void setIgnoreItems(unsigned int uid, const QVector<QUuid>& ignore) const;
     void setIncludeItems(unsigned int uid, const QVector<QUuid>& include) const;
+    void setDelay(unsigned int uid, float delay) const;
 
     Transform getParentTransform(unsigned int uid) const;
     Transform getResultTransform(unsigned int uid) const;

libraries/pointers/src/Pointer.cpp

@@ -74,6 +74,10 @@ void Pointer::setIncludeItems(const QVector<QUuid>& includeItems) const {
     DependencyManager::get<PickManager>()->setIncludeItems(_pickUID, includeItems);
 }
 
+void Pointer::setDelay(float delay) const {
+    DependencyManager::get<PickManager>()->setDelay(_pickUID, delay);
+}
+
 bool Pointer::isLeftHand() const {
     return DependencyManager::get<PickManager>()->isLeftHand(_pickUID);
 }

libraries/pointers/src/Pointer.h

@@ -59,6 +59,7 @@ public:
     virtual void setPrecisionPicking(bool precisionPicking);
     virtual void setIgnoreItems(const QVector<QUuid>& ignoreItems) const;
     virtual void setIncludeItems(const QVector<QUuid>& includeItems) const;
+    virtual void setDelay(float delay) const;
 
     bool isLeftHand() const;
     bool isRightHand() const;

libraries/pointers/src/PointerManager.cpp

@@ -157,6 +157,13 @@ void PointerManager::setLockEndUUID(unsigned int uid, const QUuid& objectID, boo
     }
 }
 
+void PointerManager::setDelay(unsigned int uid, float delay) const {
+    auto pointer = find(uid);
+    if (pointer) {
+        pointer->setDelay(delay);
+    }
+}
+
 bool PointerManager::isLeftHand(unsigned int uid) {
     auto pointer = find(uid);
     if (pointer) {

libraries/pointers/src/PointerManager.h

@@ -45,6 +45,7 @@ public:
 
     void setLength(unsigned int uid, float length) const;
     void setLockEndUUID(unsigned int uid, const QUuid& objectID, bool isAvatar, const glm::mat4& offsetMat = glm::mat4()) const;
+    void setDelay(unsigned int uid, float delay) const;
 
     void update();
 

libraries/render-utils/src/MeshPartPayload.cpp

@@ -363,7 +363,7 @@ void ModelMeshPartPayload::render(RenderArgs* args) {
                             ProceduralProgramKey(outColor.a < 1.0f, _shapeKey.isDeformed(), _shapeKey.isDualQuatSkinned()));
 
         const uint32_t compactColor = GeometryCache::toCompactColor(glm::vec4(outColor));
-        _drawMesh->getColorBuffer()->setData(sizeof(compactColor), (const gpu::Byte*)&compactColor);
+        _drawMesh->getColorBuffer()->setData(sizeof(compactColor), (const gpu::Byte*) &compactColor);
     } else if (!_itemKey.isMirror()) {
         // apply material properties
         if (RenderPipelines::bindMaterials(_drawMaterials, batch, args->_renderMode, args->_enableTexturing)) {

libraries/script-engine/src/ScriptEngines.h

@@ -267,7 +267,7 @@ signals:
      * Triggered when a client side entity script prints a message to the program log via {@link  print}, {@link Script.print},
      * {@link console.log}, {@link console.debug}, {@link console.group}, {@link console.groupEnd}, {@link console.time}, or
      * {@link console.timeEnd}.
-     * @function Script.printedMessage
+     * @function Script.printedEntityMessage
      * @param {string} message - The message.
      * @param {string} fileName - Name of the file in which message was generated. Empty string when no file name is available.
      * @param {number} lineNumber - Number of the line on which message was generated. -1 if there line number is not available.
@@ -280,7 +280,7 @@ signals:
     /*@jsdoc
      * Triggered when a client side entity script generates an error, {@link console.error} or {@link console.exception} is called, or
      * {@link console.assert} is called and fails.
-     * @function Script.errorMessage
+     * @function Script.errorEntityMessage
      * @param {string} message - The error message.
      * @param {string} fileName - Name of the file in which message was generated. Empty string when no file name is available.
      * @param {number} lineNumber - Number of the line on which message was generated. -1 if there line number is not available.
@@ -292,7 +292,7 @@ signals:
 
     /*@jsdoc
      * Triggered when a client side entity script generates a warning or {@link console.warn} is called.
-     * @function Script.warningMessage
+     * @function Script.warningEntityMessage
      * @param {string} message - The warning message.
      * @param {string} fileName - Name of the file in which message was generated. Empty string when no file name is available.
      * @param {number} lineNumber - Number of the line on which message was generated. -1 if there line number is not available.
@@ -304,7 +304,7 @@ signals:
 
     /*@jsdoc
      * Triggered when a client side entity script generates an information message or {@link console.info} is called.
-     * @function Script.infoMessage
+     * @function Script.infoEntityMessage
      * @param {string} message - The information message.
      * @param {string} fileName - Name of the file in which message was generated. Empty string when no file name is available.
      * @param {number} lineNumber - Number of the line on which message was generated. -1 if there line number is not available.

libraries/script-engine/src/ScriptManager.cpp

@@ -2054,7 +2054,7 @@ void ScriptManager::loadEntityScript(const EntityItemID& entityID, const QString
     std::weak_ptr<ScriptManager> weakRef(shared_from_this());
     scriptCache->getScriptContents(entityScript,
         [this, weakRef, entityScript, entityID](const QString& url, const QString& contents, bool isURL, bool success, const QString& status) {
-            std::shared_ptr<ScriptManager> strongRef(weakRef);
+            std::shared_ptr<ScriptManager> strongRef = weakRef.lock();
             if (!strongRef) {
                 qCWarning(scriptengine) << "loadEntityScript.contentAvailable -- ScriptManager was deleted during getScriptContents!!";
                 return;

libraries/script-engine/src/WebSocketClass.h

@@ -33,8 +33,6 @@ class ScriptEngine;
  * <p>Create using <code>new WebSocket(...)</code> in Interface, client entity, avatar, and server entity scripts, or the 
  * {@link WebSocketServer} class in server entity and assignment client scripts.
  *
- * <p><strong>Note:</strong> Does not support secure, <code>wss:</code> protocol.</p>
- *
  * @class WebSocket
  * @param {string|WebSocket} urlOrWebSocket - The URL to connect to or an existing {@link WebSocket} to reuse the connection of.
  *

libraries/shared/src/RegisteredMetaTypes.h

@@ -205,25 +205,33 @@ public:
  * @typedef {object} PickRay
  * @property {Vec3} origin - The starting position of the ray.
  * @property {Vec3} direction - The direction that the ray travels.
+ * @property {Vec3} unmodifiedDirection - The direction that the ray would travel, if not for applied effects like delays.
  */
 class PickRay : public MathPick {
 public:
-    PickRay() : origin(NAN), direction(NAN)  { }
-    PickRay(const QVariantMap& pickVariant) : origin(vec3FromVariant(pickVariant["origin"])), direction(vec3FromVariant(pickVariant["direction"])) {}
-    PickRay(const glm::vec3& origin, const glm::vec3 direction) : origin(origin), direction(direction) {}
+    PickRay() : origin(NAN), direction(NAN), unmodifiedDirection(NAN)  { }
+    PickRay(const QVariantMap& pickVariant) :
+        origin(vec3FromVariant(pickVariant["origin"])), direction(vec3FromVariant(pickVariant["direction"])),
+        unmodifiedDirection(vec3FromVariant(pickVariant["unmodifiedDirection"])) {}
+    PickRay(const glm::vec3& origin, const glm::vec3& direction) :
+        origin(origin), direction(direction), unmodifiedDirection(direction) {}
+    PickRay(const glm::vec3& origin, const glm::vec3& direction, const glm::vec3& unmodifiedDirection) :
+        origin(origin), direction(direction), unmodifiedDirection(unmodifiedDirection) {}
     glm::vec3 origin;
     glm::vec3 direction;
+    glm::vec3 unmodifiedDirection;
 
     operator bool() const override {
-        return !(glm::any(glm::isnan(origin)) || glm::any(glm::isnan(direction)));
+        return !(glm::any(glm::isnan(origin)) || glm::any(glm::isnan(direction)) || glm::any(glm::isnan(unmodifiedDirection)));
     }
     bool operator==(const PickRay& other) const {
-        return (origin == other.origin && direction == other.direction);
+        return (origin == other.origin && direction == other.direction && unmodifiedDirection == other.unmodifiedDirection);
     }
     QVariantMap toVariantMap() const override {
         QVariantMap pickRay;
         pickRay["origin"] = vec3toVariant(origin);
         pickRay["direction"] = vec3toVariant(direction);
+        pickRay["unmodifiedDirection"] = vec3toVariant(unmodifiedDirection);
         return pickRay;
     }
 };

libraries/shared/src/ViewFrustum.h

@@ -28,7 +28,7 @@ const int NUM_FRUSTUM_CORNERS = 8;
 const int NUM_FRUSTUM_PLANES = 6;
 
 const float DEFAULT_CENTER_SPHERE_RADIUS = 3.0f;
-const float DEFAULT_FIELD_OF_VIEW_DEGREES = 45.0f;
+const float DEFAULT_FIELD_OF_VIEW_DEGREES = 55.0f;
 const float DEFAULT_ASPECT_RATIO = 16.0f/9.0f;
 const float DEFAULT_NEAR_CLIP = 0.08f;
 const float DEFAULT_FAR_CLIP = 16384.0f;

pkg-scripts/make-rpm-server

@@ -13,7 +13,8 @@ fi
 # The regex below extracts the path from the VCPKG_INSTALL_ROOT variable. Said variable gets populated during the CMake step.
 VCPKG_INSTALL_ROOT=`grep VCPKG_INSTALL_ROOT $OVERTE/build/vcpkg.cmake | perl -ne 'm/set\(VCPKG_INSTALL_ROOT\s+\"(.*?)\"/; print $1'`
 
-VERSION=${RPMVERSION}
+# Remove minus character from version numbers, because rpmtool doesn't allow them.
+VERSION=${RPMVERSION//-}
 
 if [ "$OVERTE_USE_SYSTEM_QT" = "" ]; then
 SOFILES=`ls \

script-archive/systemChat/chat.js

@@ -4,7 +4,7 @@
 //
 // By Don Hopkins (dhopkins@donhopkins.com) on May 5th, 2017
 //  Copyright 2017 High Fidelity, Inc.
-//  Copyright 2023 Overte e.V.
+//  Copyright 2024 Overte e.V.
 //
 //
 // Distributed under the Apache License, Version 2.0.
@@ -13,7 +13,7 @@
 
 (function() {
 
-    var webPageURL = Script.resolvePath("html/ChatPage.html"); // URL of tablet web page.
+    var webPageURL = Script.resolvePath("ChatPage.html"); // URL of tablet web page.
     var randomizeWebPageURL = true; // Set to true for debugging.
     var lastWebPageURL = ""; // Last random URL of tablet web page.
     var onChatPage = false; // True when chat web page is opened.

scripts/communityScripts/armored-chat/README.md

@@ -0,0 +1,205 @@
+# Armored Chat
+
+1. What is Armored Chat
+2. User manual
+    - Installation
+    - Settings
+    - Usability tips
+3. Development
+
+## What is Armored Chat
+
+Armored Chat is a chat application strictly made to communicate between players in the same domain. It is made using QML and to be as light weight as reasonably possible.
+
+### Dependencies
+
+AC uses the Overte [Messages](https://apidocs.overte.org/Messages.html) API to communicate.
+
+For notifications, AC uses [notificationCore.js](https://github.com/overte-org/overte/blob/bb8bac43eadd3b20956a2ff7b0b21c28844b0f77/scripts/communityScripts/notificationCore/notificationCore.js).
+
+## User manual
+
+### Installation
+
+Armored Chat is preinstalled courtesy of [defaultScripts.js](https://github.com/overte-org/overte/blob/8661e8a858663b48e8485c2cd7120dc3e2d7b87e/scripts/defaultScripts.js).
+
+If AC is not preinstalled, or for some other reason it can not be automatically installed, you can install it manually by following [these instructions](https://github.com/overte-org/overte/blob/8661e8a858663b48e8485c2cd7120dc3e2d7b87e/scripts/defaultScripts.js) to open your script management application, and loading the script url:
+
+```
+https://raw.githubusercontent.com/overte-org/overte/master/scripts/communityScripts/armored-chat/armored_chat.js
+```
+
+---
+
+### Settings
+
+Armored Chat comes with basic settings for managing itself.
+
+#### External window
+
+This boolean setting toggles whether AC will be a in-game overlay window, or whether AC will be a external floating window.
+
+Default is `false`.
+
+#### Maximum saved messages
+
+This integer represents the amount of messages to save in the AC history. More messages may be present if AC is left on long enough. This setting only sets the number of saved messages and not the maximum amount of messages that can be viewed at any time.
+
+This means if you set the value to `5`, your history will save a maximum of 5 messages, however you will still be able to see a longer history in the session should you receive more. Once AC completely closes and fetches your message history as it initializes, you will only see the last 5 messages.
+
+Default value is `200`
+
+#### Erase chat history
+
+This action immediately clears the AC history and the session. Functionally this will set the message list to a empty Array.
+
+### Usage
+
+AC has two chat modes: Local, and Domain. Local chat displays all other local chat messages that are within 20 units of you. Domain chat will display all other Domain messages sent though that channel regardless of distance.
+
+AC also handles link embedding. When you send an HTTP(S) link, it will automatically parse it using Qt RichText and allow everyone to click on the message. Next to the link you will also see a "⮺" symbol. Clicking on this symbol will open the link in an external window.
+
+### Usability tips
+
+#### Navigation
+
+You can scroll quickly using kinetic scrolling! Try "grabbing" the right side of messages, where the timestamp is, and flinging yourself in a direction.
+
+#### Formatting
+
+You can format messages using basic HTML elements. Try `<div style="color: red"> Red text! </div>` to color your text red.
+Find the full list of Qt rich text tags [here](https://doc.qt.io/qt-6/richtext-html-subset.html). Please note that some of these tags may be intentionally restricted.
+
+#### Media embedding
+
+Images can be embedded when linked directly.
+
+Try it out by linking to the Overte logo! `https://github.com/overte-org/overte/raw/master/interface/resources/images/brand-banner.svg`
+
+In order for images to be embedded, URLs must end in a image filetype.
+Supported filetypes are:
+
+-   `.png`
+-   `.jpg`
+-   `.jpeg`
+-   `.gif`
+-   `.bmp`
+-   `.svg`
+-   `.webp`
+
+## Development
+
+### To QML communication
+
+Here are the signals needed to communicate from the JavaScript core to the QML interface.
+
+AC calls a `_emitEvent()` function that also includes a `type` key in the object. This `type` tells the QML and/or the JS core what the packet is for.
+When you call the `_emitEvent()` function be sure to include the following signals as a `type`. In the examples below, the `type` is being excluded for brevity.
+
+Example:
+
+```json
+{ type: "show_message", displayName: "username", ...}
+```
+
+#### "show_message"
+
+This signal tells the QML to add a new message to the ListView element list.
+
+Supply a `JSON` object.
+
+```json
+{
+    "displayName": "username",
+    "message": "chat message",
+    "channel": "domain", // Channel to send message on. By default it should only be "domain" or "local".
+    "date": "[ time and date string ]" // Optional, defaults to current time and date.
+}
+```
+
+#### "clear_messages"
+
+Clear all messages displayed in the ListView elements. Note this does not clear the history and this is only a visual erasure.
+
+No payload required.
+
+#### "notification"
+
+Renders a notification to the domain channel.
+The intended use is to provide updates about the domain and make the notifications accessible.
+
+Supply a `JSON` object.
+
+```json
+{
+    "message": "notification message" // Notification to render
+}
+```
+
+#### "initial_settings"
+
+Visually set the settings in the QML interface based on the supplied object.
+
+Supply a `JSON` object.
+
+```json
+{
+    "settings": {
+        // JSON object of current AC settings
+        "external_window": false,
+        "maximum_messages": 200
+    }
+}
+```
+
+### To JS communication
+
+Here are the signals needed to communicate from the QML interface to the JavaScript core. AC is developed in a way that all actions that are not style related are preformed though the JavaScript core.
+This means that what ever action you want to preform must go though the JavaScript core for processing.
+
+This is formatted the same was as the communication packets to the QML interface. Supply the following entries as "type"s in your packet.
+
+#### "send_message"
+
+Tell AC to broadcast a message to the domain.
+
+Supply a `JSON` object.
+
+```json
+{
+    "message": "message content", // The contents of the message to send.
+    "channel": "domain" // Channel to emit the message to.
+}
+```
+
+#### "setting_change"
+
+Tell AC to change a setting. Exercise caution when using this as you can add new settings unintentionally if you are not careful.
+
+Supply a `JSON` object
+
+```json
+{
+    "setting": "external_window", // The name of the setting to change
+    "value": true // The value to change the setting to
+}
+```
+
+#### "action"
+
+Tell AC to preform a generic action. This is normally reserved for functions that would get called on a button onClicked event in the QML.
+
+Supply a `JSON` object
+
+```json
+{
+    "action": "erase_history" // The action to preform
+}
+```
+
+#### "initialized"
+
+Tell AC the QML overlay has loaded successfully.
+This is called to hide the overlay on creation.
+
+No payload required.

scripts/communityScripts/armored-chat/armored_chat.js

@@ -0,0 +1,291 @@
+//
+//  armored_chat.js
+//
+//  Created by Armored Dragon, 2024.
+//  Copyright 2024 Overte e.V.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+
+(() => {
+    ("use strict");
+
+    var appIsVisible = false;
+    var settings = {
+        external_window: false,
+        maximum_messages: 200,
+    };
+
+    // Global vars
+    var tablet;
+    var chatOverlayWindow;
+    var appButton;
+    var quickMessage;
+    const channels = ["domain", "local"];
+    var messageHistory = Settings.getValue("ArmoredChat-Messages", []) || [];
+    var maxLocalDistance = 20; // Maximum range for the local chat
+    var palData = AvatarManager.getPalData().data;
+
+    Controller.keyPressEvent.connect(keyPressEvent);
+    Messages.subscribe("Chat"); // Floofchat
+    Messages.subscribe("chat");
+    Messages.messageReceived.connect(receivedMessage);
+    AvatarManager.avatarAddedEvent.connect((sessionId) => {
+        _avatarAction("connected", sessionId);
+    });
+    AvatarManager.avatarRemovedEvent.connect((sessionId) => {
+        _avatarAction("left", sessionId);
+    });
+
+    startup();
+
+    function startup() {
+        tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+
+        appButton = tablet.addButton({
+            icon: Script.resolvePath("./img/icon_white.png"),
+            activeIcon: Script.resolvePath("./img/icon_black.png"),
+            text: "CHAT",
+            isActive: appIsVisible,
+        });
+
+        // When script ends, remove itself from tablet
+        Script.scriptEnding.connect(function () {
+            console.log("Shutting Down");
+            tablet.removeButton(appButton);
+            chatOverlayWindow.close();
+        });
+
+        // Overlay button toggle
+        appButton.clicked.connect(toggleMainChatWindow);
+
+        quickMessage = new OverlayWindow({
+            source: Script.resolvePath("./armored_chat_quick_message.qml"),
+        });
+
+        _openWindow();
+    }
+    function toggleMainChatWindow() {
+        appIsVisible = !appIsVisible;
+        appButton.editProperties({ isActive: appIsVisible });
+        chatOverlayWindow.visible = appIsVisible;
+
+        // External window was closed; the window does not exist anymore
+        if (chatOverlayWindow.title == "" && appIsVisible) {
+            _openWindow();
+        }
+    }
+    function _openWindow() {
+        chatOverlayWindow = new Desktop.createWindow(
+            Script.resolvePath("./armored_chat.qml"),
+            {
+                title: "Chat",
+                size: { x: 550, y: 400 },
+                additionalFlags: Desktop.ALWAYS_ON_TOP,
+                visible: appIsVisible,
+                presentationMode: Desktop.PresentationMode.VIRTUAL,
+            }
+        );
+
+        chatOverlayWindow.closed.connect(toggleMainChatWindow);
+        chatOverlayWindow.fromQml.connect(fromQML);
+        quickMessage.fromQml.connect(fromQML);
+    }
+    function receivedMessage(channel, message) {
+        // Is the message a chat message?
+        channel = channel.toLowerCase();
+        if (channel !== "chat") return;
+        message = JSON.parse(message);
+
+        if (!message.channel) message.channel = "domain"; // We don't know where to put this message. Assume it is a domain wide message.
+        if (message.forApp) return; // Floofchat
+
+        // Floofchat compatibility hook
+        message = floofChatCompatibilityConversion(message);
+        message.channel = message.channel.toLowerCase(); // Make sure the "local", "domain", etc. is formatted consistently
+
+        if (!channels.includes(message.channel)) return; // Check the channel
+        if (
+            message.channel == "local" &&
+            Vec3.distance(MyAvatar.position, message.position) >
+                maxLocalDistance
+        )
+            return; // If message is local, and if player is too far away from location, don't do anything
+
+        // Update qml view of to new message
+        _emitEvent({ type: "show_message", ...message });
+
+        Messages.sendLocalMessage(
+            "Floof-Notif",
+            JSON.stringify({
+                sender: message.displayName,
+                text: message.message,
+            })
+        );
+
+        // Save message to history
+        let savedMessage = message;
+        delete savedMessage.position;
+        savedMessage.timeString = new Date().toLocaleTimeString(undefined, {
+            hour12: false,
+        });
+        savedMessage.dateString = new Date().toLocaleDateString(undefined, {
+            year: "numeric",
+            month: "long",
+            day: "numeric",
+        });
+        messageHistory.push(savedMessage);
+        while (messageHistory.length > settings.maximum_messages) {
+            messageHistory.shift();
+        }
+        Settings.setValue("ArmoredChat-Messages", messageHistory);
+    }
+    function fromQML(event) {
+        switch (event.type) {
+            case "send_message":
+                _sendMessage(event.message, event.channel);
+                break;
+            case "setting_change":
+                settings[event.setting] = event.value; // Update local settings
+                _saveSettings(); // Save local settings
+
+                switch (event.setting) {
+                    case "external_window":
+                        chatOverlayWindow.presentationMode = event.value
+                            ? Desktop.PresentationMode.NATIVE
+                            : Desktop.PresentationMode.VIRTUAL;
+                        break;
+                    case "maximum_messages":
+                        // Do nothing
+                        break;
+                }
+
+                break;
+            case "action":
+                switch (event.action) {
+                    case "erase_history":
+                        Settings.setValue("ArmoredChat-Messages", []);
+                        _emitEvent({
+                            type: "clear_messages",
+                        });
+                        break;
+                }
+                break;
+            case "initialized":
+                // https://github.com/overte-org/overte/issues/824
+                chatOverlayWindow.visible = appIsVisible; // The "visible" field in the Desktop.createWindow does not seem to work. Force set it to the initial state (false)
+                _loadSettings();
+                break;
+        }
+    }
+    function keyPressEvent(event) {
+        switch (JSON.stringify(event.key)) {
+            case "16777220": // Enter key
+                if (HMD.active) return; // Don't allow in VR
+
+                quickMessage.sendToQml({
+                    type: "change_visibility",
+                    value: true,
+                });
+        }
+    }
+    function _sendMessage(message, channel) {
+        if (message.length == 0) return;
+
+        Messages.sendMessage(
+            "chat",
+            JSON.stringify({
+                position: MyAvatar.position,
+                message: message,
+                displayName: MyAvatar.sessionDisplayName,
+                channel: channel,
+                action: "send_chat_message",
+            })
+        );
+
+        floofChatCompatibilitySendMessage(message, channel);
+    }
+    function _avatarAction(type, sessionId) {
+        Script.setTimeout(() => {
+            if (type == "connected") {
+                palData = AvatarManager.getPalData().data;
+            }
+
+            // Get the display name of the user
+            let displayName = "";
+            displayName =
+                AvatarManager.getPalData([sessionId])?.data[0]
+                    ?.sessionDisplayName || null;
+            if (displayName == null) {
+                for (let i = 0; i < palData.length; i++) {
+                    if (palData[i].sessionUUID == sessionId) {
+                        displayName = palData[i].sessionDisplayName;
+                    }
+                }
+            }
+
+            // Format the packet
+            let message = {};
+            message.message = `${displayName} ${type}`;
+
+            _emitEvent({ type: "notification", ...message });
+        }, 1500);
+    }
+    function _loadSettings() {
+        settings = Settings.getValue("ArmoredChat-Config", settings);
+
+        if (messageHistory) {
+            // Load message history
+            messageHistory.forEach((message) => {
+                delete message.action;
+                _emitEvent({ type: "show_message", ...message });
+            });
+        }
+
+        // Send current settings to the app
+        _emitEvent({ type: "initial_settings", settings: settings });
+    }
+    function _saveSettings() {
+        console.log("Saving config");
+        Settings.setValue("ArmoredChat-Config", settings);
+    }
+
+    /**
+     * Emit a packet to the HTML front end. Easy communication!
+     * @param {Object} packet - The Object packet to emit to the HTML
+     * @param {("show_message"|"clear_messages"|"notification"|"initial_settings")} packet.type - The type of packet it is
+     */
+    function _emitEvent(packet = { type: "" }) {
+        chatOverlayWindow.sendToQml(packet);
+    }
+
+    //
+    // Floofchat compatibility functions
+    // Added to ease the transition between Floofchat to ArmoredChat
+    // These functions can be safely removed at a much later date.
+    function floofChatCompatibilityConversion(message) {
+        if (message.type === "TransmitChatMessage" && !message.forApp) {
+            return {
+                position: message.position,
+                message: message.message,
+                displayName: message.displayName,
+                channel: message.channel.toLowerCase(),
+            };
+        }
+        return message;
+    }
+
+    function floofChatCompatibilitySendMessage(message, channel) {
+        Messages.sendMessage(
+            "Chat",
+            JSON.stringify({
+                position: MyAvatar.position,
+                message: message,
+                displayName: MyAvatar.sessionDisplayName,
+                channel: channel.charAt(0).toUpperCase() + channel.slice(1),
+                type: "TransmitChatMessage",
+                forApp: "Floof",
+            })
+        );
+    }
+})();

scripts/communityScripts/armored-chat/armored_chat.qml

@@ -0,0 +1,566 @@
+import QtQuick 2.7
+import QtQuick.Controls 2.0
+import QtQuick.Layouts 1.3
+import controlsUit 1.0 as HifiControlsUit
+
+Rectangle {
+    color: Qt.rgba(0.1,0.1,0.1,1)
+    signal sendToScript(var message);
+
+    property string pageVal: "local"
+    property string last_message_user: ""
+    property date last_message_time: new Date()
+
+    // When the window is created on the script side, the window starts open.
+    // Once the QML window is created wait, then send the initialized signal.
+    // This signal is mostly used to close the "Desktop overlay window" script side
+    // https://github.com/overte-org/overte/issues/824
+    Timer {
+        interval: 10
+        running: true
+        repeat: false
+        onTriggered: {
+            toScript({type: "initialized"});
+            load_scroll_timer.running = true
+        }
+    }
+    Timer {
+        id: load_scroll_timer
+        interval: 100
+        running: false
+        repeat: false
+        onTriggered: {
+           scrollToBottom();
+        }
+    }
+
+    // User view
+    Item {
+        anchors.fill: parent
+
+        // Navigation Bar
+        Rectangle {
+            id: navigation_bar
+            width: parent.width
+            height: 40
+            color:Qt.rgba(0,0,0,1)
+
+            Item {
+                height: parent.height
+                width: parent.width
+                anchors.fill: parent
+
+                Rectangle {
+                    width: pageVal === "local" ? 100 : 60
+                    height: parent.height
+                    color: pageVal === "local" ? "#505186" : "white"
+                    id: local_page
+
+                    Image {
+                        source: "./img/ui/" + (pageVal === "local" ? "social_white.png" : "social_black.png")
+                        sourceSize.width: 40
+                        sourceSize.height: 40
+                        anchors.centerIn: parent
+                    }
+
+                    Behavior on width {
+                        NumberAnimation {
+                            duration: 50
+                        }
+                    }
+
+                    MouseArea {
+                        anchors.fill: parent
+                        onClicked: {
+                            pageVal = "local";
+                            load_scroll_timer.running = true;
+                        }
+                    }
+                }
+                Rectangle {
+                    width: pageVal === "domain" ? 100 : 60
+                    height: parent.height
+                    color: pageVal === "domain" ? "#505186" : "white"
+                    anchors.left: local_page.right
+                    anchors.leftMargin: 5
+                    id: domain_page
+
+                    Image {
+                        source: "./img/ui/" + (pageVal === "domain" ? "world_white.png" : "world_black.png")
+                        sourceSize.width: 30
+                        sourceSize.height: 30
+                        anchors.centerIn: parent
+                    }
+
+                    Behavior on width {
+                        NumberAnimation {
+                            duration: 50
+                        }
+                    }
+
+                    MouseArea {
+                        anchors.fill: parent
+                        onClicked: {
+                            pageVal = "domain"
+                            load_scroll_timer.running = true;
+                        }
+                    }
+                }
+
+                Rectangle {
+                        width: pageVal === "settings" ? 100 : 60
+                        height: parent.height
+                        color: pageVal === "settings" ? "#505186" : "white"
+                        anchors.right: parent.right
+                        id: settings_page
+
+                        Image {
+                            source: "./img/ui/" + (pageVal === "settings" ? "settings_white.png" : "settings_black.png")
+                            sourceSize.width: 30
+                            sourceSize.height: 30
+                            anchors.centerIn: parent
+                        }
+
+                        Behavior on width {
+                        NumberAnimation {
+                            duration: 50
+                        }
+                        }
+
+                        MouseArea {
+                            anchors.fill: parent
+                            onClicked: {
+                                pageVal = "settings"
+                            }
+                        }
+                    }
+                }
+
+        }
+
+        // Pages
+        Item {
+            width: parent.width
+            height: parent.height - 40
+            anchors.top: navigation_bar.bottom
+            visible: ["local", "domain"].includes(pageVal) ? true : false
+
+
+            // Chat Message History
+            ListView {
+                width: parent.width
+                height: parent.height - 40
+                clip: true
+                interactive: true
+                spacing: 5
+                id: listview
+
+                delegate: Loader {
+                    property int delegateIndex: index
+                    property string delegateText: model.text
+                    property string delegateUsername: model.username
+                    property string delegateDate: model.date
+                    width: listview.width
+
+                    sourceComponent: {
+                        if (model.type === "chat") {
+                            return template_chat_message;
+                        } else if (model.type === "notification") {
+                            return template_notification;
+                        }
+                    }
+                }
+
+                ScrollBar.vertical: ScrollBar {
+                    id: chat_scrollbar
+                    height: 100
+                    size: 0.05
+                }
+
+                model: getChannel(pageVal)
+
+            }
+
+            ListModel {
+                id: local
+            }
+
+            ListModel {
+                id: domain
+             }
+
+            // Chat Entry
+            Rectangle {
+                width: parent.width
+                height: 40
+                color: Qt.rgba(0.9,0.9,0.9,1)
+                anchors.bottom: parent.bottom
+
+                Row {
+                    width: parent.width
+                    height: parent.height
+
+                    TextField {
+                        width: parent.width - 60
+                        height: parent.height
+                        placeholderText: pageVal.charAt(0).toUpperCase() + pageVal.slice(1) + " chat message..."
+                        clip: false
+                        Keys.onPressed: {
+                            if ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && !(event.modifiers & Qt.ShiftModifier)) {
+                                event.accepted = true;
+                                toScript({type: "send_message", message: text, channel: pageVal});
+                                text = ""
+                            }
+                        }
+                        onFocusChanged: {
+                            if (!HMD.active) return;
+                            if (focus) return ApplicationInterface.showVRKeyboardForHudUI(true);
+                            ApplicationInterface.showVRKeyboardForHudUI(false);
+                        }
+                    }
+                    Button {
+                        width: 60
+                        height:parent.height
+
+                        Image {
+                            source: "./img/ui/send_black.png"
+                            sourceSize.width: 30
+                            sourceSize.height: 30
+                            anchors.centerIn: parent
+                        }
+
+                        onClicked: {
+                            toScript({type: "send_message", message: parent.children[0].text, channel: pageVal});
+                            parent.children[0].text = ""
+                        }
+                        Keys.onPressed: {
+                            if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
+                                toScript({type: "send_message", message: parent.children[0].text, channel: pageVal});
+                                parent.children[0].text = ""
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        Item {
+            width: parent.width
+            height: parent.height - 40
+            anchors.top: navigation_bar.bottom
+            visible: ["local", "domain"].includes(pageVal) ? false : true
+
+            Column {
+                width: parent.width - 10
+                height: parent.height - 10
+                anchors.centerIn: parent
+                spacing: 10
+
+                // External Window
+                Rectangle {
+                    width: parent.width
+                    height: 40
+                    color: "transparent"
+
+                    Text{
+                        text: "External window"
+                        color: "white"
+                        font.pointSize: 12
+                        anchors.verticalCenter: parent.verticalCenter
+                    }
+
+                    CheckBox{
+                        id: s_external_window
+                        anchors.right: parent.right
+                        anchors.verticalCenter: parent.verticalCenter
+
+                        onCheckedChanged: {
+                            toScript({type: 'setting_change', setting: 'external_window', value: checked})
+                        }
+                    }
+                }
+
+                // Maximum saved messages
+                Rectangle {
+                    width: parent.width
+                    height: 40
+                    color: "transparent"
+
+                    Text{
+                        text: "Maximum saved messages"
+                        color: "white"
+                        font.pointSize: 12
+                        anchors.verticalCenter: parent.verticalCenter
+                    }
+
+                    
+                    HifiControlsUit.SpinBox {
+                        id: s_maximum_messages
+                        anchors.right: parent.right
+                        anchors.verticalCenter: parent.verticalCenter
+                        decimals: 0
+                        width: 100
+                        height: parent.height
+                        realFrom: 1
+                        realTo: 1000
+                        backgroundColor: "#cccccc"
+
+                        onValueChanged: {
+                            toScript({type: 'setting_change', setting: 'maximum_messages', value: value})
+                        }
+                    }
+                }
+
+                // Erase History
+                Rectangle {
+                    width: parent.width
+                    height: 40
+                    color: Qt.rgba(0.15,0.15,0.15,1);
+
+                    Text{
+                        text: "Erase chat history"
+                        color: "white"
+                        font.pointSize: 12
+                        anchors.verticalCenter: parent.verticalCenter
+                    }
+
+                    Button {
+                        anchors.right: parent.right
+                        text: "Erase"
+                        height: parent.height
+                        anchors.verticalCenter: parent.verticalCenter
+
+                        onClicked: {
+                            toScript({type: "action", action: "erase_history"})
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+
+    // Templates
+    Component {
+        id: template_chat_message
+
+        Rectangle{
+            property int index: delegateIndex
+            property string texttest: delegateText
+            property string username: delegateUsername
+            property string date: delegateDate
+
+            height: Math.max(65, children[1].height + 30)
+            color: index % 2 === 0 ? "transparent" : Qt.rgba(0.15,0.15,0.15,1)
+
+            Item {
+                width: parent.width - 10
+                anchors.horizontalCenter: parent.horizontalCenter
+                height: 22
+
+                Text{
+                    text: username
+                    color: "lightgray"
+                }
+
+                Text{
+                    anchors.right: parent.right
+                    text: date
+                    color: "lightgray"
+                }
+            }
+
+            TextEdit{
+                anchors.top: parent.children[0].bottom
+                x: 5
+                text: texttest
+                color:"white"
+                font.pointSize: 12
+                readOnly: true
+                selectByMouse: true
+                selectByKeyboard: true
+                width: parent.width * 0.8
+                height: contentHeight
+                wrapMode: Text.Wrap
+                textFormat: TextEdit.RichText
+
+                onLinkActivated: {
+                    Window.openWebBrowser(link)
+                }
+            }
+        }
+    }
+
+    Component {
+        id: template_notification
+
+        Rectangle{
+            property int index: delegateIndex
+            property string texttest: delegateText
+            property string username: delegateUsername
+            property string date: delegateDate
+            color: "#171717"
+            width: parent.width
+            height: 40
+
+            Item {
+                width: 10
+                height: parent.height
+
+                Rectangle {
+                    height: parent.height
+                    width: 5
+                    color: "#505186"
+                }
+            }
+
+
+            Item {
+                width: parent.width - parent.children[0].width - 5
+                height: parent.height
+                anchors.left: parent.children[0].right
+
+                TextEdit{
+                    text: texttest
+                    color:"white"
+                    font.pointSize: 12
+                    readOnly: true
+                    width: parent.width * 0.8
+                    selectByMouse: true
+                    selectByKeyboard: true
+                    height: parent.height
+                    wrapMode: Text.Wrap
+                    verticalAlignment: Text.AlignVCenter
+                    font.italic: true
+                }
+
+                Text {
+                    text: date
+                    color:"white"
+                    font.pointSize: 12
+                    anchors.right: parent.right
+                    height: parent.height
+                    wrapMode: Text.Wrap
+                    horizontalAlignment: Text.AlignRight
+                    verticalAlignment: Text.AlignVCenter
+                    font.italic: true
+                }
+            }
+
+        }
+
+    }
+
+
+
+    property var channels: {
+        "local": local,
+        "domain": domain,
+    }
+
+    function scrollToBottom() {
+        if (listview.count == 0) return;
+        listview.positionViewAtEnd();
+    }
+
+
+    function addMessage(username, message, date, channel, type){
+        channel = getChannel(channel)
+
+        // Format content
+        message = formatContent(message);
+
+        message = embedImages(message);
+
+        if (type === "notification"){
+            channel.append({ text: message, date: date, type: "notification" });
+            last_message_user = "";
+            scrollToBottom();
+            last_message_time = new Date();
+            return;
+        }
+
+        var current_time = new Date();
+        var elapsed_time = current_time - last_message_time;
+        var elapsed_minutes = elapsed_time / (1000 * 60); 
+
+        var last_item_index = channel.count - 1;
+        var last_item = channel.get(last_item_index);
+
+        if (last_message_user === username && elapsed_minutes < 1 && last_item){
+            message = "<br>" + message 
+            last_item.text = last_item.text += "\n" + message;
+            scrollToBottom()
+            last_message_time = new Date();
+            return;
+        }
+
+        last_message_user = username;
+        last_message_time = new Date();
+        channel.append({ text: message, username: username, date: date, type: type });
+        scrollToBottom();
+    }
+
+    function getChannel(id) {
+        return channels[id];
+    }
+
+    function formatContent(mess) {
+        var arrow = /\</gi
+        mess = mess.replace(arrow, "&lt;");
+
+        var link = /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/g;
+        mess = mess.replace(link, (match) => {return `<a style="color:#4EBAFD" onclick='Window.openUrl("+match+")' href='` + match + `'>` + match + `</a> <a onclick='Window.openUrl(`+match+`)'>⮺</a>`});
+
+        var newline = /\n/gi;
+        mess = mess.replace(newline, "<br>");
+        return mess
+    }
+
+    function embedImages(mess){
+        var image_link = /(https?:(\/){2})[\w.-]+(?:\.[\w\.-]+)+(?:\/[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]*)(?:png|jpe?g|gif|bmp|svg|webp)/g;
+        var matches = mess.match(image_link);
+        var new_message = ""
+        var listed = []
+        var total_emeds = 0
+
+        new_message += mess
+
+        for (var i = 0; matches && matches.length > i && total_emeds < 3; i++){
+            if (!listed.includes(matches[i])) {
+                new_message += "<br><img src="+ matches[i] +" width='250' >"
+                listed.push(matches[i]);
+                total_emeds++
+            } 
+        }
+        return new_message;
+    }
+
+    // Messages from script
+    function fromScript(message) {
+        let time = new Date().toLocaleTimeString(undefined, { hour12: false });
+        let date = new Date().toLocaleDateString(undefined, { year: "numeric", month: "long", day: "numeric", });
+
+        switch (message.type){
+            case "show_message":
+                addMessage(message.displayName, message.message, `[ ${message.timeString || time} - ${message.dateString || date} ]`, message.channel, "chat");
+                break;
+            case "notification":
+                addMessage("SYSTEM", message.message, `[ ${time} - ${date} ]`, "domain", "notification");
+                break;
+            case "clear_messages":
+                local.clear();
+                domain.clear();
+                break;
+            case "initial_settings":
+                if (message.settings.external_window) s_external_window.checked = true;
+                if (message.settings.maximum_messages) s_maximum_messages.value = message.settings.maximum_messages;
+                break;
+        }
+    }
+
+    // Send message to script
+    function toScript(packet){
+        sendToScript(packet)
+    }
+}

scripts/communityScripts/armored-chat/armored_chat_quick_message.qml

@@ -0,0 +1,112 @@
+import QtQuick 2.5
+import QtQuick.Controls 1.4
+
+Rectangle {
+    id: root
+    property var window
+
+    Binding { target: root; property:'window'; value: parent.parent; when: Boolean(parent.parent) }
+    Binding { target: window; property: 'shown'; value: false; when: Boolean(window) }
+    Component.onDestruction: chat_bar && chat_bar.destroy()
+
+    property alias chat_bar: chat_bar
+
+    Rectangle {
+        id: chat_bar
+        parent: desktop
+        x: 0
+        y: parent.height - height
+        width: parent.width
+        height: 50
+        z: 99
+        visible: false
+
+        TextArea {
+            id: textArea
+            x: 0
+            width: parent.width
+            height: parent.height
+            text:""
+            textColor: "#ffffff"
+            clip: false
+            font.pointSize: 18
+
+            Keys.onReturnPressed: { _onEnterPressed(); }
+            Keys.onEnterPressed: { _onEnterPressed(); }
+            Keys.onLeftPressed: { moveLeft(); }
+            Keys.onRightPressed: { moveRight(); }
+
+            function moveLeft(){
+                if (cursorPosition > 0){
+                    cursorPosition--
+                }
+            }
+            function moveRight(){
+                if (cursorPosition < text.length){
+                    cursorPosition++
+                }
+            }
+        }
+
+        Text {
+            text: "Local message..."
+            font.pointSize: 16
+            color: "gray"
+            x: 0
+            width: parent.width
+            anchors.verticalCenter: parent.verticalCenter
+            visible: textArea.text == ""
+        }
+
+        Button {
+            id: button
+            x: parent.width - width
+            y: 0
+            width: 64
+            height: parent.height
+            clip: false
+            visible: true
+            
+            Image {
+                id: image
+                width: 30
+                height: 30
+                fillMode: Image.PreserveAspectFit
+                visible: true
+                anchors.centerIn: parent
+                source: "./img/ui/send_white.png"
+            }
+
+            onClicked: {
+                _onEnterPressed();
+            }
+        }
+
+    }
+
+    function _onEnterPressed() {
+        changeVisibility(false)
+        toScript({type: "send_message", message: textArea.text, channel: "local"})
+        textArea.text = "";
+    }
+
+    function changeVisibility(state){
+        chat_bar.visible = state
+        if (state) textArea.forceActiveFocus();
+        else root.parent.forceActiveFocus();
+    }
+
+    // Messages from script
+    function fromScript(message) {
+        switch (message.type){
+            case "change_visibility":
+                changeVisibility(message.value)
+                break;
+        }
+    }
+
+    // Send message to script
+    function toScript(packet){
+        sendToScript(packet)
+    }
+}

scripts/communityScripts/armored-chat/img/ui/send.svg

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="32"
+   viewBox="0 -960 760 640"
+   width="38"
+   version="1.1"
+   id="svg4"
+   sodipodi:docname="send.svg"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   inkscape:export-filename="send_black.png"
+   inkscape:export-xdpi="300"
+   inkscape:export-ydpi="300"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="namedview6"
+     pagecolor="#505050"
+     bordercolor="#eeeeee"
+     borderopacity="1"
+     inkscape:showpageshadow="0"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#505050"
+     showgrid="false"
+     inkscape:zoom="21.395833"
+     inkscape:cx="17.363194"
+     inkscape:cy="16.031159"
+     inkscape:window-width="2560"
+     inkscape:window-height="1366"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     d="m 0,-320 v -640 l 760,320 z M 60,-413 604,-640 60,-870 v 168 l 242,62 -242,60 z m 0,0 v -457 z"
+     id="path2"
+     style="fill:#000000" />
+</svg>

scripts/defaultScripts.js

@@ -7,7 +7,7 @@
 //
 //  Copyright 2014 High Fidelity, Inc.
 //  Copyright 2020 Vircadia contributors.
-//  Copyright 2022 Overte e.V.
+//  Copyright 2024 Overte e.V.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -47,7 +47,7 @@ var DEFAULT_SCRIPTS_SEPARATE = [
     "communityScripts/notificationCore/notificationCore.js",
     "simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js",
     {"stable": "system/more/app-more.js", "beta": "https://more.overte.org/more/app-more.js"},
-    "communityScripts/chat/FloofChat.js",
+    "communityScripts/armored-chat/armored_chat.js",
     //"system/chat.js"
 ];
 

scripts/system/controllers/controllerDispatcher.js

@@ -17,8 +17,7 @@
    controllerDispatcherPlugins:true, controllerDispatcherPluginsNeedSort:true,
    LEFT_HAND, RIGHT_HAND, NEAR_GRAB_PICK_RADIUS, DEFAULT_SEARCH_SPHERE_DISTANCE, DISPATCHER_PROPERTIES,
    getGrabPointSphereOffset, HMD, MyAvatar, Messages, findHandChildEntities, Picks, PickType, Pointers,
-   PointerManager, getGrabPointSphereOffset, HMD, MyAvatar, Messages, findHandChildEntities, Picks, PickType, Pointers,
-   PointerManager, print, Keyboard
+   PointerManager, getGrabPointSphereOffset, HMD, MyAvatar, Messages, findHandChildEntities, print, Keyboard
 */
 
 var controllerDispatcherPlugins = {};
@@ -585,7 +584,8 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
             hover: true,
             scaleWithParent: true,
             distanceScaleEnd: true,
-            hand: LEFT_HAND
+            hand: LEFT_HAND,
+            delay: Picks.handLaserDelay
         });
         Keyboard.setLeftHandLaser(this.leftPointer);
         this.rightPointer = this.pointerManager.createPointer(false, PickType.Ray, {
@@ -596,7 +596,8 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
             hover: true,
             scaleWithParent: true,
             distanceScaleEnd: true,
-            hand: RIGHT_HAND
+            hand: RIGHT_HAND,
+            delay: Picks.handLaserDelay
         });
         Keyboard.setRightHandLaser(this.rightPointer);
         this.leftHudPointer = this.pointerManager.createPointer(true, PickType.Ray, {
@@ -608,7 +609,8 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
             hover: true,
             scaleWithParent: true,
             distanceScaleEnd: true,
-            hand: LEFT_HAND
+            hand: LEFT_HAND,
+            delay: Picks.handLaserDelay
         });
         this.rightHudPointer = this.pointerManager.createPointer(true, PickType.Ray, {
             joint: "_CAMERA_RELATIVE_CONTROLLER_RIGHTHAND",
@@ -619,7 +621,8 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
             hover: true,
             scaleWithParent: true,
             distanceScaleEnd: true,
-            hand: RIGHT_HAND
+            hand: RIGHT_HAND,
+            delay: Picks.handLaserDelay
         });
 
         this.mouseRayPointer = Pointers.createRayPointer({
@@ -668,6 +671,13 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
             }
         };
 
+        this.handLaserDelayChanged = function (delay) {
+            Pointers.setDelay(_this.leftPointer, delay);
+            Pointers.setDelay(_this.rightPointer, delay);
+            Pointers.setDelay(_this.leftHudPointer, delay);
+            Pointers.setDelay(_this.rightHudPointer, delay);
+        };
+
         this.cleanup = function () {
             Controller.disableMapping(MAPPING_NAME);
             _this.pointerManager.removePointers();
@@ -730,6 +740,8 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
     Messages.subscribe('Hifi-Hand-RayPick-Blacklist');
     Messages.messageReceived.connect(controllerDispatcher.handleMessage);
 
+    Picks.handLaserDelayChanged.connect(controllerDispatcher.handLaserDelayChanged);
+
     Script.scriptEnding.connect(function () {
         controllerDispatcher.cleanup();
     });

scripts/system/controllers/controllerScripts.js

@@ -58,7 +58,7 @@ function runDefaultsTogether() {
 function runDefaultsSeparately() {
     for (var i in CONTOLLER_SCRIPTS) {
         if (CONTOLLER_SCRIPTS.hasOwnProperty(i)) {
-            print("loading " + CONTOLLER_SCRIPTS[j]);
+            print("loading " + CONTOLLER_SCRIPTS[i]);
             Script.load(CONTOLLER_SCRIPTS[i]);
         }
     }

scripts/system/controllers/mouseLook.js

@@ -1,204 +1,98 @@
-/*
-mouseLook.js – mouse look switching script
-by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
-*/
-(function() { // BEGIN LOCAL_SCOPE
+//
+// mouseLook.js
+//
+// By Armored Dragon (June 6). Refactored from Rampa3 & Vegaslon work
+//  Copyright 2024 Overte e.V.
+//
+//
+// Distributed under the Apache License, Version 2.0.
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
 
-    var away;
+(() => {
+    // States ----
+    let mouseLookActive = Settings.getValue("mouselook-active", false);
+    let mouseLookEnabled = Camera.getMouseLook();
+    let hmdActive = HMD.active;
+    let overlayActive = Desktop.isOverlayWindowFocused();
 
-    var hmd = HMD.active;
-
-    var mouseLookEnabled = Camera.getMouseLook();
-
-    var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
-
-    var tabletUp;
-    
-    var keysOnOverlay = Desktop.isOverlayWindowFocused();
-
-    var tempOff = false;
-
-    var altMode = false;
+    // Resources ----
+    let tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 
+    // Events ----
     Camera.mouseLookChanged.connect(onMouseLookChanged);
+    Controller.keyPressEvent.connect(onKeyPressEvent);
+    Desktop.uiFocusChanged.connect(onUiFocusChanged);
+    HMD.displayModeChanged.connect(onDisplayModeChanged);
+    MyAvatar.wentActive.connect(onWentActive);
+    MyAvatar.wentAway.connect(onWentAway);
+    tablet.tabletShownChanged.connect(onTabletShownChanged);
+    Script.scriptEnding.connect(onScriptEnding);
 
+    // Program ----
     function onMouseLookChanged(newMouseLook) {
+        disableMouseLook();
         mouseLookEnabled = newMouseLook;
     }
 
-    if (!hmd){
-        if (mouseLookEnabled) {
-            if (!keysOnOverlay) {
-                if (!tablet.tabletShown){
-                    Window.displayAnnouncement("Mouse look: ON");
-                    mouseLookOn();
-                } else {
-                    Window.displayAnnouncement("Tablet is up – mouse look temporarily OFF.");
-                }
-            }
-        }
-    }
-
-    Controller.keyPressEvent.connect(onKeyPressEvent);
-
     function onKeyPressEvent(event) {
-        if (!hmd){
-            if(event.isAlt){
-                if (keysOnOverlay) return;
-                if (!mouseLookEnabled) return;
-                mouseLookOff();
-                Window.displayAnnouncement("Mouse look: Temporarily OFF");
-                tempOff = true;
-                altMode = true;
-            }
-            if (tempOff && altMode && ['left', 'right', 'up', 'down', 'esc', 'w', 'a', 's', 'd'].includes(event.text.toLowerCase())){
-                if (keysOnOverlay) return;
-                if (!mouseLookEnabled) return;
-                mouseLookOn();
-                tempOff = false;
-                altMode = false
-            }
-            if (event.text.toLowerCase() === 'm') {
-                if (!keysOnOverlay) {
-                    if (mouseLookEnabled) {
-                        if (!Camera.getCaptureMouse()){
-                            tempOff = false;
-                            Window.displayAnnouncement("Mouse look: ON");
-                            mouseLookOn();
-                        } else {
-                            tempOff = true;
-                            Window.displayAnnouncement("Mouse look: Temporarily OFF");
-                            mouseLookOff();
-                        }
-                    }
-                }
+        // Toggle using the m key
+        if (event.text.toLowerCase() === "m") {
+            if (Camera.captureMouse) {
+                disableMouseLook();
+            } else {
+                mouseLookActive = true;
+                Settings.setValue("mouselook-active", true);
+                enableMouseLook();
             }
         }
     }
 
-    tablet.tabletShownChanged.connect(onTabletShownChanged);
-
     function onTabletShownChanged() {
-        if (!hmd) {
-            if (mouseLookEnabled) {
-                if (!tablet.toolbarMode) {
-                    if (!keysOnOverlay) {
-                        if (tablet.tabletShown) {
-                            tabletUp = true;
-                            if (!tempOff) {
-                                if (!away) {
-                                    Window.displayAnnouncement("Tablet is up – mouse look temporarily OFF.");
-                                    mouseLookOff();
-                                }
-                            }
-                        } else if (!tablet.tabletShown) {
-                            tabletUp = false;
-                            if (!tempOff) {
-                                if (!away && !keysOnOverlay) {
-                                    Window.displayAnnouncement("Tablet hidden – mouse look ON.");
-                                    mouseLookOn();
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
+        if (tablet.tabletShown) disableMouseLook();
+        else enableMouseLook();
     }
 
-    MyAvatar.wentAway.connect(onWentAway);
-
     function onWentAway() {
-        if (!hmd) {
-            if (mouseLookEnabled) {
-                away = true;
-                if (!keysOnOverlay) {
-                    if (!tabletUp){
-                        Window.displayAnnouncement("Away state ON – mouse look temporarily OFF.")
-                        tempOff = false;
-                        mouseLookOff()
-                    }
-                }
-            }
-        }
+        disableMouseLook();
     }
 
-    MyAvatar.wentActive.connect(onWentActive);
-
     function onWentActive() {
-        if (!hmd) {
-            if (mouseLookEnabled) {
-                away = false;
-                if (!keysOnOverlay) {
-                    if (!tabletUp) {
-                        Window.displayAnnouncement("Away state OFF – mouse look ON.");
-                        mouseLookOn();
-                    }
-                }
-            }
-        }
+        enableMouseLook();
     }
 
-    HMD.displayModeChanged.connect(onDisplayModeChanged);
-
     function onDisplayModeChanged() {
-        if (mouseLookEnabled) {
-            if (HMD.active) {
-                hmd = true;
-                mouseLookOff();
-            } else {
-                hmd = false;
-                if (!tempOff) {
-                    if (!keysOnOverlay) {
-                        if (!tabletUp) {
-                            mouseLookOn();
-                        }
-                    }
-                }
-            }
+        hmdActive = HMD.active;
+        if (hmdActive) disableMouseLook();
+        else enableMouseLook();
+    }
+
+    function onUiFocusChanged(keyFocus) {
+        if (keyFocus) {
+            overlayActive = true;
+            disableMouseLook();
+        } else {
+            overlayActive = false;
+            enableMouseLook();
         }
     }
 
-    function mouseLookOn() {
-        if (mouseLookEnabled)
-            Camera.captureMouse = true;
+    function enableMouseLook() {
+        if (hmdActive) return;
+        if (tablet.tabletShown) return;
+        if (overlayActive) return;
+        if (!mouseLookEnabled) return; // Mouse look disabled via setting
+        if (!mouseLookActive) return; // Mouse look disabled via the hotkey
+
+        Camera.captureMouse = true;
     }
 
-    function mouseLookOff() {
+    function disableMouseLook() {
+        mouseLookActive = false;
+        Settings.setValue("mouselook-active", false);
+
         Camera.captureMouse = false;
     }
-    
-    Desktop.uiFocusChanged.connect(onUiFocusChanged);
-    
-    function onUiFocusChanged(keyFocus) {
-        if (!hmd) {
-            if (mouseLookEnabled) {
-                if (keyFocus) {
-                    keysOnOverlay = true;
-                    if (Camera.captureMouse) {
-                        mouseLookOff();
-                    }
-                } else {
-                    keysOnOverlay = false;
-                    if (!tablet.tabletShown) {
-                        if (!tempOff) {
-                            if (!away) {
-                                mouseLookOn();
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    Messages.messageReceived.connect(onMessageReceived);
-    function onMessageReceived(channel, message, sender, localOnly) {
-        if (channel === "Hifi-Away-Enable")
-            if (message === 'enable') mouseLookOn();
-    }
-
-    Script.scriptEnding.connect(onScriptEnding);
 
     function onScriptEnding() {
         Camera.captureMouse = false;
@@ -211,5 +105,4 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
         Desktop.uiFocusChanged.disconnect(onUiFocusChanged);
         Script.scriptEnding.disconnect(onScriptEnding);
     }
-
-}()); // END LOCAL_SCOPE
+})();

scripts/system/create/assets/data/createAppTooltips.json

@@ -801,4 +801,4 @@
     "localOnly": {
         "tooltip": "Whether the sound should play locally for everyone separately, or globally via the audio mixer."
     }
-}
+}

scripts/system/create/entityProperties/html/entityProperties.html

@@ -5,7 +5,7 @@
 //  Created by Ryan Huffman on 13 Nov 2014
 //  Copyright 2014 High Fidelity, Inc.
 //  Copyright 2020 Vircadia contributors.
-//  Copyright 2022 Overte e.V.
+//  Copyright 2022-2024 Overte e.V.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -63,131 +63,298 @@
             </table>
         </div>
         <div id="uiMaterialAssistant" style="display: none;">
-            <div id="uiMaterialAssistant-sidewalk">
-
-                <div id="uiMaterialAssistant-formContainer">
-                    <div id="uiMaterialAssistant-headerContainer">
-                        <div style="width: 85%; text-align: left;"><font class="uiMaterialAssistant-title">MATERIAL DATA</font></div>
-                        <div style="width: 15%; text-align: right;"><span id="uiMaterialAssistant-closeButton">&#10006;</span></div>
-                    </div>
-
-                    <div class="uiMaterialAssistant-group">
-                        <font class="uiMaterialAssistant-label">Name:&nbsp;</font>
-                        <input name = "ma-name" id = "ma-name" type = "text" class="uiMaterialAssistant-input" style= "width: 90%;">
-                    </div>
-                    
-                    <div class="uiMaterialAssistant-group">
-                        <button class="uiMaterialAssistant-active" id="ma-albedo-isActive"></button>
-                        <font class="uiMaterialAssistant-label">Albedo (Color): </font>
-                        <div id="ma-albedo-colorPicker" class="uiMaterialAssistant-color-picker"></div>
-                        <br><br>
-                        <button class="uiMaterialAssistant-active" id="ma-albedoMap-isActive"></button>
-                        <font class="uiMaterialAssistant-label">Albedo Map (RGB) URL: </font>
-                        <input name = "ma-albedoMap" id = "ma-albedoMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;"><br>
-                        <font class="uiMaterialAssistant-Explain">The Albedo (Color) can be used to tint the texture of the Albedo Map.</font>
-                    </div>
-                    
-                    <div class="uiMaterialAssistant-group">
-                        <button class="uiMaterialAssistant-active" id="ma-metallic-isActive"></button>
-                        <font class="uiMaterialAssistant-label">Metallic: </font>
-                        <input class="uiMaterialAssistant-input" name = "ma-metallic" id = "ma-metallic" readonly type = "text" size = "5"><br> 
-                        <input type="range"  style="width:100%;" min="1" max="1000" value="1" class="uiMaterialAssistant-slider" name = "ma-metallic-slider" id = "ma-metallic-slider"><br>
-                        <div style="width: 100%; display: flex;">
-                            <div style="width: 15%; text-align: left;"><font class = "uiMaterialAssistant-Explain">|&lt; Nonmetal</font></div>
-                            <div style="width: 15%; text-align: left;"><font class = "uiMaterialAssistant-Explain">| Hair</font></div>
-                            <div style="width: 60%; text-align: left;"><font class = "uiMaterialAssistant-Explain">| Chitin</font></div>
-                            <div style="width: 10%; text-align: right;"><font class = "uiMaterialAssistant-Explain">Metal &gt;|</font></div>
-                        </div><br>
-                        <font class="uiMaterialAssistant-label">Metallic Map (Grayscale) URL: </font>
-                        <input name = "ma-metallicMap" id = "ma-metallicMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;">
-                    </div>
-                    
-                    <div class="uiMaterialAssistant-group">
-                        <button class="uiMaterialAssistant-active" id="ma-roughness-isActive"></button>
-                        <font class="uiMaterialAssistant-label">Roughness:</font> 
-                        <input name = "ma-roughness" id = "ma-roughness" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
-                        <input type="range"  style="width:100%;" min="0" max="1000" value="0" class="uiMaterialAssistant-slider" name = "ma-roughness-slider" id = "ma-roughness-slider"><br>
-                        <div style="width: 100%; display: flex;">
-                            <div style="width: 50%; text-align: left;"><font class = "uiMaterialAssistant-Explain">|&lt; Glossy, polished, lustrous</font></div>
-                            <div style="width: 50%; text-align: right;"><font class = "uiMaterialAssistant-Explain">Unpolished, mat, rough &gt;|</font></div>
-                        </div><br>
-                        <font class="uiMaterialAssistant-label">Roughness Map (Grayscale) URL: </font>
-                        <input name = "ma-roughnessMap" id = "ma-roughnessMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;">
-                    </div>
-                    
-                    <div class="uiMaterialAssistant-group">
-                        <button class="uiMaterialAssistant-active" id="ma-normalMap-isActive"></button>
-                        <font class="uiMaterialAssistant-label">Normal Map URL: </font>
-                        <input name = "ma-normalMap" id = "ma-normalMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;">
-                    </div>
-                    
-                    <div class="uiMaterialAssistant-group">
-                        <button class="uiMaterialAssistant-active" id="ma-opacity-isActive"></button>
-                        <font class="uiMaterialAssistant-label">Opacity: </font> 
-                        <input name = "ma-opacity" id = "ma-opacity" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
-                        <input type="range"  style="width:100%;" min="0" max="1000" value="0" class="uiMaterialAssistant-slider" name = "ma-opacity-slider" id = "ma-opacity-slider"><br>
-                        <div style="width: 100%; display: flex;">
-                            <div style="width: 50%; text-align: left;"><font class = "uiMaterialAssistant-Explain">|&lt; Transparent</font></div>
-                            <div style="width: 50%; text-align: right;"><font class = "uiMaterialAssistant-Explain">Opaque &gt;|</font></div>
+            <div id="uiMaterialAssistant-headerContainer">
+                <div style="width: 85%; text-align: left;"><font class="uiMaterialAssistant-title">MATERIAL DATA</font></div>
+                <div style="width: 15%; text-align: right;"><span id="uiMaterialAssistant-closeButton">&#10006;&nbsp;&nbsp;</span></div>
+            </div>        
+            <div id="uiMaterialAssistant-scrollable">
+                <div id="uiMaterialAssistant-sidewalk">
+                    <div id="uiMaterialAssistant-formContainer">
+                        <div class="uiMaterialAssistant-group">
+                            <font class="uiMaterialAssistant-label">Name:&nbsp;</font>
+                            <input name = "ma-name" id = "ma-name" type = "text" class="uiMaterialAssistant-input" style= "width: 90%;">
                         </div>
-                        <br>
-                        <font class="uiMaterialAssistant-label">Opacity Map Mode:</font><br><br>
-                        <input type="radio" class="uiMaterialAssistant-radio" checked name = "ma-opacityMapMode" id = "ma-opacityMapMode-dont" value = "OPACITY_MAP_OPAQUE"> Do not used&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                        <input type="radio" class="uiMaterialAssistant-radio" name = "ma-opacityMapMode" id = "ma-opacityMapMode-mask" value = "OPACITY_MAP_MASK"> Cut off mask&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                        <input type="radio" class="uiMaterialAssistant-radio" name = "ma-opacityMapMode" id = "ma-opacityMapMode-blend" value = "OPACITY_MAP_BLEND"> Blend<br>
-                        <font class="uiMaterialAssistant-Explain"><br>Note: For an opacity map, the alpha layer of the Albedo Map will be used.<br>
-                        'Blend' mode will used the alpha value to determine the opacity of a pixel.<br>
-                        'Cut off mask' mode will use the 'Cut off threshold' to determine if a pixel will be opaque or transparent, based on the alpha value from the map.</font><br><br>
-                        <font class="uiMaterialAssistant-label">Cut Off Threshold: </font>
-                        <input name = "ma-opacityCutoff" id = "ma-opacityCutoff" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
-                        <input type="range"  style="width:100%;" min="0" max="1000" value="0" class="uiMaterialAssistant-slider" name = "ma-opacityCutoff-slider" id = "ma-opacityCutoff-slider"><br>
-                        <div style="width: 100%; display: flex;">
-                            <div style="width: 50%; text-align: left;"><font class = "uiMaterialAssistant-Explain">|&lt; Transparent</font></div>
-                            <div style="width: 50%; text-align: right;"><font class = "uiMaterialAssistant-Explain">Opaque &gt;|</font></div>
+                        
+                        <div class="uiMaterialAssistant-group">
+                            <font class="uiMaterialAssistant-label">Model: </font><br><br> 
+                            <input type="radio" class="uiMaterialAssistant-radio" checked name = "ma-Model" id = "ma-Model-hifi_pbr" value = "hifi_pbr"> PBR&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            <input type="radio" class="uiMaterialAssistant-radio" name = "ma-Model" id = "ma-Model-vrm_mtoon" value = "vrm_mtoon"> MToon&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            <input type="radio" class="uiMaterialAssistant-radio" name = "ma-Model" id = "ma-Model-hifi_shader_simple" value = "hifi_shader_simple"> Shader (Simple)<br>
                         </div>
-                    </div>
-                    
-                    <div class="uiMaterialAssistant-group">
-                        <div style="width: 100%; display: flex;">
-                            <div style="width: 70%; text-align: left;">
-                                <button class="uiMaterialAssistant-active" id="ma-emissive-isActive"></button>
-                                <font class="uiMaterialAssistant-label">Emissive: </font>
-                                <div id="ma-emissive-colorPicker" class="uiMaterialAssistant-color-picker"></div>                           
+                        
+                        <div class="uiMaterialAssistant-group">
+                            <div id="maContainerAlbedo">
+                                <button class="uiMaterialAssistant-active" id="ma-albedo-isActive"></button>
+                                <font class="uiMaterialAssistant-label">Albedo (Color): </font>
+                                <div id="ma-albedo-colorPicker" class="uiMaterialAssistant-color-picker"></div>
                             </div>
-                            <div style="width: 30%; text-align: left;">
-                                <input type="checkbox" class="uiMaterialAssistant-checkbox" name = "ma-unlit" id = "ma-unlit">
-                                <font class="uiMaterialAssistant-label">Unlit</font>
+                            <br><br>
+                            <div id="maContainerAlbedoMap">
+                                <button class="uiMaterialAssistant-active" id="ma-albedoMap-isActive"></button>
+                                <font class="uiMaterialAssistant-label">Albedo Map (RGB) URL: </font>
+                                <input name = "ma-albedoMap" id = "ma-albedoMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;"><br>
+                                <font class="uiMaterialAssistant-Explain">The Albedo (Color) can be used to tint the texture of the Albedo Map.</font>
                             </div>
                         </div>
-                        <font class="uiMaterialAssistant-label">Bloom Factor:</font> 
-                        <input name = "ma-bloom" id = "ma-bloom" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>            
-                        <input type="range"  style="width:100%;" min="100" max="900" value="100" class="uiMaterialAssistant-slider" name = "ma-bloom-slider" id = "ma-bloom-slider"><br>
-                        <font class="uiMaterialAssistant-label">Emissive Map (RGB) URL:</font> 
-                        <input name = "ma-emissiveMap" id = "ma-emissiveMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;">
+                        
+                        <div class="uiMaterialAssistant-group" id="maContainerMetallic">
+                            <button class="uiMaterialAssistant-active" id="ma-metallic-isActive"></button>
+                            <font class="uiMaterialAssistant-label">Metallic: </font>
+                            <input class="uiMaterialAssistant-input" name = "ma-metallic" id = "ma-metallic" readonly type = "text" size = "5"><br> 
+                            <input type="range"  style="width:100%;" min="1" max="1000" value="1" class="uiMaterialAssistant-slider" name = "ma-metallic-slider" id = "ma-metallic-slider"><br>
+                            <div style="width: 100%; display: flex;">
+                                <div style="width: 15%; text-align: left;"><font class = "uiMaterialAssistant-Explain">|&lt; Nonmetal</font></div>
+                                <div style="width: 15%; text-align: left;"><font class = "uiMaterialAssistant-Explain">| Hair</font></div>
+                                <div style="width: 60%; text-align: left;"><font class = "uiMaterialAssistant-Explain">| Chitin</font></div>
+                                <div style="width: 10%; text-align: right;"><font class = "uiMaterialAssistant-Explain">Metal &gt;|</font></div>
+                            </div><br>
+                            <font class="uiMaterialAssistant-label">Metallic Map (Red channel) URL: </font>
+                            <input name = "ma-metallicMap" id = "ma-metallicMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;">
+                            <div style="display: flex;">
+                                <div style="text-align: left;"><input type="checkbox" class="uiMaterialAssistant-checkbox" name = "ma-useSpecular" id = "ma-useSpecular"></div>
+                                <div style="text-align: left; padding: 3px;"><font class="uiMaterialAssistant-label"> Instead, use Specular Map </font></div>
+                            </div>                            
+                        </div>
+                        
+                        <div class="uiMaterialAssistant-group" id="maContainerRoughness">
+                            <button class="uiMaterialAssistant-active" id="ma-roughness-isActive"></button>
+                            <font class="uiMaterialAssistant-label">Roughness:</font> 
+                            <input name = "ma-roughness" id = "ma-roughness" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
+                            <input type="range"  style="width:100%;" min="0" max="1000" value="0" class="uiMaterialAssistant-slider" name = "ma-roughness-slider" id = "ma-roughness-slider"><br>
+                            <div style="width: 100%; display: flex;">
+                                <div style="width: 50%; text-align: left;"><font class = "uiMaterialAssistant-Explain">|&lt; Glossy, polished, lustrous</font></div>
+                                <div style="width: 50%; text-align: right;"><font class = "uiMaterialAssistant-Explain">Unpolished, mat, rough &gt;|</font></div>
+                            </div><br>
+                            <font class="uiMaterialAssistant-label">Roughness Map (Red channel) URL: </font>
+                            <input name = "ma-roughnessMap" id = "ma-roughnessMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;">
+                            <div style="display: flex;">
+                                <div style="text-align: left;"><input type="checkbox" class="uiMaterialAssistant-checkbox" name = "ma-useGloss" id = "ma-useGloss"></div>
+                                <div style="text-align: left; padding: 3px;"><font class="uiMaterialAssistant-label"> Instead, use Gloss Map </font></div>
+                            </div>
+                        </div>
+                        
+                        <div class="uiMaterialAssistant-group" id="maContainerNormalMap">
+                            <button class="uiMaterialAssistant-active" id="ma-normalMap-isActive"></button>
+                            <font class="uiMaterialAssistant-label">Normal Map URL: </font>
+                            <input name = "ma-normalMap" id = "ma-normalMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;">
+                            <div style="display: flex;">
+                                <div style="text-align: left;"><input type="checkbox" class="uiMaterialAssistant-checkbox" name = "ma-useBump" id = "ma-useBump"></div>
+                                <div style="text-align: left; padding: 3px;"><font class="uiMaterialAssistant-label"> Instead, use Bump Map </font></div>
+                            </div>
+                        </div>
+                        
+                        <div class="uiMaterialAssistant-group">
+                            <div id="maContainerOpacity">
+                                <button class="uiMaterialAssistant-active" id="ma-opacity-isActive"></button>
+                                <font class="uiMaterialAssistant-label">Opacity: </font> 
+                                <input name = "ma-opacity" id = "ma-opacity" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
+                                <input type="range"  style="width:100%;" min="0" max="1000" value="0" class="uiMaterialAssistant-slider" name = "ma-opacity-slider" id = "ma-opacity-slider"><br>
+                                <div style="width: 100%; display: flex;">
+                                    <div style="width: 50%; text-align: left;"><font class = "uiMaterialAssistant-Explain">|&lt; Transparent</font></div>
+                                    <div style="width: 50%; text-align: right;"><font class = "uiMaterialAssistant-Explain">Opaque &gt;|</font></div>
+                                </div>
+                            </div>
+                            <br>
+                            <div id="maContainerOpacityMap">
+                                <font class="uiMaterialAssistant-label">Opacity Map Mode:</font><br><br>
+                                <input type="radio" class="uiMaterialAssistant-radio" checked name = "ma-opacityMapMode" id = "ma-opacityMapMode-dont" value = "OPACITY_MAP_OPAQUE"> Not used&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <input type="radio" class="uiMaterialAssistant-radio" name = "ma-opacityMapMode" id = "ma-opacityMapMode-mask" value = "OPACITY_MAP_MASK"> Cut off mask&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                <input type="radio" class="uiMaterialAssistant-radio" name = "ma-opacityMapMode" id = "ma-opacityMapMode-blend" value = "OPACITY_MAP_BLEND"> Blend<br>
+                                <font class="uiMaterialAssistant-Explain"><br>Note: For an opacity map, the alpha layer of the Albedo Map will be used.<br>
+                                'Blend' mode will used the alpha value to determine the opacity of a pixel.<br>
+                                'Cut off mask' mode will use the 'Cut off threshold' to determine if a pixel will be opaque or transparent, based on the alpha value from the map.</font><br><br>
+                                <font class="uiMaterialAssistant-label">Cut Off Threshold: </font>
+                                <input name = "ma-opacityCutoff" id = "ma-opacityCutoff" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
+                                <input type="range"  style="width:100%;" min="0" max="1000" value="0" class="uiMaterialAssistant-slider" name = "ma-opacityCutoff-slider" id = "ma-opacityCutoff-slider"><br>
+                                <div style="width: 100%; display: flex;">
+                                    <div style="width: 50%; text-align: left;"><font class = "uiMaterialAssistant-Explain">|&lt; Transparent</font></div>
+                                    <div style="width: 50%; text-align: right;"><font class = "uiMaterialAssistant-Explain">Opaque &gt;|</font></div>
+                                </div>
+                            </div>
+                        </div>
+                        
+                        <div class="uiMaterialAssistant-group" id = "maContainerEmissive">
+                            <div style="width: 100%; display: flex;">
+                                <div style="width: 65%; text-align: left;">
+                                    <button class="uiMaterialAssistant-active" id="ma-emissive-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Emissive: </font>
+                                    <div id="ma-emissive-colorPicker" class="uiMaterialAssistant-color-picker"></div>
+                                </div>
+                                <div style="width: 35%; text-align: left;">
+                                    <div id = "maContainerUnlit">
+                                        <div style="display: flex;">
+                                            <div style="text-align: left;"><input type="checkbox" class="uiMaterialAssistant-checkbox" name = "ma-unlit" id = "ma-unlit"></div>
+                                            <div style="text-align: left; padding: 3px;"><font class="uiMaterialAssistant-label"> Unlit</font></div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <font class="uiMaterialAssistant-label">Bloom Factor:</font> 
+                            <input name = "ma-bloom" id = "ma-bloom" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>            
+                            <input type="range"  style="width:100%;" min="100" max="900" value="100" class="uiMaterialAssistant-slider" name = "ma-bloom-slider" id = "ma-bloom-slider"><br>
+                            <div id = "maContainerEmissiveMap">
+                                <font class="uiMaterialAssistant-label">Emissive Map (RGB) URL:</font> 
+                                <input name = "ma-emissiveMap" id = "ma-emissiveMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;">
+                            </div>
+                        </div>
+                        
+                        <div class="uiMaterialAssistant-group" id="maContainerScattering">
+                            <button class="uiMaterialAssistant-active" id="ma-scattering-isActive"></button>
+                            <font class="uiMaterialAssistant-label">Scattering: </font>
+                            <input name = "ma-scattering" id = "ma-scattering" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
+                            <input type="range"  style="width:100%;" min="0" max="1000" value="0" class="uiMaterialAssistant-slider" name = "ma-scattering-slider" id = "ma-scattering-slider"><br>
+                            <font class="uiMaterialAssistant-label">Scattering Map (Red channel) URL: </font>
+                            <input name = "ma-scatteringMap" id = "ma-scatteringMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;">
+                            <font class="uiMaterialAssistant-Explain">Scattering or Scattering Map won't be effective without the presence of a Normal/Bump Map.</font>
+                        </div>
+                        
+                        <div class="uiMaterialAssistant-group" id="maContainerOcclusionMap">
+                            <button class="uiMaterialAssistant-active" id="ma-occlusionMap-isActive"></button>
+                            <font class="uiMaterialAssistant-label">Occlusion Map (Red channel) URL: </font>
+                            <input name = "ma-occlusionMap" id = "ma-occlusionMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;">
+                            <font class="uiMaterialAssistant-Explain">Note: 'Occlusion Map' and 'Light Map' are using a separated UV Map.</font>
+                        </div>
+                        
+                        <div class="uiMaterialAssistant-group" id="maContainerLightMap">
+                            <button class="uiMaterialAssistant-active" id="ma-lightMap-isActive"></button>
+                            <font class="uiMaterialAssistant-label">Light Map (Red channel) URL: </font>
+                            <input name = "ma-lightMap" id = "ma-lightMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;">
+                            <font class="uiMaterialAssistant-Explain">Note: 'Light Map' and 'Occlusion Map' are using a separated UV Map.</font>
+                        </div>
+                        
+                        <div id="maContainerMtoon">
+                            <div class="uiMaterialAssistant-group">
+                                    <button class="uiMaterialAssistant-active" id="ma-shade-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Shade (Color): </font>
+                                    <div id="ma-shade-colorPicker" class="uiMaterialAssistant-color-picker"></div>
+                                <br><br>
+                                    <button class="uiMaterialAssistant-active" id="ma-shadeMap-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Shade Map (RGB) URL: </font>
+                                    <input name = "ma-shadeMap" id = "ma-shadeMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;"><br>
+                                    <font class="uiMaterialAssistant-Explain">The Shade (Color) can be used to tint the texture of the Shade Map.</font>
+                            </div>
+                            
+                            <div class="uiMaterialAssistant-group">
+                                    <button class="uiMaterialAssistant-active" id="ma-matcap-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Matcap (Color): </font>
+                                    <div id="ma-matcap-colorPicker" class="uiMaterialAssistant-color-picker"></div>
+                                <br><br>
+                                    <button class="uiMaterialAssistant-active" id="ma-matcapMap-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Matcap Map (RGB) URL: </font>
+                                    <input name = "ma-matcapMap" id = "ma-matcapMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;"><br>
+                                    <font class="uiMaterialAssistant-Explain">The Matcap (Color) can be used to tint the texture of the Matcap Map.</font>
+                            </div>
+                            
+                            <div class="uiMaterialAssistant-group">
+                                    <button class="uiMaterialAssistant-active" id="ma-shadingShift-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Shading Shift: </font>
+                                    <input name = "ma-shadingShift" id = "ma-shadingShift" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
+                                    <input type="range"  style="width:100%;" min="0" max="1000" value="0" class="uiMaterialAssistant-slider" name = "ma-shadingShift-slider" id = "ma-shadingShift-slider">
+                                <br><br>
+                                    <button class="uiMaterialAssistant-active" id="ma-shadingShiftMap-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Shading Shift Map (Red Channel) URL: </font>
+                                    <input name = "ma-shadingShiftMap" id = "ma-shadingShiftMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;"><br>
+                                    <font class="uiMaterialAssistant-Explain">The Shading Shift value can be used to multiply the effect of the Shading Shift Map. Shading Shift Map can be RGB texture, but it will only used the "red" channel.</font>
+                            </div>
+                            
+                            <div class="uiMaterialAssistant-group">
+                                    <button class="uiMaterialAssistant-active" id="ma-shadingToony-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Shading Toony: </font>
+                                    <input name = "ma-shadingToony" id = "ma-shadingToony" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
+                                    <input type="range"  style="width:100%;" min="0" max="1000" value="0" class="uiMaterialAssistant-slider" name = "ma-shadingToony-slider" id = "ma-shadingToony-slider">
+                                    <font class="uiMaterialAssistant-Explain">&nbsp;</font>
+                            </div>
+                            
+                            <div class="uiMaterialAssistant-group">
+                                    <button class="uiMaterialAssistant-active" id="ma-parametricRim-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Parametric Rim (Color): </font>
+                                    <div id="ma-parametricRim-colorPicker" class="uiMaterialAssistant-color-picker"></div>
+                                <br><br>    
+                                    <button class="uiMaterialAssistant-active" id="ma-parametricRimFresnelPower-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Parametric Rim Fresnel Power: </font>
+                                    <input name = "ma-parametricRimFresnelPower" id = "ma-parametricRimFresnelPower" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
+                                    <input type="range"  style="width:100%;" min="0" max="20000" value="0" class="uiMaterialAssistant-slider" name = "ma-parametricRimFresnelPower-slider" id = "ma-parametricRimFresnelPower-slider">
+                                    <font class="uiMaterialAssistant-Explain">&nbsp;</font>
+                                <br><br>    
+                                    <button class="uiMaterialAssistant-active" id="ma-parametricRimLift-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Parametric Rim Lift Factor: </font>
+                                    <input name = "ma-parametricRimLift" id = "ma-parametricRimLift" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
+                                    <input type="range"  style="width:100%;" min="-10000" max="10000" value="0" class="uiMaterialAssistant-slider" name = "ma-parametricRimLift-slider" id = "ma-parametricRimLift-slider">
+                                    <font class="uiMaterialAssistant-Explain">&nbsp;</font>
+                                <br><br>
+                                    <button class="uiMaterialAssistant-active" id="ma-rimMap-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Rim Map (RGB) URL: </font>
+                                    <input name = "ma-rimMap" id = "ma-rimMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;"><br>
+                                    <font class="uiMaterialAssistant-Explain">&nbsp;</font>
+                                <br><br>    
+                                    <button class="uiMaterialAssistant-active" id="ma-rimLightingMix-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Rim Lighting Mix: </font>
+                                    <input name = "ma-rimLightingMix" id = "ma-rimLightingMix" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
+                                    <input type="range"  style="width:100%;" min="0" max="1000" value="0" class="uiMaterialAssistant-slider" name = "ma-rimLightingMix-slider" id = "ma-rimLightingMix-slider">
+                                    <font class="uiMaterialAssistant-Explain">How much to mix between the rim color and normal lighting.</font>
+                            </div>
+<!-- ############ Not supported yet, but the code is ready (commented) ##########################################################
+                            <div class="uiMaterialAssistant-group">
+                                    <button class="uiMaterialAssistant-active" id="ma-outlineWidthMode-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Outline Width Mode : </font><br><br> 
+                                    <input type="radio" class="uiMaterialAssistant-radio" checked name = "ma-outlineWidthMode" id = "ma-outlineWidthMode-none" value = "none"> None&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    <input type="radio" class="uiMaterialAssistant-radio" name = "ma-outlineWidthMode" id = "ma-outlineWidthMode-world" value = "worldCoordinates"> World Coordinates&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    <input type="radio" class="uiMaterialAssistant-radio" name = "ma-outlineWidthMode" id = "ma-outlineWidthMode-screen" value = "screenCoordinates"> Screen Coordinates<br>
+                                    <font class="uiMaterialAssistant-Explain">'World Coordinates' will render an outline with a constant world size, i.e. its apparent size depends on distance.
+                                    'Screen Coordinates' will render an outline with a constant screen size, i.e. its apparent size remains constant.</font>
+                                <br><br>
+                                    <button class="uiMaterialAssistant-active" id="ma-outlineWidth-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Outline Width: </font>
+                                    <input name = "ma-outlineWidth" id = "ma-outlineWidth" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
+                                    <input type="range"  style="width:100%;" min="0" max="1000" value="0" class="uiMaterialAssistant-slider" name = "ma-outlineWidth-slider" id = "ma-outlineWidth-slider">
+                                    <font class="uiMaterialAssistant-Explain">The width of the outline, in meters if the mode is 'World Coordinates', or a ratio of the screen height if the Mode is 'Screen Coordinates'.</font>
+                                <br><br>
+                                    <button class="uiMaterialAssistant-active" id="ma-outline-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">Outline (Color): </font>
+                                    <div id="ma-outline-colorPicker" class="uiMaterialAssistant-color-picker"></div>
+                            </div>
+############################################################################################################ -->
+                            <div class="uiMaterialAssistant-group">
+                                    <button class="uiMaterialAssistant-active" id="ma-uvAnimationMaskMap-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">UV Animation Mask Map (Blue Channel) URL: </font>
+                                    <input name = "ma-uvAnimationMaskMap" id = "ma-uvAnimationMaskMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;"><br>
+                                    <font class="uiMaterialAssistant-Explain">UV Animation Mask Map can be RGB texture, but it will only used the "blue" channel.</font>
+                                <br><br>
+                                    <button class="uiMaterialAssistant-active" id="ma-uvAnimationScrollXSpeed-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">UV Animation Scroll X Speed: </font>
+                                    <input name = "ma-uvAnimationScrollXSpeed" id = "ma-uvAnimationScrollXSpeed" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
+                                    <input type="range"  style="width:100%;" min="-3000" max="3000" value="0" class="uiMaterialAssistant-slider" name = "ma-uvAnimationScrollXSpeed-slider" id = "ma-uvAnimationScrollXSpeed-slider">
+                                    <font class="uiMaterialAssistant-Explain">The speed of the UV scrolling animation in the X dimension, in UV units per second.</font>
+                                <br><br>
+                                    <button class="uiMaterialAssistant-active" id="ma-uvAnimationScrollYSpeed-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">UV Animation Scroll Y Speed: </font>
+                                    <input name = "ma-uvAnimationScrollYSpeed" id = "ma-uvAnimationScrollYSpeed" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
+                                    <input type="range"  style="width:100%;" min="-3000" max="3000" value="0" class="uiMaterialAssistant-slider" name = "ma-uvAnimationScrollYSpeed-slider" id = "ma-uvAnimationScrollYSpeed-slider">
+                                    <font class="uiMaterialAssistant-Explain">The speed of the UV scrolling animation in the Y dimension, in UV units per second.</font>
+                                <br><br>
+                                    <button class="uiMaterialAssistant-active" id="ma-uvAnimationRotationSpeed-isActive"></button>
+                                    <font class="uiMaterialAssistant-label">UV Animation Rotation Speed: </font>
+                                    <input name = "ma-uvAnimationRotationSpeed" id = "ma-uvAnimationRotationSpeed" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
+                                    <input type="range"  style="width:100%;" min="-10000" max="10000" value="0" class="uiMaterialAssistant-slider" name = "ma-uvAnimationRotationSpeed-slider" id = "ma-uvAnimationRotationSpeed-slider">
+                                    <font class="uiMaterialAssistant-Explain">The speed of the UV scrolling rotation around the center (0.5 UV, 0.5 UV), in radians per second.</font>
+                            </div>
+                        </div>
+                        <div id="maContainerShaderSimple">
+                            <div class="uiMaterialAssistant-group">
+                                <font class="uiMaterialAssistant-label">Procedural (json):&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</font>
+                                <button class="uiMaterialAssistant-smallButton" id= "ma-addProceduralTemplate">Use Basic Template</button>
+                                <textarea name = "ma-procedural" id = "ma-procedural" class="uiMaterialAssistant-textarea"></textarea><br>
+                                <font class="uiMaterialAssistant-Explain">&nbsp;</font>
+                            </div>
+                        </div>
+                        <div class="uiMaterialAssistant-group">
+                            <font class="uiMaterialAssistant-label">Material displayed on surface: </font><br><br> 
+                            <input type="radio" class="uiMaterialAssistant-radio" checked name = "ma-cullFaceMode" id = "ma-cullFaceMode-back" value = "CULL_BACK"> Outside&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            <input type="radio" class="uiMaterialAssistant-radio" name = "ma-cullFaceMode" id = "ma-cullFaceMode-front" value = "CULL_FRONT"> Inside&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                            <input type="radio" class="uiMaterialAssistant-radio" name = "ma-cullFaceMode" id = "ma-cullFaceMode-none" value = "CULL_NONE"> Both<br>
+                        </div>
+                        <br><br><br><br><br>
                     </div>
-                    
-                    <div class="uiMaterialAssistant-group">
-                        <button class="uiMaterialAssistant-active" id="ma-scattering-isActive"></button>
-                        <font class="uiMaterialAssistant-label">Scattering: </font>
-                        <input name = "ma-scattering" id = "ma-scattering" readonly class="uiMaterialAssistant-input" type = "text" size = "5"><br>
-                        <input type="range"  style="width:100%;" min="0" max="1000" value="0" class="uiMaterialAssistant-slider" name = "ma-scattering-slider" id = "ma-scattering-slider"><br>
-                        <font class="uiMaterialAssistant-label">Scattering Map (Grayscale) URL: </font>
-                        <input name = "ma-scatteringMap" id = "ma-scatteringMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;">
-                    </div>
-                    
-                    <div class="uiMaterialAssistant-group">
-                        <button class="uiMaterialAssistant-active" id="ma-occlusionMap-isActive"></button>
-                        <font class="uiMaterialAssistant-label">Occlusion Map (Grayscale) URL: </font>
-                        <input name = "ma-occlusionMap" id = "ma-occlusionMap" class="uiMaterialAssistant-input" type = "text" style= "width:100%;">
-                    </div>
-
-                    <div class="uiMaterialAssistant-group">
-                        <font class="uiMaterialAssistant-label">Material displayed on surface: </font><br><br> 
-                        <input type="radio" class="uiMaterialAssistant-radio" checked name = "ma-cullFaceMode" id = "ma-cullFaceMode-back" value = "CULL_BACK"> Outside&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                        <input type="radio" class="uiMaterialAssistant-radio" name = "ma-cullFaceMode" id = "ma-cullFaceMode-front" value = "CULL_FRONT"> Inside&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                        <input type="radio" class="uiMaterialAssistant-radio" name = "ma-cullFaceMode" id = "ma-cullFaceMode-none" value = "CULL_NONE"> Both<br>
-                    </div>
-                    <br><br><br><br><br>
                 </div>
             </div>
         </div>

scripts/system/create/entityProperties/html/js/entityProperties.js

@@ -2140,6 +2140,7 @@ let createAppTooltip = new CreateAppTooltip();
 let currentSpaceMode = PROPERTY_SPACE_MODE.LOCAL;
 let zonesList = [];
 let canViewAssetURLs = false;
+let maSelectedId;
 
 function createElementFromHTML(htmlString) {
     let elTemplate = document.createElement('template');
@@ -3920,10 +3921,9 @@ function saveMaterialData() {
 
 function openMaterialAssistant() {
     if (materialEditor === null) {
-        loadDataInMaUi({});
-    } else {
-        loadDataInMaUi(materialEditor.getText());
+        newJSONMaterialEditor();
     }
+    loadDataInMaUi(materialEditor.getText());
     $('#uiMaterialAssistant').show();
     $('#properties-list').hide();
 }
@@ -4815,7 +4815,16 @@ function handleEntitySelectionUpdate(selections, isPropertiesToolUpdate) {
     const multipleSelections = currentSelections.length > 1;
     const hasSelectedEntityChanged = !areSetsEqual(selectedEntityIDs, previouslySelectedEntityIDs);
 
-    closeMaterialAssistant();
+    if (selections.length === 1) {
+        if (maSelectedId !== selections[0].id) {
+            closeMaterialAssistant();
+        }
+        maSelectedId = selections[0].id;
+    } else {
+        closeMaterialAssistant();
+        maSelectedId = "";
+    }
+
     requestZoneList();
     
     if (selections.length === 0) {

scripts/system/html/css/materialAssistant.css

@@ -3,7 +3,7 @@
 //
 //  Created by Alezia Kurdis on May 17th, 2022.
 //  Copyright 2022 Vircadia contributors.
-//  Copyright 2022 Overte e.V.
+//  Copyright 2022-2024 Overte e.V.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -22,7 +22,12 @@
     background-color: #404040;
     z-index: 2;
     border-collapse: collapse;
+}
+
+#uiMaterialAssistant-scrollable {
+    border-collapse: collapse;
     overflow-y: scroll;
+    height: 100%;
 }
 
 #uiMaterialAssistant-headerContainer {
@@ -80,12 +85,21 @@ font.uiMaterialAssistant-label{
     color: #D2D2D2;
 }
 
+label.uiMaterialAssistant-label{
+    background-color: #2E2E2E;
+    font-family: Raleway-SemiBold;
+    text-decoration: none;
+    font-size: 12px;
+    color: #D2D2D2;
+}
+
 font.uiMaterialAssistant-title{
     background-color: #404040;
     font-family: Raleway-Bold;
     font-size: 18px;
     text-decoration: none;
     color: #F2F2F2;
+    white-space: normal;
 }
 
 input[type=range].uiMaterialAssistant-slider {
@@ -151,6 +165,18 @@ input[type=text].uiMaterialAssistant-input {
     color: #000000;
 }
 
+textarea.uiMaterialAssistant-textarea {
+    background-color: #ffffff;
+    border: 1px solid #000000;
+    font-family: FiraSans-SemiBold;
+    font-size: 12px;
+    width: 100%;
+    height: 200px;
+    padding: 3px;
+    margin: 3px 0px 3px 0px;
+    color: #000000;
+}
+
 input[type=text].uiMaterialAssistant-input:disabled {
     background-color: #555555;
     color: #888888;
@@ -171,8 +197,8 @@ input[type=checkbox].uiMaterialAssistant-checkbox {
     height: 16px;
     margin: 2px;
     padding: 3px;
-    display: block;
     text-align: left;
+    display: block;
 }
 
 input[type=checkbox].uiMaterialAssistant-checkbox:focus {
@@ -221,3 +247,30 @@ div.uiMaterialAssistant-color-picker {
     width: 120px;
     height: 30px;
 }
+
+button.uiMaterialAssistant-smallButton {
+    font-family: Raleway-Regular;
+    font-size: 12px;
+    border-radius: 5px;
+    border: none;
+    color: #cccccc;
+    background-color: #000000;
+    background: linear-gradient(#575757 20%, #000000 100%);
+    cursor: pointer;
+    padding: 3px 10px 3px 10px;
+}
+
+button.uiMaterialAssistant-smallButton:hover {
+    background: linear-gradient(#383838, #000000);
+    color: #eeeeee;
+    border: none;
+}
+
+button.uiMaterialAssistant-smallButton:disabled {
+    color: #555555;
+}
+
+button.uiMaterialAssistant-smallButton:focus {
+    outline: none;
+}
+

scripts/system/inspect.js

@@ -253,6 +253,9 @@ function keyPressEvent(event) {
         if (isEditUsingCamera) {
             return;
         }
+        if (Settings.getValue("mouselook-active", false)){
+            return;
+        }
         alt = true;
         changed = true;
         Picks.enablePick(pick);

scripts/system/libraries/WebTablet.js

@@ -19,7 +19,7 @@ var Y_AXIS = {x: 0, y: 1, z: 0};
 var X_AXIS = {x: 1, y: 0, z: 0};
 var DEFAULT_DPI = 31;
 var DEFAULT_WIDTH = 0.4375;
-var DEFAULT_VERTICAL_FIELD_OF_VIEW = 45; // degrees
+var DEFAULT_VERTICAL_FIELD_OF_VIEW = 55; // degrees
 var SENSOR_TO_ROOM_MATRIX = -2;
 var CAMERA_MATRIX = -7;
 var ROT_Y_180 = {x: 0.0, y: 1.0, z: 0, w: 0};

scripts/system/libraries/pointersUtils.js

@@ -36,6 +36,7 @@ var Pointer = function(hudLayer, pickType, pointerData) {
         faceCamera: true,
         ignorePickIntersection: true, // always ignore this
         renderLayer: this.renderLayer,
+        linePoints: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     };
     this.halfEnd = {
         type: "Sphere",
@@ -57,6 +58,7 @@ var Pointer = function(hudLayer, pickType, pointerData) {
         faceCamera: true,
         ignorePickIntersection: true, // always ignore this
         renderLayer: this.renderLayer,
+        linePoints: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     };
     this.fullEnd = {
         type: "Sphere",
@@ -78,6 +80,7 @@ var Pointer = function(hudLayer, pickType, pointerData) {
         faceCamera: true,
         ignorePickIntersection: true, // always ignore this
         renderLayer: this.renderLayer,
+        linePoints: [0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
     };
 
     this.renderStates = [

tools/dissectors/1-hfudt.lua

@@ -1,4 +1,5 @@
 print("Loading hfudt")
+bit32 = require("bit32")
 
 -- create the HFUDT protocol
 p_hfudt = Proto("hfudt", "HFUDT Protocol")
@@ -154,19 +155,55 @@ local packet_types = {
   [99] = "EntityQueryInitialResultsComplete",
   [100] = "BulkAvatarTraits",
   [101] = "AudioSoloRequest",
-  [102] = "BulkAvatarTraitsAck"
+  [102] = "BulkAvatarTraitsAck",
+  [103] = "StopInjector",
+  [104] = "AvatarZonePresence",
+  [105] = "WebRTCSignaling"
 }
 
+-- PacketHeaders.h, getNonSourcedPackets()
 local unsourced_packet_types = {
-  ["DomainList"] = true,
+  ["DomainConnectRequestPending"] = true,
+  ["CreateAssignment"] = true,
+  ["RequestAssignment"] = true,
+  ["DomainServerRequireDTLS"] = true,
   ["DomainConnectRequest"] = true,
-  ["ICEPing"] = true,
-  ["ICEPingReply"] = true,
+  ["DomainList"] = true,
+  ["DomainConnectionDenied"] = true,
+  ["DomainServerPathQuery"] = true,
+  ["DomainServerPathResponse"] = true,
+  ["DomainServerAddedNode"] = true,
   ["DomainServerConnectionToken"] = true,
   ["DomainSettingsRequest"] = true,
-  ["ICEServerHeartbeatACK"] = true
+  ["OctreeDataFileRequest"] = true,
+  ["OctreeDataFileReply"] = true,
+  ["OctreeDataPersist"] = true,
+  ["DomainContentReplacementFromUrl"] = true,
+  ["DomainSettings"] = true,
+  ["ICEServerPeerInformation"] = true,
+  ["ICEServerQuery"] = true,
+  ["ICEServerHeartbeat"] = true,
+  ["ICEServerHeartbeatACK"] = true,
+  ["ICEPing"] = true,
+  ["ICEPingReply"] = true,
+  ["ICEServerHeartbeatDenied"] = true,
+  ["AssignmentClientStatus"] = true,
+  ["StopNode"] = true,
+  ["DomainServerRemovedNode"] = true,
+  ["UsernameFromIDReply"] = true,
+  ["OctreeFileReplacement"] = true,
+  ["ReplicatedMicrophoneAudioNoEcho"] = true,
+  ["ReplicatedMicrophoneAudioWithEcho"] = true,
+  ["ReplicatedInjectAudio"] = true,
+  ["ReplicatedSilentAudioFrame"] = true,
+  ["ReplicatedAvatarIdentity"] = true,
+  ["ReplicatedKillAvatar"] = true,
+  ["ReplicatedBulkAvatarData"] = true,
+  ["AvatarZonePresence"] = true,
+  ["WebRTCSignaling"] = true
 }
 
+-- PacketHeaders.h, getNonVerifiedPackets()
 local nonverified_packet_types = {
     ["NodeJsonStats"] = true,
     ["EntityQuery"] = true,
@@ -222,6 +259,7 @@ function p_hfudt.dissector(buf, pinfo, tree)
       type:append_text(" (".. control_types[shifted_type][1] .. ")")
 
       subtree:add(f_control_type_text, control_types[shifted_type][1])
+      pinfo.cols.info:append(" [" .. control_types[shifted_type][1] .. "]")
     end
 
     if shifted_type == 0 then
@@ -257,7 +295,7 @@ function p_hfudt.dissector(buf, pinfo, tree)
     -- read the obfuscation level
     local obfuscation_bits = bit32.band(0x03, bit32.rshift(first_word, 27))
     subtree:add(f_obfuscation_level, obfuscation_bits)
-    
+
     -- read the sequence number
     subtree:add(f_sequence_number, bit32.band(first_word, SEQUENCE_NUMBER_MASK))
 
@@ -300,10 +338,12 @@ function p_hfudt.dissector(buf, pinfo, tree)
     local packet_type = buf(payload_offset, 1):le_uint()
     local ptype = subtree:add_le(f_type, buf(payload_offset, 1))
     local packet_type_text = packet_types[packet_type]
+
     if packet_type_text ~= nil then
       subtree:add(f_type_text, packet_type_text)
       -- if we know this packet type then add the name
       ptype:append_text(" (".. packet_type_text .. ")")
+      pinfo.cols.info:append(" [" .. packet_type_text .. "]")
     end
 
     -- read the version
@@ -431,12 +471,12 @@ function deobfuscate(message_bit, buf, level)
   else
     return
   end
-  
+
   local start = 4
   if message_bit == 1 then
     local start = 12
   end
-  
+
   local p = 0
   for i = start, buf:len() - 1 do
     out:set_index(i, bit.bxor(buf(i, 1):le_uint(), key:get_index(7 - (p % 8))) )

tools/dissectors/2-hf-audio.lua

@@ -1,5 +1,5 @@
 print("Loading hf-audio")
-
+bit32 = require("bit32")
 -- create the audio protocol
 p_hf_audio = Proto("hf-audio", "HF Audio Protocol")
 

tools/dissectors/3-hf-avatar.lua

@@ -1,4 +1,5 @@
 print("Loading hf-avatar")
+bit32 = require("bit32")
 
 -- create the avatar protocol
 p_hf_avatar = Proto("hf-avatar", "HF Avatar Protocol")

tools/dissectors/4-hf-entity.lua

@@ -1,4 +1,5 @@
 print("Loading hf-entity")
+bit32 = require("bit32")
 
 -- create the entity protocol
 p_hf_entity = Proto("hf-entity", "HF Entity Protocol")

tools/dissectors/5-hf-domain.lua

@@ -1,4 +1,6 @@
 -- create the domain protocol
+print("Loading hf-domain")
+bit32 = require("bit32")
 p_hf_domain = Proto("hf-domain", "HF Domain Protocol")
 
 -- domain packet fields

tools/dissectors/README.md

@@ -1,14 +1,73 @@
-High Fidelity Wireshark Plugins
----------------------------------
+# High Fidelity Wireshark Plugins
 
-Install wireshark 2.4.6 or higher.
 
-Copy these lua files into c:\Users\username\AppData\Roaming\Wireshark\Plugins
+## Installation
 
-After a capture any detected High Fidelity Packets should be easily identifiable by one of the following protocols
 
-* HF-AUDIO - Streaming audio packets
-* HF-AVATAR - Streaming avatar mixer packets
-* HF-ENTITY - Entity server traffic
-* HF-DOMAIN - Domain server traffic
-* HFUDT - All other UDP traffic
+* Install wireshark 2.4.6 or higher.
+* Copy these lua files into `c:\Users\username\AppData\Roaming\Wireshark\Plugins` on Windows, or `$HOME/.local/lib/wireshark/plugins` on Linux.
+
+## Lua version
+
+This is a Lua plugin, which requires the bit32 module to be installed. You can find the Lua version wireshark uses in the About dialog, eg:
+
+    Version 4.2.5 (Git commit 798e06a0f7be).
+
+    Compiled (64-bit) using GCC 14.1.1 20240507 (Red Hat 14.1.1-1), with GLib
+    2.80.2, with Qt 6.7.0, with libpcap, with POSIX capabilities (Linux), with libnl
+    3, with zlib 1.3.0.zlib-ng, with PCRE2, with Lua 5.1.5, with GnuTLS 3.8.5 and
+
+This indicates Lua 5.1 is used (see on the last line)
+
+
+## Requirements
+
+On Fedora 40:
+
+* wireshark-devel
+* lua5.1-bit32
+
+
+## Usage
+
+After a capture any detected Overte Packets should be easily identifiable by one of the following protocols
+
+* `HF-AUDIO` - Streaming audio packets
+* `HF-AVATAR` - Streaming avatar mixer packets
+* `HF-ENTITY` - Entity server traffic
+* `HF-DOMAIN` - Domain server traffic
+* `HFUDT` - All other UDP traffic
+
+
+
+
+## Troubleshooting
+
+### attempt to index global 'bit32' (a nil value)
+
+`[Expert Info (Error/Undecoded): Lua Error: /home/dale/.local/lib/wireshark/plugins/1-hfudt.lua:207: attempt to index global 'bit32' (a nil value)]`
+
+See the installation requirements, you need to install the bit32 Lua module for the right Lua version.
+
+## Development hints
+
+
+* Symlink files from the development tree to  `$HOME/.local/lib/wireshark/plugins`, to have Wireshark work on the latest dissector code.
+* Capture packets for later analysis in a PCAPNG file.
+* Only save needed packets in the dump
+
+Decode on the commandline with:
+
+    tshark -r packets.pcapng.gz -V
+
+Decode only the first packet:
+
+    tshark -r packets.pcapng.gz -V -c 1
+
+### Useful tshark arguments
+
+* `-x` hex dump
+* `-c N` Only decode first N packets
+* `-O hfudt,hf-domain,hf-entity,hf-avatar,hf-audio` Only dump Overte protocol data, skip dumping UDP/etc parts.
+* `-V` decode protocols
+*

tools/qt-builder/Dockerfile_Ubuntu_20.04_Qt5

@@ -4,11 +4,11 @@
 # - Check which commit you are building https://invent.kde.org/qt/qt/qt5/-/tree/kde/5.15
 # - Adjust this file to include the commit hash you are building, the date, the number of threads you want to use (-j10), the platform, and the Qt and QtWebEngine versions.
 #     Keep in mind that building Qt requires a lot of memory. You should have over 1.2GiB of system memory available per thread.
-# - Run the build process with something like `PROGRESS_NO_TRUNC=1 DOCKER_BUILDKIT=1 BUILDKIT_STEP_LOG_MAX_SIZE=-1 docker build --progress plain -t overte-qt5:5.15.10-2023.10.01-kde_d2122ee587cceb5b2f4130b7074f86db9aca570e -f Dockerfile_Ubuntu_20.04_Qt5 .`
+# - Run the build process with something like `PROGRESS_NO_TRUNC=1 DOCKER_BUILDKIT=1 BUILDKIT_STEP_LOG_MAX_SIZE=-1 docker build --progress plain -t overte-qt5:5.15.14-2024.06.17-kde_570f5b2105df1ea052bec0d6dbf8a00137274371 -f Dockerfile_Ubuntu_20.04_Qt5 .`
 #     Buildkit is used to cache intermittent steps in case you need to modify something afterwards.
 # - Once the build has completed, create a container from the image and export the created Qt package.
-#     `docker create --name extract overte-qt5:5.15.10-2023.10.01-kde_d2122ee587cceb5b2f4130b7074f86db9aca570e`
-#     `docker cp extract:qt5-install-5.15.10-2023.10.01-kde_d2122ee587cceb5b2f4130b7074f86db9aca570e-ubuntu-20.04-amd64.tar.xz /path/on/host`
+#     `docker create --name extract overte-qt5:5.15.14-2024.06.17-kde_570f5b2105df1ea052bec0d6dbf8a00137274371`
+#     `docker cp extract:qt5-install-5.15.14-2024.06.17-kde_570f5b2105df1ea052bec0d6dbf8a00137274371-ubuntu-20.04-amd64.tar.xz /path/on/host`
 #     `docker rm extract`
 
 FROM ubuntu:20.04
@@ -58,12 +58,12 @@ WORKDIR ../../qt5-install
 RUN find . -name \*.prl -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
 
 # Overwrite QtWebengine version to work around version conflicts
-RUN find . -name \Qt5WebEngine*Config.cmake -exec sed -i '' -e 's/5\.15\.14/5\.15\.10/g' {} \;
-RUN cp lib/libQt5WebEngine.so.5.15.14 lib/libQt5WebEngine.so.5.15.10
-RUN cp lib/libQt5WebEngineCore.so.5.15.14 lib/libQt5WebEngineCore.so.5.15.10
-RUN cp lib/libQt5WebEngineWidgets.so.5.15.14 lib/libQt5WebEngineWidgets.so.5.15.10
-RUN cp lib/libQt5Pdf.so.5.15.14 lib/libQt5Pdf.so.5.15.10
-RUN cp lib/libQt5PdfWidgets.so.5.15.14 lib/libQt5PdfWidgets.so.5.15.10
+RUN find . -name \Qt5WebEngine*Config.cmake -exec sed -i '' -e 's/5\.15\.17/5\.15\.14/g' {} \;
+RUN cp lib/libQt5WebEngine.so.5.15.17 lib/libQt5WebEngine.so.5.15.14
+RUN cp lib/libQt5WebEngineCore.so.5.15.17 lib/libQt5WebEngineCore.so.5.15.14
+RUN cp lib/libQt5WebEngineWidgets.so.5.15.17 lib/libQt5WebEngineWidgets.so.5.15.14
+RUN cp lib/libQt5Pdf.so.5.15.17 lib/libQt5Pdf.so.5.15.14
+RUN cp lib/libQt5PdfWidgets.so.5.15.17 lib/libQt5PdfWidgets.so.5.15.14
 
 
 COPY ./qt.conf ./bin/
@@ -71,4 +71,4 @@ COPY ./qt.conf ./bin/
 RUN cp ../qt5-build/config.summary ./
 
 WORKDIR ..
-RUN XZ_OPT='-T0' tar -Jcvf qt5-install-5.15.10-2023.10.01-kde_d2122ee587cceb5b2f4130b7074f86db9aca570e-ubuntu-20.04-amd64.tar.xz qt5-install
+RUN XZ_OPT='-T0' tar -Jcvf qt5-install-5.15.14-2024.06.17-kde_570f5b2105df1ea052bec0d6dbf8a00137274371-ubuntu-20.04-amd64.tar.xz qt5-install