Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-05 16:46:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated some URLs, rebranded documentation and changed default metaverse server address

Browse source
This commit is contained in:
ksuprynowicz 2022-02-09 23:57:24 +01:00
parent 43b5e83000
commit c6f1e6410e
104 changed files with 478 additions and 476 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
BUILD.md
View file

@ -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

2
BUILD_ANDROID.md
View file

@ -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

6
BUILD_LINUX.md
View file

@ -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
```

2
BUILD_OSX.md
View file

@ -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

12
BUILD_WIN.md
View file

@ -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

14
CMakeLists.txt
View file

@ -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)/*" )

6
CODING_STANDARD.md
View file

@ -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
//

12
CONTRIBUTING.md
View file

@ -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!

74
INSTALLER.md
View file

@ -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.

3
LICENSE
View file

@ -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.

2
README.md
View file

@ -1,4 +1,4 @@
<p align="center"><a href="https://vircadia.com/"><img src="interface/resources/images/brand-banner-black.svg" alt="Overte" width="350"/></a></p>
<p align="center"><a href="https://overte.org/"><img src="interface/resources/images/brand-banner-black.svg" alt="Overte" width="350"/></a></p>
<h3 align="center"><a href="https://vircadia.com/">Website</a> | <a href="https://discordapp.com/invite/Pvx2vke">Discord</a> | <a href="https://vircadia.com/download-vircadia/">Download</a></h3>
<p align="center">
<a href="https://vircadia.com/contribute"><img alt="GitHub contributors" src="https://img.shields.io/github/contributors/vircadia/vircadia"></a>

2
android/apps/interface/src/main/java/io/highfidelity/hifiinterface/HifiUtils.java
View file

@ -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;

4
android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/LoginFragment.java
View file

@ -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);
}

2
android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/EndpointUsersProvider.java
View file

@ -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;

2
android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/UserStoryDomainProvider.java
View file

@ -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";

2
android/apps/interface/src/main/java/io/highfidelity/hifiinterface/task/DownloadProfileImageTask.java
View file

@ -16,7 +16,7 @@ import io.highfidelity.hifiinterface.HifiUtils;
*/
public class DownloadProfileImageTask extends AsyncTask<String, Void, String> {
// 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;

4
android/apps/interface/src/main/res/values/strings.xml
View file

@ -27,9 +27,9 @@
<string name="online">Online</string>
<string name="signup">Sign Up</string>
<string name="signup_uppercase">SIGN UP</string>
<string name="creating_account">Creating your Vircadia account</string>
<string name="creating_account">Creating your Overte account</string>
<string name="signup_email_username_or_password_incorrect">Email, username or password incorrect.</string>
<string name="signedin_welcome">You are now signed into Vircadia</string>
<string name="signedin_welcome">You are now signed into Overte</string>
<string name="logged_in_welcome">You are now logged in!</string>
<string name="welcome">Welcome</string>
<string name="cancel">Cancel</string>

2
assignment-client/src/AssignmentClientApp.cpp
View file

@ -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();

16
cmake/macros/SetPackagingParameters.cmake
View file

@ -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

8
cmake/templates/CPackProperties.cmake.in
View file

@ -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@")

6
cmake/templates/NSIS.template.in
View file

@ -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

4
domain-server/resources/describe-settings.json
View file

@ -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
},

4
domain-server/resources/metadata_exporter/index.html
View file

@ -12,11 +12,11 @@
<html>
<head>
<title>Vircadia Metadata Exporter</title>
<title>Overte Metadata Exporter</title>
</head>
<body>
<h1>Vircadia Metadata Exporter</h1>
<h1>Overte Metadata Exporter</h1>
<p>If you can see this page, this means that your domain's metadata is available to be exported.</p>
<p>

4
domain-server/resources/prometheus_exporter/index.html
View file

@ -1,10 +1,10 @@
<html>
<head>
<title>Vircadia Prometheus exporter</title>
<title>Overte Prometheus exporter</title>
</head>
<body>
<h1>Vircadia Prometheus exporter</h1>
<h1>Overte Prometheus exporter</h1>
<p>This is the <a href="https://prometheus.io/">Prometheus</a> exporter, used to export stats about the domain server for graphing and analysis.</p>
<p>

2
domain-server/resources/web/assignment/placeholder.js
View file

@ -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.

2
domain-server/resources/web/js/shared.js
View file

@ -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'
};

4
domain-server/resources/web/web-new/README.md
View file

@ -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

4
domain-server/resources/web/web-new/package.json
View file

@ -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. <somnilibertas@gmail.com>",
"private": true,
"scripts": {

6
domain-server/resources/web/web-new/quasar.conf.js
View file

@ -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",

2
domain-server/resources/web/web-new/src/boot/axios.ts
View file

@ -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

2
domain-server/resources/web/web-new/src/components/components/login/MetaverseLogin.vue
View file

@ -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
}),

2
domain-server/resources/web/web-new/src/pages/FirstTimeWizard/Index.vue
View file

@ -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
};

6
domain-server/resources/web/wizard/index.shtml
View file

@ -25,7 +25,7 @@
<div class="col-md-12">
<span class='step-description'>
<a target='_blank' href='https://docs.vircadia.com/create-and-explore/start-working-in-your-sandbox/place-names'>Place names</a> are similar to web addresses. Users who want to visit your domain can
enter its Place Name in Vircadia's Interface. You can choose a Place Name for your domain.</br>
enter its Place Name in Overte's Interface. You can choose a Place Name for your domain.</br>
Your domain may also be reachable by <b>IP address</b>.
</span>
</div>
@ -56,7 +56,7 @@
<div class="wizard-step col-md-9 col-centered" style="display: none;">
<h4 class="step-title"></h4>
<div class="row">
<p id="permissions-description" class="col-md-12 step-info"><b>Localhost</b> has been granted administrator privileges to this domain. (Localhost is any</br>user on the same machine as the Vircadia server)</p>
<p id="permissions-description" class="col-md-12 step-info"><b>Localhost</b> has been granted administrator privileges to this domain. (Localhost is any</br>user on the same machine as the Overte server)</p>
</div>
<div id="admin-row" class="row">
<p class="col-md-6">
@ -231,7 +231,7 @@
<div class="row">
<div class="col-xs-10 col-xs-offset-1">
<p id="main-description" class="step-info">You have successfully setup and configured your Vircadia domain.</p>
<p id="main-description" class="step-info">You have successfully setup and configured your Overte domain.</p>
</div>
</div>

2
domain-server/src/DomainServer.cpp
View file

@ -395,7 +395,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
void DomainServer::parseCommandLine(int argc, char* argv[]) {
QCommandLineParser parser;
parser.setApplicationDescription("Vircadia Domain Server");
parser.setApplicationDescription("Overte Domain Server");
const QCommandLineOption versionOption = parser.addVersionOption();
const QCommandLineOption helpOption = parser.addHelpOption();

6
hifi_qt.py
View file

@ -191,7 +191,7 @@ endif()
def showQtBuildInfo(self):
print("")
print("It's also possible to build Qt for your distribution, please see the documentation at:")
print("https://github.com/vircadia/vircadia/tree/master/tools/qt-builder")
print("https://github.com/overte-org/overte/tree/master/tools/qt-builder")
print("")
print("Alternatively, you can try building against the system Qt by setting the VIRCADIA_USE_SYSTEM_QT environment variable.")
print("You'll need to install the development packages, and to have Qt 5.15.0 or later.")
@ -239,11 +239,11 @@ endif()
print(" export VIRCADIA_USE_SYSTEM_QT=1")
print("")
hifi_utils.color('clear')
print("If you'd like to try to build Qt from source either for building Vircadia, or")
print("If you'd like to try to build Qt from source either for building Overte, or")
print("to contribute a prebuilt package for your distribution, please see the")
print("documentation at: ", end='')
hifi_utils.color('blue')
print("https://github.com/vircadia/vircadia/tree/master/tools/qt-builder")
print("https://github.com/overte-org/overte/tree/master/tools/qt-builder")
hifi_utils.color('clear')
print('')
raise hifi_utils.SilentFatalError(2)

2
interface/resources/qml/+webengine/BrowserWebView.qml
View file

@ -6,7 +6,7 @@ import controlsUit 1.0
WebView {
id: webview
url: "https://vircadia.com/"
url: "https://overte.org/"
profile: FileTypeProfile;
property var parentRoot: null

4
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -529,7 +529,7 @@ Item {
font.pixelSize: linkAccountBody.textFieldFontSize
font.bold: linkAccountBody.fontBold
text: "<a href='https://metaverse.vircadia.com/users/password/new'> Can't access your account?</a>"
text: "<a href='https://overte.org/mvs/users/password/new'> Can't access your account?</a>"
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
@ -655,7 +655,7 @@ Item {
leftMargin: hifi.dimensions.contentSpacing.x
}
text: "<a href='https://metaverse.vircadia.com/users/register'>Sign Up</a>"
text: "<a href='https://overte.org/mvs/users/register'>Sign Up</a>"
linkColor: hifi.colors.blueAccent
onLinkActivated: {

4
interface/resources/qml/LoginDialog/SignUpBody.qml
View file

@ -23,7 +23,7 @@ Item {
clip: true
height: root.height
width: root.width
readonly property string termsContainerText: qsTr("By signing up, you agree to Vircadia's Terms of Service")
readonly property string termsContainerText: qsTr("By signing up, you agree to Overte's Terms of Service")
property int textFieldHeight: 31
property string fontFamily: "Raleway"
property int fontSize: 15
@ -395,7 +395,7 @@ Item {
text: signUpBody.termsContainerText
Component.onCompleted: {
// with the link.
termsText.text = qsTr("By signing up, you agree to <a href='https://vircadia.com/termsofservice'>Vircadia's Terms of Service</a>")
termsText.text = qsTr("By signing up, you agree to <a href='https://overte.org/termsofservice'>Vircadia's Terms of Service</a>")
}
}

4
interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
View file

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

2
interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml
View file

@ -128,7 +128,7 @@ ShadowRectangle {
}
}
// FIXME: Link to a Vircadias version of the video.
// FIXME: Link to a Overte's version of the video.
/*
RalewayButton {
id: video

13
interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
View file

@ -59,10 +59,10 @@ Rectangle {
textFormat: Text.StyledText
linkColor: "#00B4EF"
color: "white"
text: "<a href=\"https://vircadia.com\">Website</a>"
text: "<a href=\"https://overte.org\">Website</a>"
size: 20
onLinkActivated: {
About.openUrl("https://vircadia.com");
About.openUrl("https://overte.org");
}
}
@ -70,10 +70,10 @@ Rectangle {
textFormat: Text.StyledText
linkColor: "#00B4EF"
color: "white"
text: "<a href=\"https://github.com/vircadia/vircadia\">Source</a>"
text: "<a href=\"https://github.com/overte-org/overte\">Source</a>"
size: 20
onLinkActivated: {
About.openUrl("https://github.com/vircadia/vircadia");
About.openUrl("https://github.com/overte-org/overte");
}
}
@ -131,6 +131,11 @@ Rectangle {
}
}
Item { height: 20; width: 1 }
RalewayRegular {
color: "white"
text: "© 2022 Overte e.V."
size: 14
}
RalewayRegular {
color: "white"
text: "© 2019 - 2021 Vircadia contributors."

2
interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
View file

@ -894,7 +894,7 @@ Flickable {
hoverEnabled: true
onEntered: privacyPolicyUnderline.visible = true;
onExited: privacyPolicyUnderline.visible = false;
onClicked: About.openUrl("https://vircadia.com/privacy-policy");
onClicked: About.openUrl("https://overte.org/privacy-policy");
}
}

6
interface/src/AboutUtil.h
View file

@ -26,7 +26,7 @@
* @hifi-client-entity
* @hifi-avatar
*
* @property {string} platform - The name of the Interface platform running, e,g., <code>"Vircadia"</code> for the Vircadia.
* @property {string} platform - The name of the Interface platform running, e,g., <code>"Overte"</code> for the Overte.
* <em>Read-only.</em>
* @property {string} buildDate - The build date of Interface that is currently running. <em>Read-only.</em>
* @property {string} buildVersion - The build version of Interface that is currently running. <em>Read-only.</em>
@ -53,7 +53,7 @@
*
* @deprecated This API is deprecated and will be removed. Use the {@link About} API instead.
*
* @property {string} platform - The name of the Interface platform running, e,g., <code>"Vircadia"</code> for the Vircadia.
* @property {string} platform - The name of the Interface platform running, e,g., <code>"Overte"</code> for the Overte.
* <em>Read-only.</em>
* @property {string} buildDate - The build date of Interface that is currently running. <em>Read-only.</em>
* @property {string} buildVersion - The build version of Interface that is currently running. <em>Read-only.</em>
@ -74,7 +74,7 @@ public:
static AboutUtil* getInstance();
~AboutUtil() {}
QString getPlatformName() const { return "Vircadia"; }
QString getPlatformName() const { return "Overte"; }
QString getBuildDate() const;
QString getBuildVersion() const;
QString getReleaseName() const;

6
interface/src/Application.cpp
View file

@ -1146,7 +1146,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-SemiBold.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Regular.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Medium.ttf");
_window->setWindowTitle("Vircadia");
_window->setWindowTitle("Overte");
Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us
@ -3240,7 +3240,7 @@ void Application::showLoginScreen() {
QJsonObject loginData = {};
loginData["action"] = "login dialog popped up";
UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData);
_window->setWindowTitle("Vircadia");
_window->setWindowTitle("Overte");
} else {
resumeAfterLoginDialogActionTaken();
}
@ -7219,7 +7219,7 @@ void Application::updateWindowTitle() const {
bool isDomainLoggedIn = domainAccountManager->isLoggedIn();
QString authedDomainName = domainAccountManager->getAuthedDomainName();
QString buildVersion = " - Vircadia - "
QString buildVersion = " - Overte - "
+ (BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable ? QString("Version") : QString("Build"))
+ " " + applicationVersion();

2
interface/src/FancyCamera.h
View file

@ -20,7 +20,7 @@ class FancyCamera : public Camera {
/*@jsdoc
* The <code>Camera</code> API provides access to the "camera" that defines your view in desktop and HMD display modes.
* The Vircadia camera has axes <code>x</code> = right, <code>y</code> = up, <code>-z</code> = forward.
* The Overte camera has axes <code>x</code> = right, <code>y</code> = up, <code>-z</code> = forward.
*
* @namespace Camera
*

8
interface/src/Menu.cpp
View file

@ -809,21 +809,21 @@ Menu::Menu() {
// Help/Application menu ----------------------------------
MenuWrapper * helpMenu = addMenu("Help");
// Help > About Vircadia
action = addActionToQMenuAndActionHash(helpMenu, "About Vircadia");
// Help > About Overte
action = addActionToQMenuAndActionHash(helpMenu, "About Overte");
connect(action, &QAction::triggered, [] {
qApp->showDialog(QString("hifi/dialogs/AboutDialog.qml"),
QString("hifi/dialogs/TabletAboutDialog.qml"), "AboutDialog");
});
helpMenu->addSeparator();
// Help > Vircadia Docs
// Help > Overte Docs
action = addActionToQMenuAndActionHash(helpMenu, "Online Documentation");
connect(action, &QAction::triggered, qApp, [] {
QDesktopServices::openUrl(NetworkingConstants::HELP_DOCS_URL);
});
// Help > Vircadia Forum
// Help > Overte Forum
action = addActionToQMenuAndActionHash(helpMenu, "Community Support");
connect(action, &QAction::triggered, qApp, [] {
QDesktopServices::openUrl(NetworkingConstants::HELP_COMMUNITY_URL);

2
interface/src/avatar/AvatarProject.h
View file

@ -95,7 +95,7 @@ public:
static bool isValidNewProjectName(const QString& projectPath, const QString& projectName);
static QString getDefaultProjectsPath() {
return QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/Vircadia Projects";
return QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/Overte Projects";
}
signals:

2
interface/src/main.cpp
View file

@ -70,7 +70,7 @@ int main(int argc, const char* argv[]) {
}
QCommandLineParser parser;
parser.setApplicationDescription("Vircadia");
parser.setApplicationDescription("Overte");
QCommandLineOption versionOption = parser.addVersionOption();
QCommandLineOption helpOption = parser.addHelpOption();

6
interface/src/scripting/WindowScriptingInterface.h
View file

@ -332,7 +332,7 @@ public slots:
* @param {number} [aspectRatio=0] - The width/height ratio of the snapshot required. If the value is <code>0</code>, the
* full resolution is used (window dimensions in desktop mode; HMD display dimensions in HMD mode), otherwise one of the
* dimensions is adjusted in order to match the aspect ratio.
* @param {string} [filename=""] - If a filename is not provided, the image is saved as "vircadia-snap-by-&lt;user
* @param {string} [filename=""] - If a filename is not provided, the image is saved as "overte-snap-by-&lt;user
* name&gt;-on-YYYY-MM-DD_HH-MM-SS".
* <p>Still images are saved in JPEG or PNG format according to the extension provided &mdash; <code>".jpg"</code>,
* <code>".jpeg"</code>, or <code>".png"</code> &mdash; or if not provided then in JPEG format with an extension of
@ -371,7 +371,7 @@ public slots:
* @function Window.takeSecondaryCameraSnapshot
* @param {boolean} [notify=true] - This value is passed on through the {@link Window.stillSnapshotTaken|stillSnapshotTaken}
* signal.
* @param {string} [filename=""] - If a filename is not provided, the image is saved as "vircadia-snap-by-&lt;user
* @param {string} [filename=""] - If a filename is not provided, the image is saved as "overte-snap-by-&lt;user
* name&gt;-on-YYYY-MM-DD_HH-MM-SS".
* <p>Images are saved in JPEG or PNG format according to the extension provided &mdash; <code>".jpg"</code>,
* <code>".jpeg"</code>, or <code>".png"</code> &mdash; or if not provided then in JPEG format with an extension of
@ -390,7 +390,7 @@ public slots:
* otherwise it is saved as an equirectangular image.
* @param {boolean} [notify=true] - This value is passed on through the {@link Window.stillSnapshotTaken|stillSnapshotTaken}
* signal.
* @param {string} [filename=""] - If a filename is not provided, the image is saved as "vircadia-snap-by-&lt;user
* @param {string} [filename=""] - If a filename is not provided, the image is saved as "overte-snap-by-&lt;user
* name&gt;-on-YYYY-MM-DD_HH-MM-SS".
* <p>Images are saved in JPEG or PNG format according to the extension provided &mdash; <code>".jpg"</code>,
* <code>".jpeg"</code>, or <code>".png"</code> &mdash; or if not provided then in JPEG format with an extension of

8
interface/src/ui/PreferencesDialog.cpp
View file

@ -250,17 +250,17 @@ void setupPreferences() {
{
auto getter = []()->bool { return !Menu::getInstance()->isOptionChecked(MenuOption::DisableActivityLogger); };
auto setter = [](bool value) { Menu::getInstance()->setIsOptionChecked(MenuOption::DisableActivityLogger, !value); };
preferences->addPreference(new CheckPreference("Privacy", "Send data - Vircadia uses information provided by your "
preferences->addPreference(new CheckPreference("Privacy", "Send data - Overte uses information provided by your "
"client to improve the product through the logging of errors, tracking of usage patterns, "
"installation and system details. By allowing Vircadia to collect this information "
"installation and system details. By allowing Overte to collect this information "
"you are helping to improve the product. ", getter, setter));
}
{
auto getter = []()->bool { return !Menu::getInstance()->isOptionChecked(MenuOption::DisableCrashLogger); };
auto setter = [](bool value) { Menu::getInstance()->setIsOptionChecked(MenuOption::DisableCrashLogger, !value); };
preferences->addPreference(new CheckPreference("Privacy", "Send crashes - Vircadia uses information provided by your "
"client to improve the product through crash reports. By allowing Vircadia to collect "
preferences->addPreference(new CheckPreference("Privacy", "Send crashes - Overte uses information provided by your "
"client to improve the product through crash reports. By allowing Overte to collect "
"this information you are helping to improve the product. ", getter, setter));
}

6
interface/src/ui/Snapshot.cpp
View file

@ -42,12 +42,12 @@
#include "Snapshot.h"
#include "SnapshotUploader.h"
// filename format: vircadia-snap-by-%username%-on-%date%_%time%_@-%location%.jpg
// filename format: overte-snap-by-%username%-on-%date%_%time%_@-%location%.jpg
// %1 <= username, %2 <= date and time, %3 <= current location
const QString FILENAME_PATH_FORMAT = "vircadia-snap-by-%1-on-%2.jpg";
const QString FILENAME_PATH_FORMAT = "overte-snap-by-%1-on-%2.jpg";
const QString DATETIME_FORMAT = "yyyy-MM-dd_hh-mm-ss";
const QString SNAPSHOTS_DIRECTORY = "Snapshots";
const QString URL = "vircadia_url";
const QString URL = "overte_url";
static const int SNAPSHOT_360_TIMER_INTERVAL = 350;
static const QList<QString> SUPPORTED_IMAGE_FORMATS = { "jpg", "jpeg", "png" };

2
launchers/darwin/CMakeLists.txt
View file

@ -143,7 +143,7 @@ set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
include(CPackComponent)
set(CPACK_PACKAGE_NAME "HQ Launcher")
set(CPACK_PACKAGE_VENDOR "Vircadia")
set(CPACK_PACKAGE_VENDOR "Overte")
set(CPACK_PACKAGE_VERSION ${BUILD_VERSION})
set(CPACK_PACKAGE_FILE_NAME "HQ Launcher")

2
launchers/qt/CMakeLists.txt
View file

@ -276,7 +276,7 @@ if (APPLE)
include(CPackComponent)
set(CPACK_PACKAGE_NAME "HQ Launcher")
set(CPACK_PACKAGE_VENDOR "Vircadia")
set(CPACK_PACKAGE_VENDOR "Overte")
set(CPACK_PACKAGE_FILE_NAME "HQ Launcher")
set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})

2
launchers/qt/resources/qml/HFControls/HFTextLogo.qml
View file

@ -2,7 +2,7 @@ import QtQuick 2.3
import QtQuick 2.1
Text {
text: "Vircadia"
text: "Overte"
font.bold: true
font.family: "Graphik Semibold"
font.pixelSize: 17

2
launchers/qt/src/Launcher.cpp
View file

@ -21,7 +21,7 @@ Launcher::Launcher(int& argc, char**argv) : QGuiApplication(argc, argv) {
_launcherWindow->rootContext()->setContextProperty("LauncherState", _launcherState.get());
_launcherWindow->rootContext()->setContextProperty("PathUtils", new PathUtils());
_launcherWindow->rootContext()->setContextProperty("Platform", platform);
_launcherWindow->setTitle("Vircadia");
_launcherWindow->setTitle("Overte");
_launcherWindow->setFlags(Qt::FramelessWindowHint | Qt::Window);
_launcherWindow->setLauncherStatePtr(_launcherState);

2
launchers/qt/src/LauncherInstaller_windows.cpp
View file

@ -253,7 +253,7 @@ void LauncherInstaller::createApplicationRegistryKeys() {
success = insertRegistryKey(REGISTRY_PATH, "UninstallString", uninstallPath);
success = insertRegistryKey(REGISTRY_PATH, "DisplayVersion", std::string(LAUNCHER_BUILD_VERSION));
success = insertRegistryKey(REGISTRY_PATH, "DisplayIcon", applicationExe);
success = insertRegistryKey(REGISTRY_PATH, "Publisher", "Vircadia");
success = insertRegistryKey(REGISTRY_PATH, "Publisher", "Overte");
auto now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());

2
launchers/qt/src/main.cpp
View file

@ -31,7 +31,7 @@ bool hasSuffix(const std::string& path, const std::string& suffix) {
int main(int argc, char *argv[]) {
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QCoreApplication::setOrganizationName("Vircadia");
QCoreApplication::setOrganizationName("Overte");
QCoreApplication::setApplicationName("HQ Launcher");
Q_INIT_RESOURCE(resources);

2
launchers/win32/LauncherManager.cpp
View file

@ -629,7 +629,7 @@ BOOL LauncherManager::createApplicationRegistryKeys(int size) {
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "UninstallString", uninstallPath);
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "DisplayVersion", LauncherUtils::cStringToStd(_latestVersion));
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "DisplayIcon", applicationExe);
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "Publisher", "Vircadia");
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "Publisher", "Overte");
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "InstallDate", LauncherUtils::cStringToStd(CTime::GetCurrentTime().Format("%Y%m%d")));
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "EstimatedSize", (DWORD)size);
success = LauncherUtils::insertRegistryKey(REGISTRY_PATH, "NoModify", (DWORD)1);

8
libraries/entities/src/EntityItemProperties.cpp
View file

@ -812,7 +812,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* @property {string} actionData="" - Base-64 encoded compressed dump of the actions associated with the entity. This property
* is typically not used in scripts directly; rather, functions that manipulate an entity's actions update it, e.g.,
* {@link Entities.addAction}. The size of this property increases with the number of actions. Because this property value
* has to fit within a Vircadia datagram packet, there is a limit to the number of actions that an entity can have;
* has to fit within a Overte datagram packet, there is a limit to the number of actions that an entity can have;
* edits which would result in overflow are rejected. <em>Read-only.</em>
* @property {Entities.RenderInfo} renderInfo - Information on the cost of rendering the entity. Currently information is only
* provided for <code>Model</code> entities. <em>Read-only.</em>
@ -1262,7 +1262,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* the PolyVox data. This property is typically not used in scripts directly; rather, functions that manipulate a PolyVox
* entity update it.
* <p>The size of this property increases with the size and complexity of the PolyVox entity, with the size depending on how
* the particular entity's voxels compress. Because this property value has to fit within a Vircadia datagram packet,
* the particular entity's voxels compress. Because this property value has to fit within a Overte datagram packet,
* there is a limit to the size and complexity of a PolyVox entity; edits which would result in an overflow are rejected.</p>
* @property {Entities.PolyVoxSurfaceStyle} voxelSurfaceStyle=2 - The style of rendering the voxels' surface and how
* neighboring PolyVox entities are joined.
@ -1419,7 +1419,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* var METERS_TO_INCHES = 39.3701;
* var entity = Entities.addEntity({
* type: "Web",
* sourceUrl: "https://vircadia.com/",
* sourceUrl: "https://overte.org/",
* position: Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 0.75, z: -4 })),
* rotation: MyAvatar.orientation,
* dimensions: {
@ -5171,7 +5171,7 @@ bool EntityItemProperties::verifySignature(const QString& publicKey, const QByte
bool EntityItemProperties::verifyStaticCertificateProperties() {
// True IFF a non-empty certificateID matches the static certificate json.
// I.e., if we can verify that the certificateID was produced by Vircadia signing the static certificate hash.
// I.e., if we can verify that the certificateID was produced by Overte signing the static certificate hash.
return verifySignature(EntityItem::_marketplacePublicKey, getStaticCertificateHash(), QByteArray::fromBase64(getCertificateID().toUtf8()));
}

6
libraries/networking/src/ExternalResource.h
View file

@ -46,9 +46,9 @@ public:
* <p>An external resource bucket.</p>
* <p>The original High Fidelity used "Public", "Content", and "MPAssets" Amazon S3 buckets. The intention is that the
* community-run versions of these will keep the original data and structure, and any new additions will be made to
* Vircadia's "Assets" bucket. This should ease the transition from High Fidelity and ensure a clean separation.</p>
* Overte's "Assets" bucket. This should ease the transition from High Fidelity and ensure a clean separation.</p>
* @typedef {object} Script.ResourceBuckets
* @property {Script.ResourceBucket} Assets - Vircadia assets.
* @property {Script.ResourceBucket} Assets - Overte assets.
* @property {Script.ResourceBucket} HF_Public - Assets that used to be in High Fidelity's <code>hifi-public</code> Amazon
* S3 bucket.
* @property {Script.ResourceBucket} HF_Content - Assets that used to be in High Fidelity's <code>hifi-content</code> Amazon
@ -69,7 +69,7 @@ public:
* Amazon S3 bucket.</td></tr>
* <tr><td><code>2</code></td><td>HF_Marketplace</td><td>Assets that used to be in the High Fidelity's
* <code>mpassets</code> Amazon S3 bucket. (High Fidelity marketplace.)</td></tr>
* <tr><td><code>3</code></td><td>Assets</td><td>Vircadia assets.</td></tr>
* <tr><td><code>3</code></td><td>Assets</td><td>Overte assets.</td></tr>
* </tbody>
* </table>
* @typedef {number} Script.ResourceBucket

12
libraries/networking/src/NetworkingConstants.h
View file

@ -20,7 +20,7 @@ namespace NetworkingConstants {
// If you want to use STAGING instead of STABLE,
// links from the Domain Server web interface (like the connect account token generation)
// will still point at stable unless you ALSO change the Domain Server Metaverse Server URL inside of:
// <vircadia repo>\domain-server\resources\web\js\shared.js
// <Overte repo>\domain-server\resources\web\js\shared.js
// You can avoid changing that and still effectively use a connected domain on staging
// if you manually generate a personal access token for the domains scope
@ -29,12 +29,12 @@ namespace NetworkingConstants {
const QString WEB_ENGINE_VERSION = "Chrome/83.0.4103.122";
// For now we only have one Metaverse server.
const QUrl METAVERSE_SERVER_URL_STABLE { "https://metaverse.vircadia.com/live" };
const QUrl METAVERSE_SERVER_URL_STAGING { "https://metaverse.vircadia.com/live" };
const QUrl METAVERSE_SERVER_URL_STABLE { "https://overte.org/mvs" };
const QUrl METAVERSE_SERVER_URL_STAGING { "https://overte.org/mvs" };
// Web Engine requests to this parent domain have an account authorization header added
const QString AUTH_HOSTNAME_BASE = "vircadia.com";
const QStringList IS_AUTHABLE_HOSTNAME = { "vircadia.com", "vircadia.io" };
const QString AUTH_HOSTNAME_BASE = "overte.org";
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)";
@ -43,7 +43,7 @@ namespace NetworkingConstants {
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";
// WebEntity Defaults
const QString WEB_ENTITY_DEFAULT_SOURCE_URL = "https://vircadia.com/";
const QString WEB_ENTITY_DEFAULT_SOURCE_URL = "https://overte.org/";
const QString WEB_ENTITY_DEFAULT_USER_AGENT = WEB_ENGINE_USER_AGENT;
// Builds URLs

8
libraries/networking/src/webrtc/WebRTCDataChannels.h
View file

@ -215,13 +215,13 @@ private:
/// @brief Manages WebRTC data channels on the domain server or an assignment client that Interface clients can connect to.
///
/// @details Presents multiple individual WebRTC data channels as a single one-to-many WebRTCDataChannels object. Interface
/// clients may use WebRTC data channels for Vircadia protocol network communications instead of UDP.
/// clients may use WebRTC data channels for Overte protocol network communications instead of UDP.
/// A WebRTCSignalingServer is used in the process of setting up a WebRTC data channel between an Interface client and the
/// domain server or assignment client.
/// The Interface client initiates the connection - including initiating the data channel - and the domain server or assignment
/// client responds.
///
/// Additionally, for debugging purposes, instead of containing a Vircadia protocol payload, a WebRTC message may be an echo
/// Additionally, for debugging purposes, instead of containing a Overte protocol payload, a WebRTC message may be an echo
/// request. This is bounced back to the client.
///
/// A WebRTC data channel is identified by the IP address and port of the client WebSocket that was used when opening the data
@ -305,9 +305,9 @@ signals:
void signalingMessage(const QJsonObject& message);
/// @brief A WebRTC data message received from the Interface client.
/// @details This message is for handling at a higher level in the Vircadia protocol.
/// @details This message is for handling at a higher level in the Overte protocol.
/// @param address The address of the signaling WebSocket that the client used to connect.
/// @param byteArray The Vircadia protocol message.
/// @param byteArray The Overte protocol message.
void dataMessage(const SockAddr& address, const QByteArray& byteArray);
/// @brief Signals that the peer connection for a WebRTC data channel should be closed.

2
libraries/networking/src/webrtc/WebRTCSignalingServer.h
View file

@ -28,7 +28,7 @@
/// @details The signaling server is expected to be hosted in the domain server. It provides a WebSocket for Interface clients
/// to use in the WebRTC signaling handshake process to establish WebRTC data channel connections to each of the domain server
/// and the assignment clients (i.e., separate WebRTC data channels for each but only a single signaling WebSocket). The
/// assignment client signaling messages are expected to be relayed - by the domain server - via Vircadia protocol messages on
/// assignment client signaling messages are expected to be relayed - by the domain server - via Overte protocol messages on
/// the UDP connections between the domain server and assignment clients.
///
/// Additionally, for debugging purposes, instead of containing a WebRTC payload a signaling message may be an echo request.

2
libraries/plugins/src/plugins/SteamClientPlugin.h
View file

@ -73,7 +73,7 @@ public slots:
/*@jsdoc
* Opens Steam's "Choose Friends to invite" dialog if Interface is running under Steam.
* @function Steam.openInviteOverlay
* @example <caption>Invite Steam friends to join you in Vircadia.</caption>
* @example <caption>Invite Steam friends to join you in Overte.</caption>
* if (Steam.running) {
* print("Invite Steam friends to joint you...");
* Steam.openInviteOverlay();

8
libraries/script-engine/src/Quat.h
View file

@ -225,7 +225,7 @@ public slots:
/*@jsdoc
* Gets the "front" direction that the camera would face if its orientation was set to the quaternion value.
* This is a synonym for {@link Quat(0).getForward|Quat.getForward}.
* The Vircadia camera has axes <code>x</code> = right, <code>y</code> = up, <code>-z</code> = forward.
* The Overte camera has axes <code>x</code> = right, <code>y</code> = up, <code>-z</code> = forward.
* @function Quat(0).getFront
* @param {Quat} orientation - A quaternion representing an orientation.
* @returns {Vec3} The negative z-axis rotated by <code>orientation</code>.
@ -235,7 +235,7 @@ public slots:
/*@jsdoc
* Gets the "forward" direction that the camera would face if its orientation was set to the quaternion value.
* This is a synonym for {@link Quat(0).getFront|Quat.getFront}.
* The Vircadia camera has axes <code>x</code> = right, <code>y</code> = up, <code>-z</code> = forward.
* The Overte camera has axes <code>x</code> = right, <code>y</code> = up, <code>-z</code> = forward.
* @function Quat(0).getForward
* @param {Quat} orientation - A quaternion representing an orientation.
* @returns {Vec3} The negative z-axis rotated by <code>orientation</code>.
@ -247,7 +247,7 @@ public slots:
/*@jsdoc
* Gets the "right" direction that the camera would have if its orientation was set to the quaternion value.
* The Vircadia camera has axes <code>x</code> = right, <code>y</code> = up, <code>-z</code> = forward.
* The Overte camera has axes <code>x</code> = right, <code>y</code> = up, <code>-z</code> = forward.
* @function Quat(0).getRight
* @param {Quat} orientation - A quaternion representing an orientation.
* @returns {Vec3} The x-axis rotated by <code>orientation</code>.
@ -256,7 +256,7 @@ public slots:
/*@jsdoc
* Gets the "up" direction that the camera would have if its orientation was set to the quaternion value.
* The Vircadia camera has axes <code>x</code> = right, <code>y</code> = up, <code>-z</code> = forward.
* The Overte camera has axes <code>x</code> = right, <code>y</code> = up, <code>-z</code> = forward.
* @function Quat(0).getUp
* @param {Quat} orientation - A quaternion representing an orientation.
* @returns {Vec3} The y-axis rotated by <code>orientation</code>.

6
libraries/script-engine/src/ScriptEngine.h
View file

@ -555,7 +555,7 @@ public:
Q_INVOKABLE QUrl resourcesPath() const;
/*@jsdoc
* Starts timing a section of code in order to send usage data about it to Vircadia. Shouldn't be used outside of the
* Starts timing a section of code in order to send usage data about it to Overte. Shouldn't be used outside of the
* standard scripts.
* @function Script.beginProfileRange
* @param {string} label - A name that identifies the section of code.
@ -563,7 +563,7 @@ public:
Q_INVOKABLE void beginProfileRange(const QString& label) const;
/*@jsdoc
* Finishes timing a section of code in order to send usage data about it to Vircadia. Shouldn't be used outside of
* Finishes timing a section of code in order to send usage data about it to Overte. Shouldn't be used outside of
* the standard scripts.
* @function Script.endProfileRange
* @param {string} label - A name that identifies the section of code.
@ -707,7 +707,7 @@ public:
* @Returns {string} The URL of an external asset.
* @example <caption>Report the URL of a default particle.</caption>
* print(Script.getExternalPath(Script.ExternalPaths.Assets, "Bazaar/Assets/Textures/Defaults/Interface/default_particle.png"));
* @example <caption>Report the root directory where the Vircadia assets are located.</caption>
* @example <caption>Report the root directory where the Overte assets are located.</caption>
* print(Script.getExternalPath(Script.ExternalPaths.Assets, "."));
*/
Q_INVOKABLE QString getExternalPath(ExternalResource::Bucket bucket, const QString& path);

4
libraries/script-engine/src/Vec3.h
View file

@ -25,9 +25,9 @@
#include "GLMHelpers.h"
/*@jsdoc
* The <code>Vec3</code> API provides facilities for generating and manipulating 3-dimensional vectors. Vircadia uses a
* The <code>Vec3</code> 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.
* <img alt="Vircadia coordinate system" src="https://apidocs.vircadia.dev/images/opengl-coord-system.jpg" />
* <img alt="Overte coordinate system" src="https://apidocs.vircadia.dev/images/opengl-coord-system.jpg" />
*
* @namespace Vec3
* @variation 0

8
libraries/shared/src/shared/FileLogger.cpp
View file

@ -38,12 +38,12 @@ private:
QMutex _fileMutex;
};
static const QString FILENAME_FORMAT = "vircadia-log_%1%2.txt";
static const QString FILENAME_FORMAT = "overte-log_%1%2.txt";
static const QString DATETIME_FORMAT = "yyyy-MM-dd_hh.mm.ss";
static const QString LOGS_DIRECTORY = "Logs";
static const QString DATETIME_WILDCARD = "20[0-9][0-9]-[01][0-9]-[0-3][0-9]_[0-2][0-9]\\.[0-6][0-9]\\.[0-6][0-9]";
static const QString SESSION_WILDCARD = "[0-9a-z]{8}(-[0-9a-z]{4}){3}-[0-9a-z]{12}";
static QRegExp LOG_FILENAME_REGEX { "vircadia-log_" + DATETIME_WILDCARD + "(_" + SESSION_WILDCARD + ")?\\.txt" };
static QRegExp LOG_FILENAME_REGEX { "overte-log_" + DATETIME_WILDCARD + "(_" + SESSION_WILDCARD + ")?\\.txt" };
static QUuid SESSION_ID;
// Max log size is 512 KB. We send log files to our crash reporter, so we want to keep this relatively
@ -68,7 +68,7 @@ QString getLogRollerFilename() {
}
const QString& getLogFilename() {
static QString fileName = FileUtils::standardPath(LOGS_DIRECTORY) + "vircadia-log.txt";
static QString fileName = FileUtils::standardPath(LOGS_DIRECTORY) + "overte-log.txt";
return fileName;
}
@ -167,4 +167,4 @@ void FileLogger::sync() {
_persistThreadInstance->process();
}
#include "FileLogger.moc"
#include "FileLogger.moc"

4
libraries/ui/src/ui/TabletScriptingInterface.h
View file

@ -104,9 +104,9 @@ public:
* @function Tablet.getTablet
* @param {string} name - A unique name that identifies the tablet.
* @returns {TabletProxy} The tablet instance.
* @example <caption>Display the Vircadia home page on the system tablet.</caption>
* @example <caption>Display the Overte home page on the system tablet.</caption>
* var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
* tablet.gotoWebScreen("https://vircadia.com/");
* tablet.gotoWebScreen("https://overte.org/");
*/
Q_INVOKABLE TabletProxy* getTablet(const QString& tabletId);

8
pkg-scripts/README.md
View file

@ -1,7 +1,7 @@
# Vircadia Server Packaging Scripts
# Overte Server Packaging Scripts
Collection of scripts to create server distribution packages. Most of these scripts assume
use of the build script at https://github.com/vircadia/vircadia-builder, specifically that
use of the build script at https://github.com/overte-org/overte-builder, specifically that
the following directory structure exists:
```
@ -67,7 +67,7 @@ vircadia-domain-server@.service
vircadia-server@.target - used to launch/shutdown the two prior services
```
The top three services in this list are the "normal" services that launch Vircadia
The top three services in this list are the "normal" services that launch Overte
in the typical fashion. The bottom three services are "template" services designed
to permit multiple services to be installed and running on a single machine.
@ -82,7 +82,7 @@ used to configure and run the domain on your server.
The server stores its files in the following locations:
```
/var/lib/vircadia/.local - "unnamed" services (the default location for Vircadia servers)
/var/lib/vircadia/.local - "unnamed" services (the default location for Overte servers)
/var/lib/vircadia/serverName - "named" (template) domains
/etc/opt/vircadia - environment variables when launching named domains
```

4
pkg-scripts/new-server
View file

@ -2,7 +2,7 @@
if [ -z "$1" ] || [ -z "$2" ]; then
echo "new-server {name} {base-port}"
echo
echo "Sets up a new vircadia server with the specified name and base port number"
echo "Sets up a new Overte server with the specified name and base port number"
echo " {name} - a simple name used to identify the server to scripts (not used in the server configuration)"
echo " {base-port} - the base port number (default server is 40100). The metaverse port will be {base-port}+2"
echo " Four contiguous port numbers are allocated, these must not overlap with other running services on this machine"
@ -39,7 +39,7 @@ echo HIFI_DOMAIN_SERVER_HTTPS_PORT=$(($2 + 1)) >> /etc/opt/vircadia/$1.conf
echo HIFI_DOMAIN_SERVER_PORT=$(($2 + 2)) >> /etc/opt/vircadia/$1.conf
echo HIFI_DOMAIN_SERVER_DTLS_PORT=$(($2 + 3)) >> /etc/opt/vircadia/$1.conf
echo "A new vircadia server has been created with the name of '$1'"
echo "A new Overte server has been created with the name of '$1'"
echo
echo "To launch it:"
echo " sudo systemctl start vircadia-server@$1.target"

10
pkg-scripts/server-control
View file

@ -4,12 +4,12 @@ Priority: optional
Maintainer: Heather Anderson <heath@odysseus.anderson.name>
Build-Depends: debhelper (>= 10)
Standards-Version: 4.1.2
Homepage: https://vircadia.com
Vcs-Git: https://github.com/vircadia/vircadia.git
Vcs-Browser: https://github.com/vircadia/vircadia
Homepage: https://overte.org
Vcs-Git: https://github.com/overte-org/overte.git
Vcs-Browser: https://github.com/overte-org/overte
Package: vircadia-server
Architecture: any
Depends: adduser, {DEPENDS}
Description: Vircadia allows creation and sharing of VR experiences.
The Vircadia metaverse provides built-in social features, including avatar interactions, spatialized audio and interactive physics. Additionally, you have the ability to import any 3D object into your virtual environment.
Description: Overte allows creation and sharing of VR experiences.
The Overte provides built-in social features, including avatar interactions, spatialized audio and interactive physics. Additionally, you have the ability to import any 3D object into your virtual environment.

2
pkg-scripts/vircadia-assignment-client.service
View file

@ -1,5 +1,5 @@
[Unit]
Description=Assignment client service for the Vircadia server
Description=Assignment client service for the Overte server
After=network.target
PartOf=vircadia-server.target

2
pkg-scripts/vircadia-assignment-client@.service
View file

@ -1,5 +1,5 @@
[Unit]
Description=Assignment client service for the Vircadia server
Description=Assignment client service for the Overte server
After=network.target
PartOf=vircadia-server@%i.target

2
pkg-scripts/vircadia-domain-server.service
View file

@ -1,5 +1,5 @@
[Unit]
Description=Domain Server service for Vircadia
Description=Domain Server service for Overte
After=network.target
PartOf=vircadia-server.target

2
pkg-scripts/vircadia-domain-server@.service
View file

@ -1,5 +1,5 @@
[Unit]
Description=Domain Server service for Vircadia
Description=Domain Server service for Overte
After=network.target
PartOf=vircadia-server@%i.target

2
pkg-scripts/vircadia-ice-server.service
View file

@ -1,5 +1,5 @@
[Unit]
Description=Ice Server service for Vircadia
Description=Ice Server service for Overte
After=network.target
PartOf=vircadia-server.target

2
pkg-scripts/vircadia-ice-server@.service
View file

@ -1,5 +1,5 @@
[Unit]
Description=Ice Server service for Vircadia
Description=Ice Server service for Overte
After=network.target
PartOf=vircadia-server@%i.target

10
pkg-scripts/vircadia-server.spec
View file

@ -5,11 +5,11 @@
Name: vircadia-server
Version: %{version}
Release: 1%{?dist}
Summary: Vircadia metaverse platform, based on the High Fidelity Engine.
Summary: Overte platform, based on the High Fidelity Engine.
License: ASL 2.0
URL: https://vircadia.com
Source0: https://github.com/vircadia/vircadia-builder/blob/master/vircadia-builder
URL: https://overte.org
Source0: https://github.com/overte-org/overte-builder/blob/master/vircadia-builder
#BuildRequires: systemd-rpm-macros
BuildRequires: chrpath
@ -19,8 +19,8 @@ AutoReq: no
AutoProv: no
%description
Vircadia allows creation and sharing of VR experiences.
The Vircadia metaverse provides built-in social features, including avatar interactions, spatialized audio and interactive physics. Additionally, you have the ability to import any 3D object into your virtual environment.
Overte allows creation and sharing of VR experiences.
The Overte provides built-in social features, including avatar interactions, spatialized audio and interactive physics. Additionally, you have the ability to import any 3D object into your virtual environment.
%prep

2
pkg-scripts/vircadia-server.target
View file

@ -1,5 +1,5 @@
[Unit]
Description=Vircadia virtual domain
Description=Overte virtual domain
Wants=vircadia-assignment-client.service
Wants=vircadia-domain-server.service
#Wants=vircadia-ice-server.service

2
pkg-scripts/vircadia-server@.target
View file

@ -1,5 +1,5 @@
[Unit]
Description=Vircadia virtual domain
Description=Overte virtual domain
Wants=vircadia-assignment-client@%i.service
Wants=vircadia-domain-server@%i.service
#Wants=vircadia-ice-server@%i.service

4
screenshare/packager.js
View file

@ -26,8 +26,8 @@ if (osType == "Darwin") {
options["app-bundle-id"] = "com.highfidelity.hifi-screenshare";
} else if (osType == "Windows_NT") {
options["version-string"] = {
CompanyName: "Vircadia",
FileDescription: "Vircadia Screenshare",
CompanyName: "Overte",
FileDescription: "Overte Screenshare",
ProductName: NAME,
OriginalFilename: NAME + ".exe"
}

6
scripts/system/appreciate/resource.json
View file

@ -2,7 +2,7 @@
"name": "Appreciate App",
"version": "1.5.0",
"description": "Show someone else that you like what they're doing. Open the app to see usage instructions and some options!",
"homepage": "http://www.vircadia.com",
"homepage": "http://overte.org",
"bugs": "",
"keywords": [
"Clapping",
@ -25,7 +25,7 @@
],
"repository": {
"type": "git",
"url": "https://github.com/vircadia/vircadia-content.git"
"url": "https://github.com/overte-org/overte-content.git"
},
"main": "/appreciate_app.js",
"type": "app",
@ -38,4 +38,4 @@
"resource": {
"version": 1.0.0
}
}
}

2
scripts/system/create/edit.js
View file

@ -448,7 +448,7 @@ const DEFAULT_ENTITY_PROPERTIES = {
y: 0.9,
z: 0.01
},
sourceUrl: "https://vircadia.com/",
sourceUrl: "https://overte.org/",
dpi: 30,
},
ParticleEffect: {

2
scripts/system/inventory/src/App.vue
View file

@ -691,7 +691,7 @@ var vue_this;
function browserDevelopment() {
if (typeof EventBridge !== 'undefined') {
return false; // We are in Vircadia.
return false; // We are in Overte.
} else {
return true; // We are in the browser, probably for development purposes.
}

2
scripts/system/more/app-more.js
View file

@ -6,7 +6,7 @@
// Created by Keb Helion, February 2020.
// Copyright 2020 Vircadia contributors.
//
// This script adds a "More Apps" selector to Vircadia to allow the user to add optional functionalities to the tablet.
// This script adds a "More Apps" selector to Overte to allow the user to add optional functionalities to the tablet.
// This application has been designed to work directly from the Github repository.
//
// Distributed under the Apache License, Version 2.0.

4
scripts/system/more/more.html
View file

@ -5,8 +5,8 @@
// Created by Keb Helion, February 2020.
// Copyright 2020 Vircadia contributors.
//
// App maintained in: https://github.com/vircadia/community-apps
// App copied to: https://github.com/vircadia/vircadia
// App maintained in: https://github.com/overte-org/community-apps
// App copied to: https://github.com/overte-org/overte
//
//
// Distributed under the Apache License, Version 2.0.

404
scripts/system/places/fonts/LICENSE.txt
View file

@ -1,202 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

4
server-console/packager.js
View file

@ -28,7 +28,7 @@ var options = {
const EXEC_NAME = "server-console";
var SHORT_NAME = argv.client_only ? "Console" : "Sandbox";
var FULL_NAME = argv.client_only ? "Vircadia Console" : "Vircadia Sandbox";
var FULL_NAME = argv.client_only ? "Overte Console" : "Overte Sandbox";
// setup per OS options
if (osType == "Darwin") {
@ -36,7 +36,7 @@ if (osType == "Darwin") {
options["name"] = SHORT_NAME
} else if (osType == "Windows_NT") {
options["version-string"] = {
CompanyName: "Vircadia",
CompanyName: "Overte",
FileDescription: FULL_NAME,
ProductName: FULL_NAME,
OriginalFilename: EXEC_NAME + ".exe"

8
server-console/src/content-update.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Vircadia Server</title>
<title>Overte Server</title>
<script src="content-update.js"></script>
<link rel="stylesheet" type="text/css" href="content-update.css"></link>
</head>
@ -25,7 +25,7 @@
<div class="col2">
<img src="images/step1.jpg" alt="Step 1">
<p><b>1.</b> Stop your Vircadia Server.
<p><b>1.</b> Stop your Overte Server.
</div>
<div class="col3">
@ -35,7 +35,7 @@
<div class="col4">
<img src="images/step4.jpg" alt="Step 4">
<p><b>4.</b> Restart your Vircadia Server.
<p><b>4.</b> Restart your Overte Server.
</div>
</div>
@ -45,7 +45,7 @@
</div>
<div class="footer">
<p>For more information about managing your Vircadia Server, check out our docs: <a href="https://docs.vircadia.com/host.html" target="_blank">docs.vircadia.com</a>
<p>For more information about managing your Overte Server, check out our docs: <a href="https://docs.vircadia.com/host.html" target="_blank">docs.vircadia.com</a>
</p>
</div>
</div>

2
server-console/src/downloader.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Vircadia</title>
<title>Overte</title>
<script src="downloader.js"></script>
<link rel="stylesheet" type="text/css" href="downloader.css"></link>
</head>

14
server-console/src/main.js
View file

@ -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);

4
server-console/src/modules/hf-app.js
View file

@ -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');
}
}

8
server-console/src/splash.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Vircadia</title>
<title>Overte</title>
<script src="splash.js"></script>
<link rel="stylesheet" type="text/css" href="splash.css"></link>
</head>
@ -19,7 +19,7 @@
<div class="column left">
<p>
<h2>What now?</h2>
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.
</p>
<p>
@ -34,7 +34,7 @@ You can make your home yours by uploading your own models and scripts.
<div class="column center">
<p>
<h2>How do I use it?</h2>
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
<script>
var osType = require('os').type();
document.write(osType == 'Windows_NT' ? 'system tray.' : 'menu bar.');
@ -44,7 +44,7 @@ You can make your home yours by uploading your own models and scripts.
<p>
<ul>
<li>go to your 'Home,' automatically launching Vircadia</li>
<li>go to your 'Home,' automatically launching Overte</li>
<li>administer basic function like starting and stopping your server</li>
<li>access your server's settings and logs</li>
</ul>

2
tools/doxygen/Doxyfile
View file

@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places.
# The default value is: My Project.
PROJECT_NAME = "Vircadia C++ Documentation"
PROJECT_NAME = "Overte C++ Documentation"
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version

4
tools/jsdoc/README.md
View file

@ -8,7 +8,7 @@
If you would like the extra functionality for gravPrep:
* Run `npm install`
To generate HTML documentation for the Vircadia JavaScript API:
To generate HTML documentation for the Overte JavaScript API:
* `cd tools/jsdoc`
* `jsdoc root.js -r api-mainpage.md -c config.json`
@ -32,4 +32,4 @@ The template twig html files for hifi-grav are located out/grav/templates.
if you would like to copy these to a local version of the docs on your system you can run with the follows args:
* node grav true "path/to/grav/" "path/to/grav/content"
* node grav true "path/to/grav/" "path/to/grav/content"

6
tools/jsdoc/api-mainpage.md
View file

@ -1,4 +1,4 @@
The Vircadia JavaScript API lets content creators and developers create new experiences and transform virtual worlds within the Vircadia metaverse. With it, you can build great content, customize avatars, play audio and so much more.
The Overte JavaScript API lets content creators and developers create new experiences and transform virtual worlds within the Overte metaverse. With it, you can build great content, customize avatars, play audio and so much more.
You are most likely to interact with these APIs:
@ -6,6 +6,6 @@ You are most likely to interact with these APIs:
* The **[AvatarList](AvatarList.html)**, **[MyAvatar](MyAvatar.html)**, and **[Avatar](Avatar.html)** namespaces affect your personal avatars, and lets you get information on other people's avatars.
* The **[Script](Script.html)** namespace lets you to connect callbacks from your client to script, such as functionality that is dependent on time (`Script.update`, `Script.setTimeout`, `Script.setInterval`, etc), connect paths relatively to assets (`Script.resolvePath`), refer to other scripts (`Script.require`, `Script.include`), or connect functions to events which occur when the script is turned off (`Script.scriptEnding`).
To learn more about using Vircadia and exploring the metaverse, visit the [Vircadia User Documentation](https://docs.vircadia.com).
To learn more about using Overte and exploring the metaverse, visit the [Overte User Documentation](https://docs.vircadia.com).
For source developer oriented documentation, visit the [Vircadia Developer Documentation](https://docs.vircadia.dev).
For source developer oriented documentation, visit the [Overte Developer Documentation](https://docs.vircadia.dev).

6
tools/jsdoc/config.json
View file

@ -7,9 +7,9 @@
},
"docdash": {
"meta": {
"title": "Vircadia API Docs",
"description": "API documentation for Vircadia.",
"keyword": "api, docs, vircadia, documentation"
"title": "Overte API Docs",
"description": "API documentation for Overte.",
"keyword": "api, docs, overte, documentation"
},
"search": [true],
"collapse": [true],

2
tools/jsdoc/hifi-jsdoc-template/publish.js
View file

@ -697,7 +697,7 @@ exports.publish = function(taffyData, opts, tutorials) {
var files = find({kind: 'file'});
var packages = find({kind: 'package'});
generate('', 'Vircadia API Reference',
generate('', 'Overte API Reference',
packages.concat(
[{kind: 'mainpage', readme: opts.readme, longname: (opts.mainpagetitle) ? opts.mainpagetitle : 'Main Page'}]
).concat(files),

2
tools/jsdoc/plugins/hifi.js
View file

@ -16,7 +16,7 @@ exports.handlers = {
beforeParse: function(e) {
var pathTools = require('path');
var rootFolder = pathTools.dirname(e.filename);
console.log("Scanning the Vircadia source for JSDoc comments...");
console.log("Scanning the Overte source for JSDoc comments...");
// directories to scan for jsdoc comments
var dirList = [

Some files were not shown because too many files have changed in this diff Show more