Revert "Removed obsolete default scripts + more branding changes."

VizVR · Jan 17, 2020 · f5fcb90 · f5fcb90
1 parent 3eef6e8
commit f5fcb90
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
@@ -3185,7 +3185,7 @@ void Application::showLoginScreen() {
         QJsonObject loginData = {};
         loginData["action"] = "login dialog popped up";
         UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData);
-        _window->setWindowTitle("Project Athena");
+        _window->setWindowTitle("High Fidelity");
     } else {
         resumeAfterLoginDialogActionTaken();
     }
@@ -7067,7 +7067,7 @@ void Application::updateWindowTitle() const {
     auto accountManager = DependencyManager::get<AccountManager>();
     auto isInErrorState = nodeList->getDomainHandler().isInErrorState();
 
-    QString buildVersion = " - Project Athena Interface v0.86.0 K2 - "
+    QString buildVersion = " - Project Athena 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
@@ -1366,7 +1366,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
  * var METERS_TO_INCHES = 39.3701;
  * var entity = Entities.addEntity({
  *     type: "Web",
- *     sourceUrl: "https://projectathena.io/",
+ *     sourceUrl: "https://highfidelity.com/",
  *     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
@@ -24,7 +24,9 @@ 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
@@ -427,7 +427,7 @@ const DEFAULT_ENTITY_PROPERTIES = {
             y: 0.9,
             z: 0.01
         },
-        sourceUrl: "https://projectathena.io/",
+        sourceUrl: "https://highfidelity.com/",
         dpi: 30,
     },
     ParticleEffect: {