Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #996 from digisomni/fix/vircadia-branding-alpha

Browse source 
Update About Dialog and remove Vircadia "Alpha" references
This commit is contained in:
Kalila 2021-02-04 17:18:39 -05:00 committed by GitHub
commit 69e5d1261b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 59 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/master_build.yml vendored
View file

@ -83,15 +83,15 @@ jobs:
shell: bash
run: |
echo "${{ steps.buildenv1.outputs.symbols_archive }}"
echo "ARTIFACT_PATTERN=Vircadia-Alpha-*.$INSTALLER_EXT" >> $GITHUB_ENV
echo "ARTIFACT_PATTERN=Vircadia-*.$INSTALLER_EXT" >> $GITHUB_ENV
# Build type variables
echo "GIT_COMMIT_SHORT=${{ steps.buildenv1.outputs.github_sha_short }}" >> $GITHUB_ENV
if [ "${{ matrix.build_type }}" = "full" ]; then
echo "CLIENT_ONLY=FALSE" >> $GITHUB_ENV
echo "INSTALLER=Vircadia-Alpha-$BUILD_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV
echo "INSTALLER=Vircadia-$BUILD_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV
else
echo "CLIENT_ONLY=TRUE" >> $GITHUB_ENV
echo "INSTALLER=Vircadia-Alpha-Interface-$BUILD_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV
echo "INSTALLER=Vircadia-Interface-$BUILD_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV
fi
- name: Clear working directory
if: startsWith(matrix.os, 'windows')

4
.github/workflows/pr_build.yml vendored
View file

@ -86,9 +86,9 @@ jobs:
echo "${{ steps.buildenv1.outputs.symbols_archive }}"
echo "GIT_COMMIT_SHORT=${{ steps.buildenv1.outputs.github_sha_short }}" >> $GITHUB_ENV
if [[ "${{ matrix.build_type }}" != "android" ]]; then
echo "ARTIFACT_PATTERN=Vircadia-Alpha-PR${{ github.event.number }}-*.$INSTALLER_EXT" >> $GITHUB_ENV
echo "ARTIFACT_PATTERN=Vircadia-PR${{ github.event.number }}-*.$INSTALLER_EXT" >> $GITHUB_ENV
# Build type variables
echo "INSTALLER=Vircadia-Alpha-$RELEASE_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV
echo "INSTALLER=Vircadia-$RELEASE_NUMBER-$GIT_COMMIT_SHORT.$INSTALLER_EXT" >> $GITHUB_ENV
else
echo "ARTIFACT_PATTERN=*.$INSTALLER_EXT" >> $GITHUB_ENV
fi

2
LICENSE
View file

@ -1,5 +1,5 @@
Copyright (c) 2013-2019, High Fidelity, Inc.
Copyright (c) 2019-2020, Vircadia contributors.
Copyright (c) 2019-2021, Vircadia contributors.
All rights reserved.
https://vircadia.com

2
android/build_android.sh
View file

@ -17,7 +17,7 @@ fi
ANDROID_APP=interface
ANDROID_OUTPUT_DIR=./apps/${ANDROID_APP}/build/outputs/apk/${ANDROID_BUILD_TYPE}
ANDROID_OUTPUT_FILE=${ANDROID_APP}-${ANDROID_BUILD_TYPE}.apk
ANDROID_APK_NAME=Vircadia-Alpha-${ANDROID_APK_SUFFIX}
ANDROID_APK_NAME=Vircadia-${ANDROID_APK_SUFFIX}
./gradlew -PHIFI_ANDROID_PRECOMPILED=${HIFI_ANDROID_PRECOMPILED} -PVERSION_CODE=${VERSION_CODE} -PRELEASE_NUMBER=${RELEASE_NUMBER} -PRELEASE_TYPE=${RELEASE_TYPE} ${ANDROID_APP}:${ANDROID_BUILD_TARGET}
cp ${ANDROID_OUTPUT_DIR}/${ANDROID_OUTPUT_FILE} ./${ANDROID_APK_NAME}

BIN
cmake/installer/installer-header.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB

BIN
cmake/installer/uninstaller-header.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB

2
cmake/macros/GenerateInstallers.cmake
View file

@ -31,7 +31,7 @@ macro(GENERATE_INSTALLERS)
set(CPACK_PACKAGE_NAME ${_DISPLAY_NAME})
set(CPACK_PACKAGE_VENDOR "Vircadia")
set(CPACK_PACKAGE_VERSION ${BUILD_VERSION})
set(CPACK_PACKAGE_FILE_NAME "Vircadia-Alpha${_PACKAGE_NAME_EXTRA}-${BUILD_VERSION}")
set(CPACK_PACKAGE_FILE_NAME "Vircadia${_PACKAGE_NAME_EXTRA}-${BUILD_VERSION}")
set(CPACK_NSIS_DISPLAY_NAME ${_DISPLAY_NAME})
set(CPACK_NSIS_PACKAGE_NAME ${_DISPLAY_NAME})
if (PR_BUILD)

50
interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
View file

@ -28,13 +28,18 @@ Rectangle {
fillMode: Image.PreserveAspectFit
source: "../../../images/vircadia-banner.svg"
}
Item { height: 30; width: 1 }
Item { height: 25; width: 1 }
Column {
id: buildColumm
id: buildColumn
anchors.left: parent.left
anchors.leftMargin: 70
anchors.leftMargin: 0
RalewayRegular {
text: "Build " + About.buildVersion
text: "Interface"
size: 16
color: "white"
}
RalewayRegular {
text: "Build " + About.buildVersion + " " + About.releaseName
size: 16
color: "white"
}
@ -54,14 +59,25 @@ Rectangle {
textFormat: Text.StyledText
linkColor: "#00B4EF"
color: "white"
text: "<a href=\"https://github.com/vircadia/vircadia\">Vircadia Github</a>."
text: "<a href=\"https://vircadia.com\">Website</a>"
size: 20
onLinkActivated: {
About.openUrl("https:/github.com/vircadia/vircadia");
About.openUrl("https://vircadia.com");
}
}
Item { height: 40; width: 1 }
RalewayRegular {
textFormat: Text.StyledText
linkColor: "#00B4EF"
color: "white"
text: "<a href=\"https://github.com/vircadia/vircadia\">Source</a>"
size: 20
onLinkActivated: {
About.openUrl("https://github.com/vircadia/vircadia");
}
}
Item { height: 25; width: 1 }
Row {
spacing: 5
Image {
@ -117,7 +133,7 @@ Rectangle {
Item { height: 20; width: 1 }
RalewayRegular {
color: "white"
text: "© 2019-2020 Vircadia contributors."
text: "© 2019 - 2021 Vircadia contributors."
size: 14
}
RalewayRegular {
@ -135,5 +151,23 @@ Rectangle {
About.openUrl("http://www.apache.org/licenses/LICENSE-2.0.html");
}
}
Item { height: 35; width: 1 }
RalewayRegular {
color: "white"
text: "In memoriam,"
size: 14
}
RalewayRegular {
color: "white"
text: "2012 - 2019 the High Fidelity virtual reality project."
size: 14
}
Item { height: 5; width: 1 }
Image {
id: hifiLogo
width: 200; height: 50
fillMode: Image.PreserveAspectFit
source: "../../../images/about-highfidelity.png"
}
}
}

5
interface/src/AboutUtil.cpp
View file

@ -4,6 +4,7 @@
//
// Created by Vlad Stelmahovsky on 15/5/2018.
// Copyright 2018 High Fidelity, Inc.
// Copyright 2021 Vircadia contributors.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -40,6 +41,10 @@ QString AboutUtil::getBuildVersion() const {
return BuildInfo::VERSION;
}
QString AboutUtil::getReleaseName() const {
return BuildInfo::RELEASE_NAME;
}
QString AboutUtil::getQtVersion() const {
return qVersion();
}

4
interface/src/AboutUtil.h
View file

@ -30,12 +30,14 @@
* <em>Read-only.</em>
* @property {string} buildDate - The build date of Interface that is currently running. <em>Read-only.</em>
* @property {string} buildVersion - The build version of Interface that is currently running. <em>Read-only.</em>
* @property {string} releaseName - The release codename of the version that Interface is currently running. <em>Read-only.</em>
* @property {string} qtVersion - The Qt version used in Interface that is currently running. <em>Read-only.</em>
*
* @example <caption>Report information on the version of Interface currently running.</caption>
* print("Interface platform: " + About.platform);
* print("Interface build date: " + About.buildDate);
* print("Interface version: " + About.buildVersion);
* print("Interface release name: " + About.releaseName);
* print("Qt version: " + About.qtVersion);
*/
@ -66,6 +68,7 @@ class AboutUtil : public QObject {
Q_PROPERTY(QString platform READ getPlatformName CONSTANT)
Q_PROPERTY(QString buildDate READ getBuildDate CONSTANT)
Q_PROPERTY(QString buildVersion READ getBuildVersion CONSTANT)
Q_PROPERTY(QString releaseName READ getReleaseName CONSTANT)
Q_PROPERTY(QString qtVersion READ getQtVersion CONSTANT)
public:
static AboutUtil* getInstance();
@ -74,6 +77,7 @@ public:
QString getPlatformName() const { return "Vircadia"; }
QString getBuildDate() const;
QString getBuildVersion() const;
QString getReleaseName() const;
QString getQtVersion() const;
public slots: