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

Merge pull request #85 from kasenvr/fix/obsolete-apps

Browse source 
Removed obsolete default scripts + more branding changes.
This commit is contained in:
Marcus Llewellyn 2020-01-14 12:33:30 -06:00 committed by GitHub
commit 653b333060
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -3184,7 +3184,7 @@ void Application::showLoginScreen() {
QJsonObject loginData = {}; QJsonObject loginData = {};
loginData["action"] = "login dialog popped up"; loginData["action"] = "login dialog popped up";
UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData); UserActivityLogger::getInstance().logAction("encourageLoginDialog", loginData);
_window->setWindowTitle("High Fidelity"); _window->setWindowTitle("Project Athena");
} else { } else {
resumeAfterLoginDialogActionTaken(); resumeAfterLoginDialogActionTaken();
} }
@ -7066,7 +7066,7 @@ void Application::updateWindowTitle() const {
auto accountManager = DependencyManager::get<AccountManager>(); auto accountManager = DependencyManager::get<AccountManager>();
auto isInErrorState = nodeList->getDomainHandler().isInErrorState(); 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")) + (BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable ? QString("Version") : QString("Build"))
+ " " + applicationVersion(); + " " + applicationVersion();

2
libraries/entities/src/EntityItemProperties.cpp
View file

@ -1366,7 +1366,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* var METERS_TO_INCHES = 39.3701; * var METERS_TO_INCHES = 39.3701;
* var entity = Entities.addEntity({ * var entity = Entities.addEntity({
* type: "Web", * 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 })), * position: Vec3.sum(MyAvatar.position, Vec3.multiplyQbyV(MyAvatar.orientation, { x: 0, y: 0.75, z: -4 })),
* rotation: MyAvatar.orientation, * rotation: MyAvatar.orientation,
* dimensions: { * dimensions: {

2
scripts/defaultScripts.js
View file

@ -24,9 +24,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
"system/avatarapp.js", "system/avatarapp.js",
"system/makeUserConnection.js", "system/makeUserConnection.js",
"system/tablet-goto.js", "system/tablet-goto.js",
"system/marketplaces/marketplaces.js",
"system/notifications.js", "system/notifications.js",
"system/commerce/wallet.js",
"system/create/edit.js", "system/create/edit.js",
"system/dialTone.js", "system/dialTone.js",
"system/firstPersonHMD.js", "system/firstPersonHMD.js",

2
scripts/system/create/edit.js
View file

@ -427,7 +427,7 @@ const DEFAULT_ENTITY_PROPERTIES = {
y: 0.9, y: 0.9,
z: 0.01 z: 0.01
}, },
sourceUrl: "https://highfidelity.com/", sourceUrl: "https://projectathena.io/",
dpi: 30, dpi: 30,
}, },
ParticleEffect: { ParticleEffect: {