Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 01:36:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various URL updates + window title update.

Browse source
This commit is contained in:
Kasen IO 2020-02-05 15:25:51 -05:00
parent 7833a49784
commit 08ec9ef3b7
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/+webengine/BrowserWebView.qml
View file

@ -6,7 +6,7 @@ import controlsUit 1.0
WebView { WebView {
id: webview id: webview
url: "https://highfidelity.com/" url: "https://projectathena.io/"
profile: FileTypeProfile; profile: FileTypeProfile;
property var parentRoot: null property var parentRoot: null

2
interface/src/Application.cpp
View file

@ -3185,7 +3185,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();
} }

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
libraries/ui/src/ui/TabletScriptingInterface.h
View file

@ -105,7 +105,7 @@ public:
* @returns {TabletProxy} The tablet instance. * @returns {TabletProxy} The tablet instance.
* @example <caption>Display the High Fidelity home page on the system tablet.</caption> * @example <caption>Display the High Fidelity home page on the system tablet.</caption>
* var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); * var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
* tablet.gotoWebScreen("https://highfidelity.com/"); * tablet.gotoWebScreen("https://projectathena.io/");
*/ */
Q_INVOKABLE TabletProxy* getTablet(const QString& tabletId); Q_INVOKABLE TabletProxy* getTablet(const QString& tabletId);

2
script-archive/tests/performance/renderableMatrix.js
View file

@ -114,7 +114,7 @@ Script.setInterval(function () {
if (isModel) { if (isModel) {
properties.modelURL = type; properties.modelURL = type;
} else if (type === 'Web') { } else if (type === 'Web') {
properties.sourceUrl = 'https://highfidelity.com'; properties.sourceUrl = 'https://projectathena.io';
} else { } else {
properties.color = { red: x / ROWS_X * 255, green: y / ROWS_Y * 255, blue: z / ROWS_Z * 255 }; properties.color = { red: x / ROWS_X * 255, green: y / ROWS_Y * 255, blue: z / ROWS_Z * 255 };
if (type === 'ParticleEffect') { if (type === 'ParticleEffect') {

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: {