From 336b5e275b5ad533638f3bc3aa6715a4186856e6 Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Sun, 12 Jan 2020 23:13:01 -0500 Subject: [PATCH] Removed obsolete default scripts + more branding changes. --- interface/src/Application.cpp | 4 ++-- libraries/entities/src/EntityItemProperties.cpp | 2 +- scripts/defaultScripts.js | 2 -- scripts/system/create/edit.js | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 3994a574d7..ee9abbfedb 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3184,7 +3184,7 @@ void Application::showLoginScreen() { QJsonObject loginData = {}; loginData["action"] = "login dialog popped up"; UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData); - _window->setWindowTitle("High Fidelity"); + _window->setWindowTitle("Project Athena"); } else { resumeAfterLoginDialogActionTaken(); } @@ -7066,7 +7066,7 @@ void Application::updateWindowTitle() const { auto accountManager = DependencyManager::get(); auto isInErrorState = nodeList->getDomainHandler().isInErrorState(); - QString buildVersion = " - Project Athena v0.86.0 K2 - " + QString buildVersion = " - Project Athena Interface v0.86.0 K2 - " + (BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable ? QString("Version") : QString("Build")) + " " + applicationVersion(); diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 2b8f2b4c14..9afaa5e85b 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -1366,7 +1366,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const { * var METERS_TO_INCHES = 39.3701; * var entity = Entities.addEntity({ * type: "Web", - * sourceUrl: "https://highfidelity.com/", + * sourceUrl: "https://projectathena.io/", * position: Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 0.75, z: -4 })), * rotation: MyAvatar.orientation, * dimensions: { diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index 795458f05d..07708ec509 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -24,9 +24,7 @@ var DEFAULT_SCRIPTS_COMBINED = [ "system/avatarapp.js", "system/makeUserConnection.js", "system/tablet-goto.js", - "system/marketplaces/marketplaces.js", "system/notifications.js", - "system/commerce/wallet.js", "system/create/edit.js", "system/dialTone.js", "system/firstPersonHMD.js", diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js index c57f4bae50..ef07aa4d6e 100644 --- a/scripts/system/create/edit.js +++ b/scripts/system/create/edit.js @@ -427,7 +427,7 @@ const DEFAULT_ENTITY_PROPERTIES = { y: 0.9, z: 0.01 }, - sourceUrl: "https://highfidelity.com/", + sourceUrl: "https://projectathena.io/", dpi: 30, }, ParticleEffect: {