diff --git a/BUILD.md b/BUILD.md index fd30b124eb..6ecee986e1 100644 --- a/BUILD.md +++ b/BUILD.md @@ -38,7 +38,7 @@ These are not placed in your normal build tree when doing an out of source build ### CMake -Vircadia uses CMake to generate build files and project files for your platform. +Overte uses CMake to generate build files and project files for your platform. ### Qt @@ -73,7 +73,7 @@ Note: Installing Qt Creator is optional but recommended if you will be editing Q ### VCPKG -Vircadia uses vcpkg to download and build dependencies. +Overte uses vcpkg to download and build dependencies. You do not need to install vcpkg. Building the dependencies can be lengthy and the resulting files will be stored in your OS temp directory. @@ -177,7 +177,7 @@ In the examples below the variable $NAME would be replaced by the name of the de * $NAME_ROOT_DIR - pass this variable to Cmake with the -DNAME_ROOT_DIR= flag when running Cmake to generate build files * $NAME_ROOT_DIR - set this variable in your ENV -* HIFI_LIB_DIR - set this variable in your ENV to your Vircadia lib folder, should contain a folder '$name' +* HIFI_LIB_DIR - set this variable in your ENV to your Overte lib folder, should contain a folder '$name' ## Optional Components diff --git a/BUILD_ANDROID.md b/BUILD_ANDROID.md index 0556e175d6..539a8be55f 100644 --- a/BUILD_ANDROID.md +++ b/BUILD_ANDROID.md @@ -79,7 +79,7 @@ SUPPRESS_QUEST_FRAME_PLAYER ### Clone the repository -`git clone https://github.com/vircadia/vircadia.git` +`git clone https://github.com/overte-org/overte.git` ## Building & Running diff --git a/BUILD_LINUX.md b/BUILD_LINUX.md index ed82d097f8..8fc3b7ede9 100644 --- a/BUILD_LINUX.md +++ b/BUILD_LINUX.md @@ -4,7 +4,7 @@ Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only Linux specific instructions are found in this file. -You can use the [Vircadia Builder](https://github.com/vircadia/vircadia-builder) to build on Linux more easily. Alternatively, you can follow the manual steps below. +You can use the [Overte Builder](https://github.com/overte-org/overte-builder) to build on Linux more easily. Alternatively, you can follow the manual steps below. ## Ubuntu 18.04 @@ -84,7 +84,7 @@ sudo apt-get install nodejs Clone this repository: ```bash -git clone https://github.com/vircadia/vircadia.git +git clone https://github.com/overte-org/overte.git ``` Then checkout the master branch with: @@ -127,7 +127,7 @@ Setting `VIRCADIA_CPU_ARCHITECTURE` to an empty string will use the default comp Create the build directory: ```bash -cd vircadia +cd overte mkdir build cd build ``` diff --git a/BUILD_OSX.md b/BUILD_OSX.md index b041768dce..62e714302e 100644 --- a/BUILD_OSX.md +++ b/BUILD_OSX.md @@ -8,7 +8,7 @@ Please read the [general build guide](BUILD.md) for information on dependencies ### CMake, OpenSSL, and NPM -[Homebrew](https://brew.sh/) is an excellent package manager for macOS. It makes the installation of some Vircadia dependencies very simple. +[Homebrew](https://brew.sh/) is an excellent package manager for macOS. It makes the installation of some Overte dependencies very simple. ```bash brew install cmake openssl npm diff --git a/BUILD_WIN.md b/BUILD_WIN.md index f7e5cebc46..9eb74a84e9 100644 --- a/BUILD_WIN.md +++ b/BUILD_WIN.md @@ -2,7 +2,7 @@ *Last Updated on 15 Apr 2021* -This is a stand-alone guide for creating your first Vircadia build for Windows 64-bit. +This is a stand-alone guide for creating your first Overte build for Windows 64-bit. Note: We are now using Visual Studio 2019 and Qt 5.15.2. If you are upgrading from previous versions, do a clean uninstall of those versions before going through this guide. @@ -68,7 +68,7 @@ To create this variable: * Set "Variable value" to `%QT_INSTALL_DIR%\5.15.2\msvc2019_64\lib\cmake`, where `%QT_INSTALL_DIR%` is the directory you specified for Qt's installation. The default is `C:\Qt`. ## Step 6. Create VCPKG environment variable -In the next step, you will use CMake to build Vircadia. By default, the CMake process builds dependency files in Windows' `%TEMP%` directory, which is periodically cleared by the operating system. To prevent you from having to re-build the dependencies in the event that Windows clears that directory, we recommend that you create a `HIFI_VCPKG_BASE` environment variable linked to a directory somewhere on your machine. That directory will contain all dependency files until you manually remove them. +In the next step, you will use CMake to build Overte. By default, the CMake process builds dependency files in Windows' `%TEMP%` directory, which is periodically cleared by the operating system. To prevent you from having to re-build the dependencies in the event that Windows clears that directory, we recommend that you create a `HIFI_VCPKG_BASE` environment variable linked to a directory somewhere on your machine. That directory will contain all dependency files until you manually remove them. To create this variable: * Navigate to 'Edit the System Environment Variables' Through the Start menu. @@ -96,7 +96,7 @@ Run Command Prompt from Start and run the following commands: ### Visual Studio 2019 Run `cmake .. -G "Visual Studio 16 2019" -A x64`. -Where `%VIRCADIA_DIR%` is the directory for the Vircadia repository. +Where `%VIRCADIA_DIR%` is the directory for the Overte repository. ## Step 8. Making a Build @@ -116,16 +116,16 @@ Restart Visual Studio again. In Visual Studio, right-click "interface" under the Apps folder in Solution Explorer and select "Set as Startup Project". Run from the menu bar `Debug > Start Debugging`. -Now, you should have a full build of Vircadia and be able to run the Interface using Visual Studio. +Now, you should have a full build of Overte and be able to run the Interface using Visual Studio. Note: You can also run Interface by launching it from command line or File Explorer from `%VIRCADIA_DIR%\build\interface\Release\interface.exe` # Troubleshooting For any problems after Step #7, first try this: -* Delete your locally cloned copy of the Vircadia repository +* Delete your locally cloned copy of the Overte repository * Restart your computer -* Redownload the [repository](https://github.com/vircadia/vircadia) +* Redownload the [repository](https://github.com/overte.org/overte) * Restart directions from Step #7 ## CMake gives you the same error message repeatedly after the build fails diff --git a/CMakeLists.txt b/CMakeLists.txt index 587c2f870e..c94e438727 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,14 +75,14 @@ if ((NOT "${RELEASE_TYPE}" STREQUAL "PRODUCTION") AND (NOT "${RELEASE_TYPE}" STR endif() # VIRCADIA_OPTIMIZE -# Variable determining vircadia optimization. If not set, it defaults to true. +# Variable determining Overte optimization. If not set, it defaults to true. # It's used to determine build flags for main codebase and for VCPKG dependencies. # Should be set to false to get completely unoptimized build for easier line-by-line debugging if( NOT WIN32 ) if(NOT DEFINED VIRCADIA_OPTIMIZE) - message("Enabling code optimization for Vircadia and compiled dependencies") - set(VIRCADIA_OPTIMIZE true CACHE BOOL "Enable code optimization for Vircadia and compiled dependencies") + message("Enabling code optimization for Overte and compiled dependencies") + set(VIRCADIA_OPTIMIZE true CACHE BOOL "Enable code optimization for Overte and compiled dependencies") endif() #compiler needs to be detected before building VCPKG dependencies @@ -107,8 +107,8 @@ if( NOT WIN32 ) MESSAGE(STATUS "VIRCADIA_OPTIMIZE: ${VIRCADIA_OPTIMIZE}") # VIRCADIA_CPU_ARCHITECTURE - # Variable determining CPU architecture for which Vircadia will be built. - # If defined, it's appended to CXXFLAGS and CFLAGS for both Vircadia and VCPKG dependencies + # Variable determining CPU architecture for which Overte will be built. + # If defined, it's appended to CXXFLAGS and CFLAGS for both Overte and VCPKG dependencies #Assume -march=native for compilers that allow it if architecture is not specified if(NOT DEFINED VIRCADIA_CPU_ARCHITECTURE) @@ -349,7 +349,7 @@ GroupSources("scripts") GroupSources("unpublishedScripts") unset(JS_SRC) -# Include Vircadia Web app files if cloned into a subdirectory. +# 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)/*" ) @@ -358,7 +358,7 @@ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vircadia-web") unset(WEB_APP_SRC) endif() -# Include Vircadia Web SDK files if cloned into a subdirectory. +# 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)/*" ) diff --git a/CODING_STANDARD.md b/CODING_STANDARD.md index 3d4516f99f..0f3a5a7c60 100644 --- a/CODING_STANDARD.md +++ b/CODING_STANDARD.md @@ -976,9 +976,9 @@ while (true) { #### [4.3.4] Source files (header and implementation) must include a boilerplate. -Boilerplates should include the filename, creator, copyright Vircadia contributors, and Apache 2.0 License information. -This should be placed at the top of the file. If editing an existing file that is copyright High Fidelity, add a second -copyright line, copyright Vircadia contributors. +Boilerplates should include the filename, creator, copyright Overte e.V., and Apache 2.0 License information. +This should be placed at the top of the file. If editing an existing file that is copyright High Fidelity or +Vircadia contributors, add an additional copyright line, copyright Overte e.V. ```cpp // diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 72f296e92e..e808b65749 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ Contributing 2. Clone your fork of the repository locally ``` - git clone git://github.com/USERNAME/vircadia.git + git clone git://github.com/USERNAME/overte.git ``` 3. Create a new branch @@ -21,7 +21,7 @@ Contributing 6. Update your branch ``` - git remote add upstream https://github.com/vircadia/vircadia + git remote add upstream https://github.com/overte-org/overte git pull upstream master ``` @@ -48,10 +48,10 @@ To make the QA process go as smoothly as possible. Reporting Bugs === 1. Always update to the latest code on master, we make many merges every day and it is possible the bug has already been fixed! -2. Search [issues](https://github.com/vircadia/vircadia/issues) to make sure that somebody has not already reported the same bug. -3. [Add](https://github.com/vircadia/vircadia/issues/new) your report to the issues list! +2. Search [issues](https://github.com/overte-org/overte/issues) to make sure that somebody has not already reported the same bug. +3. [Add](https://github.com/overte-org/overte/issues/new) your report to the issues list! Requesting a Feature === -1. Search [issues](https://github.com/vircadia/vircadia/issues) to make sure that somebody has not already requested the same feature. -2. [Add](https://github.com/vircadia/vircadia/issues/new) your request to the issues list! +1. Search [issues](https://github.com/overte-org/overte/issues) to make sure that somebody has not already requested the same feature. +2. [Add](https://github.com/overte-org/overte/issues/new) your request to the issues list! diff --git a/INSTALLER.md b/INSTALLER.md index d6c8e0253d..bfdbe105da 100644 --- a/INSTALLER.md +++ b/INSTALLER.md @@ -2,11 +2,11 @@ *Last Updated on June 16, 2021* -Follow the [build guide](BUILD.md) to figure out how to build Vircadia for your platform. +Follow the [build guide](BUILD.md) to figure out how to build Overte for your platform. During generation, CMake should produce an `install` target and a `package` target. -The `install` target will copy the Vircadia targets and their dependencies to your `CMAKE_INSTALL_PREFIX`. +The `install` target will copy the Overte targets and their dependencies to your `CMAKE_INSTALL_PREFIX`. This variable is set by the `project(hifi)` command in `CMakeLists.txt` to `C:/Program Files/hifi` and stored in `build/CMakeCache.txt` ## Packaging @@ -82,8 +82,8 @@ For code signing to work, you will need to set the `HF_PFX_FILE` and `HF_PFX_PAS #### Create an MSIX Package 1. Get the 'MSIX Packaging Tool' from the Windows Store. -2. Run the process to create a new MSIX package from an existing .exe or .msi installer. This process will allow you to install Vircadia with the usual installer, however it will monitor changes to the computer to replicate the functionality in the MSIX Package. Therefore, you will want to avoid doing anything else on your computer during this process. -3. Be sure to select no shortcuts and install only the Vircadia Interface. +2. Run the process to create a new MSIX package from an existing .exe or .msi installer. This process will allow you to install Overte with the usual installer, however it will monitor changes to the computer to replicate the functionality in the MSIX Package. Therefore, you will want to avoid doing anything else on your computer during this process. +3. Be sure to select no shortcuts and install only the Overte Interface. 4. When asked for "Entry" points, select only the Interface entry and not the uninstaller. This is because the MSIX package is uninstalled by Windows itself. If for some reason the uninstaller shows up anyway, you can edit the manifest to manually remove it from view even if the uninstaller is present in the package. This is necessary to uplaod to the Windows Store. 5. Once completed, you can sign the package with this application or with other tools such as 'MSIX Hero'. It must be signed with a local certificate to test, and with a proper certificate to distribute. 6. If uploading to the Windows Store, you will have to ensure all your manifest info including publisher information matches what is registered with your Microsoft Developer account for Windows. You will see these errors and the expected values when validating it. @@ -129,27 +129,25 @@ For code signing to work, you will need to set the `HF_PFX_FILE` and `HF_PFX_PAS Recommended CPU Cores: 16 Minimum Disk Space: 40GB ``` -3. Get and bootstrap Vircadia Builder. +3. Get and bootstrap Overte Builder. ```bash - git clone https://github.com/vircadia/vircadia-builder.git - cd vircadia-builder + git clone https://github.com/overte-org/overte-builder.git + cd overte-builder ``` -3. Run Vircadia Builder. +3. Run Overte Builder. ```bash ./vircadia-builder --build server ``` -4. If Vircadia Builder needed to install dependencies and asks you to run it again then do so. Otherwise, skip to the next step. +4. If Overte Builder needed to install dependencies and asks you to run it again then do so. Otherwise, skip to the next step. ```bash ./vircadia-builder --build server ``` -5. Vircadia Builder will ask you to configure it to build the server. The values will be prefilled with defaults, the following steps will explain what they are and what you might want to put. *Advanced users: See [here](BUILD.md#possible-environment-variables) for possible environment variables and settings.* -6. This value is the Git repository of Vircadia. You can set this URL to your fork of the Vircadia repository if you need to. +5. Overte Builder will ask you to configure it to build the server. The values will be prefilled with defaults, the following steps will explain what they are and what you might want to put. *Advanced users: See [here](BUILD.md#possible-environment-variables) for possible environment variables and settings.* +6. This value is the Git repository of Overte. You can set this URL to your fork of the Overte repository if you need to. ```text - Git repository: https://github.com/vircadia/vircadia/ - # OR, for example - Git repository: https://github.com/digisomni/vircadia/ + Git repository: https://github.com/overte-org/overte/ ``` -7. This value is the tag on the repository. If you would like to use a specific version of Vircadia, typically tags will be named like this: "v2021.1.0-rc" +7. This value is the tag on the repository. If you would like to use a specific version of Overte, typically tags will be named like this: "v2021.1.0-rc" ```text Git tag: master # OR, for example @@ -169,25 +167,25 @@ For code signing to work, you will need to set the `HF_PFX_FILE` and `HF_PFX_PAS ```text Build number: fd6973b ``` -11. This value is the directory that Vircadia will get installed to. You should leave this as the default value unless you are an advanced user. +11. This value is the directory that Overte will get installed to. You should leave this as the default value unless you are an advanced user. ```text Installation dir: /home/ubuntu/Vircadia ``` -12. This value is the number of CPU cores that the Vircadia Builder will use to compile the Vircadia server. By default it will use all cores available on your build server. You should leave this as the default value it gives you for your build server. +12. This value is the number of CPU cores that the Overte Builder will use to compile the Overte server. By default it will use all cores available on your build server. You should leave this as the default value it gives you for your build server. ```text - CPU cores to use for Vircadia: 16 + CPU cores to use for Overte: 16 ``` -13. This value is the number of CPU cores that the Vircadia Builder will use to compile Qt5 (a required component for Vircadia). By default it will use all cores available on your build server. You should leave this as the default value it gives you for your build server. +13. This value is the number of CPU cores that the Overte Builder will use to compile Qt5 (a required component for Overte). By default it will use all cores available on your build server. You should leave this as the default value it gives you for your build server. ```text CPU cores to use for Qt5: 16 ``` 14. It will ask you if you would like to proceed with the specified values. If you're happy with the configuration, type `yes`, otherwise enter `no` and press enter to start over. You can press `Ctrl` + `C` simultaneously on your keyboard to exit. -15. Vircadia Builder will now run, it may take a while. See this [table](https://github.com/vircadia/vircadia-builder#how-long-does-it-take) for estimated times. +15. Overte Builder will now run, it may take a while. See this [table](https://github.com/overte-org/overte-builder#how-long-does-it-take) for estimated times. 16. Navigate to the `pkg-scripts` directory. ```bash cd ../Vircadia/source/pkg-scripts/ ``` -17. Generate the .deb package. Set `DEBVERSION` to the same version you entered for the `Release number` on Vircadia Builder. Set `DEBEMAIL` and `DEBFULLNAME` to your own information to be packaged with the release. *The version cannot begin with a letter and cannot include underscores or dashes in it.* +17. Generate the .deb package. Set `DEBVERSION` to the same version you entered for the `Release number` on Overte Builder. Set `DEBEMAIL` and `DEBFULLNAME` to your own information to be packaged with the release. *The version cannot begin with a letter and cannot include underscores or dashes in it.* ```bash DEBVERSION="2021.1.0" DEBEMAIL="your-email@somewhere.com" DEBFULLNAME="Your Full Name" ./make-deb-server ``` @@ -207,28 +205,26 @@ For code signing to work, you will need to set the `HF_PFX_FILE` and `HF_PFX_PAS sudo yum install git -y sudo yum install rpm-build ``` -3. Get and bootstrap Vircadia Builder. +3. Get and bootstrap Overte Builder. ```bash - git clone https://github.com/vircadia/vircadia-builder.git - cd vircadia-builder + git clone https://github.com/overte-org/overte-builder.git + cd overte-builder sudo ./install_amazon_linux_deps.sh ``` -4. Run Vircadia Builder. +4. Run Overte Builder. ```bash ./vircadia-builder --build server ``` -5. If Vircadia Builder needed to install dependencies and asks you to run it again then do so. Otherwise, skip to the next step. +5. If Overte Builder needed to install dependencies and asks you to run it again then do so. Otherwise, skip to the next step. ```bash ./vircadia-builder --build server ``` -6. Vircadia Builder will ask you to configure it to build the server. The values will be prefilled with defaults, the following steps will explain what they are and what you might want to put. *Advanced users: See [here](BUILD.md#possible-environment-variables) for possible environment variables and settings.* -7. This value is the Git repository of Vircadia. You can set this URL to your fork of the Vircadia repository if you need to. +6. Overte Builder will ask you to configure it to build the server. The values will be prefilled with defaults, the following steps will explain what they are and what you might want to put. *Advanced users: See [here](BUILD.md#possible-environment-variables) for possible environment variables and settings.* +7. This value is the Git repository of Overte. You can set this URL to your fork of the Overte repository if you need to. ```text - Git repository: https://github.com/vircadia/vircadia/ - # OR, for example - Git repository: https://github.com/digisomni/vircadia/ + Git repository: https://github.com/overte-org/overte/ ``` -8. This value is the tag on the repository. If you would like to use a specific version of Vircadia, typically tags will be named like this: "v2021.1.0-rc". +8. This value is the tag on the repository. If you would like to use a specific version of Overte, typically tags will be named like this: "v2021.1.0-rc". ```text Git tag: master # OR, for example @@ -248,26 +244,26 @@ For code signing to work, you will need to set the `HF_PFX_FILE` and `HF_PFX_PAS ```text Build number: fd6973b ``` -12. This value is the directory that Vircadia will get installed to. You should leave this as the default value unless you are an advanced user. +12. This value is the directory that Overte will get installed to. You should leave this as the default value unless you are an advanced user. ```text Installation dir: /root/Vircadia ``` -13. This value is the number of CPU cores that the Vircadia Builder will use to compile the Vircadia server. By default it will use all cores available on your build server given you have enough memory. You should leave this as the default value it gives you for your build server. +13. This value is the number of CPU cores that the Overte Builder will use to compile the Overte server. By default it will use all cores available on your build server given you have enough memory. You should leave this as the default value it gives you for your build server. ```text - CPU cores to use for Vircadia: 16 + CPU cores to use for Overte: 16 ``` -14. This value is the number of CPU cores that the Vircadia Builder will use to compile Qt5 (a required component for Vircadia). By default it will use all cores available on your build server given you have enough memory. You should leave this as the default value it gives you for your build server. +14. This value is the number of CPU cores that the Overte Builder will use to compile Qt5 (a required component for Overte). By default it will use all cores available on your build server given you have enough memory. You should leave this as the default value it gives you for your build server. ```text CPU cores to use for Qt5: 16 ``` 15. It will ask you if you would like to proceed with the specified values. If you're happy with the configuration, type `yes`, otherwise enter `no` and press enter to start over. You can press `Ctrl` + `C` simultaneously on your keyboard to exit. -16. Vircadia Builder will now run, it may take a while. See this [table](https://github.com/vircadia/vircadia-builder#how-long-does-it-take) for estimated times. +16. Overte Builder will now run, it may take a while. See this [table](https://github.com/overte-org/overte-builder#how-long-does-it-take) for estimated times. 17. Navigate to the `pkg-scripts` directory. ```bash cd ../Vircadia/source/pkg-scripts/ ``` -18. Generate the .rpm package. Set `RPMVERSION` to the same version you entered for the `Release number` on Vircadia Builder. *The version cannot begin with a letter and cannot include underscores or dashes in it.* +18. Generate the .rpm package. Set `RPMVERSION` to the same version you entered for the `Release number` on Overte Builder. *The version cannot begin with a letter and cannot include underscores or dashes in it.* ```bash RPMVERSION="2021.1.0" ./make-rpm-server ``` -19. If successful, the generated .rpm package will be in the `pkg-scripts` folder of the Vircadia source files. +19. If successful, the generated .rpm package will be in the `pkg-scripts` folder of the Overte source files. diff --git a/LICENSE b/LICENSE index d5ca6ae075..bc3bd0cc3b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,8 @@ Copyright (c) 2013-2019, High Fidelity, Inc. Copyright (c) 2019-2021, Vircadia contributors. +Copyright (c) 2022, Overte e.V. All rights reserved. -https://vircadia.com +https://overte.org Licensed under the Apache License version 2.0 (the "License"); You may not use this software except in compliance with the License. diff --git a/README.md b/README.md index c0f95144b4..d772ca6e77 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

Overte

+

Overte

Website | Discord | Download

GitHub contributors diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java index a54dfffcbb..f5c766b452 100644 --- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java +++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java @@ -9,7 +9,7 @@ import java.net.URISyntaxException; public class HifiUtils { - public static final String METAVERSE_BASE_URL = "https://metaverse.vircadia.com/live"; + public static final String METAVERSE_BASE_URL = "https://overte.org/mvs"; private static HifiUtils instance; diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java index 436852be50..11622e6eb1 100644 --- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java +++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java @@ -41,7 +41,7 @@ public class LoginFragment extends Fragment private final String OAUTH_CLIENT_ID = BuildConfig.OAUTH_CLIENT_ID; private final String OAUTH_REDIRECT_URI = BuildConfig.OAUTH_REDIRECT_URI; - private final String OAUTH_AUTHORIZE_BASE_URL = "https://metaverse.vircadia.com/live/oauth/authorize"; + private final String OAUTH_AUTHORIZE_BASE_URL = "https://overte.org/mvs/oauth/authorize"; private static final int OAUTH_AUTHORIZE_REQUEST = 1; private EditText mUsername; @@ -222,7 +222,7 @@ public class LoginFragment extends Fragment } private void onForgotPasswordClicked() { - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://metaverse.vircadia.com/live/users/password/new")); + Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://overte.org/mvs/users/password/new")); startActivity(intent); } diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/EndpointUsersProvider.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/EndpointUsersProvider.java index 6033151877..a340006b2a 100644 --- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/EndpointUsersProvider.java +++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/EndpointUsersProvider.java @@ -28,7 +28,7 @@ import retrofit2.http.Query; public class EndpointUsersProvider implements UsersProvider { - public static final String BASE_URL = "https://metaverse.vircadia.com/live/"; + public static final String BASE_URL = "https://overte.ovg/mvs/"; private final Retrofit mRetrofit; private final EndpointUsersProviderService mEndpointUsersProviderService; diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java index 561313c5fe..3139e2f288 100644 --- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java +++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java @@ -22,7 +22,7 @@ import retrofit2.http.Query; public class UserStoryDomainProvider implements DomainProvider { - public static final String BASE_URL = "https://metaverse.vircadia.com/live/"; + public static final String BASE_URL = "https://overte.org/mvs/"; private static final String INCLUDE_ACTIONS_FOR_PLACES = "concurrency"; private static final String INCLUDE_ACTIONS_FOR_FULL_SEARCH = "concurrency,announcements,snapshot"; diff --git a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/task/DownloadProfileImageTask.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/task/DownloadProfileImageTask.java index e669a6eff0..edf431973f 100644 --- a/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/task/DownloadProfileImageTask.java +++ b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/task/DownloadProfileImageTask.java @@ -16,7 +16,7 @@ import io.highfidelity.hifiinterface.HifiUtils; */ public class DownloadProfileImageTask extends AsyncTask { // Note: This should now be available in the API, correct? - private static final String BASE_PROFILE_URL = "https://metaverse.vircadia.com/live"; + private static final String BASE_PROFILE_URL = "https://overte.org/mvs"; private static final String TAG = "Interface"; private final DownloadProfileImageResultProcessor mResultProcessor; diff --git a/android/apps/interface/src/main/res/values/strings.xml b/android/apps/interface/src/main/res/values/strings.xml index c1d7303f36..6e4edc6640 100644 --- a/android/apps/interface/src/main/res/values/strings.xml +++ b/android/apps/interface/src/main/res/values/strings.xml @@ -27,9 +27,9 @@ Online Sign Up SIGN UP - Creating your Vircadia account + Creating your Overte account Email, username or password incorrect. - You are now signed into Vircadia + You are now signed into Overte You are now logged in! Welcome Cancel diff --git a/assignment-client/src/AssignmentClientApp.cpp b/assignment-client/src/AssignmentClientApp.cpp index 41d0de7f9a..6f308095c8 100644 --- a/assignment-client/src/AssignmentClientApp.cpp +++ b/assignment-client/src/AssignmentClientApp.cpp @@ -45,7 +45,7 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) : // parse command-line QCommandLineParser parser; - parser.setApplicationDescription("Vircadia Assignment Client"); + parser.setApplicationDescription("Overte Assignment Client"); const QCommandLineOption helpOption = parser.addHelpOption(); const QCommandLineOption versionOption = parser.addVersionOption(); diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake index abe93275f6..66e939fb5c 100644 --- a/cmake/macros/SetPackagingParameters.cmake +++ b/cmake/macros/SetPackagingParameters.cmake @@ -48,7 +48,7 @@ macro(SET_PACKAGING_PARAMETERS) set(DEPLOY_PACKAGE TRUE) set(PRODUCTION_BUILD 1) set(BUILD_VERSION ${RELEASE_NUMBER}) - set(BUILD_ORGANIZATION "Vircadia") + set(BUILD_ORGANIZATION "Overte") set(HIGH_FIDELITY_PROTOCOL "hifi") set(HIGH_FIDELITY_APP_PROTOCOL "hifiapp") set(INTERFACE_ICON_PREFIX "interface") @@ -72,7 +72,7 @@ macro(SET_PACKAGING_PARAMETERS) set(DEPLOY_PACKAGE TRUE) set(PR_BUILD 1) set(BUILD_VERSION "PR${RELEASE_NUMBER}") - set(BUILD_ORGANIZATION "Vircadia - PR${RELEASE_NUMBER}") + set(BUILD_ORGANIZATION "Overte - PR${RELEASE_NUMBER}") set(INTERFACE_ICON_PREFIX "interface-beta") # add definition for this release type @@ -80,7 +80,7 @@ macro(SET_PACKAGING_PARAMETERS) else () set(DEV_BUILD 1) set(BUILD_VERSION "dev") - set(BUILD_ORGANIZATION "Vircadia - ${BUILD_VERSION}") + set(BUILD_ORGANIZATION "Overte - ${BUILD_VERSION}") set(INTERFACE_ICON_PREFIX "interface-beta") # add definition for this release type @@ -185,21 +185,21 @@ macro(SET_PACKAGING_PARAMETERS) # shortcut names if (PRODUCTION_BUILD) - set(INTERFACE_SHORTCUT_NAME "Vircadia") + set(INTERFACE_SHORTCUT_NAME "Overte") set(CONSOLE_SHORTCUT_NAME "Console") set(SANDBOX_SHORTCUT_NAME "Server") set(APP_USER_MODEL_ID "com.vircadia.console") else () - set(INTERFACE_SHORTCUT_NAME "Vircadia - ${BUILD_VERSION_NO_SHA}") + set(INTERFACE_SHORTCUT_NAME "Overte - ${BUILD_VERSION_NO_SHA}") set(CONSOLE_SHORTCUT_NAME "Console - ${BUILD_VERSION_NO_SHA}") set(SANDBOX_SHORTCUT_NAME "Server - ${BUILD_VERSION_NO_SHA}") endif () set(INTERFACE_HF_SHORTCUT_NAME "${INTERFACE_SHORTCUT_NAME}") - set(CONSOLE_HF_SHORTCUT_NAME "Vircadia ${CONSOLE_SHORTCUT_NAME}") - set(SANDBOX_HF_SHORTCUT_NAME "Vircadia ${SANDBOX_SHORTCUT_NAME}") + set(CONSOLE_HF_SHORTCUT_NAME "Overte ${CONSOLE_SHORTCUT_NAME}") + set(SANDBOX_HF_SHORTCUT_NAME "Overte ${SANDBOX_SHORTCUT_NAME}") - set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "Vircadia") + set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "Overte") set(PRE_SANDBOX_CONSOLE_SHORTCUT_NAME "Server Console") # check if we need to find signtool diff --git a/cmake/templates/CPackProperties.cmake.in b/cmake/templates/CPackProperties.cmake.in index 87a518781d..960f695cd1 100644 --- a/cmake/templates/CPackProperties.cmake.in +++ b/cmake/templates/CPackProperties.cmake.in @@ -10,11 +10,11 @@ # See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html # -set(INTERFACE_DISPLAY_NAME "Vircadia") +set(INTERFACE_DISPLAY_NAME "Overte") set(INTERFACE_SHORTCUT_NAME "@INTERFACE_SHORTCUT_NAME@") set(INTERFACE_HF_SHORTCUT_NAME "@INTERFACE_HF_SHORTCUT_NAME@") set(INTERFACE_WIN_EXEC_NAME "@INTERFACE_EXEC_PREFIX@.exe") -set(CONSOLE_DISPLAY_NAME "Vircadia Server Console") +set(CONSOLE_DISPLAY_NAME "Overte Server Console") set(CONSOLE_INSTALL_SUBDIR "@CONSOLE_INSTALL_DIR@") set(CONSOLE_SHORTCUT_NAME "@CONSOLE_SHORTCUT_NAME@") set(CONSOLE_HF_SHORTCUT_NAME "@CONSOLE_HF_SHORTCUT_NAME@") @@ -23,9 +23,9 @@ set(SANDBOX_HF_SHORTCUT_NAME "@SANDBOX_HF_SHORTCUT_NAME@") set(CONSOLE_WIN_EXEC_NAME "@CONSOLE_EXEC_NAME@") set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "@PRE_SANDBOX_INTERFACE_SHORTCUT_NAME@") set(PRE_SANDBOX_CONSOLE_SHORTCUT_NAME "@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@") -set(DS_DISPLAY_NAME "Vircadia Domain Server") +set(DS_DISPLAY_NAME "Overte Domain Server") set(DS_EXEC_NAME "@DS_EXEC_NAME@") -set(AC_DISPLAY_NAME "Vircadia Assignment Client") +set(AC_DISPLAY_NAME "Overte Assignment Client") set(AC_EXEC_NAME "@AC_EXEC_NAME@") set(HIGH_FIDELITY_PROTOCOL "@HIGH_FIDELITY_PROTOCOL@") set(HIGH_FIDELITY_APP_PROTOCOL "@HIGH_FIDELITY_APP_PROTOCOL@") diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 33587f3e5a..e7952ba941 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -718,7 +718,7 @@ Function InstallTypesPage StrCpy $OffsetUnits u StrCpy $Express "0" - ${NSD_CreateRadioButton} 30% $CurrentOffset$OffsetUnits 100% 10u "Express Install (Recommended)"; $\nInstalls Vircadia Interface" + ${NSD_CreateRadioButton} 30% $CurrentOffset$OffsetUnits 100% 10u "Express Install (Recommended)"; $\nInstalls Overte Interface" pop $ExpressInstallRadioButton ${NSD_OnClick} $ExpressInstallRadioButton ChangeExpressLabel IntOp $CurrentOffset $CurrentOffset + 15 @@ -1018,7 +1018,7 @@ Function ReadPostInstallOptions ${If} @CLIENT_COMPONENT_CONDITIONAL@ ${LogText} "Option: Install Client" - ; check if the user asked for a desktop shortcut to Vircadia + ; check if the user asked for a desktop shortcut to Overte ${NSD_GetState} $DesktopClientCheckbox $DesktopClientState ${LogText} "Option: Create Client Desktop Shortcut: $DesktopClientState" ${EndIf} @@ -1072,7 +1072,7 @@ Function HandlePostInstallOptions ${EndIf} ${If} @CLIENT_COMPONENT_CONDITIONAL@ - ; check if the user asked for a desktop shortcut to Vircadia + ; check if the user asked for a desktop shortcut to Overte ${If} $DesktopClientState == ${BST_CHECKED} CreateShortCut "$DESKTOP\@INTERFACE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" !insertmacro WriteInstallOption "@CLIENT_DESKTOP_SHORTCUT_REG_KEY@" YES diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index 61e08f5f8e..874f883c33 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 Vircadia 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 vircadia-cert.key, vircadia-cert.crt, and vircadia-crt-ca.crt.", "type": "checkbox", "default": false, "advanced": true @@ -1981,7 +1981,7 @@ "name": "provider", "label": "Provider", "help": "OAuth provider URL.", - "default": "https://metaverse.vircadia.com/live", + "default": "https://overte.org/mvs", "advanced": true, "backup": false }, diff --git a/domain-server/resources/metadata_exporter/index.html b/domain-server/resources/metadata_exporter/index.html index 1b18c508cc..19e9838424 100644 --- a/domain-server/resources/metadata_exporter/index.html +++ b/domain-server/resources/metadata_exporter/index.html @@ -12,11 +12,11 @@ - Vircadia Metadata Exporter + Overte Metadata Exporter -

Vircadia Metadata Exporter

+

Overte Metadata Exporter

If you can see this page, this means that your domain's metadata is available to be exported.

diff --git a/domain-server/resources/prometheus_exporter/index.html b/domain-server/resources/prometheus_exporter/index.html index 5a23c78858..5ef5f3404e 100644 --- a/domain-server/resources/prometheus_exporter/index.html +++ b/domain-server/resources/prometheus_exporter/index.html @@ -1,10 +1,10 @@ - Vircadia Prometheus exporter + Overte Prometheus exporter -

Vircadia Prometheus exporter

+

Overte Prometheus exporter

This is the Prometheus exporter, used to export stats about the domain server for graphing and analysis.

diff --git a/domain-server/resources/web/assignment/placeholder.js b/domain-server/resources/web/assignment/placeholder.js index 3666396d6e..b3bc052f8b 100644 --- a/domain-server/resources/web/assignment/placeholder.js +++ b/domain-server/resources/web/assignment/placeholder.js @@ -1,3 +1,3 @@ // Here you can put a script that will be run by an assignment-client (AC) -// For examples, please go to https://github.com/vircadia/vircadia/tree/master/script-archive/acScripts +// For examples, please go to https://github.com/overte-org/overte/tree/master/script-archive/acScripts // The directory named acScripts contains assignment-client specific scripts you can try. diff --git a/domain-server/resources/web/js/shared.js b/domain-server/resources/web/js/shared.js index bec8d19119..2f51aacafe 100644 --- a/domain-server/resources/web/js/shared.js +++ b/domain-server/resources/web/js/shared.js @@ -51,7 +51,7 @@ $.extend(Settings, { var URLs = { // STABLE METAVERSE_URL: https://metaverse.highfidelity.com // STAGING METAVERSE_URL: https://staging.highfidelity.com - DEFAULT_METAVERSE_URL: "https://metaverse.vircadia.com/live", + DEFAULT_METAVERSE_URL: "https://overte.org/mvs", CDN_URL: 'https://cdn-1.vircadia.com/eu-c-1', PLACE_URL: 'https://xr.place' }; diff --git a/domain-server/resources/web/web-new/README.md b/domain-server/resources/web/web-new/README.md index d18007e4c9..e4772fc647 100644 --- a/domain-server/resources/web/web-new/README.md +++ b/domain-server/resources/web/web-new/README.md @@ -1,6 +1,6 @@ -# Vircadia Domain Dashboard (vircadia-domain-dashboard) +# Overte Domain Dashboard (vircadia-domain-dashboard) -The Domain dashboard for Vircadia virtual worlds. +The Domain dashboard for Overte virtual worlds. ## Maintainer Instructions diff --git a/domain-server/resources/web/web-new/package.json b/domain-server/resources/web/web-new/package.json index ea2c62a8be..5a4ffc838d 100644 --- a/domain-server/resources/web/web-new/package.json +++ b/domain-server/resources/web/web-new/package.json @@ -1,8 +1,8 @@ { "name": "vircadia-domain-dashboard", "version": "0.0.1", - "description": "The Domain dashboard for Vircadia virtual worlds.", - "productName": "Vircadia Domain Dashboard", + "description": "The Domain dashboard for Overte virtual worlds.", + "productName": "Overte Domain Dashboard", "author": "Kalila L. ", "private": true, "scripts": { diff --git a/domain-server/resources/web/web-new/quasar.conf.js b/domain-server/resources/web/web-new/quasar.conf.js index e063c0aa80..a4361a6ed5 100644 --- a/domain-server/resources/web/web-new/quasar.conf.js +++ b/domain-server/resources/web/web-new/quasar.conf.js @@ -147,9 +147,9 @@ module.exports = configure(function (ctx) { }, manifest: { - name: "Vircadia Domain Dashboard", - short_name: "Vircadia Domain Dashboard", - description: "The Domain dashboard for Vircadia virtual worlds.", + name: "Overte Domain Dashboard", + short_name: "Overte Domain Dashboard", + description: "The Domain dashboard for Overte virtual worlds.", display: "standalone", orientation: "portrait", background_color: "#ffffff", diff --git a/domain-server/resources/web/web-new/src/boot/axios.ts b/domain-server/resources/web/web-new/src/boot/axios.ts index 92097bc61b..5e8a1220f9 100644 --- a/domain-server/resources/web/web-new/src/boot/axios.ts +++ b/domain-server/resources/web/web-new/src/boot/axios.ts @@ -19,7 +19,7 @@ declare module "@vue/runtime-core" { Log.info(Log.types.OTHER, "Bootstrapping Axios."); // TODO: This needs to be centralized and not hardcoded. -const METAVERSE_URL = "https://metaverse.vircadia.com/live"; +const METAVERSE_URL = "https://overte.org/mvs"; axios.interceptors.request.use((config) => { // This is a necessary header to be passed to the Metaverse server in order for // it to fail with an HTTP error code instead of succeeding and returning diff --git a/domain-server/resources/web/web-new/src/components/components/login/MetaverseLogin.vue b/domain-server/resources/web/web-new/src/components/components/login/MetaverseLogin.vue index 3fe58121d3..a7750e2ae8 100644 --- a/domain-server/resources/web/web-new/src/components/components/login/MetaverseLogin.vue +++ b/domain-server/resources/web/web-new/src/components/components/login/MetaverseLogin.vue @@ -67,7 +67,7 @@ export default { password: "", showPassword: false, // TODO: Needs to be stored somewhere central. - DEFAULT_METAVERSE_URL: "https://metaverse.vircadia.com/live", + DEFAULT_METAVERSE_URL: "https://overte.org/mvs", AUTOCOMPLETE: false }), diff --git a/domain-server/resources/web/web-new/src/pages/FirstTimeWizard/Index.vue b/domain-server/resources/web/web-new/src/pages/FirstTimeWizard/Index.vue index a4428f2265..6cc8880fbe 100644 --- a/domain-server/resources/web/web-new/src/pages/FirstTimeWizard/Index.vue +++ b/domain-server/resources/web/web-new/src/pages/FirstTimeWizard/Index.vue @@ -720,7 +720,7 @@ export default defineComponent({ // Consts WELCOME_TEXT_TIMEOUT: 4500, MAIN_WIZARD_TRANSITION_TIME: 1000, - DEFAULT_METAVERSE_URL: "https://metaverse.vircadia.com/live", + DEFAULT_METAVERSE_URL: "https://overte.org/mvs", FINAL_WIZARD_STEP: 9, COMPLETE_WIZARD_REDIRECT_DELAY: 4000 }; diff --git a/domain-server/resources/web/wizard/index.shtml b/domain-server/resources/web/wizard/index.shtml index f140ba8686..ab7bc86563 100644 --- a/domain-server/resources/web/wizard/index.shtml +++ b/domain-server/resources/web/wizard/index.shtml @@ -25,7 +25,7 @@

Place names are similar to web addresses. Users who want to visit your domain can - enter its Place Name in Vircadia's Interface. You can choose a Place Name for your domain.
+ 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.
@@ -56,7 +56,7 @@ diff --git a/server-console/src/downloader.html b/server-console/src/downloader.html index f1f7a2024c..cedb6552c9 100644 --- a/server-console/src/downloader.html +++ b/server-console/src/downloader.html @@ -1,7 +1,7 @@ - Vircadia + Overte diff --git a/server-console/src/main.js b/server-console/src/main.js index 80be5c3fc2..496ee099dc 100644 --- a/server-console/src/main.js +++ b/server-console/src/main.js @@ -134,7 +134,7 @@ function shutdown() { dialog.showMessageBox({ type: 'question', buttons: ['Yes', 'No'], - title: 'Stopping Vircadia Sandbox', + title: 'Stopping Overte Sandbox', message: 'Quitting will stop your Sandbox and your Home domain will no longer be running.\nDo you wish to continue?' }, shutdownCallback); } else { @@ -280,7 +280,7 @@ function binaryMissingMessage(displayName, executableName, required) { var message = "The " + displayName + " executable was not found.\n"; if (required) { - message += "It is required for the Vircadia Sandbox to run.\n\n"; + message += "It is required for the Overte Sandbox to run.\n\n"; } else { message += "\n"; } @@ -293,7 +293,7 @@ function binaryMissingMessage(displayName, executableName, required) { message += paths.join("\n"); } else { message += "It is expected to be found beside this executable.\n"; - message += "You may need to re-install the Vircadia Sandbox."; + message += "You may need to re-install the Overte Sandbox."; } return message; @@ -399,7 +399,7 @@ function visitSandboxClicked() { StartInterface('hifi://localhost'); } else { // show an error to say that we can't go home without an interface instance - dialog.showErrorBox("Client Not Found", binaryMissingMessage("Vircadia client", "Interface", false)); + dialog.showErrorBox("Client Not Found", binaryMissingMessage("Overte client", "Interface", false)); } } @@ -613,7 +613,7 @@ function updateTrayMenu(serverState) { tray.setImage(trayIcons[notificationState]); tray.setContextMenu(Menu.buildFromTemplate(menuArray)); if (isShuttingDown) { - tray.setToolTip('Vircadia - Shutting Down'); + tray.setToolTip('Overte - Shutting Down'); } } } @@ -868,7 +868,7 @@ function onContentLoaded() { notifier.notify({ icon: notificationIcon, title: 'An update is available!', - message: 'Vircadia version ' + latestVersion + ' is available', + message: 'Overte version ' + latestVersion + ' is available', wait: true, appID: buildInfo.appUserModelId, url: url @@ -941,7 +941,7 @@ app.on('ready', function() { // Create tray icon tray = new Tray(trayIcons[NotificationState.UNNOTIFIED]); - tray.setToolTip('Vircadia'); + tray.setToolTip('Overte'); tray.on('click', function() { tray.popUpContextMenu(tray.menu); diff --git a/server-console/src/modules/hf-app.js b/server-console/src/modules/hf-app.js index cdb744e5e6..71b0b508a2 100644 --- a/server-console/src/modules/hf-app.js +++ b/server-console/src/modules/hf-app.js @@ -34,7 +34,7 @@ exports.getBuildInfo = function() { buildIdentifier: "dev", buildNumber: "0", stableBuild: "0", - organization: "Vircadia - dev", + organization: "Overte - dev", appUserModelId: "com.vircadia.console" }; var buildInfo = DEFAULT_BUILD_INFO; @@ -124,4 +124,4 @@ exports.getApplicationDataDirectory = function(local) { exports.getInterfaceDataDirectory = function(local) { return path.join(exports.getRootHifiDataDirectory(local), '/Interface'); -} \ No newline at end of file +} diff --git a/server-console/src/splash.html b/server-console/src/splash.html index e2e84eebae..5a3c763a7d 100644 --- a/server-console/src/splash.html +++ b/server-console/src/splash.html @@ -1,7 +1,7 @@ - Vircadia + Overte @@ -19,7 +19,7 @@

What now?

-Vircadia is now installed and your Home domain is ready for you to explore. To start you off, we've put a few things in your home to play around with and learn the ropes. +Overte is now installed and your Home domain is ready for you to explore. To start you off, we've put a few things in your home to play around with and learn the ropes.

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

How do I use it?

- You can manage your server by clicking on the Vircadia icon in your + You can manage your server by clicking on the Overte icon in your