From 9b6d202a21150f9c896387e560f5dae7ab71d980 Mon Sep 17 00:00:00 2001 From: ksuprynowicz Date: Wed, 3 Aug 2022 21:16:14 +0200 Subject: [PATCH] Rebranding and fixing URLs --- .github/workflows/master_build.yml | 2 +- .github/workflows/pr_build.yml | 6 ++-- BUILD_ANDROID.md | 8 ++--- BUILD_LINUX.md | 4 +-- BUILD_OSX.md | 2 +- BUILD_WIN.md | 2 +- CMakeLists.txt | 24 ++++++------- INSTALLER.md | 6 ++-- README.md | 8 ++--- android/build.gradle | 2 +- android/build_android.sh | 4 +-- android/containerized_build.sh | 4 +-- android/docker/Dockerfile | 12 +++---- android/setupGVR.gradle | 2 +- cmake/macros/SetPackagingParameters.cmake | 4 +-- .../macros/SetupHifiClientServerPlugin.cmake | 2 +- cmake/macros/SetupHifiPlugin.cmake | 2 +- cmake/ports/draco/portfile.cmake | 2 +- cmake/ports/etc2comp/portfile.cmake | 2 +- cmake/ports/hifi-scribe/portfile.cmake | 2 +- cmake/ports/webrtc/README.md | 6 ++-- cmake/templates/BuildInfo.h.in | 2 +- cmake/templates/NSIS.template.in | 2 +- .../resources/describe-settings.json | 2 +- .../resources/web/wizard/index.shtml | 2 +- domain-server/src/DomainServer.cpp | 2 +- hifi_android.py | 2 +- hifi_qt.py | 2 +- hifi_vcpkg.py | 4 +-- interface/CMakeLists.txt | 14 ++++---- .../html/commerce/backup_instructions.html | 2 +- interface/resources/html/tabletHelp.html | 8 ++--- .../resources/qml/LoginDialog/SignUpBody.qml | 2 +- .../+webengine/FlickableWebViewCore.qml | 2 +- .../hifi/avatarPackager/AvatarPackagerApp.qml | 2 +- .../qml/hifi/avatarapp/MessageBoxes.qml | 2 +- .../qml/hifi/commerce/checkout/Checkout.qml | 2 +- .../qml/hifi/commerce/purchases/Purchases.qml | 2 +- interface/src/Application.cpp | 2 +- interface/src/CrashHandler_Crashpad.cpp | 2 +- interface/src/CrashHandler_None.cpp | 2 +- interface/src/SpeechRecognizer.h | 2 +- interface/src/avatar/AvatarDoctor.cpp | 2 +- interface/src/avatar/MyAvatar.h | 14 ++++---- interface/src/ui/ModelsBrowser.cpp | 2 +- launchers/darwin/CMakeLists.txt | 2 +- .../src/avatars-renderer/Avatar.h | 4 +-- .../src/avatars-renderer/ScriptAvatar.h | 4 +-- libraries/avatars/src/AvatarData.h | 10 +++--- libraries/avatars/src/ScriptAvatarData.h | 8 ++--- .../src/controllers/ScriptingInterface.h | 6 ++-- .../controllers/impl/MappingBuilderProxy.h | 4 +-- .../src/controllers/impl/RouteBuilderProxy.h | 26 +++++++------- libraries/image/src/image/TextureProcessing.h | 2 +- libraries/midi/src/Midi.h | 2 +- libraries/networking/src/ExternalResource.cpp | 2 +- libraries/networking/src/ExternalResource.h | 4 +-- libraries/networking/src/MessagesClient.h | 8 ++--- .../networking/src/NetworkingConstants.h | 2 +- libraries/networking/src/SocketType.h | 6 ++-- libraries/networking/src/udt/NetworkSocket.h | 6 ++-- .../src/webrtc/WebRTCDataChannels.h | 6 ++-- .../src/webrtc/WebRTCSignalingServer.cpp | 6 ++-- .../src/webrtc/WebRTCSignalingServer.h | 6 ++-- .../networking/src/webrtc/WebRTCSocket.h | 6 ++-- .../src/AssetScriptingInterface.h | 2 +- .../src/AudioScriptingInterface.h | 2 +- .../src/ConsoleScriptingInterface.h | 2 +- .../src/FileScriptingInterface.h | 2 +- libraries/script-engine/src/KeyEvent.h | 2 +- libraries/script-engine/src/Mat4.h | 2 +- .../script-engine/src/MenuItemProperties.h | 2 +- .../src/ModelScriptingInterface.h | 2 +- libraries/script-engine/src/MouseEvent.h | 2 +- libraries/script-engine/src/Quat.h | 2 +- .../src/RecordingScriptingInterface.h | 2 +- .../src/SceneScriptingInterface.h | 2 +- .../script-engine/src/ScriptAudioInjector.h | 2 +- libraries/script-engine/src/ScriptEngine.h | 4 +-- libraries/script-engine/src/ScriptEngines.h | 2 +- .../script-engine/src/ScriptGatekeeper.h | 6 ++-- libraries/script-engine/src/ScriptUUID.h | 2 +- libraries/script-engine/src/ScriptsModel.h | 2 +- .../script-engine/src/ScriptsModelFilter.h | 2 +- libraries/script-engine/src/TouchEvent.h | 2 +- .../src/UsersScriptingInterface.h | 2 +- libraries/script-engine/src/Vec3.h | 4 +-- libraries/script-engine/src/WebSocketClass.h | 2 +- .../script-engine/src/WebSocketServerClass.h | 2 +- libraries/script-engine/src/WheelEvent.h | 2 +- .../script-engine/src/XMLHttpRequestClass.h | 2 +- libraries/shared/src/ModerationFlags.h | 6 ++-- pkg-scripts/Dockerfile.templ | 26 +++++++------- pkg-scripts/docker-entrypoint.sh | 18 +++++----- pkg-scripts/docker-vircadia-supervisor.conf | 36 +++++++++---------- pkg-scripts/make-deb-server | 2 +- pkg-scripts/make-docker-server | 4 +-- pkg-scripts/make-rpm-server | 2 +- pkg-scripts/new-server | 4 +-- pkg-scripts/server-postrm | 2 +- prebuild.py | 2 +- screenshare/README.md | 4 +-- script-archive/afk.js | 2 +- .../tests/performance/renderableMatrix.js | 2 +- .../fireworksLaunchButtonEntityScript.js | 2 +- .../chapter1/fireworksLaunchButtonSpawner.js | 4 +-- .../fireworksLaunchButtonEntityScript.js | 2 +- .../chapter2/fireworksLaunchButtonSpawner.js | 4 +-- .../fireworksLaunchButtonEntityScript.js | 2 +- .../chapter3/fireworksLaunchButtonSpawner.js | 4 +-- scripts/defaultScripts.js | 2 +- scripts/system/quickGoto.js | 1 - server-console/CMakeLists.txt | 2 +- server-console/package.json | 8 ++--- server-console/packager.js | 2 +- server-console/src/content-update.html | 2 +- server-console/src/modules/hf-app.js | 8 ++--- server-console/src/splash.html | 4 +-- tools/nitpick/src/TestRunnerDesktop.cpp | 10 +++--- tools/qt-builder/README.md | 6 ++-- tools/qt-builder/qt-lite-build-steps.md | 6 ++-- .../marketplace/record/html/record.html | 2 +- 122 files changed, 273 insertions(+), 274 deletions(-) diff --git a/.github/workflows/master_build.yml b/.github/workflows/master_build.yml index bb98a4fcfc..31dac18d8d 100644 --- a/.github/workflows/master_build.yml +++ b/.github/workflows/master_build.yml @@ -74,7 +74,7 @@ jobs: echo "INSTALLER_EXT=dmg" >> $GITHUB_ENV echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV echo "::set-output name=symbols_archive::${BUILD_NUMBER}-${{ matrix.build_type }}-mac-symbols.zip" - echo "APP_TARGET_NAME=Vircadia" >> $GITHUB_ENV + echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV fi # Windows build variables if [ "${{ matrix.os }}" = "windows-2019" ]; then diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index d402d33bf0..7766ecb946 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -110,7 +110,7 @@ jobs: else echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCLIENT_ONLY=1 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV fi - echo "APP_TARGET_NAME=Vircadia" >> $GITHUB_ENV + echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV fi # Windows build variables if [ "${{ matrix.os }}" = "windows-2019" ]; then @@ -226,9 +226,9 @@ jobs: fi if [ ${{ env.CI_WORKSPACE }} ]; then - find "$CI_WORKSPACE/vircadia-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz" + find "$CI_WORKSPACE/overte-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz" else - find "$HOME/vircadia-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz" + find "$HOME/overte-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz" fi - name: Archive cmake logs diff --git a/BUILD_ANDROID.md b/BUILD_ANDROID.md index 539a8be55f..353864a9a2 100644 --- a/BUILD_ANDROID.md +++ b/BUILD_ANDROID.md @@ -36,7 +36,7 @@ If Android Studio pops open the "Plugin Update Recommeded" dialog, do not click ## Environment ### Create a keystore in Android Studio -Follow the directions [here](https://developer.android.com/studio/publish/app-signing#generate-key) to create a keystore file. You can save it anywhere (preferably not in the `vircadia` folder). +Follow the directions [here](https://developer.android.com/studio/publish/app-signing#generate-key) to create a keystore file. You can save it anywhere (preferably not in the `overte` folder). ### Set up machine specific Gradle properties @@ -87,12 +87,12 @@ SUPPRESS_QUEST_FRAME_PLAYER * Open Android Studio * Choose _Open an existing Android Studio project_ -* Navigate to the `vircadia` repository that had you cloned and choose the `android` folder and select _OK_ +* Navigate to the `overte` repository that had you cloned and choose the `android` folder and select _OK_ * Wait for Gradle to sync (this should take around 20 minutes the first time) * If a dialog pops open saying "Plugin Update Recommeded" dialog, do not click update, just click X on the top right to close. * In the _Project_ window click on the project you wish to build (i.e. "questInterface") then click _Build_ in the top menu and choose _Make Module 'questInterface'_ * By default this will build the "debug" apk, you can change this by opening the _Build Variants_ window along the left side and select other build types such as "release". -* Your newly build APK should reside in `vircadia\android\apps\questInterface\release` (if you chose release). +* Your newly build APK should reside in `overte\android\apps\questInterface\release` (if you chose release). ### Running a Module @@ -140,7 +140,7 @@ With your start menu, search for 'Edit the System Environment Variables' and ope Some things you can try if you want to do a clean build -* Delete the `build` and `.externalNativeBuild` folders from the folder for each module you're building (for example, `vircadia/android/apps/interface`) +* Delete the `build` and `.externalNativeBuild` folders from the folder for each module you're building (for example, `overte/android/apps/interface`) * If you have set your `HIFI_VCPKG_ROOT` environment variable, delete the contents of that directory; otherwise, delete `AppData/Local/Temp/hifi` * In Android Studio, click _File > Invalidate Caches / Restart_ and select _Invalidate and Restart_ diff --git a/BUILD_LINUX.md b/BUILD_LINUX.md index 8fc3b7ede9..4f21db4344 100644 --- a/BUILD_LINUX.md +++ b/BUILD_LINUX.md @@ -137,7 +137,7 @@ Prepare makefiles: cmake .. ``` -If cmake fails with a vcpkg error, then delete `~/vircadia-files/vcpkg/`. +If cmake fails with a vcpkg error, then delete `~/overte-files/vcpkg/`. #### Server @@ -190,4 +190,4 @@ Go to "localhost" in the running Interface to visit your newly launched Domain s If your goal is to set up a development environment, it is desirable to set the directory that vcpkg builds into with the `HIFI_VCPKG_BASE` environment variable. For example, you might set `HIFI_VCPKG_BASE` to `/home/$USER/vcpkg`. -By default, vcpkg will build in the `~/vircadia-files/vcpkg/` directory. +By default, vcpkg will build in the `~/overte-files/vcpkg/` directory. diff --git a/BUILD_OSX.md b/BUILD_OSX.md index 62e714302e..455d2c75fc 100644 --- a/BUILD_OSX.md +++ b/BUILD_OSX.md @@ -48,7 +48,7 @@ sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer cmake ../ -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G Xcode -DOSX_SDK=10.12 .. ``` -After running CMake, you will have the make files or Xcode project file necessary to build all of the components. Open the `vircadia.xcodeproj` file, choose `ALL_BUILD` from the Product > Scheme menu (or target drop down), and click Run. +After running CMake, you will have the make files or Xcode project file necessary to build all of the components. Open the `overte.xcodeproj` file, choose `ALL_BUILD` from the Product > Scheme menu (or target drop down), and click Run. If the build completes successfully, you will have built targets for all components located in the `build/${target_name}/Debug` directories. diff --git a/BUILD_WIN.md b/BUILD_WIN.md index 9eb74a84e9..8cc7752ba2 100644 --- a/BUILD_WIN.md +++ b/BUILD_WIN.md @@ -100,7 +100,7 @@ Where `%VIRCADIA_DIR%` is the directory for the Overte repository. ## Step 8. Making a Build -Open `%VIRCADIA_DIR%\build\vircadia.sln` using Visual Studio. +Open `%VIRCADIA_DIR%\build\overte.sln` using Visual Studio. Change the Solution Configuration (menu ribbon under the menu bar, next to the green play button) from "Debug" to "Release" for best performance. diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ba18d982b..9f7c9ffc48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -220,7 +220,7 @@ endif() option(VCPKG_APPLOCAL_DEPS OFF) -project(vircadia) +project(overte) include("cmake/init.cmake") include("cmake/compiler.cmake") option(VCPKG_APPLOCAL_DEPS OFF) @@ -391,20 +391,20 @@ GroupSources("unpublishedScripts") unset(JS_SRC) # Include Overte Web app files if cloned into a subdirectory. -if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web") - file(GLOB_RECURSE WEB_APP_SRC vircadia-web/*.*) - list(FILTER WEB_APP_SRC EXCLUDE REGEX "vircadia-web/(dist|node_modules|public)/*" ) - add_custom_target(vircadia-web SOURCES ${WEB_APP_SRC}) - GroupSources("vircadia-web") +if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/overte-web") + file(GLOB_RECURSE WEB_APP_SRC overte-web/*.*) + list(FILTER WEB_APP_SRC EXCLUDE REGEX "overte-web/(dist|node_modules|public)/*" ) + overte(overte-web SOURCES ${WEB_APP_SRC}) + GroupSources("overte-web") unset(WEB_APP_SRC) endif() # Include Overte Web SDK files if cloned into a subdirectory. -if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web-sdk") - file(GLOB_RECURSE WEB_SDK_SRC vircadia-web-sdk/*.*) - list(FILTER WEB_SDK_SRC EXCLUDE REGEX "vircadia-web-sdk/(dist|node_modules|public)/*" ) - add_custom_target(vircadia-web-sdk SOURCES ${WEB_SDK_SRC}) - GroupSources("vircadia-web-sdk") +if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/overte-web-sdk") + file(GLOB_RECURSE WEB_SDK_SRC overte-web-sdk/*.*) + list(FILTER WEB_SDK_SRC EXCLUDE REGEX "overte-web-sdk/(dist|node_modules|public)/*" ) + add_custom_target(overte-web-sdk SOURCES ${WEB_SDK_SRC}) + GroupSources("overte-web-sdk") unset(WEB_SDK_SRC) endif() @@ -471,7 +471,7 @@ endif() if (BUILD_CLIENT) add_subdirectory(interface) if (APPLE) - set_target_properties(Vircadia PROPERTIES FOLDER "Apps") + set_target_properties(Overte PROPERTIES FOLDER "Apps") else() set_target_properties(interface PROPERTIES FOLDER "Apps") endif() diff --git a/INSTALLER.md b/INSTALLER.md index 56832ab85c..50e1c88796 100644 --- a/INSTALLER.md +++ b/INSTALLER.md @@ -70,7 +70,7 @@ For code signing to work, you will need to set the `HF_PFX_FILE` and `HF_PFX_PAS #### Creating the Installer 1. Perform a clean cmake from a new terminal. -1. Open the `vircadia.sln` solution with elevated (administrator) permissions on Visual Studio and select the **Release** configuration. +1. Open the `overte.sln` solution with elevated (administrator) permissions on Visual Studio and select the **Release** configuration. 1. Build the solution. 1. Build `packaged-server-console-npm-install` (found under **hidden/Server Console**) 1. Build `packaged-server-console` (found under **Server Console**) @@ -140,7 +140,7 @@ rm -rf * ``` Add `PRODUCTION_BUILD=1` to below command for release and release candidate builds. ```bash -VIRCADIA_USE_SYSTEM_QT=true cmake .. -DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DVCPKG_BUILD_TYPE=release -DSERVER_ONLY=true -DBUILD_TOOLS=true +OVERTE_USE_SYSTEM_QT=true cmake .. -DOVERTE_CPU_ARCHITECTURE=-msse3 -DVCPKG_BUILD_TYPE=release -DSERVER_ONLY=true -DBUILD_TOOLS=true ``` 4. Build @@ -179,7 +179,7 @@ rm -rf * ``` Add `PRODUCTION_BUILD=1` to below command for release and release candidate builds. ```bash -VIRCADIA_USE_SYSTEM_QT=true cmake .. -DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DVCPKG_BUILD_TYPE=release -DSERVER_ONLY=true -DBUILD_TOOLS=true +OVERTE_USE_SYSTEM_QT=true cmake .. -DOVERTE_CPU_ARCHITECTURE=-msse3 -DVCPKG_BUILD_TYPE=release -DSERVER_ONLY=true -DBUILD_TOOLS=true ``` 4. Build diff --git a/README.md b/README.md index b3f580a461..d9dffc9f33 100644 --- a/README.md +++ b/README.md @@ -43,20 +43,20 @@ Overte is a 3D social software project seeking to incrementally bring about a tr - [For Windows](https://github.com/overte-org/overte/blob/master/BUILD_WIN.md) - [For Mac](https://github.com/overte-org/overte/blob/master/BUILD_OSX.md) - [For Linux](https://github.com/overte-org/overte/blob/master/BUILD_LINUX.md) -- [For Linux - Vircadia Builder](https://github.com/overte-org/overte-builder) +- [For Linux - Overte Builder](https://github.com/overte-org/overte-builder) #### How to build a Server - [For Windows](https://github.com/overte-org/overte/blob/master/BUILD_WIN.md) - [For Linux](https://github.com/overte-org/overte/blob/master/BUILD_LINUX.md) -- [For Linux - Vircadia Builder](https://github.com/overte-org/overte-builder) +- [For Linux - Overte Builder](https://github.com/overte-org/overte-builder) #### How to generate an Installer - [For Windows - Interface & Server](https://github.com/overte-org/overte/blob/master/INSTALLER.md) - [For Mac - Interface](https://github.com/overte-org/overte/blob/master/INSTALLER.md#os-x) -- [For Linux - Server .deb - Vircadia Builder](INSTALLER.md#ubuntu-1804--deb) -- [For Linux - Interface AppImage - Vircadia Builder](https://github.com/overte-org/overte-builder/blob/master/README.md#building-appimages) +- [For Linux - Server .deb - Overte Builder](INSTALLER.md#ubuntu-1804--deb) +- [For Linux - Interface AppImage - Overte Builder](https://github.com/overte-org/overte-builder/blob/master/README.md#building-appimages) ### Boot to Metaverse: The Goal diff --git a/android/build.gradle b/android/build.gradle index a90b103e11..8886b0673e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -48,7 +48,7 @@ ext { def appDir = new File(projectDir, 'apps/interface') def jniFolder = new File(appDir, 'src/main/jniLibs/arm64-v8a') -def baseUrl = 'https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dependencies/android/' +def baseUrl = 'https://build-deps.overte.org/dependencies/android/' def breakpadDumpSymsDir = new File("${appDir}/build/tmp/breakpadDumpSyms") task extractGvrBinaries() { diff --git a/android/build_android.sh b/android/build_android.sh index d3c79afdbe..1859f88fd6 100755 --- a/android/build_android.sh +++ b/android/build_android.sh @@ -17,7 +17,7 @@ fi ANDROID_APP=interface ANDROID_OUTPUT_DIR=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_TYPE} ANDROID_OUTPUT_FILE=${ANDROID_APP}-${ANDROID_BUILD_TYPE}.apk -ANDROID_APK_NAME=Vircadia-${ANDROID_APK_SUFFIX} +ANDROID_APK_NAME=Overte-${ANDROID_APK_SUFFIX} ./gradlew -PHIFI_ANDROID_PRECOMPILED=${HIFI_ANDROID_PRECOMPILED} -PVERSION_CODE=${VERSION_CODE} -PRELEASE_NUMBER=${RELEASE_NUMBER} -PRELEASE_TYPE=${RELEASE_TYPE} ${ANDROID_APP}:${ANDROID_BUILD_TARGET} cp ${ANDROID_OUTPUT_DIR}/${ANDROID_OUTPUT_FILE} ./${ANDROID_APK_NAME} @@ -25,7 +25,7 @@ cp ${ANDROID_OUTPUT_DIR}/${ANDROID_OUTPUT_FILE} ./${ANDROID_APK_NAME} ANDROID_APP=questInterface ANDROID_OUTPUT_DIR=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_TYPE} ANDROID_OUTPUT_FILE=${ANDROID_APP}-${ANDROID_BUILD_TYPE}.apk -ANDROID_APK_NAME=Vircadia-Quest-Alpha-${ANDROID_APK_SUFFIX} +ANDROID_APK_NAME=Overte-Quest-Alpha-${ANDROID_APK_SUFFIX} ./gradlew -PHIFI_ANDROID_PRECOMPILED=${HIFI_ANDROID_PRECOMPILED} -PVERSION_CODE=${VERSION_CODE} -PRELEASE_NUMBER=${RELEASE_NUMBER} -PRELEASE_TYPE=${RELEASE_TYPE} ${ANDROID_APP}:${ANDROID_BUILD_TARGET} || true cp ${ANDROID_OUTPUT_DIR}/${ANDROID_OUTPUT_FILE} ./${ANDROID_APK_NAME} diff --git a/android/containerized_build.sh b/android/containerized_build.sh index bbf0b605d8..190e4ecb47 100755 --- a/android/containerized_build.sh +++ b/android/containerized_build.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -xeuo pipefail -DOCKER_IMAGE_NAME="vircadia_androidbuild" +DOCKER_IMAGE_NAME="overte_androidbuild" docker build --build-arg BUILD_UID=`id -u` -t "${DOCKER_IMAGE_NAME}" -f ./android/docker/Dockerfile ./android/docker @@ -17,7 +17,7 @@ test -z "$STABLE_BUILD" && export STABLE_BUILD=0 docker run \ --rm \ --security-opt seccomp:unconfined \ - -v "${WORKSPACE}":/home/gha/vircadia \ + -v "${WORKSPACE}":/home/gha/overte \ -e RELEASE_NUMBER \ -e RELEASE_TYPE \ -e ANDROID_APP \ diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index ab5ddb562d..c7499ac2a8 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -62,8 +62,8 @@ RUN echo "gha ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers USER gha WORKDIR /home/gha -# Vircadia dependencies -ENV HIFI_BASE="/home/gha/vircadia_android" +# Overte dependencies +ENV HIFI_BASE="/home/gha/overte_android" ENV HIFI_ANDROID_PRECOMPILED="$HIFI_BASE/dependencies" ENV HIFI_VCPKG_BASE="$HIFI_BASE/vcpkg" @@ -72,17 +72,17 @@ RUN mkdir "$HIFI_BASE" && \ mkdir "$HIFI_ANDROID_PRECOMPILED" # Download the repo -RUN git clone https://github.com/vircadia/vircadia.git +RUN git clone https://github.com/overte-org/overte.git -WORKDIR /home/gha/vircadia +WORKDIR /home/gha/overte RUN mkdir build # Pre-cache the vcpkg managed dependencies -WORKDIR /home/gha/vircadia/build +WORKDIR /home/gha/overte/build RUN python3 ../prebuild.py --build-root `pwd` --android interface # Pre-cache the gradle dependencies -WORKDIR /home/gha/vircadia/android +WORKDIR /home/gha/overte/android RUN ./gradlew -m tasks -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED #RUN ./gradlew extractDependencies -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED diff --git a/android/setupGVR.gradle b/android/setupGVR.gradle index cc3023d391..e3b46b12d9 100644 --- a/android/setupGVR.gradle +++ b/android/setupGVR.gradle @@ -11,7 +11,7 @@ buildscript { def file='gvrsdk_v1.101.0.tgz' -def url='https://cdn-1.vircadia.com/eu-c-1/vircadia-public/austin/android/' + file +def url='https://build-deps.overte.org/dependencies/android/' + file def destFile = new File(HIFI_ANDROID_PRECOMPILED, file) // FIXME find a way to only download if the file doesn't exist diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index 66e939fb5c..027300439b 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -39,7 +39,7 @@ macro(SET_PACKAGING_PARAMETERS) set(SERVER_COMPONENT server) if (APPLE) - set(INTERFACE_BUNDLE_NAME "Vircadia") + set(INTERFACE_BUNDLE_NAME "Overte") else() set(INTERFACE_BUNDLE_NAME "interface") endif() @@ -188,7 +188,7 @@ macro(SET_PACKAGING_PARAMETERS) set(INTERFACE_SHORTCUT_NAME "Overte") set(CONSOLE_SHORTCUT_NAME "Console") set(SANDBOX_SHORTCUT_NAME "Server") - set(APP_USER_MODEL_ID "com.vircadia.console") + set(APP_USER_MODEL_ID "com.overte.console") else () set(INTERFACE_SHORTCUT_NAME "Overte - ${BUILD_VERSION_NO_SHA}") set(CONSOLE_SHORTCUT_NAME "Console - ${BUILD_VERSION_NO_SHA}") diff --git a/cmake/macros/SetupHifiClientServerPlugin.cmake b/cmake/macros/SetupHifiClientServerPlugin.cmake index 5c98ceb139..abf9f7ce06 100644 --- a/cmake/macros/SetupHifiClientServerPlugin.cmake +++ b/cmake/macros/SetupHifiClientServerPlugin.cmake @@ -12,7 +12,7 @@ macro(SETUP_HIFI_CLIENT_SERVER_PLUGIN) if (BUILD_CLIENT) if (APPLE) - add_dependencies(Vircadia ${TARGET_NAME}) + add_dependencies(Overte ${TARGET_NAME}) else() add_dependencies(interface ${TARGET_NAME}) endif() diff --git a/cmake/macros/SetupHifiPlugin.cmake b/cmake/macros/SetupHifiPlugin.cmake index 22fa02dd79..376c0fe4a5 100644 --- a/cmake/macros/SetupHifiPlugin.cmake +++ b/cmake/macros/SetupHifiPlugin.cmake @@ -10,7 +10,7 @@ macro(SETUP_HIFI_PLUGIN) setup_hifi_library(${ARGV}) if (BUILD_CLIENT) if (APPLE) - add_dependencies(Vircadia ${TARGET_NAME}) + add_dependencies(Overte ${TARGET_NAME}) else() add_dependencies(interface ${TARGET_NAME}) endif() diff --git a/cmake/ports/draco/portfile.cmake b/cmake/ports/draco/portfile.cmake index 76e90c1896..a1ce409c9e 100644 --- a/cmake/ports/draco/portfile.cmake +++ b/cmake/ports/draco/portfile.cmake @@ -17,7 +17,7 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO vircadia/draco + REPO overte-org/draco REF 1.3.5-fixed SHA512 68bb15de013093077946d431ab1f4080b84a66d45d20873f2c0dc44aa28034fb4ec1f6e24f9300fde563da53943b73d47163b9c6acf2667312128c50c6d075bd HEAD_REF master diff --git a/cmake/ports/etc2comp/portfile.cmake b/cmake/ports/etc2comp/portfile.cmake index f37559bb8c..88dfb6af0d 100644 --- a/cmake/ports/etc2comp/portfile.cmake +++ b/cmake/ports/etc2comp/portfile.cmake @@ -17,7 +17,7 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO vircadia/etc2comp + REPO overte-org/etc2comp REF 7f1843bf07825c21cab711360c1ddbad04641036 SHA512 d747076acda8537d39585858c793a35c3dcc9ef283d723619a47f8c81ec1454c95b3340ad35f0655a939eae5b8271c801c48a9a7568311a01903a344c44af25b HEAD_REF master diff --git a/cmake/ports/hifi-scribe/portfile.cmake b/cmake/ports/hifi-scribe/portfile.cmake index 040f9649cd..d1be909e4f 100644 --- a/cmake/ports/hifi-scribe/portfile.cmake +++ b/cmake/ports/hifi-scribe/portfile.cmake @@ -2,7 +2,7 @@ set(VCPKG_POLICY_EMPTY_PACKAGE enabled) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO vircadia/scribe + REPO overte-org/scribe REF 1bd638a36ca771e5a68d01985b6389b71835cbd2 SHA512 dbe241d86df3912e544f6b9839873f9875df54efc93822b145e7b13243eaf2e3d690bc8a28b1e52d05bdcd7e68fca6b0b2f5c43ffd0f56a9b7a50d54dcf9e31e HEAD_REF master diff --git a/cmake/ports/webrtc/README.md b/cmake/ports/webrtc/README.md index a4053b679e..3008504ed1 100644 --- a/cmake/ports/webrtc/README.md +++ b/cmake/ports/webrtc/README.md @@ -98,7 +98,7 @@ https://bugs.webrtc.org/9213#c13 ``` #### Exclude BoringSSL -A separate OpenSSL VCPKG is used for building Vircadia. +A separate OpenSSL VCPKG is used for building Overte. The following patches are needed even though SSL is excluded in the `gn gen` build commands. - Rename *third_party\boringssl* to *third_party\boringssl-NO*. - Edit *third_party\libsrtp\BUILD.gn:\ @@ -158,9 +158,9 @@ The following patches are needed even though SSL is excluded in the `gn gen` bui ### Set Up OpenSSL Do one of the following to provide OpenSSL for building against: -a. If you have built Vircadia, find the **HIFI_VCPKG_BASE** subdirectory used in your build and make note of the path to and +a. If you have built Overte, find the **HIFI_VCPKG_BASE** subdirectory used in your build and make note of the path to and including the *installed\x64-windows\include* directory (which includes an *openssl* directory). -a. Follow https://github.com/vircadia/vcpkg to install *vcpkg* and then *openssl*. Make note of the path to and including the +a. Follow https://github.com/overte-org/vcpkg to install *vcpkg* and then *openssl*. Make note of the path to and including the *packages\openssl-windows_x64-windows\include* directory (which includes an *openssl* directory). Copy the *\\openssl* directory to the following locations (i.e., add as *openssl* subdirectories): diff --git a/cmake/templates/BuildInfo.h.in b/cmake/templates/BuildInfo.h.in index 99726d270f..767807b41b 100644 --- a/cmake/templates/BuildInfo.h.in +++ b/cmake/templates/BuildInfo.h.in @@ -23,7 +23,7 @@ namespace BuildInfo { const QString DOMAIN_SERVER_NAME = "domain-server"; const QString AC_CLIENT_SERVER_NAME = "ac-client"; const QString MODIFIED_ORGANIZATION = "@BUILD_ORGANIZATION@"; - const QString ORGANIZATION_DOMAIN = "vircadia.com"; + const QString ORGANIZATION_DOMAIN = "overte.org"; const QString VERSION = "@BUILD_VERSION@"; const QString RELEASE_NAME = "@RELEASE_NAME@"; const QString BUILD_NUMBER = "@BUILD_NUMBER@"; diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index e7952ba941..ae5397770b 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -1133,7 +1133,7 @@ Function HandlePostInstallOptions ClearErrors ; copy the data from production build to this PR build - CopyFiles "$APPDATA\Vircadia\*" $0 + CopyFiles "$APPDATA\Overte\*" $0 ; handle an error in copying files IfErrors 0 NoError diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index 653b8d5f91..cad51a40dc 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -88,7 +88,7 @@ { "name": "enable_webrtc_websocket_ssl", "label": "Enable WebRTC WebSocket SSL", - "help": "Use secure WebSocket (wss:// protocol) for WebRTC signaling channel. If \"on\", the key, cert, and CA files are expected to be in the local Overte app directory, in a /domain-server/ subdirectory with filenames vircadia-cert.key, vircadia-cert.crt, and vircadia-crt-ca.crt.", + "help": "Use secure WebSocket (wss:// protocol) for WebRTC signaling channel. If \"on\", the key, cert, and CA files are expected to be in the local Overte app directory, in a /domain-server/ subdirectory with filenames overte-cert.key, overte-cert.crt, and overte-crt-ca.crt.", "type": "checkbox", "default": false, "advanced": true diff --git a/domain-server/resources/web/wizard/index.shtml b/domain-server/resources/web/wizard/index.shtml index 1efc049358..22d9f73b9e 100644 --- a/domain-server/resources/web/wizard/index.shtml +++ b/domain-server/resources/web/wizard/index.shtml @@ -24,7 +24,7 @@
- Place names are similar to web addresses. Users who want to visit your domain can + Place names are similar to web addresses. Users who want to visit your domain can enter its Place Name in Overte's Interface. You can choose a Place Name for your domain.
Your domain may also be reachable by IP address. diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 1076d6108c..9f00c6df4d 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -66,7 +66,7 @@ using namespace std::chrono; Q_LOGGING_CATEGORY(domain_server, "hifi.domain_server") Q_LOGGING_CATEGORY(domain_server_ice, "hifi.domain_server.ice") -Q_LOGGING_CATEGORY(domain_server_auth, "vircadia.domain_server.auth") +Q_LOGGING_CATEGORY(domain_server_auth, "overte.domain_server.auth") const QString ACCESS_TOKEN_KEY_PATH = "metaverse.access_token"; const QString DomainServer::REPLACEMENT_FILE_EXTENSION = ".replace"; diff --git a/hifi_android.py b/hifi_android.py index 7ddd01f0a6..46e985b05c 100644 --- a/hifi_android.py +++ b/hifi_android.py @@ -10,7 +10,7 @@ import zipfile print = functools.partial(print, flush=True) -ANDROID_PACKAGE_URL = 'https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dependencies/android/' +ANDROID_PACKAGE_URL = 'https://build-deps.overte.org/dependencies/android/' ANDROID_PACKAGES = { 'qt' : { diff --git a/hifi_qt.py b/hifi_qt.py index 2e92f4b54f..f0d498a02b 100644 --- a/hifi_qt.py +++ b/hifi_qt.py @@ -100,7 +100,7 @@ endif() # For a pre-built qt, however, we have to unpack it. The archive is required to contain # a qt5-install directory in it. - self.path = os.path.expanduser("~/vircadia-files/qt") + self.path = os.path.expanduser("~/overte-files/qt") self.fullPath = os.path.join(self.path, 'qt5-install') self.cmakePath = os.path.join(self.fullPath, 'lib', 'cmake') diff --git a/hifi_vcpkg.py b/hifi_vcpkg.py index 81188259fc..54cfab3a01 100644 --- a/hifi_vcpkg.py +++ b/hifi_vcpkg.py @@ -60,9 +60,9 @@ endif() self.path = args.vcpkg_root self.noClean = True else: - defaultBasePath = os.path.expanduser('~/vircadia-files/vcpkg') + defaultBasePath = os.path.expanduser('~/overte-files/vcpkg') if 'CI_WORKSPACE' in os.environ: - self.basePath = os.path.join(os.getenv('CI_WORKSPACE'), 'vircadia-files/vcpkg') + self.basePath = os.path.join(os.getenv('CI_WORKSPACE'), 'overte-files/vcpkg') else: self.basePath = os.getenv('HIFI_VCPKG_BASE', defaultBasePath) if self.args.android: diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 654c6d791f..fc3ff60b67 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -1,6 +1,6 @@ if (APPLE) - # Make the OSX DMG app be Vircadia.app. - set(TARGET_NAME Vircadia) + # Make the OSX DMG app be Overte.app. + set(TARGET_NAME Overte) else() set(TARGET_NAME interface) endif() @@ -121,14 +121,14 @@ if (APPLE) # configure CMake to use a custom Info.plist set_target_properties(${this_target} PROPERTIES MACOSX_BUNDLE_INFO_PLIST MacOSXBundleInfo.plist.in) - set(MACOSX_BUNDLE_BUNDLE_NAME "Vircadia") + set(MACOSX_BUNDLE_BUNDLE_NAME "Overte") if (PRODUCTION_BUILD) - set(MACOSX_BUNDLE_GUI_IDENTIFIER com.vircadia.interface) + set(MACOSX_BUNDLE_GUI_IDENTIFIER com.overte.interface) else () if (DEV_BUILD) - set(MACOSX_BUNDLE_GUI_IDENTIFIER com.vircadia.interface-dev) + set(MACOSX_BUNDLE_GUI_IDENTIFIER com.overte.interface-dev) elseif (PR_BUILD) - set(MACOSX_BUNDLE_GUI_IDENTIFIER com.vircadia.interface-pr) + set(MACOSX_BUNDLE_GUI_IDENTIFIER com.overte.interface-pr) endif () endif () @@ -159,7 +159,7 @@ elseif (WIN32) set(CONFIGURE_ICON_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Icon.rc") configure_file("${HF_CMAKE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT}) - set(APP_FULL_NAME "Vircadia") + set(APP_FULL_NAME "Overte") set(CONFIGURE_VERSION_INFO_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.rc") configure_file("${HF_CMAKE_DIR}/templates/VersionInfo.rc.in" ${CONFIGURE_VERSION_INFO_RC_OUTPUT}) diff --git a/interface/resources/html/commerce/backup_instructions.html b/interface/resources/html/commerce/backup_instructions.html index 034844e705..bf95a2cb4d 100644 --- a/interface/resources/html/commerce/backup_instructions.html +++ b/interface/resources/html/commerce/backup_instructions.html @@ -596,7 +596,7 @@

Want to learn more?

You can find out much more about the blockchain and about commerce in High Fidelity by visiting our Docs site:

-

Visit High Fidelity's Docs

+

Visit High Fidelity's Docs

diff --git a/interface/resources/html/tabletHelp.html b/interface/resources/html/tabletHelp.html index f9dc7034f5..0b1a654103 100644 --- a/interface/resources/html/tabletHelp.html +++ b/interface/resources/html/tabletHelp.html @@ -77,9 +77,9 @@ var handControllerImageURL = null; var index = 0; var count = 3; - var handControllerRefURL = "https://docs.vircadia.com/explore/get-started/vr-controls.html#vr-controls"; - var keyboardRefURL = "https://docs.vircadia.com/explore/get-started/desktop.html#movement-controls"; - var gamepadRefURL = "https://docs.vircadia.com/explore/get-started/vr-controls.html#gamepad"; + var handControllerRefURL = "https://docs.overte.org/explore/get-started/vr-controls.html#vr-controls"; + var keyboardRefURL = "https://docs.overte.org/explore/get-started/desktop.html#movement-controls"; + var gamepadRefURL = "https://docs.overte.org/explore/get-started/vr-controls.html#gamepad"; function showKbm() { document.getElementById("main_image").setAttribute("src", "img/tablet-help-keyboard.jpg"); @@ -189,7 +189,7 @@
- Report Problem + Report Problem diff --git a/interface/resources/qml/LoginDialog/SignUpBody.qml b/interface/resources/qml/LoginDialog/SignUpBody.qml index aae0f7609d..95cc833b56 100644 --- a/interface/resources/qml/LoginDialog/SignUpBody.qml +++ b/interface/resources/qml/LoginDialog/SignUpBody.qml @@ -395,7 +395,7 @@ Item { text: signUpBody.termsContainerText Component.onCompleted: { // with the link. - termsText.text = qsTr("By signing up, you agree to Vircadia's Terms of Service") + termsText.text = qsTr("By signing up, you agree to Overte Terms of Service") } } diff --git a/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml b/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml index 931233622a..9a08a3d0f8 100644 --- a/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml +++ b/interface/resources/qml/controls/+webengine/FlickableWebViewCore.qml @@ -147,7 +147,7 @@ Item { webViewCore.profile.offTheRecord = false; webViewCore.profile.storageName = "qmlWebEngine"; } else { - webViewCore.profile.httpUserAgent += " (VircadiaInterface)"; + webViewCore.profile.httpUserAgent += " (OverteInterface)"; } // Ensure the JS from the web-engine makes it to our logging webViewCore.javaScriptConsoleMessage.connect(function(level, message, lineNumber, sourceID) { diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml index 3c82fdb32b..be9fe932e0 100644 --- a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml +++ b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml @@ -229,7 +229,7 @@ Item { } function openDocs() { - Qt.openUrlExternally("https://docs.vircadia.com/create/avatars/package-avatar.html"); + Qt.openUrlExternally("https://docs.overte.org/create/avatars/package-avatar.html"); } function openVideo() { diff --git a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml index 290bf14877..6bcabf8a64 100644 --- a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml +++ b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml @@ -7,7 +7,7 @@ MessageBox { popup.onButton2Clicked = callback; popup.titleText = 'Specify Avatar URL' popup.bodyText = 'This will not overwrite your existing favorite if you are wearing one.
' + - '' + + '' + 'Learn to make a custom avatar by opening this link on your desktop.' + '' popup.inputText.visible = true; diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml index 2a88cf8c17..de0a799b9a 100644 --- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml +++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml @@ -779,7 +779,7 @@ Rectangle { lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain. " + "If you want to save the state of the content in this domain, create a backup before proceeding.

" + "For more information about backing up and restoring content, " + - "" + + "" + "click here to open info on your desktop browser."; lightboxPopup.button1text = "CANCEL"; lightboxPopup.button1method = function() { diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml index 2d886ce38e..348e1afb27 100644 --- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml +++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml @@ -603,7 +603,7 @@ Rectangle { lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain. " + "If you want to save the state of the content in this domain, create a backup before proceeding.

" + "For more information about backing up and restoring content, " + - "" + + "" + "click here to open info on your desktop browser."; lightboxPopup.button1text = "CANCEL"; lightboxPopup.button1method = function() { diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 0ed0aee125..dca6e555c0 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -7884,7 +7884,7 @@ bool Application::askToReplaceDomainContent(const QString& url) { static const QString infoText = simpleWordWrap("Your domain's content will be replaced with a new content set. " "If you want to save what you have now, create a backup before proceeding. For more information about backing up " "and restoring content, visit the documentation page at: ", MAX_CHARACTERS_PER_LINE) + - "\nhttps://docs.vircadia.com/host/maintain-domain/backup-domain.html"; + "\nhttps://docs.overte.org/host/maintain-domain/backup-domain.html"; ModalDialogListener* dig = OffscreenUi::asyncQuestion("Are you sure you want to replace this domain's content set?", infoText, QMessageBox::Yes | QMessageBox::No, QMessageBox::No); diff --git a/interface/src/CrashHandler_Crashpad.cpp b/interface/src/CrashHandler_Crashpad.cpp index 50f384b0d6..a9efdea98e 100644 --- a/interface/src/CrashHandler_Crashpad.cpp +++ b/interface/src/CrashHandler_Crashpad.cpp @@ -13,7 +13,7 @@ #include "CrashHandler.h" -Q_LOGGING_CATEGORY(crash_handler, "vircadia.crash_handler") +Q_LOGGING_CATEGORY(crash_handler, "overte.crash_handler") #include diff --git a/interface/src/CrashHandler_None.cpp b/interface/src/CrashHandler_None.cpp index 2e86472705..718a955e81 100644 --- a/interface/src/CrashHandler_None.cpp +++ b/interface/src/CrashHandler_None.cpp @@ -18,7 +18,7 @@ #include -Q_LOGGING_CATEGORY(crash_handler, "vircadia.crash_handler") +Q_LOGGING_CATEGORY(crash_handler, "overte.crash_handler") bool startCrashHandler(std::string appPath) { qCWarning(crash_handler) << "No crash handler available."; diff --git a/interface/src/SpeechRecognizer.h b/interface/src/SpeechRecognizer.h index 8b8eb534b0..be6a1aa296 100644 --- a/interface/src/SpeechRecognizer.h +++ b/interface/src/SpeechRecognizer.h @@ -82,7 +82,7 @@ signals: * return turnRate; * } * - * var MAPPING_NAME = "com.vircadia.controllers.example.speechRecognizer"; + * var MAPPING_NAME = "com.overte.controllers.example.speechRecognizer"; * var mapping = Controller.newMapping(MAPPING_NAME); * * mapping.from(getTurnRate).to(Controller.Actions.Yaw); diff --git a/interface/src/avatar/AvatarDoctor.cpp b/interface/src/avatar/AvatarDoctor.cpp index 2d8c50296a..5c2fc01911 100644 --- a/interface/src/avatar/AvatarDoctor.cpp +++ b/interface/src/avatar/AvatarDoctor.cpp @@ -55,7 +55,7 @@ static QStringList HAND_MAPPING_SUFFIXES = { "HandThumb1", }; -const QUrl PACKAGE_AVATAR_DOCS_BASE_URL = QUrl("https://docs.vircadia.com/create/avatars/package-avatar.html"); +const QUrl PACKAGE_AVATAR_DOCS_BASE_URL = QUrl("https://docs.overte.org/create/avatars/package-avatar.html"); AvatarDoctor::AvatarDoctor(const QUrl& avatarFSTFileUrl) : _avatarFSTFileUrl(avatarFSTFileUrl) { diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h index f2a5147140..b1c7762c3b 100644 --- a/interface/src/avatar/MyAvatar.h +++ b/interface/src/avatar/MyAvatar.h @@ -682,7 +682,7 @@ public: *

Note: When using pre-built animation data, it's critical that the joint orientation of the source animation and target * rig are equivalent, since the animation data applies absolute values onto the joints. If the orientations are different, * the avatar will move in unpredictable ways. For more information about avatar joint orientation standards, see - * Avatar Standards.

+ * Avatar Standards.

* @function MyAvatar.overrideAnimation * @param {string} url - The URL to the animation file. Animation files may be in glTF or FBX format, but only need to * contain the avatar skeleton and animation data. glTF models may be in JSON or binary format (".gltf" or ".glb" URLs @@ -790,7 +790,7 @@ public: *

Note: When using pre-built animation data, it's critical that the joint orientation of the source animation and target * rig are equivalent, since the animation data applies absolute values onto the joints. If the orientations are different, * the avatar will move in unpredictable ways. For more information about avatar joint orientation standards, see - * Avatar Standards. + * Avatar Standards. * @function MyAvatar.overrideRoleAnimation * @param {string} role - The animation role to override * @param {string} url - The URL to the animation file. Animation files need to be in glTF or FBX format, but only need to @@ -1954,7 +1954,7 @@ public: /*@jsdoc * Enables and disables flow simulation of physics on the avatar's hair, clothes, and body parts. See - * {@link https://docs.vircadia.com/create/avatars/add-flow.html|Add Flow to Your Avatar} for more + * {@link https://docs.overte.org/create/avatars/add-flow.html|Add Flow to Your Avatar} for more * information. * @function MyAvatar.useFlow * @param {boolean} isActive - true if flow simulation is enabled on the joint, false if it isn't. @@ -2317,7 +2317,7 @@ public slots: /*@jsdoc * Gets the URL of the override animation graph. - *

See {@link https://docs.vircadia.com/create/avatars/custom-animations.html|Custom Avatar Animations} for + *

See {@link https://docs.overte.org/create/avatars/custom-animations.html|Custom Avatar Animations} for * information on animation graphs.

* @function MyAvatar.getAnimGraphOverrideUrl * @returns {string} The URL of the override animation graph JSON file. "" if there is no override animation @@ -2327,7 +2327,7 @@ public slots: /*@jsdoc * Sets the animation graph to use in preference to the default animation graph. - *

See {@link https://docs.vircadia.com/create/avatars/custom-animations.html|Custom Avatar Animations} for + *

See {@link https://docs.overte.org/create/avatars/custom-animations.html|Custom Avatar Animations} for * information on animation graphs.

* @function MyAvatar.setAnimGraphOverrideUrl * @param {string} url - The URL of the animation graph JSON file to use. Set to "" to clear an override. @@ -2336,7 +2336,7 @@ public slots: /*@jsdoc * Gets the URL of animation graph (i.e., the avatar animation JSON) that's currently being used for avatar animations. - *

See {@link https://docs.vircadia.com/create/avatars/custom-animations.html|Custom Avatar Animations} for + *

See {@link https://docs.overte.org/create/avatars/custom-animations.html|Custom Avatar Animations} for * information on animation graphs.

* @function MyAvatar.getAnimGraphUrl * @returns {string} The URL of the current animation graph JSON file. @@ -2347,7 +2347,7 @@ public slots: /*@jsdoc * Sets the current animation graph (i.e., the avatar animation JSON) to use for avatar animations and makes it the default. - *

See {@link https://docs.vircadia.com/create/avatars/custom-animations.html|Custom Avatar Animations} for + *

See {@link https://docs.overte.org/create/avatars/custom-animations.html|Custom Avatar Animations} for * information on animation graphs.

* @function MyAvatar.setAnimGraphUrl * @param {string} url - The URL of the animation graph JSON file to use. diff --git a/interface/src/ui/ModelsBrowser.cpp b/interface/src/ui/ModelsBrowser.cpp index 191fc1a09c..50d9571e35 100644 --- a/interface/src/ui/ModelsBrowser.cpp +++ b/interface/src/ui/ModelsBrowser.cpp @@ -34,7 +34,7 @@ const char* MODEL_TYPE_NAMES[] = { "entities", "heads", "skeletons", "skeletons", "attachments" }; static const QString S3_URL = NetworkingConstants::HF_PUBLIC_CDN_URL; -static const QString PUBLIC_URL = "http://public.vircadia.com"; // Changed to Vircadia but not entirely sure what to do with this yet. +static const QString PUBLIC_URL = "http://public.overte.org"; // Changed to Overte but not entirely sure what to do with this yet. static const QString MODELS_LOCATION = "models/"; static const QString PREFIX_PARAMETER_NAME = "prefix"; diff --git a/launchers/darwin/CMakeLists.txt b/launchers/darwin/CMakeLists.txt index 4eee595c3a..d807fbafd1 100644 --- a/launchers/darwin/CMakeLists.txt +++ b/launchers/darwin/CMakeLists.txt @@ -149,7 +149,7 @@ set(CPACK_PACKAGE_FILE_NAME "HQ Launcher") set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME}) -set(DMG_SUBFOLDER_NAME "Vircadia") +set(DMG_SUBFOLDER_NAME "Overte") set(ESCAPED_DMG_SUBFOLDER_NAME "") set(DMG_SUBFOLDER_ICON "${CMAKE_SOURCE_DIR}/cmake/installer/install-folder.rsrc") diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h index fa5a5cff67..7a2bc474a1 100644 --- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h +++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h @@ -208,7 +208,7 @@ public: /*@jsdoc * Gets the default rotation of a joint (in the current avatar) relative to its parent. *

For information on the joint hierarchy used, see - * Avatar Standards.

+ * Avatar Standards.

* @function MyAvatar.getDefaultJointRotation * @param {number} index - The joint index. * @returns {Quat} The default rotation of the joint if the joint index is valid, otherwise {@link Quat(0)|Quat.IDENTITY}. @@ -219,7 +219,7 @@ public: * Gets the default translation of a joint (in the current avatar) relative to its parent, in model coordinates. *

Warning: These coordinates are not necessarily in meters.

*

For information on the joint hierarchy used, see - * Avatar Standards.

+ * Avatar Standards.

* @function MyAvatar.getDefaultJointTranslation * @param {number} index - The joint index. * @returns {Vec3} The default translation of the joint (in model coordinates) if the joint index is valid, otherwise diff --git a/libraries/avatars-renderer/src/avatars-renderer/ScriptAvatar.h b/libraries/avatars-renderer/src/avatars-renderer/ScriptAvatar.h index aac8236eda..a4595e9bde 100644 --- a/libraries/avatars-renderer/src/avatars-renderer/ScriptAvatar.h +++ b/libraries/avatars-renderer/src/avatars-renderer/ScriptAvatar.h @@ -88,7 +88,7 @@ public slots: /*@jsdoc * Gets the default rotation of a joint in the avatar relative to its parent. *

For information on the joint hierarchy used, see - * Avatar Standards.

+ * Avatar Standards.

* @function ScriptAvatar.getDefaultJointRotation * @param {number} index - The joint index. * @returns {Quat} The default rotation of the joint if avatar data are available and the joint index is valid, otherwise @@ -100,7 +100,7 @@ public slots: * Gets the default translation of a joint in the avatar relative to its parent, in model coordinates. *

Warning: These coordinates are not necessarily in meters.

*

For information on the joint hierarchy used, see - * Avatar Standards.

+ * Avatar Standards.

* @function ScriptAvatar.getDefaultJointTranslation * @param {number} index - The joint index. * @returns {Vec3} The default translation of the joint (in model coordinates) if avatar data are available and the joint diff --git a/libraries/avatars/src/AvatarData.h b/libraries/avatars/src/AvatarData.h index 9b4b021827..6a41437e05 100755 --- a/libraries/avatars/src/AvatarData.h +++ b/libraries/avatars/src/AvatarData.h @@ -862,7 +862,7 @@ public: /*@jsdoc * Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see - * Avatar Standards. + * Avatar Standards. * @function Avatar.getJointRotation * @param {number} index - The index of the joint. * @returns {Quat} The rotation of the joint relative to its parent. @@ -873,7 +873,7 @@ public: * Gets the translation of a joint relative to its parent, in model coordinates. *

Warning: These coordinates are not necessarily in meters.

*

For information on the joint hierarchy used, see - * Avatar Standards.

+ * Avatar Standards.

* @function Avatar.getJointTranslation * @param {number} index - The index of the joint. * @returns {Vec3} The translation of the joint relative to its parent, in model coordinates. @@ -983,7 +983,7 @@ public: /*@jsdoc * Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see - * Avatar Standards. + * Avatar Standards. * @function Avatar.getJointRotation * @param {string} name - The name of the joint. * @returns {Quat} The rotation of the joint relative to its parent. @@ -998,7 +998,7 @@ public: * Gets the translation of a joint relative to its parent, in model coordinates. *

Warning: These coordinates are not necessarily in meters.

*

For information on the joint hierarchy used, see - * Avatar Standards.

+ * Avatar Standards.

* @function Avatar.getJointTranslation * @param {number} name - The name of the joint. * @returns {Vec3} The translation of the joint relative to its parent, in model coordinates. @@ -1140,7 +1140,7 @@ public: * set hasScriptedBlendshapes back to false when the animation is complete. * @function Avatar.setBlendshape * @param {string} name - The name of the blendshape, per the - * {@link https://docs.vircadia.com/create/avatars/avatar-standards.html#blendshapes Avatar Standards}. + * {@link https://docs.overte.org/create/avatars/avatar-standards.html#blendshapes Avatar Standards}. * @param {number} value - A value between 0.0 and 1.0. * @example Open your avatar's mouth wide. * MyAvatar.hasScriptedBlendshapes = true; diff --git a/libraries/avatars/src/ScriptAvatarData.h b/libraries/avatars/src/ScriptAvatarData.h index 3982c32b29..8f9b7b77b1 100644 --- a/libraries/avatars/src/ScriptAvatarData.h +++ b/libraries/avatars/src/ScriptAvatarData.h @@ -118,7 +118,7 @@ public: /*@jsdoc * Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see - * Avatar Standards. + * Avatar Standards. * @function ScriptAvatar.getJointRotation * @param {number} index - The index of the joint. * @returns {Quat} The rotation of the joint relative to its parent, or {@link Quat(0)|Quat.IDENTITY} if the avatar data @@ -130,7 +130,7 @@ public: * Gets the translation of a joint relative to its parent, in model coordinates. *

Warning: These coordinates are not necessarily in meters.

*

For information on the joint hierarchy used, see - * Avatar Standards.

+ * Avatar Standards.

* @function ScriptAvatar.getJointTranslation * @param {number} index - The index of the joint. * @returns {Vec3} The translation of the joint relative to its parent, in model coordinates, or {@link Vec3(0)|Vec3.ZERO} @@ -140,7 +140,7 @@ public: /*@jsdoc * Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see - * Avatar Standards. + * Avatar Standards. * @function ScriptAvatar.getJointRotation * @param {string} name - The name of the joint. * @returns {Quat} The rotation of the joint relative to its parent, or {@link Quat(0)|Quat.IDENTITY} if the avatar data @@ -152,7 +152,7 @@ public: * Gets the translation of a joint relative to its parent, in model coordinates. *

Warning: These coordinates are not necessarily in meters.

*

For information on the joint hierarchy used, see - * Avatar Standards.

+ * Avatar Standards.

* @function ScriptAvatar.getJointTranslation * @param {number} name - The name of the joint. * @returns {Vec3} The translation of the joint relative to its parent, in model coordinates, or {@link Vec3(0)|Vec3.ZERO} diff --git a/libraries/controllers/src/controllers/ScriptingInterface.h b/libraries/controllers/src/controllers/ScriptingInterface.h index 969b2d19d2..7da9a4e57f 100644 --- a/libraries/controllers/src/controllers/ScriptingInterface.h +++ b/libraries/controllers/src/controllers/ScriptingInterface.h @@ -276,7 +276,7 @@ namespace controller { * by {@link Uuid(0).generate|Uuid.generate} is used. * @returns {MappingObject} A controller mapping object. * @example Create a simple mapping that makes the right trigger move your avatar up. - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * * mapping.from(Controller.Standard.RT).to(Controller.Actions.TranslateY); @@ -311,7 +311,7 @@ namespace controller { * @returns {MappingObject} A controller mapping object. * @example Create a simple mapping that makes the right trigger move your avatar up. * var mappingJSON = { - * "name": "com.vircadia.controllers.example.jsonMapping", + * "name": "com.overte.controllers.example.jsonMapping", * "channels": [ * { "from": "Standard.RT", "to": "Actions.TranslateY" } * ] @@ -463,7 +463,7 @@ namespace controller { * {@link Controller.Hardware|Controller.Hardware.Keyboard} outputs. * @function Controller.captureMouseEvents * @example Disable Controller.Hardware.Keyboard mouse events for a short period. - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Hardware.Keyboard.MouseX).to(function (x) { * print("Mouse x = " + x); diff --git a/libraries/controllers/src/controllers/impl/MappingBuilderProxy.h b/libraries/controllers/src/controllers/impl/MappingBuilderProxy.h index bf943f373f..aeb4480a92 100644 --- a/libraries/controllers/src/controllers/impl/MappingBuilderProxy.h +++ b/libraries/controllers/src/controllers/impl/MappingBuilderProxy.h @@ -71,7 +71,7 @@ class UserInputMapper; * @property {Controller.MappingJSONRoute[]} channels - An array of routes. * @example A simple mapping JSON that makes the right trigger move your avatar up after a dead zone. * { - * "name": "com.vircadia.controllers.example.jsonMapping", + * "name": "com.overte.controllers.example.jsonMapping", * "channels": [ * { * "from": "Standard.RT", @@ -176,7 +176,7 @@ public: * @returns {RouteObject} A route ready for mapping to an action or function using {@link RouteObject} methods. The data * value passed to the route is the combined value of source2 - source1. * @example Make the Oculus Touch triggers move your avatar up and down. - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping * .makeAxis(Controller.Hardware.OculusTouch.LT, Controller.Hardware.OculusTouch.RT) diff --git a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h index d9fec2f808..86338fae9a 100644 --- a/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h +++ b/libraries/controllers/src/controllers/impl/RouteBuilderProxy.h @@ -90,7 +90,7 @@ class RouteBuilderProxy : public QObject { * an in-line function definition. * * @example Make the right trigger move your avatar up. - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * * mapping.from(Controller.Standard.RT).to(Controller.Actions.TranslateY); @@ -105,7 +105,7 @@ class RouteBuilderProxy : public QObject { * print("Trigger value: " + value); * } * - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * * mapping.from(Controller.Standard.RT).to(onRightTrigger); @@ -124,7 +124,7 @@ class RouteBuilderProxy : public QObject { * otherwise it is disabled. * @returns {RouteObject} The RouteObject with debug output enabled or disabled. * @example Write debug information to the program log for a right trigger mapping. - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * * mapping.from(Controller.Standard.RT).debug().to(function (value) { @@ -175,7 +175,7 @@ class RouteBuilderProxy : public QObject { * calls.

* @returns {RouteObject} The RouteObject with the condition added. * @example Process the right trigger differently in HMD and desktop modes. - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * * // Processed only if in HMD mode. @@ -203,7 +203,7 @@ class RouteBuilderProxy : public QObject { * @param {number} max - The maximum value to pass through. * @returns {RouteObject} The route object with the clamp filter added. * @example Clamp right trigger values to between 0.3 and 0.7. - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.RT).clamp(0.3, 0.7).to(function (value) { * print("Value: " + value); @@ -225,7 +225,7 @@ class RouteBuilderProxy : public QObject { * @param {number} max - When the input value rises above this value the output value changes to 1. * @returns {RouteObject} The RouteObject with the filter applied. * @example Round the right joystick forward/back values to 0 or 1 with hysteresis. - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.RY).peek().to(function (value) { * print("Raw value: " + value); // 0.0 - 1.0. @@ -247,7 +247,7 @@ class RouteBuilderProxy : public QObject { * @param {number} interval - The interval between sending values, in seconds. * @returns {RouteObject} The RouteObject with the filter applied. * @example Send right trigger values every half second. - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.RT).pulse(0.5).to(function (value) { * print("Value: " + value); @@ -266,7 +266,7 @@ class RouteBuilderProxy : public QObject { * @param {number} multiplier - The scale to multiply the value by. * @returns {RouteObject} The RouteObject with the filter applied. * @example Scale the value of the right joystick forward/back values by 10. - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.LY).to(function (value) { * print("L value: " + value); // -1.0 to 1.0 values. @@ -288,7 +288,7 @@ class RouteBuilderProxy : public QObject { * @function RouteObject#invert * @returns {RouteObject} The RouteObject with the filter applied. * @example Invert the value of the right joystick forward/back values. - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.LY).to(function (value) { * print("L value: " + value); // -1.0 to 1.0 values, forward to back. @@ -313,7 +313,7 @@ class RouteBuilderProxy : public QObject { * negative of this value is used. * @returns {RouteObject} The RouteObject with the filter applied. * @example Apply a dead-zone to the right joystick forward/back values. - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.RY).deadZone(0.2).to(function (value) { * print("Value: " + value); // 0.0 - 1.0 values once outside the dead-zone. @@ -334,7 +334,7 @@ class RouteBuilderProxy : public QObject { * @returns {RouteObject} The RouteObject with the filter applied. * @example Round the right joystick forward/back values to -1, 0, or * 1. - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.RY).constrainToInteger().to(function (value) { * print("Value: " + value); // -1, 0, or 1 @@ -353,7 +353,7 @@ class RouteBuilderProxy : public QObject { * @function RouteObject#constrainToPositiveInteger * @returns {RouteObject} The RouteObject with the filter applied. * @example Round the right joystick forward/back values to 0 or 1. - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * mapping.from(Controller.Standard.RY).constrainToPositiveInteger().to(function (value) { * print("Value: " + value); // 0, or 1 @@ -436,7 +436,7 @@ class RouteBuilderProxy : public QObject { * @function RouteObject#logicalNot * @returns {RouteObject} The RouteObject with the filter applied. * @example Logical NOT of LSTouch value. - * var MAPPING_NAME = "com.vircadia.controllers.example.newMapping"; + * var MAPPING_NAME = "com.overte.controllers.example.newMapping"; * var mapping = Controller.newMapping(MAPPING_NAME); * * mapping.from(Controller.Standard.RSTouch).peek().to(function (value) { diff --git a/libraries/image/src/image/TextureProcessing.h b/libraries/image/src/image/TextureProcessing.h index 7bf249ebda..c46ea299cd 100644 --- a/libraries/image/src/image/TextureProcessing.h +++ b/libraries/image/src/image/TextureProcessing.h @@ -34,7 +34,7 @@ namespace TextureUsage { /*@jsdoc *

Describes the type of texture.

*

See also: {@link Material} and - * {@link https://docs.vircadia.com/create/3d-models/pbr-materials-guide.html|PBR Materials Guide}.

+ * {@link https://docs.overte.org/create/3d-models/pbr-materials-guide.html|PBR Materials Guide}.

* * * diff --git a/libraries/midi/src/Midi.h b/libraries/midi/src/Midi.h index aca573f5ce..ee1ba6e8b3 100644 --- a/libraries/midi/src/Midi.h +++ b/libraries/midi/src/Midi.h @@ -24,7 +24,7 @@ /*@jsdoc * The Midi API provides the ability to connect Interface with musical instruments and other external or virtual * devices via the MIDI protocol. For further information and examples, see the tutorial: - * Use MIDI to Control Your Environment. + * Use MIDI to Control Your Environment. * *

Note: Only works on Windows.

* diff --git a/libraries/networking/src/ExternalResource.cpp b/libraries/networking/src/ExternalResource.cpp index 1058bddff8..84311eef3b 100644 --- a/libraries/networking/src/ExternalResource.cpp +++ b/libraries/networking/src/ExternalResource.cpp @@ -13,7 +13,7 @@ #include #include -Q_LOGGING_CATEGORY(external_resource, "vircadia.networking.external_resource") +Q_LOGGING_CATEGORY(external_resource, "overte.networking.external_resource") ExternalResource::ExternalResource(QObject* parent) : QObject(parent) { } diff --git a/libraries/networking/src/ExternalResource.h b/libraries/networking/src/ExternalResource.h index b93c378a37..15b01a521a 100644 --- a/libraries/networking/src/ExternalResource.h +++ b/libraries/networking/src/ExternalResource.h @@ -9,8 +9,8 @@ // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -#ifndef vircadia_ExternalResource_h -#define vircadia_ExternalResource_h +#ifndef overte_ExternalResource_h +#define overte_ExternalResource_h #include #include diff --git a/libraries/networking/src/MessagesClient.h b/libraries/networking/src/MessagesClient.h index b67904f227..524025176d 100644 --- a/libraries/networking/src/MessagesClient.h +++ b/libraries/networking/src/MessagesClient.h @@ -64,7 +64,7 @@ public: * from an assignment client script it is received only by that same assignment client script.

* @example * // Receiving script. - * var channelName = "com.vircadia.example.messages-example"; + * var channelName = "com.overte.example.messages-example"; * * function onMessageReceived(channel, message, sender, localOnly) { * print("Message received:"); @@ -84,7 +84,7 @@ public: * * * // Sending script. - * var channelName = "com.vircadia.example.messages-example"; + * var channelName = "com.overte.example.messages-example"; * var message = "Hello"; * Messages.sendMessage(channelName, message); */ @@ -112,7 +112,7 @@ public: * from an assignment client script it is received only by that same assignment client script.

* @example * // Receiving script. - * var channelName = "com.vircadia.example.messages-example"; + * var channelName = "com.overte.example.messages-example"; * * function onDataReceived(channel, data, sender, localOnly) { * var int8data = new Int8Array(data); @@ -140,7 +140,7 @@ public: * * * // Sending script. - * var channelName = "com.vircadia.example.messages-example"; + * var channelName = "com.overte.example.messages-example"; * var int8data = new Int8Array([1, 1, 2, 3, 5, 8, 13]); * Messages.sendData(channelName, int8data.buffer); */ diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h index e920da1cf5..63557fc6c4 100644 --- a/libraries/networking/src/NetworkingConstants.h +++ b/libraries/networking/src/NetworkingConstants.h @@ -37,7 +37,7 @@ namespace NetworkingConstants { const QStringList IS_AUTHABLE_HOSTNAME = { "overte.org" }; // Use a custom User-Agent to avoid ModSecurity filtering, e.g. by hosting providers. - const QByteArray VIRCADIA_USER_AGENT = "Mozilla/5.0 (VircadiaInterface)"; + const QByteArray VIRCADIA_USER_AGENT = "Mozilla/5.0 (OverteInterface)"; const QString WEB_ENGINE_USER_AGENT = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) " + WEB_ENGINE_VERSION + " Mobile Safari/537.36"; const QString MOBILE_USER_AGENT = "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) " + WEB_ENGINE_VERSION + " Mobile Safari/537.36"; diff --git a/libraries/networking/src/SocketType.h b/libraries/networking/src/SocketType.h index c689f51422..399940654d 100644 --- a/libraries/networking/src/SocketType.h +++ b/libraries/networking/src/SocketType.h @@ -11,8 +11,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#ifndef vircadia_SocketType_h -#define vircadia_SocketType_h +#ifndef overte_SocketType_h +#define overte_SocketType_h /// @addtogroup Networking /// @{ @@ -38,4 +38,4 @@ public: /// @} -#endif // vircadia_SocketType_h +#endif // overte_SocketType_h diff --git a/libraries/networking/src/udt/NetworkSocket.h b/libraries/networking/src/udt/NetworkSocket.h index 030f27e119..212279286c 100644 --- a/libraries/networking/src/udt/NetworkSocket.h +++ b/libraries/networking/src/udt/NetworkSocket.h @@ -6,8 +6,8 @@ // Copyright 2021 Vircadia contributors. // -#ifndef vircadia_NetworkSocket_h -#define vircadia_NetworkSocket_h +#ifndef overte_NetworkSocket_h +#define overte_NetworkSocket_h #include #include @@ -167,4 +167,4 @@ private: /// @} -#endif // vircadia_NetworkSocket_h +#endif // overte_NetworkSocket_h diff --git a/libraries/networking/src/webrtc/WebRTCDataChannels.h b/libraries/networking/src/webrtc/WebRTCDataChannels.h index 9bfb84d6cf..5b15e2596a 100644 --- a/libraries/networking/src/webrtc/WebRTCDataChannels.h +++ b/libraries/networking/src/webrtc/WebRTCDataChannels.h @@ -6,8 +6,8 @@ // Copyright 2021 Vircadia contributors. // -#ifndef vircadia_WebRTCDataChannels_h -#define vircadia_WebRTCDataChannels_h +#ifndef overte_WebRTCDataChannels_h +#define overte_WebRTCDataChannels_h #include @@ -337,4 +337,4 @@ private: #endif // WEBRTC_DATA_CHANNELS -#endif // vircadia_WebRTCDataChannels_h +#endif // overte_WebRTCDataChannels_h diff --git a/libraries/networking/src/webrtc/WebRTCSignalingServer.cpp b/libraries/networking/src/webrtc/WebRTCSignalingServer.cpp index 0534639419..07960cd321 100644 --- a/libraries/networking/src/webrtc/WebRTCSignalingServer.cpp +++ b/libraries/networking/src/webrtc/WebRTCSignalingServer.cpp @@ -31,9 +31,9 @@ WebRTCSignalingServer::WebRTCSignalingServer(QObject* parent, bool isWSSEnabled) this)); auto dsDirPath = PathUtils::getAppLocalDataPath(); - const QString KEY_FILENAME = "vircadia-cert.key"; - const QString CRT_FILENAME = "vircadia-cert.crt"; - const QString CA_CRT_FILENAME = "vircadia-cert-ca.crt"; + const QString KEY_FILENAME = "overte-cert.key"; + const QString CRT_FILENAME = "overte-cert.crt"; + const QString CA_CRT_FILENAME = "overte-cert-ca.crt"; qCDebug(networking_webrtc) << "WebSocket WSS key file:" << dsDirPath + KEY_FILENAME; qCDebug(networking_webrtc) << "WebSocket WSS cert file:" << dsDirPath + CRT_FILENAME; qCDebug(networking_webrtc) << "WebSocket WSS CA cert file:" << dsDirPath + CA_CRT_FILENAME; diff --git a/libraries/networking/src/webrtc/WebRTCSignalingServer.h b/libraries/networking/src/webrtc/WebRTCSignalingServer.h index a613c95666..1f76ceb716 100644 --- a/libraries/networking/src/webrtc/WebRTCSignalingServer.h +++ b/libraries/networking/src/webrtc/WebRTCSignalingServer.h @@ -6,8 +6,8 @@ // Copyright 2021 Vircadia contributors. // -#ifndef vircadia_WebRTCSignalingServer_h -#define vircadia_WebRTCSignalingServer_h +#ifndef overte_WebRTCSignalingServer_h +#define overte_WebRTCSignalingServer_h #include @@ -110,4 +110,4 @@ private: #endif // WEBRTC_DATA_CHANNELS -#endif // vircadia_WebRTCSignalingServer_h +#endif // overte_WebRTCSignalingServer_h diff --git a/libraries/networking/src/webrtc/WebRTCSocket.h b/libraries/networking/src/webrtc/WebRTCSocket.h index 04856f50f1..4380cac69d 100644 --- a/libraries/networking/src/webrtc/WebRTCSocket.h +++ b/libraries/networking/src/webrtc/WebRTCSocket.h @@ -6,8 +6,8 @@ // Copyright 2021 Vircadia contributors. // -#ifndef vircadia_WebRTCSocket_h -#define vircadia_WebRTCSocket_h +#ifndef overte_WebRTCSocket_h +#define overte_WebRTCSocket_h #include @@ -168,4 +168,4 @@ private: #endif // WEBRTC_DATA_CHANNELS -#endif // vircadia_WebRTCSocket_h +#endif // overte_WebRTCSocket_h diff --git a/libraries/script-engine/src/AssetScriptingInterface.h b/libraries/script-engine/src/AssetScriptingInterface.h index b9fcb3c1c7..49a619306f 100644 --- a/libraries/script-engine/src/AssetScriptingInterface.h +++ b/libraries/script-engine/src/AssetScriptingInterface.h @@ -44,7 +44,7 @@ * @hifi-server-entity * @hifi-assignment-client */ -/// Provides the Assets scripting API +/// Provides the Assets scripting API class AssetScriptingInterface : public BaseAssetScriptingInterface, QScriptable { Q_OBJECT public: diff --git a/libraries/script-engine/src/AudioScriptingInterface.h b/libraries/script-engine/src/AudioScriptingInterface.h index 6bfb7352ee..6ebe42d67f 100644 --- a/libraries/script-engine/src/AudioScriptingInterface.h +++ b/libraries/script-engine/src/AudioScriptingInterface.h @@ -22,7 +22,7 @@ class ScriptAudioInjector; -/// Provides the Audio scripting API +/// Provides the Audio scripting API class AudioScriptingInterface : public QObject, public Dependency { Q_OBJECT SINGLETON_DEPENDENCY diff --git a/libraries/script-engine/src/ConsoleScriptingInterface.h b/libraries/script-engine/src/ConsoleScriptingInterface.h index 591d44b22d..39ccea192b 100644 --- a/libraries/script-engine/src/ConsoleScriptingInterface.h +++ b/libraries/script-engine/src/ConsoleScriptingInterface.h @@ -40,7 +40,7 @@ * @hifi-server-entity * @hifi-assignment-client */ -/// Provides the console scripting API +/// Provides the console scripting API class ConsoleScriptingInterface : public QObject, protected QScriptable { Q_OBJECT public: diff --git a/libraries/script-engine/src/FileScriptingInterface.h b/libraries/script-engine/src/FileScriptingInterface.h index 2afa995214..dddadd9fc3 100644 --- a/libraries/script-engine/src/FileScriptingInterface.h +++ b/libraries/script-engine/src/FileScriptingInterface.h @@ -30,7 +30,7 @@ * @hifi-server-entity * @hifi-assignment-client */ -/// Provides the File scripting API +/// Provides the File scripting API class FileScriptingInterface : public QObject { Q_OBJECT diff --git a/libraries/script-engine/src/KeyEvent.h b/libraries/script-engine/src/KeyEvent.h index 10c5fde404..e322aa4a65 100644 --- a/libraries/script-engine/src/KeyEvent.h +++ b/libraries/script-engine/src/KeyEvent.h @@ -18,7 +18,7 @@ #include #include -/// Represents a keyboard event to the scripting engine. Exposed as KeyEvent +/// Represents a keyboard event to the scripting engine. Exposed as KeyEvent class KeyEvent { public: KeyEvent(); diff --git a/libraries/script-engine/src/Mat4.h b/libraries/script-engine/src/Mat4.h index 204e87c57d..6ee8306067 100644 --- a/libraries/script-engine/src/Mat4.h +++ b/libraries/script-engine/src/Mat4.h @@ -38,7 +38,7 @@ * @hifi-server-entity * @hifi-assignment-client */ -/// Provides the Mat4 scripting interface +/// Provides the Mat4 scripting interface class Mat4 : public QObject, protected QScriptable { Q_OBJECT diff --git a/libraries/script-engine/src/MenuItemProperties.h b/libraries/script-engine/src/MenuItemProperties.h index 30b78cd55b..c1845ccae9 100644 --- a/libraries/script-engine/src/MenuItemProperties.h +++ b/libraries/script-engine/src/MenuItemProperties.h @@ -20,7 +20,7 @@ #include "KeyEvent.h" -/// Represents a menu item a script may declare and bind events to. Exposed as MenuItemProperties +/// Represents a menu item a script may declare and bind events to. Exposed as MenuItemProperties class MenuItemProperties { public: MenuItemProperties() {} diff --git a/libraries/script-engine/src/ModelScriptingInterface.h b/libraries/script-engine/src/ModelScriptingInterface.h index 5bd8d08944..abf8720a3e 100644 --- a/libraries/script-engine/src/ModelScriptingInterface.h +++ b/libraries/script-engine/src/ModelScriptingInterface.h @@ -35,7 +35,7 @@ class QScriptEngine; * * @deprecated This API is deprecated. Use the {@link Graphics} API instead. */ -/// Provides the Model scripting interface +/// Provides the Model scripting interface class ModelScriptingInterface : public QObject { Q_OBJECT diff --git a/libraries/script-engine/src/MouseEvent.h b/libraries/script-engine/src/MouseEvent.h index 7c668a6901..05f96812f9 100644 --- a/libraries/script-engine/src/MouseEvent.h +++ b/libraries/script-engine/src/MouseEvent.h @@ -20,7 +20,7 @@ class QScriptEngine; -/// Represents a mouse event to the scripting engine. Exposed as MouseEvent +/// Represents a mouse event to the scripting engine. Exposed as MouseEvent class MouseEvent { public: MouseEvent(); diff --git a/libraries/script-engine/src/Quat.h b/libraries/script-engine/src/Quat.h index 227f9a4bc5..606a17cf71 100644 --- a/libraries/script-engine/src/Quat.h +++ b/libraries/script-engine/src/Quat.h @@ -54,7 +54,7 @@ * print(JSON.stringify(Quat.IDENTITY)); // { x: 0, y: 0, z: 0, w: 1 } * print(JSON.stringify(Quat.safeEulerAngles(Quat.IDENTITY))); // { x: 0, y: 0, z: 0 } */ -/// Provides the Quat scripting interface +/// Provides the Quat scripting interface class Quat : public QObject, protected QScriptable { Q_OBJECT Q_PROPERTY(glm::quat IDENTITY READ IDENTITY CONSTANT) diff --git a/libraries/script-engine/src/RecordingScriptingInterface.h b/libraries/script-engine/src/RecordingScriptingInterface.h index a170958a91..3189fdbabb 100644 --- a/libraries/script-engine/src/RecordingScriptingInterface.h +++ b/libraries/script-engine/src/RecordingScriptingInterface.h @@ -38,7 +38,7 @@ class QScriptValue; * @hifi-avatar * @hifi-assignment-client */ -/// Provides the Recording scripting interface +/// Provides the Recording scripting interface class RecordingScriptingInterface : public QObject, public Dependency { Q_OBJECT diff --git a/libraries/script-engine/src/SceneScriptingInterface.h b/libraries/script-engine/src/SceneScriptingInterface.h index 6c65ed5244..639e413177 100644 --- a/libraries/script-engine/src/SceneScriptingInterface.h +++ b/libraries/script-engine/src/SceneScriptingInterface.h @@ -31,7 +31,7 @@ * @property {boolean} shouldRenderEntities - true if entities (domain, avatar, and local) are rendered, * false if they aren't. */ -/// Provides the Scene scripting interface +/// Provides the Scene scripting interface class SceneScriptingInterface : public QObject, public Dependency { Q_OBJECT SINGLETON_DEPENDENCY diff --git a/libraries/script-engine/src/ScriptAudioInjector.h b/libraries/script-engine/src/ScriptAudioInjector.h index 8818ffab43..de2c5de107 100644 --- a/libraries/script-engine/src/ScriptAudioInjector.h +++ b/libraries/script-engine/src/ScriptAudioInjector.h @@ -38,7 +38,7 @@ * Read-only. * @property {AudioInjector.AudioInjectorOptions} options - Configures how the injector plays the audio. */ -/// Provides the AudioInjector scripting interface +/// Provides the AudioInjector scripting interface class ScriptAudioInjector : public QObject { Q_OBJECT diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h index 3ab8ba298d..45c71b7e90 100644 --- a/libraries/script-engine/src/ScriptEngine.h +++ b/libraries/script-engine/src/ScriptEngine.h @@ -137,7 +137,7 @@ public: * Read-only. * @property {Script.ResourceBuckets} ExternalPaths - External resource buckets. */ -/// The main class managing a scripting engine. Also provides the Script scripting interface +/// The main class managing a scripting engine. Also provides the Script scripting interface class ScriptEngine : public BaseScriptEngine, public EntitiesScriptEngineProvider { Q_OBJECT Q_PROPERTY(QString context READ getContext) @@ -444,7 +444,7 @@ public: /*@jsdoc * Provides access to methods or objects provided in an external JavaScript or JSON file. - * See {@link https://docs.vircadia.com/script/js-tips.html} for further details. + * See {@link https://docs.overte.org/script/js-tips.html} for further details. * @function Script.require * @param {string} module - The module to use. May be a JavaScript file, a JSON file, or the name of a system module such * as "appUi" (i.e., the "appUi.js" system module JavaScript file). diff --git a/libraries/script-engine/src/ScriptEngines.h b/libraries/script-engine/src/ScriptEngines.h index bc41fb8ab4..e8366a8017 100644 --- a/libraries/script-engine/src/ScriptEngines.h +++ b/libraries/script-engine/src/ScriptEngines.h @@ -53,7 +53,7 @@ class ScriptEngine; * scripts directory of the Interface installation. * Read-only. */ -/// Provides the ScriptDiscoveryService scripting interface +/// Provides the ScriptDiscoveryService scripting interface class ScriptEngines : public QObject, public Dependency, public ScriptInitializerMixin { Q_OBJECT diff --git a/libraries/script-engine/src/ScriptGatekeeper.h b/libraries/script-engine/src/ScriptGatekeeper.h index 71bce13193..9f70900c9e 100644 --- a/libraries/script-engine/src/ScriptGatekeeper.h +++ b/libraries/script-engine/src/ScriptGatekeeper.h @@ -12,8 +12,8 @@ /// @addtogroup ScriptEngine /// @{ -#ifndef vircadia_ScriptGatekeeper_h -#define vircadia_ScriptGatekeeper_h +#ifndef overte_ScriptGatekeeper_h +#define overte_ScriptGatekeeper_h #include @@ -30,6 +30,6 @@ private: bool _initialized { false }; }; -#endif // vircadia_ScriptGatekeeper_h +#endif // overte_ScriptGatekeeper_h /// @} diff --git a/libraries/script-engine/src/ScriptUUID.h b/libraries/script-engine/src/ScriptUUID.h index 24edb91184..abcd34ccec 100644 --- a/libraries/script-engine/src/ScriptUUID.h +++ b/libraries/script-engine/src/ScriptUUID.h @@ -35,7 +35,7 @@ * * @property {Uuid} NULL - The null UUID, "{00000000-0000-0000-0000-000000000000}". */ -/// Provides the Uuid scripting interface +/// Provides the Uuid scripting interface class ScriptUUID : public QObject, protected QScriptable { Q_OBJECT Q_PROPERTY(QString NULL READ NULL_UUID CONSTANT) // String for use in scripts. diff --git a/libraries/script-engine/src/ScriptsModel.h b/libraries/script-engine/src/ScriptsModel.h index 2c90a73d2d..7773033083 100644 --- a/libraries/script-engine/src/ScriptsModel.h +++ b/libraries/script-engine/src/ScriptsModel.h @@ -122,7 +122,7 @@ public: * print("Scripts:"); * printDirectory(null, 0, ""); // null index for the root directory. */ -/// Provides script file information available from the ScriptDiscoveryService scripting interface +/// Provides script file information available from the ScriptDiscoveryService scripting interface class ScriptsModel : public QAbstractItemModel { Q_OBJECT public: diff --git a/libraries/script-engine/src/ScriptsModelFilter.h b/libraries/script-engine/src/ScriptsModelFilter.h index 7a52be76e4..d682a1a5ef 100644 --- a/libraries/script-engine/src/ScriptsModelFilter.h +++ b/libraries/script-engine/src/ScriptsModelFilter.h @@ -74,7 +74,7 @@ * print("Edit scripts:"); * printDirectory(null, 0, ""); // null index for the root directory. */ -/// Provides script file information available from the ScriptDiscoveryService scripting interface +/// Provides script file information available from the ScriptDiscoveryService scripting interface class ScriptsModelFilter : public QSortFilterProxyModel { Q_OBJECT public: diff --git a/libraries/script-engine/src/TouchEvent.h b/libraries/script-engine/src/TouchEvent.h index d084514ff6..5783418d54 100644 --- a/libraries/script-engine/src/TouchEvent.h +++ b/libraries/script-engine/src/TouchEvent.h @@ -23,7 +23,7 @@ class QScriptValue; class QScriptEngine; -/// Represents a display or device event to the scripting engine. Exposed as TouchEvent +/// Represents a display or device event to the scripting engine. Exposed as TouchEvent class TouchEvent { public: TouchEvent(); diff --git a/libraries/script-engine/src/UsersScriptingInterface.h b/libraries/script-engine/src/UsersScriptingInterface.h index 8bca34ad0b..b0c419e14b 100644 --- a/libraries/script-engine/src/UsersScriptingInterface.h +++ b/libraries/script-engine/src/UsersScriptingInterface.h @@ -41,7 +41,7 @@ * @property {BanFlags} BAN_BY_FINGERPRINT - Ban user by fingerprint. Read-only. * @property {BanFlags} BAN_BY_IP - Ban user by IP address. Read-only. */ -/// Provides the Users scripting interface +/// Provides the Users scripting interface class UsersScriptingInterface : public QObject, public Dependency { Q_OBJECT SINGLETON_DEPENDENCY diff --git a/libraries/script-engine/src/Vec3.h b/libraries/script-engine/src/Vec3.h index bfdacc73fa..61fcd82475 100644 --- a/libraries/script-engine/src/Vec3.h +++ b/libraries/script-engine/src/Vec3.h @@ -27,7 +27,7 @@ /*@jsdoc * The Vec3 API provides facilities for generating and manipulating 3-dimensional vectors. Overte uses a * right-handed Cartesian coordinate system where the y-axis is the "up" and the negative z-axis is the "front" direction. - * Overte coordinate system + * Overte coordinate system * * @namespace Vec3 * @variation 0 @@ -74,7 +74,7 @@ * @property {Vec3} FRONT - { x: 0, y: 0, z: -1 } : Unit vector in the "front" direction. Synonym for * UNIT_NEG_Z. Read-only. */ -/// Provides the Vec3 scripting interface +/// Provides the Vec3 scripting interface class Vec3 : public QObject, protected QScriptable { Q_OBJECT Q_PROPERTY(glm::vec3 UNIT_X READ UNIT_X CONSTANT) diff --git a/libraries/script-engine/src/WebSocketClass.h b/libraries/script-engine/src/WebSocketClass.h index 457c955dc8..70c02a94b4 100644 --- a/libraries/script-engine/src/WebSocketClass.h +++ b/libraries/script-engine/src/WebSocketClass.h @@ -81,7 +81,7 @@ * webSocket.send("Test message"); * }; */ -/// Provides the WebSocket scripting interface +/// Provides the WebSocket scripting interface class WebSocketClass : public QObject { Q_OBJECT Q_PROPERTY(QString binaryType READ getBinaryType WRITE setBinaryType) diff --git a/libraries/script-engine/src/WebSocketServerClass.h b/libraries/script-engine/src/WebSocketServerClass.h index 7cf03d7b41..0fa01f7813 100644 --- a/libraries/script-engine/src/WebSocketServerClass.h +++ b/libraries/script-engine/src/WebSocketServerClass.h @@ -76,7 +76,7 @@ * webSocket.send(TEST_MESSAGE); * }; */ -/// Provides the WebSocketServer scripting interface +/// Provides the WebSocketServer scripting interface class WebSocketServerClass : public QObject { Q_OBJECT Q_PROPERTY(QString url READ getURL) diff --git a/libraries/script-engine/src/WheelEvent.h b/libraries/script-engine/src/WheelEvent.h index a2b14ac29d..b14b521fe9 100644 --- a/libraries/script-engine/src/WheelEvent.h +++ b/libraries/script-engine/src/WheelEvent.h @@ -21,7 +21,7 @@ class QScriptValue; class QScriptEngine; -/// Represents a mouse wheel event to the scripting engine. Exposed as WheelEvent +/// Represents a mouse wheel event to the scripting engine. Exposed as WheelEvent class WheelEvent { public: WheelEvent(); diff --git a/libraries/script-engine/src/XMLHttpRequestClass.h b/libraries/script-engine/src/XMLHttpRequestClass.h index 013f888be8..06568710c5 100644 --- a/libraries/script-engine/src/XMLHttpRequestClass.h +++ b/libraries/script-engine/src/XMLHttpRequestClass.h @@ -152,7 +152,7 @@ XMlHttpRequest.getResponseHeader(QString) function * req.open("GET", URL); * req.send(); */ -/// Provides the XMLHttpRequest scripting interface +/// Provides the XMLHttpRequest scripting interface class XMLHttpRequestClass : public QObject { Q_OBJECT Q_PROPERTY(QScriptValue response READ getResponse) diff --git a/libraries/shared/src/ModerationFlags.h b/libraries/shared/src/ModerationFlags.h index cf97f6249c..a507dc28bf 100644 --- a/libraries/shared/src/ModerationFlags.h +++ b/libraries/shared/src/ModerationFlags.h @@ -9,8 +9,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#ifndef vircadia_ModerationFlags_h -#define vircadia_ModerationFlags_h +#ifndef overte_ModerationFlags_h +#define overte_ModerationFlags_h class ModerationFlags { public: @@ -42,4 +42,4 @@ public: static constexpr unsigned int getDefaultBanFlags() { return (BanFlags::BAN_BY_USERNAME | BanFlags::BAN_BY_FINGERPRINT); }; }; -#endif // vircadia_ModerationFlags_h +#endif // overte_ModerationFlags_h diff --git a/pkg-scripts/Dockerfile.templ b/pkg-scripts/Dockerfile.templ index e340024bce..4fa11005b8 100644 --- a/pkg-scripts/Dockerfile.templ +++ b/pkg-scripts/Dockerfile.templ @@ -19,25 +19,25 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ apt-get install -y tzdata supervisor ${DEPENDS} && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ - mkdir -p /var/lib/vircadia -RUN groupadd -r vircadia ; \ - useradd -Nr vircadia -d /var/lib/vircadia ; \ - usermod -aG vircadia vircadia ; \ - chown vircadia.vircadia /var/lib/vircadia ; \ + mkdir -p /var/lib/overte +RUN groupadd -r overte ; \ + useradd -Nr overte -d /var/lib/overte ; \ + usermod -aG overte overte ; \ + chown overte.overte /var/lib/overte ; \ exit 0 -VOLUME /var/lib/vircadia +VOLUME /var/lib/overte RUN mkdir -p /var/run ; chmod 777 /var/run -COPY vircadia.conf /etc/supervisor/conf.d/vircadia.conf +COPY overte.conf /etc/supervisor/conf.d/overte.conf COPY entrypoint.sh / -COPY opt /opt/vircadia -COPY lib /opt/vircadia/lib +COPY opt /opt/overte +COPY lib /opt/overte/lib ENTRYPOINT ["/entrypoint.sh"] -CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/vircadia.conf"] +CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/overte.conf"] LABEL \ - net.vircadia.gitsrc="${GITSRC}" \ - net.vircadia.gitdate="${GITDATE}" \ - net.vircadia.gitcommit="${GITCOMMIT}" + net.overte.gitsrc="${GITSRC}" \ + net.overte.gitdate="${GITDATE}" \ + net.overte.gitcommit="${GITCOMMIT}" diff --git a/pkg-scripts/docker-entrypoint.sh b/pkg-scripts/docker-entrypoint.sh index b519647edb..ba50311b28 100755 --- a/pkg-scripts/docker-entrypoint.sh +++ b/pkg-scripts/docker-entrypoint.sh @@ -6,23 +6,23 @@ set -x # allowing the container to be run directly as Jenkins. In Dev, or on unknown # environments, run the container as root to automatically correct docker # group in container to match the docker.sock GID mounted from the host. -if [ -f /var/lib/vircadia/.local -a "$(id -u)" = "0" ]; then +if [ -f /var/lib/overte/.local -a "$(id -u)" = "0" ]; then # realign gid - THIS_VIRCADIA_GID=`ls -ngd /var/lib/vircadia/.local | cut -f3 -d' '` - CUR_VIRCADIA_GID=`getent group vircadia | cut -f3 -d: || true` + THIS_VIRCADIA_GID=`ls -ngd /var/lib/overte/.local | cut -f3 -d' '` + CUR_VIRCADIA_GID=`getent group overte | cut -f3 -d: || true` if [ ! -z "$THIS_VIRCADIA_GID" -a "$THIS_VIRCADIA_GID" != "$CUR_VIRCADIA_GID" ]; then - groupmod -g ${THIS_VIRCADIA_GID} -o vircadia + groupmod -g ${THIS_VIRCADIA_GID} -o overte fi # realign pid - THIS_VIRCADIA_PID=`ls -nd /var/lib/vircadia/.local | cut -f3 -d' '` - CUR_VIRCADIA_PID=`getent passwd vircadia | cut -f3 -d: || true` + THIS_VIRCADIA_PID=`ls -nd /var/lib/overte/.local | cut -f3 -d' '` + CUR_VIRCADIA_PID=`getent passwd overte | cut -f3 -d: || true` if [ ! -z "$THIS_VIRCADIA_PID" -a "$THIS_VIRCADIA_PID" != "$CUR_VIRCADIA_PID" ]; then - usermod -u ${THIS_VIRCADIA_PID} -o vircadia + usermod -u ${THIS_VIRCADIA_PID} -o overte fi - if ! groups vircadia | grep -q vircadia; then - usermod -aG vircadia vircadia + if ! groups overte | grep -q overte; then + usermod -aG overte overte fi fi diff --git a/pkg-scripts/docker-vircadia-supervisor.conf b/pkg-scripts/docker-vircadia-supervisor.conf index c57ed7be59..c257b3dae5 100644 --- a/pkg-scripts/docker-vircadia-supervisor.conf +++ b/pkg-scripts/docker-vircadia-supervisor.conf @@ -1,74 +1,74 @@ [supervisord] -user=vircadia +user=overte nodaemon=true -environment=HOME="/var/lib/vircadia",USER="vircadia",LD_LIBRARY_PATH="/opt/vircadia/lib" +environment=HOME="/var/lib/overte",USER="overte",LD_LIBRARY_PATH="/opt/overte/lib" logfile=/dev/stdout logfile_maxbytes=0 pidfile=/var/run/supervisord.pid [program:domain-server] -command=/opt/vircadia/domain-server --get-temp-name +command=/opt/overte/domain-server --get-temp-name autorestart=unexpected -directory=/opt/vircadia +directory=/opt/overte [program:audio-mixer] -command=/opt/vircadia/assignment-client -t 0 -a localhost -p 48000 +command=/opt/overte/assignment-client -t 0 -a localhost -p 48000 autorestart=unexpected -directory=/opt/vircadia +directory=/opt/overte stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 [program:avatar-mixer] -command=/opt/vircadia/assignment-client -t 1 -a localhost -p 48001 +command=/opt/overte/assignment-client -t 1 -a localhost -p 48001 autorestart=unexpected -directory=/opt/vircadia +directory=/opt/overte stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 [program:entities-server] -command=/opt/vircadia/assignment-client -t 6 -a localhost -p 48006 +command=/opt/overte/assignment-client -t 6 -a localhost -p 48006 autorestart=unexpected -directory=/opt/vircadia +directory=/opt/overte stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 [program:asset-server] -command=/opt/vircadia/assignment-client -t 3 -a localhost -p 48003 +command=/opt/overte/assignment-client -t 3 -a localhost -p 48003 autorestart=unexpected -directory=/opt/vircadia +directory=/opt/overte stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 [program:entity-script-server] -command=/opt/vircadia/assignment-client -t 5 -a localhost -p 48005 +command=/opt/overte/assignment-client -t 5 -a localhost -p 48005 autorestart=unexpected -directory=/opt/vircadia +directory=/opt/overte stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 [program:messages-mixer] -command=/opt/vircadia/assignment-client -t 4 -a localhost -p 48004 +command=/opt/overte/assignment-client -t 4 -a localhost -p 48004 autorestart=unexpected -directory=/opt/vircadia +directory=/opt/overte stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 [program:scripted-agent] -command=/opt/vircadia/assignment-client -t 2 -a localhost --max 100 +command=/opt/overte/assignment-client -t 2 -a localhost --max 100 autorestart=unexpected -directory=/opt/vircadia +directory=/opt/overte stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr diff --git a/pkg-scripts/make-deb-server b/pkg-scripts/make-deb-server index 8fe89b95aa..8f19fe12fe 100755 --- a/pkg-scripts/make-deb-server +++ b/pkg-scripts/make-deb-server @@ -2,7 +2,7 @@ if [ "$OVERTE" = "" ]; then OVERTE=`realpath ..` - QT5_LIBS=`realpath ~/vircadia-files/qt/qt5-install/lib` + QT5_LIBS=`realpath ~/overte-files/qt/qt5-install/lib` fi sudo apt-get install chrpath binutils dh-make diff --git a/pkg-scripts/make-docker-server b/pkg-scripts/make-docker-server index 68b8ca7cd6..322d2e0bd5 100755 --- a/pkg-scripts/make-docker-server +++ b/pkg-scripts/make-docker-server @@ -15,7 +15,7 @@ rm -r temp-make-dock mkdir -p $DOCK_BUILD_ROOT cp $VIRCADIA/source/pkg-scripts/Dockerfile.templ $DOCK_BUILD_ROOT/Dockerfile cp $VIRCADIA/source/pkg-scripts/docker-entrypoint.sh $DOCK_BUILD_ROOT/entrypoint.sh -cp $VIRCADIA/source/pkg-scripts/docker-vircadia-supervisor.conf $DOCK_BUILD_ROOT/vircadia.conf +cp $VIRCADIA/source/pkg-scripts/docker-overte-supervisor.conf $DOCK_BUILD_ROOT/overte.conf # copy the files over mkdir -p $DOCK_BUILD_ROOT/opt @@ -55,4 +55,4 @@ SOFILES=`ls $DOCK_BUILD_ROOT/lib | sed 's/\./\\\./g' | paste -d'|' -s` DEPENDS=`find $DOCK_BUILD_ROOT/opt $DOCK_BUILD_ROOT/lib -type f -executable -exec sh -c 'objdump -p {} | grep NEEDED' \; | awk '{print $2}' | sort | uniq | egrep -v "^($SOFILES)$" | xargs -n 1 -I {} sh -c 'dpkg -S {} | head -n 1' | cut -d ':' -f 1 | sort | uniq | paste -d' ' -s` cd $DOCK_BUILD_ROOT -docker build -t odysseus654/vircadia-server --build-arg "DEPENDS=$DEPENDS" --build-arg "GITSRC=$GITSRC" --build-arg "GITDATE=$GITDATE" --build-arg "GITCOMMIT=$GITCOMMIT" . +docker build -t odysseus654/overte-server --build-arg "DEPENDS=$DEPENDS" --build-arg "GITSRC=$GITSRC" --build-arg "GITDATE=$GITDATE" --build-arg "GITCOMMIT=$GITCOMMIT" . diff --git a/pkg-scripts/make-rpm-server b/pkg-scripts/make-rpm-server index 2ce339bd54..9fa249548f 100755 --- a/pkg-scripts/make-rpm-server +++ b/pkg-scripts/make-rpm-server @@ -2,7 +2,7 @@ if [ "$OVERTE" = "" ]; then OVERTE=`realpath ..` - QT5_LIBS=`realpath ~/vircadia-files/qt/qt5-install/lib` + QT5_LIBS=`realpath ~/overte-files/qt/qt5-install/lib` fi VERSION=${RPMVERSION} diff --git a/pkg-scripts/new-server b/pkg-scripts/new-server index 7f40a2ba3d..3bd22e9c7c 100755 --- a/pkg-scripts/new-server +++ b/pkg-scripts/new-server @@ -28,8 +28,8 @@ if [ -d "/var/lib/overte/$1" ]; then fi mkdir -p /var/lib/overte/$1/.local/share -ln -s ../.. /var/lib/overte/$1/.local/share/Vircadia\ -\ dev -ln -s ../.. /var/lib/overte/$1/.local/share/Vircadia +ln -s ../.. /var/lib/overte/$1/.local/share/Overte\ -\ dev +ln -s ../.. /var/lib/overte/$1/.local/share/Overte mkdir -p /var/lib/overte/$1/domain-server echo "{\"metaverse\": {\"local_port\": $(($2 + 2))},\"version\": 2.4}" > /var/lib/overte/$1/domain-server/config.json chown -R overte.overte /var/lib/overte/$1 diff --git a/pkg-scripts/server-postrm b/pkg-scripts/server-postrm index b599a6311a..f3032c0af8 100755 --- a/pkg-scripts/server-postrm +++ b/pkg-scripts/server-postrm @@ -1,5 +1,5 @@ #!/bin/sh -# postrm script for vircadia-server +# postrm script for overte-server # # see: dh_installdeb(1) diff --git a/prebuild.py b/prebuild.py index d3c819489c..89b018390e 100644 --- a/prebuild.py +++ b/prebuild.py @@ -86,7 +86,7 @@ def parse_args(): if True: args = parser.parse_args() else: - args = parser.parse_args(['--android', 'questInterface', '--build-root', 'C:/git/vircadia/android/apps/questInterface/.externalNativeBuild/cmake/debug/arm64-v8a']) + args = parser.parse_args(['--android', 'questInterface', '--build-root', 'C:/git/overte/android/apps/questInterface/.externalNativeBuild/cmake/debug/arm64-v8a']) return args def main(): diff --git a/screenshare/README.md b/screenshare/README.md index d02ab56870..63501dd490 100644 --- a/screenshare/README.md +++ b/screenshare/README.md @@ -1,5 +1,5 @@ # Screen Sharing within High Fidelity -This Screen Share app, built using Electron, allows for easy desktop screen sharing when used in conjuction with various scripts in the `vircadia-content` repository. +This Screen Share app, built using Electron, allows for easy desktop screen sharing when used in conjuction with various scripts in the `overte-content` repository. # Screen Sharing Source Files ## `packager.js` @@ -13,4 +13,4 @@ The main process file to configure the electron app. The render file to display the app's UI. ## `screenshareApp.html` -The HTML that displays the screen selection UI and the confirmation screen UI. \ No newline at end of file +The HTML that displays the screen selection UI and the confirmation screen UI. diff --git a/script-archive/afk.js b/script-archive/afk.js index 46441b8886..aae53f69d5 100644 --- a/script-archive/afk.js +++ b/script-archive/afk.js @@ -6,7 +6,7 @@ // Copyright 2015 High Fidelity, Inc. // kevintown.net // -// JavaScript for the Vircadia interface that creates an away from keyboard functionality by providing a UI and keyPressEvent which will mute toggle the connected microphone, face tracking dde and set the avatar to a hand raise pose. +// JavaScript for the Overte interface that creates an away from keyboard functionality by providing a UI and keyPressEvent which will mute toggle the connected microphone, face tracking dde and set the avatar to a hand raise pose. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/script-archive/tests/performance/renderableMatrix.js b/script-archive/tests/performance/renderableMatrix.js index 2108e35519..38d709124e 100644 --- a/script-archive/tests/performance/renderableMatrix.js +++ b/script-archive/tests/performance/renderableMatrix.js @@ -114,7 +114,7 @@ Script.setInterval(function () { if (isModel) { properties.modelURL = type; } else if (type === 'Web') { - properties.sourceUrl = 'https://vircadia.com'; + properties.sourceUrl = 'https://overte.org'; } else { properties.color = { red: x / ROWS_X * 255, green: y / ROWS_Y * 255, blue: z / ROWS_Z * 255 }; if (type === 'ParticleEffect') { diff --git a/script-archive/tutorials/fireworks/chapter1/fireworksLaunchButtonEntityScript.js b/script-archive/tutorials/fireworks/chapter1/fireworksLaunchButtonEntityScript.js index f518701eb1..ecbc7e70ca 100644 --- a/script-archive/tutorials/fireworks/chapter1/fireworksLaunchButtonEntityScript.js +++ b/script-archive/tutorials/fireworks/chapter1/fireworksLaunchButtonEntityScript.js @@ -4,7 +4,7 @@ // Created by Eric Levin on 3/7/2016 // Copyright 2016 High Fidelity, Inc. // -// This is the chapter 1 entity script of the fireworks tutorial (https://docs.vircadia.dev/docs/fireworks-scripting-tutorial) +// This is the chapter 1 entity script of the fireworks tutorial (https://docs.overte.org/docs/fireworks-scripting-tutorial) // // Distributed under the Apache License, Version 2.0. diff --git a/script-archive/tutorials/fireworks/chapter1/fireworksLaunchButtonSpawner.js b/script-archive/tutorials/fireworks/chapter1/fireworksLaunchButtonSpawner.js index 921c0508ee..0ad502f55e 100644 --- a/script-archive/tutorials/fireworks/chapter1/fireworksLaunchButtonSpawner.js +++ b/script-archive/tutorials/fireworks/chapter1/fireworksLaunchButtonSpawner.js @@ -4,7 +4,7 @@ // Created by Eric Levin on 3/7/2016 // Copyright 2016 High Fidelity, Inc. // -// This is the chapter 1 interface script of the fireworks tutorial (https://docs.vircadia.dev/docs/fireworks-scripting-tutorial) +// This is the chapter 1 interface script of the fireworks tutorial (https://docs.overte.org/docs/fireworks-scripting-tutorial) // // Distributed under the Apache License, Version 2.0. @@ -34,4 +34,4 @@ Entities.deleteEntity(launchButton); } - Script.scriptEnding.connect(cleanup); \ No newline at end of file + Script.scriptEnding.connect(cleanup); diff --git a/script-archive/tutorials/fireworks/chapter2/fireworksLaunchButtonEntityScript.js b/script-archive/tutorials/fireworks/chapter2/fireworksLaunchButtonEntityScript.js index ba16e8af5b..0b200f2e57 100644 --- a/script-archive/tutorials/fireworks/chapter2/fireworksLaunchButtonEntityScript.js +++ b/script-archive/tutorials/fireworks/chapter2/fireworksLaunchButtonEntityScript.js @@ -4,7 +4,7 @@ // Created by Eric Levin on 3/7/2016 // Copyright 2016 High Fidelity, Inc. // -// This is the chapter 2 entity script of the fireworks tutorial (https://docs.vircadia.dev/docs/fireworks-scripting-tutorial) +// This is the chapter 2 entity script of the fireworks tutorial (https://docs.overte.org/docs/fireworks-scripting-tutorial) // // Distributed under the Apache License, Version 2.0. diff --git a/script-archive/tutorials/fireworks/chapter2/fireworksLaunchButtonSpawner.js b/script-archive/tutorials/fireworks/chapter2/fireworksLaunchButtonSpawner.js index e55e7f9d43..def9e092cc 100644 --- a/script-archive/tutorials/fireworks/chapter2/fireworksLaunchButtonSpawner.js +++ b/script-archive/tutorials/fireworks/chapter2/fireworksLaunchButtonSpawner.js @@ -4,7 +4,7 @@ // Created by Eric Levin on 3/7/2016 // Copyright 2016 High Fidelity, Inc. // -// This is the chapter 2 interface script of the fireworks tutorial (https://docs.vircadia.dev/docs/fireworks-scripting-tutorial) +// This is the chapter 2 interface script of the fireworks tutorial (https://docs.overte.org/docs/fireworks-scripting-tutorial) // // Distributed under the Apache License, Version 2.0. @@ -34,4 +34,4 @@ Entities.deleteEntity(launchButton); } - Script.scriptEnding.connect(cleanup); \ No newline at end of file + Script.scriptEnding.connect(cleanup); diff --git a/script-archive/tutorials/fireworks/chapter3/fireworksLaunchButtonEntityScript.js b/script-archive/tutorials/fireworks/chapter3/fireworksLaunchButtonEntityScript.js index faccec5b5c..cc67a58f5a 100644 --- a/script-archive/tutorials/fireworks/chapter3/fireworksLaunchButtonEntityScript.js +++ b/script-archive/tutorials/fireworks/chapter3/fireworksLaunchButtonEntityScript.js @@ -4,7 +4,7 @@ // Created by Eric Levin on 3/7/2016 // Copyright 2016 High Fidelity, Inc. // -// This is the chapter 3 entity script of the fireworks tutorial (https://docs.vircadia.dev/docs/fireworks-scripting-tutorial) +// This is the chapter 3 entity script of the fireworks tutorial (https://docs.overte.org/docs/fireworks-scripting-tutorial) // // Distributed under the Apache License, Version 2.0. diff --git a/script-archive/tutorials/fireworks/chapter3/fireworksLaunchButtonSpawner.js b/script-archive/tutorials/fireworks/chapter3/fireworksLaunchButtonSpawner.js index 0cde1cbd9c..84249a747f 100644 --- a/script-archive/tutorials/fireworks/chapter3/fireworksLaunchButtonSpawner.js +++ b/script-archive/tutorials/fireworks/chapter3/fireworksLaunchButtonSpawner.js @@ -4,7 +4,7 @@ // Created by Eric Levin on 3/7/2016 // Copyright 2016 High Fidelity, Inc. // -// This is the chapter 3 interface script of the fireworks tutorial (https://docs.vircadia.dev/docs/fireworks-scripting-tutorial) +// This is the chapter 3 interface script of the fireworks tutorial (https://docs.overte.org/docs/fireworks-scripting-tutorial) // // Distributed under the Apache License, Version 2.0. @@ -34,4 +34,4 @@ Entities.deleteEntity(launchButton); } - Script.scriptEnding.connect(cleanup); \ No newline at end of file + Script.scriptEnding.connect(cleanup); diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index 6167a45f15..dec95dd936 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -46,7 +46,7 @@ var DEFAULT_SCRIPTS_SEPARATE = [ "system/controllers/controllerScripts.js", "communityScripts/notificationCore/notificationCore.js", "simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js", - {"stable": "system/more/app-more.js", "beta": "https://cdn.vircadia.com/community-apps/more/app-more.js"}, + {"stable": "system/more/app-more.js", "beta": "https://more.overte.org/more/app-more.js"}, {"stable": "communityScripts/chat/FloofChat.js", "beta": "https://content.fluffy.ws/scripts/chat/FloofChat.js"} //"system/chat.js" ]; diff --git a/scripts/system/quickGoto.js b/scripts/system/quickGoto.js index 3211688e6e..e2c97d8b1d 100644 --- a/scripts/system/quickGoto.js +++ b/scripts/system/quickGoto.js @@ -31,7 +31,6 @@ } addGotoButton("hub.daleglass.net"); - addGotoButton("lq-hub.vircadia.com"); addGotoButton("file:///~/serverless/tutorial.json"); }()); // END LOCAL_SCOPE diff --git a/server-console/CMakeLists.txt b/server-console/CMakeLists.txt index 03432ab08d..045b5cb38b 100644 --- a/server-console/CMakeLists.txt +++ b/server-console/CMakeLists.txt @@ -30,7 +30,7 @@ set_target_properties(${TARGET_NAME}-npm-install PROPERTIES FOLDER "hidden/Serve # add a dependency from the package target to the server components if (BUILD_CLIENT) if (APPLE) - add_dependencies(${TARGET_NAME} Vircadia) + add_dependencies(${TARGET_NAME} Overte) else() add_dependencies(${TARGET_NAME} interface) endif() diff --git a/server-console/package.json b/server-console/package.json index d5b2a0793d..83bd59e572 100644 --- a/server-console/package.json +++ b/server-console/package.json @@ -1,7 +1,7 @@ { - "name": "VircadiaConsole", - "description": "Vircadia Console", - "author": "Vircadia", + "name": "OverteConsole", + "description": "Overte Console", + "author": "Overte", "license": "Apache-2.0", "version": "1.0.0", "keywords": [ @@ -13,7 +13,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/vircadia/vircadia.git" + "url": "https://github.com/overte-org/overte.git" }, "main": "src/main.js", "scripts": { diff --git a/server-console/packager.js b/server-console/packager.js index ea115e041d..9259af6085 100644 --- a/server-console/packager.js +++ b/server-console/packager.js @@ -32,7 +32,7 @@ var FULL_NAME = argv.client_only ? "Overte Console" : "Overte Sandbox"; // setup per OS options if (osType == "Darwin") { - options["app-bundle-id"] = "com.vircadia.server-console" + (argv.production ? "" : "-dev") + options["app-bundle-id"] = "com.overte.server-console" + (argv.production ? "" : "-dev") options["name"] = SHORT_NAME } else if (osType == "Windows_NT") { options["version-string"] = { diff --git a/server-console/src/content-update.html b/server-console/src/content-update.html index b8df859950..db08b2c73b 100644 --- a/server-console/src/content-update.html +++ b/server-console/src/content-update.html @@ -45,7 +45,7 @@
-

For more information about managing your Overte Server, check out our docs: docs.vircadia.com +

For more information about managing your Overte Server, check out our docs: docs.overte.org

diff --git a/server-console/src/modules/hf-app.js b/server-console/src/modules/hf-app.js index 71b0b508a2..4caa01b61a 100644 --- a/server-console/src/modules/hf-app.js +++ b/server-console/src/modules/hf-app.js @@ -35,7 +35,7 @@ exports.getBuildInfo = function() { buildNumber: "0", stableBuild: "0", organization: "Overte - dev", - appUserModelId: "com.vircadia.console" + appUserModelId: "com.overte.console" }; var buildInfo = DEFAULT_BUILD_INFO; @@ -63,11 +63,11 @@ exports.startInterface = function(url) { // do this as a workaround for app translocation on osx, which makes // it nearly impossible to find the interface executable - var bundle_id = 'com.vircadia.interface-dev'; + var bundle_id = 'com.overte.interface-dev'; if (buildInfo.releaseType == 'PR') { - bundle_id = 'com.vircadia.interface-pr'; + bundle_id = 'com.overte.interface-pr'; } else if (buildInfo.releaseType == 'PRODUCTION') { - bundle_id = 'com.vircadia.interface'; + bundle_id = 'com.overte.interface'; } childProcess.exec('open -b ' + bundle_id + ' --args --url ' + url); } else { diff --git a/server-console/src/splash.html b/server-console/src/splash.html index 5a3c763a7d..b2cf33e0af 100644 --- a/server-console/src/splash.html +++ b/server-console/src/splash.html @@ -28,7 +28,7 @@ You can make your home yours by uploading your own models and scripts.

- To get started exploring and creating, check out our Quick-start Guide + To get started exploring and creating, check out our Quick-start Guide

@@ -51,7 +51,7 @@ You can make your home yours by uploading your own models and scripts.

- For more information on managing your server, visit our documentation + For more information on managing your server, visit our documentation

diff --git a/tools/nitpick/src/TestRunnerDesktop.cpp b/tools/nitpick/src/TestRunnerDesktop.cpp index ee966a8ea0..a7f0e6689d 100644 --- a/tools/nitpick/src/TestRunnerDesktop.cpp +++ b/tools/nitpick/src/TestRunnerDesktop.cpp @@ -78,9 +78,9 @@ void TestRunnerDesktop::setWorkingFolderAndEnableControls() { setWorkingFolder(_workingFolderLabel); #ifdef Q_OS_WIN - _installationFolder = _workingFolder + "/Vircadia"; + _installationFolder = _workingFolder + "/Overte"; #elif defined Q_OS_MAC - _installationFolder = _workingFolder + "/Vircadia"; + _installationFolder = _workingFolder + "/Overte"; #endif nitpick->enableRunTabControls(); @@ -261,7 +261,7 @@ void TestRunnerDesktop::runInstaller() { script.write("#!/bin/sh\n\n"); script.write("VOLUME=`hdiutil attach \"$1\" | grep Volumes | awk '{print $3}'`\n"); - QString folderName {"Vircadia"}; + QString folderName {"Overte"}; if (!_runLatest->isChecked()) { folderName += QString(" - ") + getPRNumberFromURL(_url->text()); } @@ -321,10 +321,10 @@ void TestRunnerDesktop::saveExistingHighFidelityAppDataFolder() { dataDirectory = QDir::homePath() + "/Library/Application Support"; #endif if (_runLatest->isChecked()) { - _appDataFolder.setPath(dataDirectory + "/Vircadia"); + _appDataFolder.setPath(dataDirectory + "/Overte"); } else { // We are running a PR build - _appDataFolder.setPath(dataDirectory + "/Vircadia - " + getPRNumberFromURL(_url->text())); + _appDataFolder.setPath(dataDirectory + "/Overte - " + getPRNumberFromURL(_url->text())); } _savedAppDataFolder.setPath(dataDirectory + "/" + UNIQUE_FOLDER_NAME); diff --git a/tools/qt-builder/README.md b/tools/qt-builder/README.md index 0ce96c373f..b8d26d5553 100644 --- a/tools/qt-builder/README.md +++ b/tools/qt-builder/README.md @@ -194,8 +194,8 @@ Using 7-Zip: * `7z a -ttar qt5-install-5.15.2-windows.tar qt5-install` * `7z a -tgzip qt5-install-5.15.2-windows.tar.gz qt5-install-5.15.2-windows.tar` -Upload qt5-install-5.15.2-windows.tar.gz to the Amazon S3 vircadia-public bucket, under the dependencies/vckpg directory. -Update hifi_vcpkg.py to use this new URL. Additionally, you should make a small change to any file in the vircadia/cmake/ports +Upload qt5-install-5.15.2-windows.tar.gz to build-deps.overte.org, under the dependencies/vckpg directory. +Update hifi_vcpkg.py to use this new URL. Additionally, you should make a small change to any file in the overte/cmake/ports directory to force the re-download of the qt-install.tar.gz during the build process for Overte. #### Preparing Symbols @@ -349,7 +349,7 @@ Add a *qt.conf* file. ```bash tar -Jcvf qt5-install-5.15.2-qtwebengine-5.15.7-macOSXSDK10.14-macos.tar.xz qt5-install ``` -Upload qt5-install-5.15.2-qtwebengine-5.15.7-macOSXSDK10.14-macos.tar.xz to our Amazon S3 vircadia-public bucket, under the dependencies/vckpg directory +Upload qt5-install-5.15.2-qtwebengine-5.15.7-macOSXSDK10.14-macos.tar.xz to build-deps.overte.org, under the dependencies/vckpg directory #### Creating symbols (optional) Run `python3 prepare-mac-symbols-for-backtrace.py qt5-install` to scan the qt5-build directory for any dylibs and execute dsymutil to create dSYM bundles. After running this command the backtrace directory will be created. Zip this directory up, but make sure that all dylibs and dSYM fiels are in the root of the zip file, not under a sub-directory. This file can then be uploaded to backtrace or other crash log handling tool. diff --git a/tools/qt-builder/qt-lite-build-steps.md b/tools/qt-builder/qt-lite-build-steps.md index 6e393f19cb..bc52456301 100644 --- a/tools/qt-builder/qt-lite-build-steps.md +++ b/tools/qt-builder/qt-lite-build-steps.md @@ -30,7 +30,7 @@ cd qt-build ``` Download ssl-static.zip and unzip to ssl-static folder next to qt5 folder -`https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dante/ssl-static-windows.zip` +`https://build-deps.overte.org/dependencies/ssl-static-windows.zip` remove config.opt in the build folder copy over the config file from qt-builder ``` @@ -71,7 +71,7 @@ cd qt-build ``` Download ssl-static.zip and unzip to ssl-static folder next to qt5 folder -`https://cdn-1.vircadia.com/eu-c-1/vircadia-public/dante/openssl-static-osx.zip` +`https://build-deps.overte.org/dependencies/openssl-static-osx.zip` copy over the config file from qt-builder ``` cp path-to-your-hifi-directory/tools/qt-builder/qt-lite-osx-config ./config.opt @@ -101,4 +101,4 @@ https://wiki.openssl.org/index.php/Compilation_and_Installation#OpenSSL_1.0.2 follow the instructions in that link. Keeping in mind that you need to use the non-dll commands (ex: 'nmake -f ms\ntdll.mak clean for the DLL target and nmake -f ms\nt.mak clean for static libraries.' -so you'd want to use 'ms\nt.mak' \ No newline at end of file +so you'd want to use 'ms\nt.mak' diff --git a/unpublishedScripts/marketplace/record/html/record.html b/unpublishedScripts/marketplace/record/html/record.html index 810238a580..8f8f83e432 100644 --- a/unpublishedScripts/marketplace/record/html/record.html +++ b/unpublishedScripts/marketplace/record/html/record.html @@ -42,7 +42,7 @@

Setup Instructions

In your sandbox domain:

    -
  • Right-click the Vircadia Sandbox icon in your system tray and click “Settings”.
    • +
  • Right-click the Overte Sandbox icon in your system tray and click “Settings”.
  • In the “Scripts” section add a new row and paste in this script URL:
ValueNameDescription
Send and receive a message.Send and receive data.