Skip to content

Commit

Permalink
Lots of renamings, more to come.
Browse files Browse the repository at this point in the history
  • Loading branch information
Kasen IO committed Apr 7, 2020
1 parent e3d4856 commit 115c40b
Show file tree
Hide file tree
Showing 65 changed files with 114 additions and 111 deletions.
2 changes: 1 addition & 1 deletion BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,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 High Fidelity lib folder, should contain a folder '$name'
* HIFI_LIB_DIR - set this variable in your ENV to your Vircadia lib folder, should contain a folder '$name'

### Optional Components

Expand Down
3 changes: 3 additions & 0 deletions BUILD_LINUX_CHEATSHEET.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
## This guide is specific to Ubuntu 16.04.

THIS DOCUMENT IS OUTDATED.

Deb packages of High Fidelity domain server and assignment client are stored on debian.highfidelity.com

```
Expand Down
2 changes: 1 addition & 1 deletion BUILD_OSX.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Please read the [general build guide](BUILD.md) for information on dependencies

### Homebrew

[Homebrew](https://brew.sh/) is an excellent package manager for macOS. It makes install of some High Fidelity dependencies very simple.
[Homebrew](https://brew.sh/) is an excellent package manager for macOS. It makes install of some Vircadia dependencies very simple.

brew install cmake openssl

Expand Down
18 changes: 9 additions & 9 deletions BUILD_WIN.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Build Windows

*Last Updated on January 13, 2020*
*Last Updated on April 7, 2020*

This is a stand-alone guide for creating your first Vircadia build for Windows 64-bit.

Expand Down Expand Up @@ -68,7 +68,7 @@ To create this variable:
### Step 5. Running CMake to Generate Build Files

Run Command Prompt from Start and run the following commands:
`cd "%HIFI_DIR%"`
`cd "%VIRCADIA_DIR%"`
`mkdir build`
`cd build`

Expand All @@ -78,11 +78,11 @@ Run `cmake .. -G "Visual Studio 15 Win64"`.
#### If you're using Visual Studio 2019,
Run `cmake .. -G "Visual Studio 16 2019" -A x64`.

Where `%HIFI_DIR%` is the directory for the highfidelity repository.
Where `%VIRCADIA_DIR%` is the directory for the Vircadia repository.

### Step 6. Making a Build

Open `%HIFI_DIR%\build\athena.sln` using Visual Studio.
Open `%VIRCADIA_DIR%\build\athena.sln` using Visual Studio.

Change the Solution Configuration (menu ribbon under the menu bar, next to the green play button) from "Debug" to "Release" for best performance.

Expand All @@ -98,22 +98,22 @@ 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 Project Athena and be able to run the Interface using Visual Studio. Please check our [Docs](https://wiki.highfidelity.com/wiki/Main_Page) for more information regarding the programming workflow.
Now, you should have a full build of Vircadia 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 `%HIFI_DIR%\build\interface\Release\interface.exe`
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 #6, first try this:
* Delete your locally cloned copy of the highfidelity repository
* Delete your locally cloned copy of the Vircadia repository
* Restart your computer
* Redownload the [repository](https://github.com/kasenvr/project-athena)
* Restart directions from Step #6

#### CMake gives you the same error message repeatedly after the build fails

Remove `CMakeCache.txt` found in the `%HIFI_DIR%\build` directory.
Remove `CMakeCache.txt` found in the `%VIRCADIA_DIR%\build` directory.

#### CMake can't find OpenSSL

Remove `CMakeCache.txt` found in the `%HIFI_DIR%\build` directory. Verify that your HIFI_VCPKG_BASE environment variable is set and pointing to the correct location. Verify that the file `${HIFI_VCPKG_BASE}/installed/x64-windows/include/openssl/ssl.h` exists.
Remove `CMakeCache.txt` found in the `%VIRCADIA_DIR%\build` directory. Verify that your HIFI_VCPKG_BASE environment variable is set and pointing to the correct location. Verify that the file `${HIFI_VCPKG_BASE}/installed/x64-windows/include/openssl/ssl.h` exists.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Copyright (c) 2013-2019, High Fidelity, Inc.
Copyright (c) 2019-2020, Project Athena Contributors.
All rights reserved.
https://projectathena.io
https://vircadia.com

Licensed under the Apache License version 2.0 (the "License");
You may not use this software except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion README_hifi.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Come chat with us in [our Gitter](https://gitter.im/highfidelity/hifi) if you ha

Documentation
=========
Documentation is available at [docs.highfidelity.com](https://docs.highfidelity.com), if something is missing, please suggest it via a new job on Worklist (add to the hifi-docs project).
Documentation is available at [docs.vircadia.dev](https://docs.vircadia.dev), if something is missing, please suggest it via a new job on Worklist (add to the hifi-docs project).

There is also detailed [documentation on our coding standards](CODING_STANDARD.md).

Expand Down
4 changes: 2 additions & 2 deletions android/apps/interface/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 High Fidelity account</string>
<string name="creating_account">Creating your Vircadia 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 High Fidelity</string>
<string name="signedin_welcome">You are now signed into Vircadia</string>
<string name="logged_in_welcome">You are now logged in!</string>
<string name="welcome">Welcome</string>
<string name="cancel">Cancel</string>
Expand Down
2 changes: 1 addition & 1 deletion assignment-client/src/AssignmentClientApp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :

// parse command-line
QCommandLineParser parser;
parser.setApplicationDescription("High Fidelity Assignment Client");
parser.setApplicationDescription("Vircadia Assignment Client");
const QCommandLineOption helpOption = parser.addHelpOption();
const QCommandLineOption versionOption = parser.addVersionOption();

Expand Down
2 changes: 1 addition & 1 deletion cmake/ports/hifi-client-deps/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: hifi-client-deps
Version: 0
Description: Collected dependencies for High Fidelity applications
Description: Collected dependencies for Vircadia applications
Build-Depends: hifi-deps, glslang, nlohmann-json, openvr (windows), sdl2 (!android), spirv-cross (!android), spirv-tools (!android), vulkanmemoryallocator
2 changes: 1 addition & 1 deletion domain-server/resources/web/wizard/index.shtml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div class="row">
<div class="col-md-12">
<span class='step-description'>
<a target='_blank' href='https://docs.highfidelity.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
<a target='_blank' href='https://docs.vircadia.dev/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 High Fidelity's Interface. You can choose a Place Name for your domain.</br>
Your domain may also be reachable by <b>IP address</b>.
</span>
Expand Down
2 changes: 1 addition & 1 deletion domain-server/src/DomainServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :

void DomainServer::parseCommandLine(int argc, char* argv[]) {
QCommandLineParser parser;
parser.setApplicationDescription("High Fidelity Domain Server");
parser.setApplicationDescription("Vircadia Domain Server");
const QCommandLineOption versionOption = parser.addVersionOption();
const QCommandLineOption helpOption = parser.addHelpOption();

Expand Down
2 changes: 1 addition & 1 deletion interface/resources/html/commerce/backup_instructions.html
Original file line number Diff line number Diff line change
Expand Up @@ -596,7 +596,7 @@ <h3>What happens if I lose my passphrase?</h3>

<h2>Want to learn more?</h2>
<p>You can find out much more about the blockchain and about commerce in High Fidelity by visiting our Docs site:</p>
<p><a href="http://docs.highfidelity.com" class="btn">Visit High Fidelity's Docs</a></p>
<p><a href="http://docs.vircadia.dev" class="btn">Visit High Fidelity's Docs</a></p>
<hr>

</div>
Expand Down
8 changes: 4 additions & 4 deletions interface/resources/html/tabletHelp.html
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
var handControllerImageURL = null;
var index = 0;
var count = 3;
var handControllerRefURL = "https://docs.projectathena.dev/explore/get-started/vr-controls.html#vr-controls";
var keyboardRefURL = "https://docs.projectathena.dev/explore/get-started/desktop.html#movement-controls";
var gamepadRefURL = "https://docs.projectathena.dev/explore/get-started/vr-controls.html#gamepad";
var handControllerRefURL = "https://docs.vircadia.dev/explore/get-started/vr-controls.html#vr-controls";
var keyboardRefURL = "https://docs.vircadia.dev/explore/get-started/desktop.html#movement-controls";
var gamepadRefURL = "https://docs.vircadia.dev/explore/get-started/vr-controls.html#gamepad";

function showKbm() {
document.getElementById("main_image").setAttribute("src", "img/tablet-help-keyboard.jpg");
Expand Down Expand Up @@ -189,7 +189,7 @@
<a href="#" id="right_button" onmousedown="cycleRight()"></a>
<a href="#" id="image_button"></a>
</div>
<a href="mailto:support@projectathena.io" id="report_problem">Report Problem</a>
<a href="mailto:support@vircadia.com" id="report_problem">Report Problem</a>
</body>

</html>
2 changes: 1 addition & 1 deletion interface/resources/qml/+webengine/BrowserWebView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import controlsUit 1.0

WebView {
id: webview
url: "https://projectathena.io/"
url: "https://vircadia.com/"
profile: FileTypeProfile;

property var parentRoot: null
Expand Down
4 changes: 2 additions & 2 deletions interface/resources/qml/LoginDialog/LinkAccountBody.qml
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ Item {
font.pixelSize: linkAccountBody.textFieldFontSize
font.bold: linkAccountBody.fontBold

text: "<a href='metaverse.projectathena.io/users/password/new'> Can't access your account?</a>"
text: "<a href='metaverse.vircadia.com/users/password/new'> Can't access your account?</a>"

verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
Expand Down Expand Up @@ -480,7 +480,7 @@ Item {
leftMargin: hifi.dimensions.contentSpacing.x
}

text: "<a href='metaverse.projectathena.io/users/register'>Sign Up</a>"
text: "<a href='metaverse.vircadia.com/users/register'>Sign Up</a>"

linkColor: hifi.colors.blueAccent
onLinkActivated: {
Expand Down
2 changes: 1 addition & 1 deletion interface/resources/qml/LoginDialog/SignUpBody.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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://projectathena.io/termsofservice'>Project Athena's Terms of Service</a>")
termsText.text = qsTr("By signing up, you agree to <a href='https://vircadia.com/termsofservice'>Vircadia's Terms of Service</a>")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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://projectathena.io/termsofservice'>Project Athena's Terms of Service</a>")
termsText.text = qsTr("By creating this user profile, you agree to <a href='https://vircadia.com/termsofservice'>Vircadia's Terms of Service</a>")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ Item {
}

function openDocs() {
Qt.openUrlExternally("https://docs.projectathena.dev/create/avatars/package-avatar.html");
Qt.openUrlExternally("https://docs.vircadia.dev/create/avatars/package-avatar.html");
}

function openVideo() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ Item {
text: "This item is not for sale yet, <a href='#'>learn more</a>."

onLinkActivated: {
Qt.openUrlExternally("https://docs.projectathena.dev/sell/add-item/upload-avatar.html");
Qt.openUrlExternally("https://docs.vircadia.dev/sell/add-item/upload-avatar.html");
}
}

Expand Down
2 changes: 1 addition & 1 deletion interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ MessageBox {
popup.onButton2Clicked = callback;
popup.titleText = 'Specify Avatar URL'
popup.bodyText = 'This will not overwrite your existing favorite if you are wearing one.<br>' +
'<a href="https://docs.projectathena.dev/create/avatars/create-avatars.html">' +
'<a href="https://docs.vircadia.dev/create/avatars/create-avatars.html">' +
'Learn to make a custom avatar by opening this link on your desktop.' +
'</a>'
popup.inputText.visible = true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ Rectangle {
lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain. " +
"If you want to save the state of the content in this domain, create a backup before proceeding.<br><br>" +
"For more information about backing up and restoring content, " +
"<a href='https://docs.projectathena.dev/host/maintain-domain/backup-domain.html'>" +
"<a href='https://docs.vircadia.dev/host/maintain-domain/backup-domain.html'>" +
"click here to open info on your desktop browser.";
lightboxPopup.button1text = "CANCEL";
lightboxPopup.button1method = function() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ Rectangle {
lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain. " +
"If you want to save the state of the content in this domain, create a backup before proceeding.<br><br>" +
"For more information about backing up and restoring content, " +
"<a href='https://docs.projectathena.dev/host/maintain-domain/backup-domain.html'>" +
"<a href='https://docs.vircadia.dev/host/maintain-domain/backup-domain.html'>" +
"click here to open info on your desktop browser.";
lightboxPopup.button1text = "CANCEL";
lightboxPopup.button1method = function() {
Expand Down
2 changes: 1 addition & 1 deletion interface/resources/qml/hifi/commerce/wallet/Help.qml
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
if (link === "#privateKeyPath") {
Qt.openUrlExternally("file:///" + root.keyFilePath.substring(0, root.keyFilePath.lastIndexOf('/')));
} else if (link === "#blockchain") {
Qt.openUrlExternally("https://docs.projectathena.dev/explore/shop.html");
Qt.openUrlExternally("https://docs.vircadia.dev/explore/shop.html");
} else if (link === "#bank") {
if ((Account.metaverseServerURL).toString().indexOf("staging") >= 0) {
Qt.openUrlExternally("hifi://hifiqa-master-metaverse-staging"); // So that we can test in staging.
Expand Down
2 changes: 1 addition & 1 deletion interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Rectangle {
textFormat: Text.StyledText
linkColor: "#00B4EF"
color: "white"
text: "<a href=\"https:/github.com/kasenvr/hifi-community\">Project Athena Github</a>."
text: "<a href=\"https:/github.com/kasenvr/project-athena\">Vircadia Github</a>."
size: 20
onLinkActivated: {
HiFiAbout.openUrl("https:/github.com/kasenvr/project-athena");
Expand Down
2 changes: 1 addition & 1 deletion interface/src/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7727,7 +7727,7 @@ bool Application::askToReplaceDomainContent(const QString& url) {
static const QString infoText = simpleWordWrap("Your domain's content will be replaced with a new content set. "
"If you want to save what you have now, create a backup before proceeding. For more information about backing up "
"and restoring content, visit the documentation page at: ", MAX_CHARACTERS_PER_LINE) +
"\nhttps://docs.projectathena.dev/host/maintain-domain/backup-domain.html";
"\nhttps://docs.vircadia.dev/host/maintain-domain/backup-domain.html";

ModalDialogListener* dig = OffscreenUi::asyncQuestion("Are you sure you want to replace this domain's content set?",
infoText, QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
Expand Down
6 changes: 3 additions & 3 deletions interface/src/Menu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ Menu::Menu() {
// Help > Athena Docs
action = addActionToQMenuAndActionHash(helpMenu, "Online Documentation");
connect(action, &QAction::triggered, qApp, [] {
QDesktopServices::openUrl(QUrl("https://docs.projectathena.dev/"));
QDesktopServices::openUrl(QUrl("https://docs.vircadia.dev/"));
});

// Help > Athena Forum
Expand All @@ -791,7 +791,7 @@ Menu::Menu() {
// Help > Scripting Reference
action = addActionToQMenuAndActionHash(helpMenu, "Online Script Reference");
connect(action, &QAction::triggered, qApp, [] {
QDesktopServices::openUrl(QUrl("https://apidocs.projectathena.dev/"));
QDesktopServices::openUrl(QUrl("https://apidocs.vircadia.dev/"));
});

addActionToQMenuAndActionHash(helpMenu, "Controls Reference", 0, qApp, SLOT(showHelp()));
Expand All @@ -801,7 +801,7 @@ Menu::Menu() {
// Help > Release Notes
action = addActionToQMenuAndActionHash(helpMenu, "Release Notes");
connect(action, &QAction::triggered, qApp, [] {
QDesktopServices::openUrl(QUrl("https://docs.projectathena.dev/release-notes.html"));
QDesktopServices::openUrl(QUrl("https://docs.vircadia.dev/release-notes.html"));
});

// Help > Report a Bug!
Expand Down
2 changes: 1 addition & 1 deletion interface/src/avatar/AvatarDoctor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ static QStringList HAND_MAPPING_SUFFIXES = {
"HandThumb1",
};

const QUrl PACKAGE_AVATAR_DOCS_BASE_URL = QUrl("https://docs.projectathena.dev/create/avatars/package-avatar.html");
const QUrl PACKAGE_AVATAR_DOCS_BASE_URL = QUrl("https://docs.vircadia.dev/create/avatars/package-avatar.html");

AvatarDoctor::AvatarDoctor(const QUrl& avatarFSTFileUrl) :
_avatarFSTFileUrl(avatarFSTFileUrl) {
Expand Down
Loading

0 comments on commit 115c40b

Please sign in to comment.