Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:27:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Attempt find/replace all "High Fidleity" strings with "Vircadia"

Browse source 
Also updates most URLs to point to Vircadia resources with the exception of the serverless domain tutorial.

Branched from `v0.86.0-k2`
This commit is contained in:
Marcus Llewellyn 2020-03-31 14:33:08 -05:00
parent 243309fdc4
commit 96047d7536
7 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server-console/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "HighFidelityConsole", "name": "VircadiaConsole",
"description": "High Fidelity Console", "description": "Vircadia Console",
"author": "High Fidelity", "author": "High Fidelity",
"license": "Apache-2.0", "license": "Apache-2.0",
"version": "1.0.0", "version": "1.0.0",
@ -13,7 +13,7 @@
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/highfidelity/hifi.git" "url": "https://github.com/kasenvr/project-athena.git"
}, },
"main": "src/main.js", "main": "src/main.js",
"scripts": { "scripts": {

6
server-console/packager.js
View file

@ -28,15 +28,15 @@ var options = {
const EXEC_NAME = "server-console"; const EXEC_NAME = "server-console";
var SHORT_NAME = argv.client_only ? "Console" : "Sandbox"; var SHORT_NAME = argv.client_only ? "Console" : "Sandbox";
var FULL_NAME = argv.client_only ? "High Fidelity Console" : "High Fidelity Sandbox"; var FULL_NAME = argv.client_only ? "Vircadia Console" : "Vircadia Sandbox";
// setup per OS options // setup per OS options
if (osType == "Darwin") { if (osType == "Darwin") {
options["app-bundle-id"] = "com.highfidelity.server-console" + (argv.production ? "" : "-dev") options["app-bundle-id"] = "com.vircadia.server-console" + (argv.production ? "" : "-dev")
options["name"] = SHORT_NAME options["name"] = SHORT_NAME
} else if (osType == "Windows_NT") { } else if (osType == "Windows_NT") {
options["version-string"] = { options["version-string"] = {
CompanyName: "High Fidelity, Inc.", CompanyName: "Vircadia",
FileDescription: FULL_NAME, FileDescription: FULL_NAME,
ProductName: FULL_NAME, ProductName: FULL_NAME,
OriginalFilename: EXEC_NAME + ".exe" OriginalFilename: EXEC_NAME + ".exe"

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

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>High Fidelity Sandbox</title> <title>Vircadia Sandbox</title>
<script src="content-update.js"></script> <script src="content-update.js"></script>
<link rel="stylesheet" type="text/css" href="content-update.css"></link> <link rel="stylesheet" type="text/css" href="content-update.css"></link>
</head> </head>
@ -45,7 +45,7 @@
</div> </div>
<div class="footer"> <div class="footer">
<p>For more information about managing your high Fidelity Sandbox Server, check out our docs: <a href="https://wiki.highfidelity.com/wiki/Sandbox" target="_blank">wiki.highfidelity.com/wiki/Sandbox</a> <p>For more information about managing your Vircadia Sandbox Server, check out our docs: <a href="https://docs.vircadia.dev/host.html" target="_blank">docs.vircadia.com</a>
</p> </p>
</div> </div>
</div> </div>

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

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

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

@ -113,7 +113,7 @@ function isInterfaceInstalled () {
// the executable to a random location before starting it // the executable to a random location before starting it
// which makes finding the interface near impossible using // which makes finding the interface near impossible using
// relative paths. For now, as there are no server-only // relative paths. For now, as there are no server-only
// installs, we just assume the interface is installed here // installs, we just assume the interface is installed here
return true; return true;
} else { } else {
return interfacePath; return interfacePath;
@ -134,7 +134,7 @@ function shutdown() {
dialog.showMessageBox({ dialog.showMessageBox({
type: 'question', type: 'question',
buttons: ['Yes', 'No'], buttons: ['Yes', 'No'],
title: 'Stopping High Fidelity Sandbox', title: 'Stopping Vircadia Sandbox',
message: 'Quitting will stop your Sandbox and your Home domain will no longer be running.\nDo you wish to continue?' message: 'Quitting will stop your Sandbox and your Home domain will no longer be running.\nDo you wish to continue?'
}, shutdownCallback); }, shutdownCallback);
} else { } else {
@ -280,7 +280,7 @@ function binaryMissingMessage(displayName, executableName, required) {
var message = "The " + displayName + " executable was not found.\n"; var message = "The " + displayName + " executable was not found.\n";
if (required) { if (required) {
message += "It is required for the High Fidelity Sandbox to run.\n\n"; message += "It is required for the Vircadia Sandbox to run.\n\n";
} else { } else {
message += "\n"; message += "\n";
} }
@ -293,7 +293,7 @@ function binaryMissingMessage(displayName, executableName, required) {
message += paths.join("\n"); message += paths.join("\n");
} else { } else {
message += "It is expected to be found beside this executable.\n"; message += "It is expected to be found beside this executable.\n";
message += "You may need to re-install the High Fidelity Sandbox."; message += "You may need to re-install the Vircadia Sandbox.";
} }
return message; return message;
@ -337,10 +337,10 @@ var notificationState = NotificationState.UNNOTIFIED;
function setNotificationState (notificationType, pending = undefined) { function setNotificationState (notificationType, pending = undefined) {
if (pending !== undefined) { if (pending !== undefined) {
if ((notificationType === HifiNotificationType.TRANSACTIONS || if ((notificationType === HifiNotificationType.TRANSACTIONS ||
notificationType === HifiNotificationType.ITEMS)) { notificationType === HifiNotificationType.ITEMS)) {
// special case, because we want to clear the indicator light // special case, because we want to clear the indicator light
// on INVENTORY when either Transactions or Items are // on INVENTORY when either Transactions or Items are
// clicked on in the notification popup, we detect that case // clicked on in the notification popup, we detect that case
// here and force both to be unnotified. // here and force both to be unnotified.
pendingNotifications[HifiNotificationType.TRANSACTIONS] = pending; pendingNotifications[HifiNotificationType.TRANSACTIONS] = pending;
@ -399,7 +399,7 @@ function visitSandboxClicked() {
StartInterface('hifi://localhost'); StartInterface('hifi://localhost');
} else { } else {
// show an error to say that we can't go home without an interface instance // show an error to say that we can't go home without an interface instance
dialog.showErrorBox("Client Not Found", binaryMissingMessage("High Fidelity client", "Interface", false)); dialog.showErrorBox("Client Not Found", binaryMissingMessage("Vircadia client", "Interface", false));
} }
} }
@ -613,7 +613,7 @@ function updateTrayMenu(serverState) {
tray.setImage(trayIcons[notificationState]); tray.setImage(trayIcons[notificationState]);
tray.setContextMenu(Menu.buildFromTemplate(menuArray)); tray.setContextMenu(Menu.buildFromTemplate(menuArray));
if (isShuttingDown) { if (isShuttingDown) {
tray.setToolTip('High Fidelity - Shutting Down'); tray.setToolTip('Vircadia - Shutting Down');
} }
} }
} }
@ -868,7 +868,7 @@ function onContentLoaded() {
notifier.notify({ notifier.notify({
icon: notificationIcon, icon: notificationIcon,
title: 'An update is available!', title: 'An update is available!',
message: 'High Fidelity version ' + latestVersion + ' is available', message: 'Vircadia version ' + latestVersion + ' is available',
wait: true, wait: true,
appID: buildInfo.appUserModelId, appID: buildInfo.appUserModelId,
url: url url: url
@ -941,7 +941,7 @@ app.on('ready', function() {
// Create tray icon // Create tray icon
tray = new Tray(trayIcons[NotificationState.UNNOTIFIED]); tray = new Tray(trayIcons[NotificationState.UNNOTIFIED]);
tray.setToolTip('High Fidelity'); tray.setToolTip('Vircadia');
tray.on('click', function() { tray.on('click', function() {
tray.popUpContextMenu(tray.menu); tray.popUpContextMenu(tray.menu);
@ -951,7 +951,7 @@ app.on('ready', function() {
trayNotifications.startPolling(); trayNotifications.startPolling();
} }
updateTrayMenu(ProcessGroupStates.STOPPED); updateTrayMenu(ProcessGroupStates.STOPPED);
if (isServerInstalled()) { if (isServerInstalled()) {
maybeInstallDefaultContentSet(onContentLoaded); maybeInstallDefaultContentSet(onContentLoaded);
} }

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

@ -34,8 +34,8 @@ exports.getBuildInfo = function() {
buildIdentifier: "dev", buildIdentifier: "dev",
buildNumber: "0", buildNumber: "0",
stableBuild: "0", stableBuild: "0",
organization: "High Fidelity - dev", organization: "Vircadia - dev",
appUserModelId: "com.highfidelity.console" appUserModelId: "com.vircadia.console"
}; };
var buildInfo = DEFAULT_BUILD_INFO; var buildInfo = DEFAULT_BUILD_INFO;
@ -63,11 +63,11 @@ exports.startInterface = function(url) {
// do this as a workaround for app translocation on osx, which makes // do this as a workaround for app translocation on osx, which makes
// it nearly impossible to find the interface executable // it nearly impossible to find the interface executable
var bundle_id = 'com.highfidelity.interface-dev'; var bundle_id = 'com.vircadia.interface-dev';
if (buildInfo.releaseType == 'PR') { if (buildInfo.releaseType == 'PR') {
bundle_id = 'com.highfidelity.interface-pr'; bundle_id = 'com.vircadia.interface-pr';
} else if (buildInfo.releaseType == 'PRODUCTION') { } else if (buildInfo.releaseType == 'PRODUCTION') {
bundle_id = 'com.highfidelity.interface'; bundle_id = 'com.vircadia.interface';
} }
childProcess.exec('open -b ' + bundle_id + ' --args --url ' + url); childProcess.exec('open -b ' + bundle_id + ' --args --url ' + url);
} else { } else {

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

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>High Fidelity</title> <title>Vircadia</title>
<script src="splash.js"></script> <script src="splash.js"></script>
<link rel="stylesheet" type="text/css" href="splash.css"></link> <link rel="stylesheet" type="text/css" href="splash.css"></link>
</head> </head>
@ -19,7 +19,7 @@
<div class="column left"> <div class="column left">
<p> <p>
<h2>What now?</h2> <h2>What now?</h2>
High Fidelity is now installed and your Home domain is ready for you to explore. To start you off, we've put a few things in your home to play around with and learn the ropes. Vircadia is now installed and your Home domain is ready for you to explore. To start you off, we've put a few things in your home to play around with and learn the ropes.
</p> </p>
<p> <p>
@ -28,13 +28,13 @@ You can make your home yours by uploading your own models and scripts.
</p> </p>
<p> <p>
<em>To get started exploring and creating,</em> <a target="_blank" href="https://docs.highfidelity.com/docs/explore">check out our Quick-start Guide</a> <em>To get started exploring and creating,</em> <a target="_blank" href="https://docs.vircadia.dev/explore.html">check out our Quick-start Guide</a>
</p> </p>
</div> </div>
<div class="column center"> <div class="column center">
<p> <p>
<h2>How do I use it?</h2> <h2>How do I use it?</h2>
You can manage your server by clicking on the High Fidelity icon in your You can manage your server by clicking on the Vircadia icon in your
<script> <script>
var osType = require('os').type(); var osType = require('os').type();
document.write(osType == 'Windows_NT' ? 'system tray.' : 'menu bar.'); document.write(osType == 'Windows_NT' ? 'system tray.' : 'menu bar.');
@ -44,14 +44,14 @@ You can make your home yours by uploading your own models and scripts.
<p> <p>
<ul> <ul>
<li>go to your 'Home,' automatically launching High Fidelity</li> <li>go to your 'Home,' automatically launching Vircadia</li>
<li>administer basic function like starting and stopping your server</li> <li>administer basic function like starting and stopping your server</li>
<li>access your server's settings and logs</li> <li>access your server's settings and logs</li>
</ul> </ul>
</p> </p>
<p> <p>
<em>For more information on managing your server,</em> <a target="_blank" href="https://docs.highfidelity.com/">visit our documentation</a> <em>For more information on managing your server,</em> <a target="_blank" href="https://docs.vircadia.dev/host.html">visit our documentation</a>
</p> </p>
</div> </div>
<div class="column right"> <div class="column right">