diff --git a/BUILD_LINUX.md b/BUILD_LINUX.md
index 14bd8c6af4..41f4238f0e 100644
--- a/BUILD_LINUX.md
+++ b/BUILD_LINUX.md
@@ -63,9 +63,9 @@ sudo apt-get install libasound2 libxmu-dev libxi-dev freeglut3-dev libasound2-de
```bash
sudo apt-get -y install libpulse0 libnss3 libnspr4 libfontconfig1 libxcursor1 libxcomposite1 libxtst6 libxslt1.1
```
-1. Install Python 3:
+1. Install Python 3 and required packages
```bash
-sudo apt-get install python3.6
+sudo apt-get install python3 python3-distro
```
1. Install node, required to build the jsdoc documentation
```bash
diff --git a/hifi_utils.py b/hifi_utils.py
index 24e43dc83c..d117011c99 100644
--- a/hifi_utils.py
+++ b/hifi_utils.py
@@ -118,6 +118,6 @@ def downloadAndExtract(url, destPath, hash=None, hasher=hashlib.sha512(), isZip=
zip.extractall(destPath)
else:
# Extract the archive
- with tarfile.open(tempFileName, 'r:gz') as tgz:
+ with tarfile.open(tempFileName, 'r:*') as tgz:
tgz.extractall(destPath)
os.remove(tempFileName)
diff --git a/hifi_vcpkg.py b/hifi_vcpkg.py
index f0e8840621..e6ffeb8dbb 100644
--- a/hifi_vcpkg.py
+++ b/hifi_vcpkg.py
@@ -9,6 +9,7 @@ import tempfile
import json
import xml.etree.ElementTree as ET
import functools
+import distro
from os import path
print = functools.partial(print, flush=True)
@@ -286,15 +287,32 @@ endif()
elif platform.system() == 'Darwin':
url = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-macos.tar.gz%3FversionId=bLAgnoJ8IMKpqv8NFDcAu8hsyQy3Rwwz'
elif platform.system() == 'Linux':
- if platform.linux_distribution()[1][:3] == '16.':
- url = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-16.04-with-symbols.tar.gz'
- elif platform.linux_distribution()[1][:3] == '18.':
- url = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-18.04.tar.gz'
+ dist = distro.linux_distribution()
+
+ if distro.id() == 'ubuntu':
+ u_major = int( distro.major_version() )
+ u_minor = int( distro.minor_version() )
+
+ if u_major == 16:
+ url = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-16.04-with-symbols.tar.gz'
+ elif u_major == 18:
+ url = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-18.04.tar.gz'
+ elif u_major == 19 and u_minor == 10:
+ url = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.6-ubuntu-19.10.tar.xz'
+ elif u_major > 18 and ( u_major != 19 and u_minor != 4):
+ print("We don't support " + distro.name(pretty=True) + " yet. Perhaps consider helping us out?")
+ else:
+ print("Sorry, " + distro.name(pretty=True) + " is old and won't be officially supported. Please consider upgrading.");
else:
- print('UNKNOWN LINUX VERSION!!!')
+ print("Sorry, " + distro.name(pretty=True) + " is not supported. Please consider helping us out.")
+ print("It's also possible to build Qt for your distribution, please see the documentation at:")
+ print("https://github.com/kasenvr/project-athena/tree/kasen/core/tools/qt-builder")
return;
else:
print('UNKNOWN OPERATING SYSTEM!!!')
+ print("System : " + platform.system())
+ print("Architecture: " + platform.architecture())
+ print("Machine : " + platform.machine())
return;
print('Extracting ' + url + ' to ' + dest)
diff --git a/interface/resources/images/about-opus.png b/interface/resources/images/about-opus.png
new file mode 100644
index 0000000000..57924b070f
Binary files /dev/null and b/interface/resources/images/about-opus.png differ
diff --git a/interface/resources/images/about-projectathena.png b/interface/resources/images/about-projectathena.png
new file mode 100644
index 0000000000..ae2d2bcd06
Binary files /dev/null and b/interface/resources/images/about-projectathena.png differ
diff --git a/interface/resources/images/project-athena-banner-color2.svg b/interface/resources/images/project-athena-banner-color2.svg
new file mode 100644
index 0000000000..b41a980fe0
--- /dev/null
+++ b/interface/resources/images/project-athena-banner-color2.svg
@@ -0,0 +1,157 @@
+
+
diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml
index e3cd492edb..fbc8f9495a 100644
--- a/interface/resources/qml/LoginDialog.qml
+++ b/interface/resources/qml/LoginDialog.qml
@@ -4,6 +4,7 @@
// Created by David Rowe on 3 Jun 2015
// Copyright 2015 High Fidelity, Inc.
// Distributed under the Apache License, Version 2.0.
+//
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
@@ -84,7 +85,7 @@ FocusScope {
Image {
id: banner
anchors.centerIn: parent
- source: "../images/high-fidelity-banner.svg"
+ source: "../images/project-athena-banner-color2.svg"
horizontalAlignment: Image.AlignHCenter
}
}
diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index 04ffe72a57..6de8676fd0 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -356,7 +356,7 @@ Item {
font.pixelSize: linkAccountBody.textFieldFontSize
font.bold: linkAccountBody.fontBold
- text: " Can't access your account?"
+ text: " Can't access your account?"
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
@@ -480,7 +480,7 @@ Item {
leftMargin: hifi.dimensions.contentSpacing.x
}
- text: "Sign Up"
+ text: "Sign Up"
linkColor: hifi.colors.blueAccent
onLinkActivated: {
diff --git a/interface/resources/qml/LoginDialog/SignUpBody.qml b/interface/resources/qml/LoginDialog/SignUpBody.qml
index f1e0cfe685..7347464f4e 100644
--- a/interface/resources/qml/LoginDialog/SignUpBody.qml
+++ b/interface/resources/qml/LoginDialog/SignUpBody.qml
@@ -23,7 +23,7 @@ Item {
clip: true
height: root.height
width: root.width
- readonly property string termsContainerText: qsTr("By signing up, you agree to High Fidelity's Terms of Service")
+ readonly property string termsContainerText: qsTr("By signing up, you agree to Project Athena's Terms of Service")
property int textFieldHeight: 31
property string fontFamily: "Raleway"
property int fontSize: 15
@@ -395,7 +395,7 @@ Item {
text: signUpBody.termsContainerText
Component.onCompleted: {
// with the link.
- termsText.text = qsTr("By signing up, you agree to High Fidelity's Terms of Service")
+ termsText.text = qsTr("By signing up, you agree to Project Athena's Terms of Service")
}
}
diff --git a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
index d2fd1dfe35..8b3c878d46 100644
--- a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
+++ b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
@@ -19,7 +19,7 @@ import TabletScriptingInterface 1.0
Item {
id: usernameCollisionBody
clip: true
- readonly property string termsContainerText: qsTr("By creating this user profile, you agree to High Fidelity's Terms of Service")
+ readonly property string termsContainerText: qsTr("By creating this user profile, you agree to Project Athena's Terms of Service")
width: root.width
height: root.height
readonly property string fontFamily: "Raleway"
@@ -218,7 +218,7 @@ Item {
text: usernameCollisionBody.termsContainerText
Component.onCompleted: {
// with the link.
- termsText.text = qsTr("By creating this user profile, you agree to High Fidelity's Terms of Service")
+ termsText.text = qsTr("By creating this user profile, you agree to Project Athena's Terms of Service")
}
}
diff --git a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
index 91e40aa608..2be66442ce 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
@@ -25,7 +25,7 @@ Rectangle {
Image {
sourceSize.width: 295
sourceSize.height: 75
- source: "../../../images/about-highfidelity.png"
+ source: "../../../images/about-projectathena.png"
}
Item { height: 30; width: 1 }
Column {
@@ -45,7 +45,7 @@ Rectangle {
}
Item { height: 10; width: 1 }
RalewayRegular {
- text: "An open-source virtual reality platform."
+ text: "An open source virtual reality platform."
size: 20
color: "white"
}
@@ -56,9 +56,9 @@ Rectangle {
text: "Project Athena Github."
size: 20
onLinkActivated: {
- HiFiAbout.openUrl("https:/github.com/kasenvr/hifi-community");
+ HiFiAbout.openUrl("https:/github.com/kasenvr/project-athena");
}
-
+
}
Item { height: 40; width: 1 }
Row {
@@ -93,21 +93,35 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
}
}
+ Row {
+ spacing: 5
+ Image {
+ sourceSize.width: 34
+ sourceSize.height: 25
+ source: "../../../images/about-opus.png"
+ MouseArea {
+ anchors.fill: parent
+ onClicked: {
+ HiFiAbout.openUrl("http://opus-codec.org/");
+ }
+ }
+ }
+ RalewayRegular {
+ color: "white"
+ text: "Built using the Opus codec."
+ size: 12
+ anchors.verticalCenter: parent.verticalCenter
+ }
+ }
Item { height: 20; width: 1 }
RalewayRegular {
- textFormat: Text.StyledText
- linkColor: "#00B4EF"
color: "white"
- property string link: "https://eos.io/"
- text: "Blockchain technology from EOS."
+ text: "© 2019 - 2020 Project Athena Contributors."
size: 14
- onLinkActivated: {
- HiFiAbout.openUrl(link);
- }
}
RalewayRegular {
color: "white"
- text: "© 2012 - 2019 High Fidelity, Inc.. All rights reserved."
+ text: "© 2012 - 2019 High Fidelity, Inc. All rights reserved."
size: 14
}
RalewayRegular {
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 1be67ef188..b0e5bbe8de 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -768,30 +768,30 @@ Menu::Menu() {
// Help/Application menu ----------------------------------
MenuWrapper * helpMenu = addMenu("Help");
- // Help > About High Fidelity
- action = addActionToQMenuAndActionHash(helpMenu, "About High Fidelity");
+ // Help > About Project Athena
+ action = addActionToQMenuAndActionHash(helpMenu, "About Project Athena");
connect(action, &QAction::triggered, [] {
qApp->showDialog(QString("hifi/dialogs/AboutDialog.qml"),
QString("hifi/dialogs/TabletAboutDialog.qml"), "AboutDialog");
});
helpMenu->addSeparator();
- // Help > HiFi Docs
+ // Help > Athena Docs
action = addActionToQMenuAndActionHash(helpMenu, "Online Documentation");
connect(action, &QAction::triggered, qApp, [] {
- QDesktopServices::openUrl(QUrl("https://docs.highfidelity.com/"));
+ QDesktopServices::openUrl(QUrl("https://docs.projectathena.dev/"));
});
- // Help > HiFi Forum
- action = addActionToQMenuAndActionHash(helpMenu, "Online Forums");
+ // Help > Athena Forum
+ /* action = addActionToQMenuAndActionHash(helpMenu, "Online Forums");
connect(action, &QAction::triggered, qApp, [] {
QDesktopServices::openUrl(QUrl("https://forums.highfidelity.com/"));
- });
+ }); */
// Help > Scripting Reference
action = addActionToQMenuAndActionHash(helpMenu, "Online Script Reference");
connect(action, &QAction::triggered, qApp, [] {
- QDesktopServices::openUrl(QUrl("https://docs.highfidelity.com/api-reference"));
+ QDesktopServices::openUrl(QUrl("https://apidocs.projectathena.dev/"));
});
addActionToQMenuAndActionHash(helpMenu, "Controls Reference", 0, qApp, SLOT(showHelp()));
@@ -801,13 +801,13 @@ Menu::Menu() {
// Help > Release Notes
action = addActionToQMenuAndActionHash(helpMenu, "Release Notes");
connect(action, &QAction::triggered, qApp, [] {
- QDesktopServices::openUrl(QUrl("https://docs.highfidelity.com/release-notes.html"));
+ QDesktopServices::openUrl(QUrl("https://docs.projectathena.dev/release-notes.html"));
});
// Help > Report a Bug!
action = addActionToQMenuAndActionHash(helpMenu, "Report a Bug!");
connect(action, &QAction::triggered, qApp, [] {
- QDesktopServices::openUrl(QUrl("https://github.com/kasenvr/hifi-community/issues"));
+ QDesktopServices::openUrl(QUrl("https://github.com/kasenvr/project-athena/issues"));
});
}
diff --git a/interface/src/workload/PhysicsBoundary.cpp b/interface/src/workload/PhysicsBoundary.cpp
index cc78789145..02f7633a44 100644
--- a/interface/src/workload/PhysicsBoundary.cpp
+++ b/interface/src/workload/PhysicsBoundary.cpp
@@ -1,5 +1,5 @@
//
-// PhysicsBoundary.h
+// PhysicsBoundary.cpp
//
// Created by Andrew Meadows 2018.04.05
// Copyright 2018 High Fidelity, Inc.