Merge pull request #13 from AleziaKurdis/overte_rebranding
Resources Rebranding for Overte
6
BUILD.md
|
@ -38,7 +38,7 @@ These are not placed in your normal build tree when doing an out of source build
|
|||
|
||||
### CMake
|
||||
|
||||
Vircadia uses CMake to generate build files and project files for your platform.
|
||||
Overte uses CMake to generate build files and project files for your platform.
|
||||
|
||||
### Qt
|
||||
|
||||
|
@ -73,7 +73,7 @@ Note: Installing Qt Creator is optional but recommended if you will be editing Q
|
|||
|
||||
### VCPKG
|
||||
|
||||
Vircadia uses vcpkg to download and build dependencies.
|
||||
Overte uses vcpkg to download and build dependencies.
|
||||
You do not need to install vcpkg.
|
||||
|
||||
Building the dependencies can be lengthy and the resulting files will be stored in your OS temp directory.
|
||||
|
@ -177,7 +177,7 @@ In the examples below the variable $NAME would be replaced by the name of the de
|
|||
|
||||
* $NAME_ROOT_DIR - pass this variable to Cmake with the -DNAME_ROOT_DIR= flag when running Cmake to generate build files
|
||||
* $NAME_ROOT_DIR - set this variable in your ENV
|
||||
* HIFI_LIB_DIR - set this variable in your ENV to your Vircadia lib folder, should contain a folder '$name'
|
||||
* HIFI_LIB_DIR - set this variable in your ENV to your Overte lib folder, should contain a folder '$name'
|
||||
|
||||
## Optional Components
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
```
|
||||
|
|
|
@ -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
|
@ -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
|
||||
|
|
|
@ -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)/*" )
|
||||
|
|
|
@ -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
|
||||
//
|
||||
|
|
|
@ -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
|
@ -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
|
@ -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.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<p align="center"><a href="https://vircadia.com/"><img src="interface/resources/images/vircadia-banner.svg" alt="Vircadia - Codename Athena" 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>
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
Before Width: | Height: | Size: 100 KiB After Width: | Height: | Size: 25 KiB |
Before Width: | Height: | Size: 264 KiB After Width: | Height: | Size: 281 KiB |
Before Width: | Height: | Size: 100 KiB After Width: | Height: | Size: 25 KiB |
|
@ -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
|
||||
|
|
|
@ -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@")
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
},
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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'
|
||||
};
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
1
domain-server/resources/web/web-new/dist/spa/css/472.1b315250.css
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
#firstTimeWizardContainer[data-v-4c988532]{animation:firstTimeWizardContainerFadeIn-4c988532 5s;-webkit-animation:firstTimeWizardContainerFadeIn-4c988532 5s;-moz-animation:firstTimeWizardContainerFadeIn-4c988532 5s;-o-animation:firstTimeWizardContainerFadeIn-4c988532 5s;-ms-animation:firstTimeWizardContainerFadeIn-4c988532 5s;background-color:#000000bf}@keyframes firstTimeWizardContainerFadeIn-4c988532{0%{background-color:#0000}to{background-color:#000000bf}}.welcome[data-v-4c988532]{color:#fff}.wizardCard[data-v-4c988532]{color:#fff}.mainWizardStepper[data-v-4c988532],.wizardCard[data-v-4c988532]{background:none!important;box-shadow:none!important}[data-v-4c988532] .q-stepper__header{display:none!important}[data-v-4c988532] .q-panel{overflow:hidden!important}.q-dialog__inner div[data-v-4c988532]{border:none!important;box-shadow:none!important}
|
|
@ -1 +0,0 @@
|
|||
#firstTimeWizardContainer[data-v-01471642]{animation:firstTimeWizardContainerFadeIn-01471642 5s;-webkit-animation:firstTimeWizardContainerFadeIn-01471642 5s;-moz-animation:firstTimeWizardContainerFadeIn-01471642 5s;-o-animation:firstTimeWizardContainerFadeIn-01471642 5s;-ms-animation:firstTimeWizardContainerFadeIn-01471642 5s;background-color:#000000bf}@keyframes firstTimeWizardContainerFadeIn-01471642{0%{background-color:#0000}to{background-color:#000000bf}}.welcome[data-v-01471642]{color:#fff}.wizardCard[data-v-01471642]{color:#fff}.mainWizardStepper[data-v-01471642],.wizardCard[data-v-01471642]{background:none!important;box-shadow:none!important}[data-v-01471642] .q-stepper__header{display:none!important}[data-v-01471642] .q-panel{overflow:hidden!important}.q-dialog__inner div[data-v-01471642]{border:none!important;box-shadow:none!important}
|
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 401 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 6.6 KiB |
Before Width: | Height: | Size: 871 B After Width: | Height: | Size: 677 B |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 4.9 KiB |
|
@ -1 +1 @@
|
|||
<!DOCTYPE html><html><head><title>Vircadia Domain Dashboard</title><meta charset=utf-8><meta name=description content="The Domain dashboard for Vircadia virtual worlds."><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png sizes=128x128 href=icons/favicon-128x128.png><link rel=icon type=image/png sizes=96x96 href=icons/favicon-96x96.png><link rel=icon type=image/png sizes=32x32 href=icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=icons/favicon-16x16.png><link rel=icon type=image/ico href=favicon.ico><script defer src=js/vendor.f7426f3d.js></script><script defer src=js/app.d7a0143e.js></script><link href=css/vendor.2ba81df8.css rel=stylesheet><link href=css/app.31d6cfe0.css rel=stylesheet></head><body><div id=q-app></div></body></html>
|
||||
<!DOCTYPE html><html><head><title>Overte Domain Dashboard</title><meta charset=utf-8><meta name=description content="The Domain dashboard for Overte virtual worlds."><meta name=format-detection content="telephone=no"><meta name=msapplication-tap-highlight content=no><meta name=viewport content="user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1,width=device-width"><link rel=icon type=image/png sizes=128x128 href=icons/favicon-128x128.png><link rel=icon type=image/png sizes=96x96 href=icons/favicon-96x96.png><link rel=icon type=image/png sizes=32x32 href=icons/favicon-32x32.png><link rel=icon type=image/png sizes=16x16 href=icons/favicon-16x16.png><link rel=icon type=image/ico href=favicon.ico><script defer src=js/vendor.f7426f3d.js></script><script defer src=js/app.a371137e.js></script><link href=css/vendor.2ba81df8.css rel=stylesheet><link href=css/app.31d6cfe0.css rel=stylesheet></head><body><div id=q-app></div></body></html>
|
1
domain-server/resources/web/web-new/dist/spa/js/472.efda1ea2.js
vendored
Normal file
1
domain-server/resources/web/web-new/dist/spa/js/app.a371137e.js
vendored
Normal file
32442
domain-server/resources/web/web-new/package-lock.json
generated
|
@ -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": {
|
||||
|
@ -31,7 +31,8 @@
|
|||
"eslint-plugin-import": "^2.19.1",
|
||||
"eslint-plugin-node": "^11.0.0",
|
||||
"eslint-plugin-promise": "^5.1.0",
|
||||
"eslint-plugin-vue": "^7.0.0"
|
||||
"eslint-plugin-vue": "^7.0.0",
|
||||
"strip-ansi": "^3.0.1"
|
||||
},
|
||||
"browserslist": [
|
||||
"last 10 Chrome versions",
|
||||
|
|
Before Width: | Height: | Size: 71 KiB After Width: | Height: | Size: 401 KiB |
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 6.6 KiB |
Before Width: | Height: | Size: 871 B After Width: | Height: | Size: 677 B |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 4.9 KiB |
|
@ -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",
|
||||
|
|
|
@ -9,7 +9,9 @@
|
|||
-->
|
||||
|
||||
<template>
|
||||
<div id="q-app">
|
||||
<router-view />
|
||||
</div>
|
||||
</template>
|
||||
<script lang="ts">
|
||||
import { defineComponent } from "vue";
|
||||
|
|
After Width: | Height: | Size: 74 KiB |
|
@ -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
|
||||
|
|
|
@ -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
|
||||
}),
|
||||
|
||||
|
|
|
@ -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
|
||||
};
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 281 KiB |
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 281 KiB |
Before Width: | Height: | Size: 130 KiB After Width: | Height: | Size: 129 KiB |
Before Width: | Height: | Size: 156 KiB After Width: | Height: | Size: 155 KiB |
Before Width: | Height: | Size: 151 KiB After Width: | Height: | Size: 150 KiB |
Before Width: | Height: | Size: 122 KiB After Width: | Height: | Size: 122 KiB |
Before Width: | Height: | Size: 132 KiB After Width: | Height: | Size: 132 KiB |
Before Width: | Height: | Size: 4 KiB After Width: | Height: | Size: 2.9 KiB |
75
interface/resources/images/brand-banner-black.svg
Normal file
|
@ -0,0 +1,75 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
width="497.41666mm"
|
||||
height="130.60057mm"
|
||||
viewBox="0 0 497.41665 130.60057"
|
||||
version="1.1"
|
||||
id="svg5"
|
||||
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
|
||||
sodipodi:docname="BRAND_Overte_color-black.svg"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
||||
<title
|
||||
id="title715">BRAND_Overte_color-black</title>
|
||||
<sodipodi:namedview
|
||||
id="namedview7"
|
||||
pagecolor="#d1d1d1"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pagecheckerboard="true"
|
||||
inkscape:document-units="px"
|
||||
showgrid="false"
|
||||
inkscape:zoom="0.30143108"
|
||||
inkscape:cx="743.12178"
|
||||
inkscape:cy="688.3829"
|
||||
inkscape:window-width="1627"
|
||||
inkscape:window-height="1011"
|
||||
inkscape:window-x="1705"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="layer2" />
|
||||
<defs
|
||||
id="defs2" />
|
||||
<g
|
||||
inkscape:label="Letters"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
style="display:inline"
|
||||
transform="translate(-14.404381,-53.065788)">
|
||||
<path
|
||||
style="fill:#000000;stroke-width:0.278116"
|
||||
d="M 73.081685,183.50811 C 57.169081,181.82057 43.335913,175.04014 32.291669,163.51456 22.75521,153.56248 16.788722,141.19135 14.76984,127.18408 c -0.548186,-3.80334 -0.463774,-14.26632 0.146669,-18.17771 2.545786,-16.312289 10.479876,-30.335248 23.131483,-40.883353 4.701127,-3.919498 11.537379,-7.952155 17.48785,-10.315937 2.359078,-0.937117 8.307363,-2.794478 8.949451,-2.794478 0.344955,0 0.401018,2.40337 0.401018,17.19175 v 17.19178 l -1.042919,0.495792 c -3.018754,1.435061 -8.014008,5.8529 -10.710792,9.472694 -8.380515,11.248802 -8.308457,27.342122 0.172716,38.541092 7.809793,10.31263 19.975337,15.02912 32.603354,12.64005 12.829256,-2.4271 23.42546,-13.25343 25.72326,-26.28189 0.47197,-2.67591 0.47311,-8.71701 0.002,-11.40282 -0.91004,-5.19026 -3.22816,-10.41856 -6.35045,-14.323072 -2.76212,-3.454077 -7.915891,-7.712474 -11.131634,-9.197726 l -1.161421,-0.536388 -0.0082,-17.0347 c -0.0055,-12.049562 0.08104,-17.034696 0.294129,-17.034696 0.651068,0 4.775287,1.155735 7.464546,2.091815 24.00882,8.35692 40.94107,29.566556 43.67072,54.702727 0.3765,3.46703 0.3765,10.59984 0,14.06686 -1.34041,12.34324 -6.86415,25.36517 -14.71258,34.68417 -10.48473,12.44927 -24.43229,20.30908 -40.490203,22.81728 -3.242633,0.50651 -12.905085,0.75257 -16.128266,0.41079 z M 185.97103,147.90975 c -3.95587,-1.03715 -7.37446,-3.42486 -9.65921,-6.74641 -0.91345,-1.32801 -23.34149,-50.116054 -23.71998,-51.59844 l -0.16073,-0.629544 9.23997,0.07331 9.23993,0.07331 0.61987,1.66869 c 0.34096,0.917775 4.462,10.554564 9.15793,21.415044 5.85352,13.53781 8.75808,19.94312 9.23781,20.37214 0.86701,0.77525 2.03871,0.80176 2.97253,0.0673 0.5308,-0.41753 2.93809,-5.77058 9.53659,-21.20648 4.85459,-11.35635 8.95331,-21.054669 9.10823,-21.551817 l 0.2817,-0.903877 h 9.14996 9.14994 l -0.1836,0.625771 c -0.57971,1.974988 -22.43922,49.869303 -23.51516,51.521823 -2.34179,3.59662 -5.94793,6.11971 -9.96328,6.97084 -2.67554,0.56716 -8.0469,0.48957 -10.4924,-0.15152 z m 51.4588,-0.82522 c -2.70662,-0.64656 -4.58408,-2.70427 -5.12142,-5.61307 -0.18921,-1.02467 -0.26253,-9.4364 -0.21177,-24.3552 l 0.0772,-22.789918 0.83863,-1.639515 c 0.98887,-1.933272 2.50978,-3.022846 4.83121,-3.461087 0.95069,-0.179608 11.3924,-0.282814 28.57658,-0.282814 h 27.07846 v 7.78729 7.787294 H 270.9777 248.45662 l -0.4327,0.66039 c -0.34309,0.52364 -0.41646,1.34449 -0.35409,3.96318 l 0.0786,3.30275 22.73609,0.0712 22.73612,0.0712 v 5.5591 5.55909 l -22.73612,0.0712 -22.73609,0.0712 -0.0781,3.58171 c -0.0624,2.8676 0.008,3.71325 0.35408,4.24132 l 0.43213,0.65956 h 22.52111 22.52111 v 7.50917 7.50918 l -27.60318,-0.0271 c -15.18173,-0.0149 -27.99134,-0.12129 -28.46583,-0.23471 z M 301.008,119.18056 c 0,-25.590573 0.0414,-28.226272 0.45354,-28.814551 1.01159,-1.444257 0.651,-1.423081 24.22775,-1.423081 22.46805,0 24.95943,0.09832 28.2285,1.113515 8.18934,2.543234 13.19071,11.047007 11.5057,19.562917 -0.59684,3.01636 -1.54094,4.91725 -3.42125,6.88857 -1.46071,1.5314 -1.55832,1.70882 -1.08579,1.97326 2.20981,1.23667 4.10715,4.30774 4.60363,7.45137 0.157,0.99425 0.31761,6.21947 0.35691,11.61157 l 0.0713,9.8038 -7.81719,-1.4e-4 -7.8172,-1.9e-4 -0.17889,-1.70951 c -0.0982,-0.94023 -0.1789,-4.78043 -0.1789,-8.53381 0,-6.30514 -0.0432,-6.91372 -0.5685,-7.99877 -1.09257,-2.25686 -0.56484,-2.18909 -17.71773,-2.27601 l -15.08785,-0.0766 v 10.2973 10.29729 h -7.7873 -7.78729 z m 45.78673,-6.37909 c 2.06544,-1.13079 3.22376,-3.54967 2.63722,-5.50741 -0.46059,-1.53723 -1.80237,-2.98587 -3.08583,-3.33146 -0.67297,-0.1812 -6.24367,-0.25825 -15.34061,-0.21258 l -14.28385,0.072 -0.0762,4.80909 -0.0763,4.80909 14.67726,-0.081 c 13.2418,-0.0729 14.76254,-0.12787 15.54815,-0.55779 z m 49.60755,13.13109 V 104.51751 H 383.6089 370.81551 v -7.787293 -7.787289 h 33.51314 33.51317 v 7.787289 7.787293 h -12.79344 -12.79342 v 21.41505 21.41504 h -7.92631 -7.92637 z m 52.67493,21.15197 c -2.70663,-0.64656 -4.58409,-2.70427 -5.12145,-5.61307 -0.18917,-1.02467 -0.2624,-9.4364 -0.2116,-24.3552 l 0.0776,-22.789918 0.83862,-1.639515 c 0.9889,-1.933272 2.50982,-3.022846 4.83123,-3.461087 0.95071,-0.179608 11.3924,-0.282814 28.57658,-0.282814 h 27.0785 v 7.78729 7.787294 h -22.52112 -22.52108 l -0.43274,0.66039 c -0.34308,0.52364 -0.41646,1.34449 -0.35406,3.96318 l 0.0786,3.30275 22.73611,0.0712 22.73609,0.0712 v 5.5591 5.55909 l -22.73609,0.0712 -22.73611,0.0712 -0.0781,3.58171 c -0.0624,2.8676 0.009,3.71325 0.35403,4.24132 l 0.43215,0.65956 h 22.5211 22.52109 v 7.50917 7.50918 l -27.60317,-0.0271 c -15.18174,-0.0149 -27.99136,-0.12129 -28.46585,-0.23471 z"
|
||||
id="path339"
|
||||
sodipodi:nodetypes="cssssssscsscsscssccscssssccssscccssssssccccssssccccscscccccssccccccccsccccccccccsssssscccccssscccccccssccccccccccccccccccccccccccscscscccccssccccccccscccccccc" />
|
||||
</g>
|
||||
<g
|
||||
inkscape:groupmode="layer"
|
||||
id="layer2"
|
||||
inkscape:label="barres"
|
||||
style="display:inline"
|
||||
transform="translate(-14.404381,-53.065788)">
|
||||
<path
|
||||
style="fill:#6667ab;fill-opacity:1;stroke-width:0.278116"
|
||||
d="m 123.56909,182.67565 c 0,-0.14918 0.36863,-0.46158 0.81918,-0.69459 3.01493,-1.55906 11.36565,-9.36506 15.41093,-14.40564 2.7642,-3.44428 6.42644,-8.93239 7.688,-11.5209 l 0.97341,-1.99727 181.68019,-0.0182 181.68025,-0.0181 v 14.4621 14.46211 H 317.69507 c -125.82085,0 -194.12598,-0.0954 -194.12598,-0.27106 z M 148.21936,81.34256 c -0.27245,-1.085485 -4.01802,-7.096024 -6.45325,-10.355584 -4.49104,-6.011229 -9.54533,-11.153151 -15.05003,-15.3109 -1.4957,-1.129749 -2.81567,-2.054058 -2.93323,-2.054058 -0.11743,0 -0.2139,-0.125121 -0.2139,-0.278129 0,-0.185202 64.89406,-0.278101 194.12599,-0.278101 H 511.8209 V 67.52789 81.989991 H 330.10131 148.38173 Z"
|
||||
id="path619"
|
||||
sodipodi:nodetypes="ccsscccccscccssssscccccc" />
|
||||
</g>
|
||||
<metadata
|
||||
id="metadata713">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:title>BRAND_Overte_color-black</dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
</svg>
|
After Width: | Height: | Size: 7.3 KiB |
75
interface/resources/images/brand-banner.svg
Normal file
|
@ -0,0 +1,75 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
width="497.41666mm"
|
||||
height="130.60057mm"
|
||||
viewBox="0 0 497.41665 130.60057"
|
||||
version="1.1"
|
||||
id="svg5"
|
||||
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
|
||||
sodipodi:docname="BRAND_Overte_color-white.svg"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
||||
<title
|
||||
id="title715">BRAND_Overte_color-white</title>
|
||||
<sodipodi:namedview
|
||||
id="namedview7"
|
||||
pagecolor="#d1d1d1"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pagecheckerboard="true"
|
||||
inkscape:document-units="px"
|
||||
showgrid="false"
|
||||
inkscape:zoom="0.30143108"
|
||||
inkscape:cx="743.12178"
|
||||
inkscape:cy="688.3829"
|
||||
inkscape:window-width="1627"
|
||||
inkscape:window-height="1011"
|
||||
inkscape:window-x="1705"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="layer1" />
|
||||
<defs
|
||||
id="defs2" />
|
||||
<g
|
||||
inkscape:label="Letters"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
style="display:inline"
|
||||
transform="translate(-14.404381,-53.065788)">
|
||||
<path
|
||||
style="fill:#ffffff;stroke-width:0.278116"
|
||||
d="M 73.081685,183.50811 C 57.169081,181.82057 43.335913,175.04014 32.291669,163.51456 22.75521,153.56248 16.788722,141.19135 14.76984,127.18408 c -0.548186,-3.80334 -0.463774,-14.26632 0.146669,-18.17771 2.545786,-16.312289 10.479876,-30.335248 23.131483,-40.883353 4.701127,-3.919498 11.537379,-7.952155 17.48785,-10.315937 2.359078,-0.937117 8.307363,-2.794478 8.949451,-2.794478 0.344955,0 0.401018,2.40337 0.401018,17.19175 v 17.19178 l -1.042919,0.495792 c -3.018754,1.435061 -8.014008,5.8529 -10.710792,9.472694 -8.380515,11.248802 -8.308457,27.342122 0.172716,38.541092 7.809793,10.31263 19.975337,15.02912 32.603354,12.64005 12.829256,-2.4271 23.42546,-13.25343 25.72326,-26.28189 0.47197,-2.67591 0.47311,-8.71701 0.002,-11.40282 -0.91004,-5.19026 -3.22816,-10.41856 -6.35045,-14.323072 -2.76212,-3.454077 -7.915891,-7.712474 -11.131634,-9.197726 l -1.161421,-0.536388 -0.0082,-17.0347 c -0.0055,-12.049562 0.08104,-17.034696 0.294129,-17.034696 0.651068,0 4.775287,1.155735 7.464546,2.091815 24.00882,8.35692 40.94107,29.566556 43.67072,54.702727 0.3765,3.46703 0.3765,10.59984 0,14.06686 -1.34041,12.34324 -6.86415,25.36517 -14.71258,34.68417 -10.48473,12.44927 -24.43229,20.30908 -40.490203,22.81728 -3.242633,0.50651 -12.905085,0.75257 -16.128266,0.41079 z M 185.97103,147.90975 c -3.95587,-1.03715 -7.37446,-3.42486 -9.65921,-6.74641 -0.91345,-1.32801 -23.34149,-50.116054 -23.71998,-51.59844 l -0.16073,-0.629544 9.23997,0.07331 9.23993,0.07331 0.61987,1.66869 c 0.34096,0.917775 4.462,10.554564 9.15793,21.415044 5.85352,13.53781 8.75808,19.94312 9.23781,20.37214 0.86701,0.77525 2.03871,0.80176 2.97253,0.0673 0.5308,-0.41753 2.93809,-5.77058 9.53659,-21.20648 4.85459,-11.35635 8.95331,-21.054669 9.10823,-21.551817 l 0.2817,-0.903877 h 9.14996 9.14994 l -0.1836,0.625771 c -0.57971,1.974988 -22.43922,49.869303 -23.51516,51.521823 -2.34179,3.59662 -5.94793,6.11971 -9.96328,6.97084 -2.67554,0.56716 -8.0469,0.48957 -10.4924,-0.15152 z m 51.4588,-0.82522 c -2.70662,-0.64656 -4.58408,-2.70427 -5.12142,-5.61307 -0.18921,-1.02467 -0.26253,-9.4364 -0.21177,-24.3552 l 0.0772,-22.789918 0.83863,-1.639515 c 0.98887,-1.933272 2.50978,-3.022846 4.83121,-3.461087 0.95069,-0.179608 11.3924,-0.282814 28.57658,-0.282814 h 27.07846 v 7.78729 7.787294 H 270.9777 248.45662 l -0.4327,0.66039 c -0.34309,0.52364 -0.41646,1.34449 -0.35409,3.96318 l 0.0786,3.30275 22.73609,0.0712 22.73612,0.0712 v 5.5591 5.55909 l -22.73612,0.0712 -22.73609,0.0712 -0.0781,3.58171 c -0.0624,2.8676 0.008,3.71325 0.35408,4.24132 l 0.43213,0.65956 h 22.52111 22.52111 v 7.50917 7.50918 l -27.60318,-0.0271 c -15.18173,-0.0149 -27.99134,-0.12129 -28.46583,-0.23471 z M 301.008,119.18056 c 0,-25.590573 0.0414,-28.226272 0.45354,-28.814551 1.01159,-1.444257 0.651,-1.423081 24.22775,-1.423081 22.46805,0 24.95943,0.09832 28.2285,1.113515 8.18934,2.543234 13.19071,11.047007 11.5057,19.562917 -0.59684,3.01636 -1.54094,4.91725 -3.42125,6.88857 -1.46071,1.5314 -1.55832,1.70882 -1.08579,1.97326 2.20981,1.23667 4.10715,4.30774 4.60363,7.45137 0.157,0.99425 0.31761,6.21947 0.35691,11.61157 l 0.0713,9.8038 -7.81719,-1.4e-4 -7.8172,-1.9e-4 -0.17889,-1.70951 c -0.0982,-0.94023 -0.1789,-4.78043 -0.1789,-8.53381 0,-6.30514 -0.0432,-6.91372 -0.5685,-7.99877 -1.09257,-2.25686 -0.56484,-2.18909 -17.71773,-2.27601 l -15.08785,-0.0766 v 10.2973 10.29729 h -7.7873 -7.78729 z m 45.78673,-6.37909 c 2.06544,-1.13079 3.22376,-3.54967 2.63722,-5.50741 -0.46059,-1.53723 -1.80237,-2.98587 -3.08583,-3.33146 -0.67297,-0.1812 -6.24367,-0.25825 -15.34061,-0.21258 l -14.28385,0.072 -0.0762,4.80909 -0.0763,4.80909 14.67726,-0.081 c 13.2418,-0.0729 14.76254,-0.12787 15.54815,-0.55779 z m 49.60755,13.13109 V 104.51751 H 383.6089 370.81551 v -7.787293 -7.787289 h 33.51314 33.51317 v 7.787289 7.787293 h -12.79344 -12.79342 v 21.41505 21.41504 h -7.92631 -7.92637 z m 52.67493,21.15197 c -2.70663,-0.64656 -4.58409,-2.70427 -5.12145,-5.61307 -0.18917,-1.02467 -0.2624,-9.4364 -0.2116,-24.3552 l 0.0776,-22.789918 0.83862,-1.639515 c 0.9889,-1.933272 2.50982,-3.022846 4.83123,-3.461087 0.95071,-0.179608 11.3924,-0.282814 28.57658,-0.282814 h 27.0785 v 7.78729 7.787294 h -22.52112 -22.52108 l -0.43274,0.66039 c -0.34308,0.52364 -0.41646,1.34449 -0.35406,3.96318 l 0.0786,3.30275 22.73611,0.0712 22.73609,0.0712 v 5.5591 5.55909 l -22.73609,0.0712 -22.73611,0.0712 -0.0781,3.58171 c -0.0624,2.8676 0.009,3.71325 0.35403,4.24132 l 0.43215,0.65956 h 22.5211 22.52109 v 7.50917 7.50918 l -27.60317,-0.0271 c -15.18174,-0.0149 -27.99136,-0.12129 -28.46585,-0.23471 z"
|
||||
id="path339"
|
||||
sodipodi:nodetypes="cssssssscsscsscssccscssssccssscccssssssccccssssccccscscccccssccccccccsccccccccccsssssscccccssscccccccssccccccccccccccccccccccccccscscscccccssccccccccscccccccc" />
|
||||
</g>
|
||||
<g
|
||||
inkscape:groupmode="layer"
|
||||
id="layer2"
|
||||
inkscape:label="barres"
|
||||
style="display:inline"
|
||||
transform="translate(-14.404381,-53.065788)">
|
||||
<path
|
||||
style="fill:#6667ab;fill-opacity:1;stroke-width:0.278116"
|
||||
d="m 123.56909,182.67565 c 0,-0.14918 0.36863,-0.46158 0.81918,-0.69459 3.01493,-1.55906 11.36565,-9.36506 15.41093,-14.40564 2.7642,-3.44428 6.42644,-8.93239 7.688,-11.5209 l 0.97341,-1.99727 181.68019,-0.0182 181.68025,-0.0181 v 14.4621 14.46211 H 317.69507 c -125.82085,0 -194.12598,-0.0954 -194.12598,-0.27106 z M 148.21936,81.34256 c -0.27245,-1.085485 -4.01802,-7.096024 -6.45325,-10.355584 -4.49104,-6.011229 -9.54533,-11.153151 -15.05003,-15.3109 -1.4957,-1.129749 -2.81567,-2.054058 -2.93323,-2.054058 -0.11743,0 -0.2139,-0.125121 -0.2139,-0.278129 0,-0.185202 64.89406,-0.278101 194.12599,-0.278101 H 511.8209 V 67.52789 81.989991 H 330.10131 148.38173 Z"
|
||||
id="path619"
|
||||
sodipodi:nodetypes="ccsscccccscccssssscccccc" />
|
||||
</g>
|
||||
<metadata
|
||||
id="metadata713">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:title>BRAND_Overte_color-white</dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
</svg>
|
After Width: | Height: | Size: 7.3 KiB |
76
interface/resources/images/brand-logo.svg
Normal file
|
@ -0,0 +1,76 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
width="14.816667mm"
|
||||
height="14.816667mm"
|
||||
viewBox="0 0 14.816667 14.816667"
|
||||
version="1.1"
|
||||
id="svg5"
|
||||
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
|
||||
sodipodi:docname="LOGO_Overte_Interface.svg"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/">
|
||||
<title
|
||||
id="title715">LOGO_Overte_Interface</title>
|
||||
<sodipodi:namedview
|
||||
id="namedview7"
|
||||
pagecolor="#d1d1d1"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pagecheckerboard="true"
|
||||
inkscape:document-units="mm"
|
||||
showgrid="false"
|
||||
inkscape:zoom="1.2057243"
|
||||
inkscape:cx="163.38727"
|
||||
inkscape:cy="60.959209"
|
||||
inkscape:window-width="1627"
|
||||
inkscape:window-height="1011"
|
||||
inkscape:window-x="1705"
|
||||
inkscape:window-y="0"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="layer4" />
|
||||
<defs
|
||||
id="defs2" />
|
||||
<g
|
||||
inkscape:groupmode="layer"
|
||||
id="layer4"
|
||||
inkscape:label="pastille"
|
||||
style="display:inline"
|
||||
transform="translate(-64.878913,-47.104301)">
|
||||
<circle
|
||||
style="fill:#6667ab;fill-opacity:1;stroke-width:0.326686"
|
||||
id="path12778"
|
||||
cx="72.287247"
|
||||
cy="54.512634"
|
||||
r="7.4083333" />
|
||||
</g>
|
||||
<g
|
||||
inkscape:label="Letters"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
style="display:inline"
|
||||
transform="translate(-64.878913,-47.104301)">
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;stroke-width:0.0240699"
|
||||
d="m 71.752748,60.147164 c -1.377172,-0.14605 -2.574378,-0.732869 -3.530213,-1.730362 -0.825342,-0.861313 -1.341717,-1.931985 -1.516444,-3.144257 -0.04744,-0.329165 -0.04014,-1.234694 0.01269,-1.573208 0.220327,-1.411764 0.906991,-2.625395 2.001937,-3.538291 0.406864,-0.339217 0.998514,-0.688227 1.513503,-0.892803 0.204169,-0.0811 0.718969,-0.241851 0.774539,-0.241851 0.02985,0 0.03471,0.208002 0.03471,1.487877 v 1.48788 l -0.09026,0.04291 c -0.261261,0.124198 -0.69358,0.506545 -0.926976,0.819823 -0.7253,0.973539 -0.719063,2.366351 0.01495,3.335577 0.675906,0.892517 1.728786,1.300709 2.82169,1.093946 1.110321,-0.210056 2.027379,-1.147031 2.226244,-2.274592 0.04085,-0.23159 0.04094,-0.754422 2.06e-4,-0.986869 -0.07876,-0.449196 -0.279384,-0.901684 -0.549607,-1.239604 -0.23905,-0.298937 -0.685088,-0.667484 -0.963399,-0.796026 L 73.475802,51.95089 73.4751,50.476605 c -4.67e-4,-1.042841 0.007,-1.474284 0.02546,-1.474284 0.05635,0 0.413281,0.100024 0.646028,0.181038 2.077867,0.723258 3.543285,2.558867 3.779523,4.734302 0.03259,0.300057 0.03259,0.917373 0,1.21743 -0.116007,1.068259 -0.594065,2.195254 -1.273315,3.001776 -0.907409,1.077435 -2.114515,1.75767 -3.504262,1.974746 -0.280638,0.04384 -1.116884,0.06513 -1.395838,0.03555 z"
|
||||
id="path339"
|
||||
sodipodi:nodetypes="cssssssscsscsscssccscsssscc" />
|
||||
</g>
|
||||
<metadata
|
||||
id="metadata713">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:title>LOGO_Overte_Interface</dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
</svg>
|
After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 84 KiB After Width: | Height: | Size: 103 KiB |
|
@ -1,23 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" baseProfile="full" width="1880" height="320" viewBox="0 0 1880.00 320.00" enable-background="new 0 0 1880.00 320.00" xml:space="preserve">
|
||||
<radialGradient id="SVGID_Fill1_" cx="-571.529" cy="-604.157" r="3176.39" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0.451163" stop-color="#01BDFF" stop-opacity="1"/>
|
||||
<stop offset="0.827907" stop-color="#8C1AFF" stop-opacity="1"/>
|
||||
</radialGradient>
|
||||
<path fill="url(#SVGID_Fill1_)" stroke-width="0.2" stroke-linejoin="round" d="M 28.723,5.00146L 1706.72,5.00146C 1726.61,5.00146 1750.24,21.1192 1759.51,41.0015L 1870.49,278.999C 1879.76,298.881 1871.16,314.999 1851.28,314.999L 173.277,314.999C 153.395,314.999 129.761,298.881 120.49,278.999L 9.51012,41.0015C 0.238872,21.1192 8.84079,5.00146 28.723,5.00146 Z "/>
|
||||
<path fill="#36393F" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 678.939,23.013L 1697.3,23.0124C 1723.4,22.9324 1739.32,35.2514 1749.85,58.4911L 1844.51,261.508C 1860.58,289.515 1859.52,298.385 1825.06,296.987L 677.061,296.987"/>
|
||||
<g>
|
||||
<path fill="#FAFAFA" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 699.7,159.966C 699.7,145.281 702.032,131.093 706.698,117.404C 711.363,103.714 718.063,91.58 726.796,81.0016C 735.529,70.4231 745.996,61.9604 758.199,55.6133C 770.401,49.2663 784.039,46.0927 799.112,46.0927L 906.779,46.0927L 906.779,93.8823L 800.189,93.8823C 794.686,93.8823 789.003,95.7491 783.142,99.4827C 777.28,103.216 771.896,108.132 766.992,114.23C 762.087,120.328 758.019,127.36 754.789,135.325C 751.559,143.29 749.944,151.379 749.944,159.593C 749.944,167.807 751.499,175.896 754.61,183.861C 757.72,191.826 761.788,198.92 766.812,205.142C 771.837,211.365 777.459,216.343 783.68,220.077C 789.901,223.81 796.122,225.677 802.342,225.677L 906.779,225.677L 906.779,273.467L 798.036,273.467C 782.244,273.467 768.248,270.044 756.045,263.199C 743.843,256.354 733.555,247.456 725.181,236.504C 716.807,225.553 710.466,213.356 706.16,199.915C 701.853,186.475 699.7,173.158 699.7,159.966 Z "/>
|
||||
<rect x="1464.81" y="46.0927" fill="#FAFAFA" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" width="55.9871" height="227.374"/>
|
||||
</g>
|
||||
<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 493.02,97.6159L 493.02,139.602L 493,139.602L 493,199.602L 493.02,199.602L 493.02,273.467L 439.123,273.467L 439.123,46.0928L 566.737,46.0928C 578.327,46.0928 588.237,48.2707 596.467,52.6265C 604.696,56.9823 611.419,62.7071 616.635,69.8009C 621.851,76.8946 625.618,84.9218 627.936,93.8824C 630.254,102.843 631.413,111.928 631.413,121.137C 631.413,128.604 630.428,136.009 628.457,143.352C 626.487,150.695 623.763,157.54 620.286,163.887C 616.809,170.234 612.578,175.896 607.594,180.874C 602.61,185.852 597.104,189.71 591.077,192.448L 654.363,273.467L 588.295,273.467L 521,188.288L 521,149.512L 566.737,149.512C 568.359,149.512 569.982,148.517 571.605,146.526C 573.227,144.534 574.618,142.17 575.777,139.432C 576.937,136.694 577.922,133.894 578.733,131.031C 579.544,128.169 579.95,125.991 579.95,124.498C 579.95,122.257 579.718,119.644 579.255,116.657C 578.791,113.67 578.038,110.746 576.995,107.883C 575.951,105.021 574.56,102.594 572.822,100.603C 571.083,98.6115 569.055,97.6159 566.737,97.6159L 493.02,97.6159 Z "/>
|
||||
<g>
|
||||
<rect x="340.465" y="46.0927" fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" width="54.9846" height="227.374"/>
|
||||
</g>
|
||||
<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 55.5166,46.093L 161.961,273.467L 214.479,273.467L 216.626,269.689L 115.436,46.093L 55.5166,46.093 Z "/>
|
||||
<path fill="#FFFFFF" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 231.92,235.709L 319.513,46.0926L 259.594,46.0926L 202.957,171.669L 231.92,235.709 Z "/>
|
||||
<path fill="#FAFAFA" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 987.874,273.467L 926.863,273.467L 1034.17,46.0927L 1088,46.0927L 1195.67,273.467L 1134.66,273.467L 1106.67,212.983L 1047.45,212.983L 1044.83,212.918L 1065.94,164.447L 1087.65,164.447L 1060.73,106.576"/>
|
||||
<path fill="#FAFAFA" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 1605.13,273.467L 1544.12,273.467L 1651.43,46.0927L 1705.26,46.0927L 1812.93,273.467L 1751.91,273.467L 1723.92,212.983L 1664.7,212.983L 1662,212.918L 1683.24,164.447L 1704.9,164.447L 1677.98,106.576"/>
|
||||
<path fill="#FAFAFA" fill-opacity="1" stroke-width="0.2" stroke-linejoin="round" d="M 1438.98,159.966C 1438.98,173.158 1436.83,186.475 1432.52,199.915C 1428.22,213.356 1421.88,225.553 1413.5,236.504C 1405.13,247.456 1394.84,256.354 1382.64,263.199C 1370.43,270.044 1356.44,273.467 1340.65,273.467L 1217.91,273.467L 1217.91,121.9L 1272.1,121.9L 1272.1,225.677L 1335.98,225.677C 1342.2,225.677 1348.42,223.81 1354.64,220.077C 1360.86,216.343 1366.49,211.365 1371.51,205.142C 1376.54,198.92 1380.6,191.826 1383.71,183.861C 1386.82,175.896 1388.38,167.807 1388.38,159.593C 1388.38,150.632 1386.58,142.17 1383,134.205C 1379.41,126.24 1375.04,119.271 1369.9,113.297C 1364.75,107.323 1359.31,102.594 1353.57,99.1094C 1347.82,95.6247 1342.8,93.8824 1338.49,93.8824L 1272.1,93.8824L 1272.1,93.9001L 1217.91,93.9001L 1217.91,46.0927L 1332.03,46.0927C 1350.46,46.0927 1366.43,49.0796 1379.95,55.0533C 1393.46,61.0269 1404.59,69.1163 1413.32,79.3215C 1422.06,89.5265 1428.52,101.536 1432.7,115.35C 1436.89,129.165 1438.98,144.037 1438.98,159.966 Z "/>
|
||||
</svg>
|
|
@ -1,60 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
id="svg17"
|
||||
xml:space="preserve"
|
||||
enable-background="new 0 0 256.00 256.00"
|
||||
viewBox="0 0 257.6 257.6"
|
||||
height="56"
|
||||
width="56"
|
||||
version="1.1"><metadata
|
||||
id="metadata23"><rdf:RDF><cc:Work
|
||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
|
||||
id="defs21" />
|
||||
<radialGradient
|
||||
gradientTransform="translate(1.15,1.25)"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
r="410"
|
||||
cy="-40.865398"
|
||||
cx="-40.865398"
|
||||
id="SVGID_Fill1_">
|
||||
<stop
|
||||
id="stop2"
|
||||
stop-opacity="1"
|
||||
stop-color="#01BDFF"
|
||||
offset="0.35814" />
|
||||
<stop
|
||||
id="stop4"
|
||||
stop-opacity="1"
|
||||
stop-color="#466BFF"
|
||||
offset="0.618605" />
|
||||
<stop
|
||||
id="stop6"
|
||||
stop-opacity="1"
|
||||
stop-color="#8C1AFF"
|
||||
offset="0.855814" />
|
||||
</radialGradient>
|
||||
<circle
|
||||
style="fill:url(#SVGID_Fill1_);stroke-width:0.2;stroke-linejoin:round"
|
||||
r="125"
|
||||
id="ellipse9"
|
||||
cy="129.25"
|
||||
cx="129.14999" />
|
||||
<g
|
||||
transform="translate(1.15,1.25)"
|
||||
id="g15">
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:0.2;stroke-linejoin:round"
|
||||
id="path11"
|
||||
d="m 48,65.0981 64.513,137.8039 h 31.829 l 1.301,-2.289 L 84.3151,65.0981 Z" />
|
||||
<path
|
||||
style="fill:#ffffff;fill-opacity:1;stroke-width:0.2;stroke-linejoin:round"
|
||||
id="path13"
|
||||
d="M 154.913,180.019 208,65.0978 h -36.315 l -34.326,76.1082 z" />
|
||||
</g>
|
||||
</svg>
|
Before Width: | Height: | Size: 1.7 KiB |
|
@ -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
|
||||
|
||||
|
|
|
@ -85,9 +85,9 @@ FocusScope {
|
|||
Image {
|
||||
id: banner
|
||||
anchors.centerIn: parent
|
||||
sourceSize.width: 500
|
||||
sourceSize.width: 346
|
||||
sourceSize.height: 91
|
||||
source: "../images/vircadia-banner.svg"
|
||||
source: "../images/brand-banner.svg"
|
||||
horizontalAlignment: Image.AlignHCenter
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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: {
|
||||
|
|
|
@ -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>")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -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>")
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -81,9 +81,9 @@ FocusScope {
|
|||
Image {
|
||||
id: banner
|
||||
anchors.centerIn: parent
|
||||
sourceSize.width: 500
|
||||
sourceSize.width: 346
|
||||
sourceSize.height: 91
|
||||
source: "../images/vircadia-banner.svg"
|
||||
source: "../images/brand-banner.svg"
|
||||
horizontalAlignment: Image.AlignHCenter
|
||||
}
|
||||
}
|
||||
|
|
|
@ -47,7 +47,7 @@ ScrollingWindow {
|
|||
|
||||
Image {
|
||||
id: logo
|
||||
source: "../images/vircadia-logo.svg"
|
||||
source: "../images/brand-logo.svg"
|
||||
width: updateDialog.logoSize
|
||||
height: updateDialog.logoSize
|
||||
anchors {
|
||||
|
|
|
@ -129,9 +129,9 @@ FocusScope {
|
|||
Image {
|
||||
id: banner
|
||||
anchors.centerIn: parent
|
||||
sourceSize.width: 400
|
||||
sourceSize.width: 278
|
||||
sourceSize.height: 73
|
||||
source: "../../images/vircadia-banner.svg"
|
||||
source: "../../images/brand-banner.svg"
|
||||
horizontalAlignment: Image.AlignHCenter
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -24,9 +24,9 @@ Rectangle {
|
|||
spacing: 5
|
||||
|
||||
Image {
|
||||
width: 400; height: 73
|
||||
width: 278; height: 73
|
||||
fillMode: Image.PreserveAspectFit
|
||||
source: "../../../images/vircadia-banner.svg"
|
||||
source: "../../../images/brand-banner.svg"
|
||||
}
|
||||
Item { height: 25; width: 1 }
|
||||
Column {
|
||||
|
@ -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."
|
||||
|
|
|
@ -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");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
BIN
interface/resources/serverless/Models/logo_overte.fbx
Normal file
|
@ -0,0 +1,3 @@
|
|||
name = LOGO-OVERTE
|
||||
filename = qrc:///serverless/Models/logo_overte.fbx
|
||||
materialMap = [{"mat::MAIN": {"materials":[{ "name": "MAIN", "albedo": [1.0 ,1.0 ,1.0], "roughness": 0.5, "metallic": 0.01, "emissive": [1.55, 1.55, 1.55], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}, {"mat::SECONDARY": {"materials":[{ "name": "SECONDARY", "albedo": [0.3843, 0.39213, 0.8901], "roughness": 0.5, "metallic": 0.01, "emissive": [0.6988, 0.5611, 2.6047], "cullFaceMode": "CULL_NONE", "model": "hifi_pbr"}]}}]
|
|
@ -319,63 +319,32 @@
|
|||
"faceCamera": false,
|
||||
"isFacingAvatar": false
|
||||
},
|
||||
{
|
||||
"id": "{0436152a-b188-4608-abe9-a3fb1c4b283d}",
|
||||
{
|
||||
"type": "Model",
|
||||
"lastEdited": 1617140818158676,
|
||||
"name": "Vircadia Sign",
|
||||
"locked": true,
|
||||
"position": {
|
||||
"x": 43.52519226074219,
|
||||
"y": 4.912969589233398,
|
||||
"z": 8.236417770385742
|
||||
},
|
||||
"name": "LOGO",
|
||||
"dimensions": {
|
||||
"x": 4.443090915679932,
|
||||
"y": 0.7363157868385315,
|
||||
"z": 0.16073395311832428
|
||||
"x": 13.745243072509766,
|
||||
"y": 3.6150240898132324,
|
||||
"z": 0.5063754320144653
|
||||
},
|
||||
"rotation": {
|
||||
"x": -0.0000152587890625,
|
||||
"y": -0.7019302845001221,
|
||||
"z": 0.0000152587890625,
|
||||
"w": 0.7122453451156616
|
||||
"x": 0,
|
||||
"y": -0.7933533787727356,
|
||||
"z": 0,
|
||||
"w": 0.6087614297866821
|
||||
},
|
||||
"created": 1614198986205729,
|
||||
"lastEditedBy": "{7f097416-1c40-4cba-aa7c-6e20a7281823}",
|
||||
"queryAACube": {
|
||||
"x": 41.271915435791016,
|
||||
"y": 2.659691333770752,
|
||||
"z": 5.983139514923096,
|
||||
"scale": 4.506556510925293
|
||||
"position": {
|
||||
"x":60.310699462890625,
|
||||
"y":4.58831787109375,
|
||||
"z":18.133499145507812
|
||||
},
|
||||
"canCastShadow": false,
|
||||
"grab": {
|
||||
"grabbable": false,
|
||||
"equippableLeftRotation": {
|
||||
"x": -0.0000152587890625,
|
||||
"y": -0.0000152587890625,
|
||||
"z": -0.0000152587890625,
|
||||
"w": 1
|
||||
},
|
||||
"equippableRightRotation": {
|
||||
"x": -0.0000152587890625,
|
||||
"y": -0.0000152587890625,
|
||||
"z": -0.0000152587890625,
|
||||
"w": 1
|
||||
}
|
||||
"grabbable": false
|
||||
},
|
||||
"damping": 0,
|
||||
"angularDamping": 0,
|
||||
"modelURL": "qrc:///serverless/Models/VircadiaLogo.fbx",
|
||||
"blendshapeCoefficients": "{\n}\n",
|
||||
"animation": {
|
||||
"allowTranslation": false
|
||||
},
|
||||
"clientOnly": false,
|
||||
"avatarEntity": false,
|
||||
"localEntity": false,
|
||||
"faceCamera": false,
|
||||
"isFacingAvatar": false
|
||||
"modelURL": "qrc:///serverless/Models/logo_overte_white-color-emissive.fst",
|
||||
"useOriginalPivot": true,
|
||||
"locked": true
|
||||
},
|
||||
{
|
||||
"id": "{06b826d4-5385-4c49-92c2-47e24f97b35a}",
|
||||
|
@ -451,67 +420,6 @@
|
|||
"localEntity": false,
|
||||
"faceCamera": true,
|
||||
"isFacingAvatar": false
|
||||
},
|
||||
{
|
||||
"id": "{159f2743-d862-47e3-9f27-5de062b09941}",
|
||||
"type": "Material",
|
||||
"lastEdited": 1617140810844450,
|
||||
"parentID": "{0436152a-b188-4608-abe9-a3fb1c4b283d}",
|
||||
"parentJointIndex": 0,
|
||||
"name": "VClogo",
|
||||
"locked": true,
|
||||
"userData": "{\"verticalOffset\":0,\"segments\":16,\"updateInterval\":1000}",
|
||||
"position": {
|
||||
"x": -0.00001823902130126953,
|
||||
"y": -0.0002636909484863281,
|
||||
"z": 0.10145187377929688
|
||||
},
|
||||
"rotation": {
|
||||
"x": 0.0012969970703125,
|
||||
"y": 0.0000152587890625,
|
||||
"z": 0.0000457763671875,
|
||||
"w": 0.999969482421875
|
||||
},
|
||||
"created": 1614198986205783,
|
||||
"lastEditedBy": "{7f097416-1c40-4cba-aa7c-6e20a7281823}",
|
||||
"queryAACube": {
|
||||
"x": 47.7151985168457,
|
||||
"y": 1.0358200073242188,
|
||||
"z": 24.254812240600586,
|
||||
"scale": 4.506557464599609
|
||||
},
|
||||
"canCastShadow": false,
|
||||
"grab": {
|
||||
"grabbable": false,
|
||||
"equippableLeftRotation": {
|
||||
"x": -0.0000152587890625,
|
||||
"y": -0.0000152587890625,
|
||||
"z": -0.0000152587890625,
|
||||
"w": 1
|
||||
},
|
||||
"equippableRightRotation": {
|
||||
"x": -0.0000152587890625,
|
||||
"y": -0.0000152587890625,
|
||||
"z": -0.0000152587890625,
|
||||
"w": 1
|
||||
}
|
||||
},
|
||||
"collisionMask": 23,
|
||||
"collidesWith": "static,dynamic,kinematic,otherAvatar,",
|
||||
"scriptTimestamp": 1597610738986,
|
||||
"materialURL": "materialData",
|
||||
"priority": 3,
|
||||
"parentMaterialName": "[mat::NeonTubes]",
|
||||
"materialMappingPos": {
|
||||
"x": 0.8125,
|
||||
"y": 0
|
||||
},
|
||||
"materialData": "{\"materialVersion\":1,\"materials\":[{\"name\":\"baseMaterial2\",\"model\":\"hifi_pbr\",\"opacity\":1,\"albedo\":[0,0,0],\"roughness\":1,\"metallic\":0,\"emissive\":[2.3,2,2],\"scattering\":0,\"unlit\":false,\"opacityMapMode\":\"OPACITY_MAP_MASK\",\"cullFaceMode\":\"CULL_BACK\",\"defaultFallthrough\":false}]}",
|
||||
"clientOnly": false,
|
||||
"avatarEntity": false,
|
||||
"localEntity": false,
|
||||
"faceCamera": false,
|
||||
"isFacingAvatar": false
|
||||
},
|
||||
{
|
||||
"id": "{5b6443c5-ec22-4c8a-9581-85134ceb6856}",
|
||||
|
|
|
@ -319,63 +319,32 @@
|
|||
"faceCamera": false,
|
||||
"isFacingAvatar": false
|
||||
},
|
||||
{
|
||||
"id": "{0436152a-b188-4608-abe9-a3fb1c4b283d}",
|
||||
{
|
||||
"type": "Model",
|
||||
"lastEdited": 1617140818158676,
|
||||
"name": "Vircadia Sign",
|
||||
"locked": true,
|
||||
"position": {
|
||||
"x": 43.52519226074219,
|
||||
"y": 4.912969589233398,
|
||||
"z": 8.236417770385742
|
||||
},
|
||||
"name": "LOGO",
|
||||
"dimensions": {
|
||||
"x": 4.443090915679932,
|
||||
"y": 0.7363157868385315,
|
||||
"z": 0.16073395311832428
|
||||
"x": 13.745243072509766,
|
||||
"y": 3.6150240898132324,
|
||||
"z": 0.5063754320144653
|
||||
},
|
||||
"rotation": {
|
||||
"x": -0.0000152587890625,
|
||||
"y": -0.7019302845001221,
|
||||
"z": 0.0000152587890625,
|
||||
"w": 0.7122453451156616
|
||||
"x": 0,
|
||||
"y": -0.7933533787727356,
|
||||
"z": 0,
|
||||
"w": 0.6087614297866821
|
||||
},
|
||||
"created": 1614198986205729,
|
||||
"lastEditedBy": "{7f097416-1c40-4cba-aa7c-6e20a7281823}",
|
||||
"queryAACube": {
|
||||
"x": 41.271915435791016,
|
||||
"y": 2.659691333770752,
|
||||
"z": 5.983139514923096,
|
||||
"scale": 4.506556510925293
|
||||
"position": {
|
||||
"x":60.310699462890625,
|
||||
"y":4.58831787109375,
|
||||
"z":18.133499145507812
|
||||
},
|
||||
"canCastShadow": false,
|
||||
"grab": {
|
||||
"grabbable": false,
|
||||
"equippableLeftRotation": {
|
||||
"x": -0.0000152587890625,
|
||||
"y": -0.0000152587890625,
|
||||
"z": -0.0000152587890625,
|
||||
"w": 1
|
||||
},
|
||||
"equippableRightRotation": {
|
||||
"x": -0.0000152587890625,
|
||||
"y": -0.0000152587890625,
|
||||
"z": -0.0000152587890625,
|
||||
"w": 1
|
||||
}
|
||||
"grabbable": false
|
||||
},
|
||||
"damping": 0,
|
||||
"angularDamping": 0,
|
||||
"modelURL": "qrc:///serverless/Models/VircadiaLogo.fbx",
|
||||
"blendshapeCoefficients": "{\n}\n",
|
||||
"animation": {
|
||||
"allowTranslation": false
|
||||
},
|
||||
"clientOnly": false,
|
||||
"avatarEntity": false,
|
||||
"localEntity": false,
|
||||
"faceCamera": false,
|
||||
"isFacingAvatar": false
|
||||
"modelURL": "qrc:///serverless/Models/logo_overte_white-color-emissive.fst",
|
||||
"useOriginalPivot": true,
|
||||
"locked": true
|
||||
},
|
||||
{
|
||||
"id": "{06b826d4-5385-4c49-92c2-47e24f97b35a}",
|
||||
|
@ -451,67 +420,6 @@
|
|||
"localEntity": false,
|
||||
"faceCamera": true,
|
||||
"isFacingAvatar": false
|
||||
},
|
||||
{
|
||||
"id": "{159f2743-d862-47e3-9f27-5de062b09941}",
|
||||
"type": "Material",
|
||||
"lastEdited": 1617140810844450,
|
||||
"parentID": "{0436152a-b188-4608-abe9-a3fb1c4b283d}",
|
||||
"parentJointIndex": 0,
|
||||
"name": "VClogo",
|
||||
"locked": true,
|
||||
"userData": "{\"verticalOffset\":0,\"segments\":16,\"updateInterval\":1000}",
|
||||
"position": {
|
||||
"x": -0.00001823902130126953,
|
||||
"y": -0.0002636909484863281,
|
||||
"z": 0.10145187377929688
|
||||
},
|
||||
"rotation": {
|
||||
"x": 0.0012969970703125,
|
||||
"y": 0.0000152587890625,
|
||||
"z": 0.0000457763671875,
|
||||
"w": 0.999969482421875
|
||||
},
|
||||
"created": 1614198986205783,
|
||||
"lastEditedBy": "{7f097416-1c40-4cba-aa7c-6e20a7281823}",
|
||||
"queryAACube": {
|
||||
"x": 47.7151985168457,
|
||||
"y": 1.0358200073242188,
|
||||
"z": 24.254812240600586,
|
||||
"scale": 4.506557464599609
|
||||
},
|
||||
"canCastShadow": false,
|
||||
"grab": {
|
||||
"grabbable": false,
|
||||
"equippableLeftRotation": {
|
||||
"x": -0.0000152587890625,
|
||||
"y": -0.0000152587890625,
|
||||
"z": -0.0000152587890625,
|
||||
"w": 1
|
||||
},
|
||||
"equippableRightRotation": {
|
||||
"x": -0.0000152587890625,
|
||||
"y": -0.0000152587890625,
|
||||
"z": -0.0000152587890625,
|
||||
"w": 1
|
||||
}
|
||||
},
|
||||
"collisionMask": 23,
|
||||
"collidesWith": "static,dynamic,kinematic,otherAvatar,",
|
||||
"scriptTimestamp": 1597610738986,
|
||||
"materialURL": "materialData",
|
||||
"priority": 3,
|
||||
"parentMaterialName": "[mat::NeonTubes]",
|
||||
"materialMappingPos": {
|
||||
"x": 0.8125,
|
||||
"y": 0
|
||||
},
|
||||
"materialData": "{\"materialVersion\":1,\"materials\":[{\"name\":\"baseMaterial2\",\"model\":\"hifi_pbr\",\"opacity\":1,\"albedo\":[0,0,0],\"roughness\":1,\"metallic\":0,\"emissive\":[2.3,2,2],\"scattering\":0,\"unlit\":false,\"opacityMapMode\":\"OPACITY_MAP_MASK\",\"cullFaceMode\":\"CULL_BACK\",\"defaultFallthrough\":false}]}",
|
||||
"clientOnly": false,
|
||||
"avatarEntity": false,
|
||||
"localEntity": false,
|
||||
"faceCamera": false,
|
||||
"isFacingAvatar": false
|
||||
},
|
||||
{
|
||||
"id": "{5b6443c5-ec22-4c8a-9581-85134ceb6856}",
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -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
|
||||
*
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
@ -380,7 +380,7 @@ int main(int argc, const char* argv[]) {
|
|||
PROFILE_SYNC_END(startup, "app full ctor", "");
|
||||
|
||||
#if defined(Q_OS_LINUX)
|
||||
app.setWindowIcon(QIcon(PathUtils::resourcesPath() + "images/vircadia-logo.svg"));
|
||||
app.setWindowIcon(QIcon(PathUtils::resourcesPath() + "images/brand-logo.svg"));
|
||||
#endif
|
||||
startCrashHookMonitor(&app);
|
||||
|
||||
|
|
|
@ -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-<user
|
||||
* @param {string} [filename=""] - If a filename is not provided, the image is saved as "overte-snap-by-<user
|
||||
* name>-on-YYYY-MM-DD_HH-MM-SS".
|
||||
* <p>Still images are saved in JPEG or PNG format according to the extension provided — <code>".jpg"</code>,
|
||||
* <code>".jpeg"</code>, or <code>".png"</code> — 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-<user
|
||||
* @param {string} [filename=""] - If a filename is not provided, the image is saved as "overte-snap-by-<user
|
||||
* name>-on-YYYY-MM-DD_HH-MM-SS".
|
||||
* <p>Images are saved in JPEG or PNG format according to the extension provided — <code>".jpg"</code>,
|
||||
* <code>".jpeg"</code>, or <code>".png"</code> — 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-<user
|
||||
* @param {string} [filename=""] - If a filename is not provided, the image is saved as "overte-snap-by-<user
|
||||
* name>-on-YYYY-MM-DD_HH-MM-SS".
|
||||
* <p>Images are saved in JPEG or PNG format according to the extension provided — <code>".jpg"</code>,
|
||||
* <code>".jpeg"</code>, or <code>".png"</code> — or if not provided then in JPEG format with an extension of
|
||||
|
|
|
@ -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));
|
||||
}
|
||||
|
||||
|
|