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

Reduce scope of PR.

Browse source
This commit is contained in:
Kasen IO 2020-05-17 22:13:57 -04:00
parent f4bcc82dd6
commit 335f0c86dd
17 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/AssignmentClientApp.cpp
View file

@ -44,7 +44,7 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
// parse command-line
QCommandLineParser parser;
parser.setApplicationDescription("Vircadia Assignment Client");
parser.setApplicationDescription("High Fidelity Assignment Client");
const QCommandLineOption helpOption = parser.addHelpOption();
const QCommandLineOption versionOption = parser.addVersionOption();

2
cmake/ports/hifi-client-deps/CONTROL
View file

@ -1,4 +1,4 @@
Source: hifi-client-deps
Version: 0
Description: Collected dependencies for Vircadia applications
Description: Collected dependencies for High Fidelity applications
Build-Depends: hifi-deps, glslang, nlohmann-json, openvr (windows), sdl2 (!android), spirv-cross (!android), spirv-tools (!android), vulkanmemoryallocator

2
domain-server/src/DomainServer.cpp
View file

@ -334,7 +334,7 @@ DomainServer::DomainServer(int argc, char* argv[]) :
void DomainServer::parseCommandLine(int argc, char* argv[]) {
QCommandLineParser parser;
parser.setApplicationDescription("Vircadia Domain Server");
parser.setApplicationDescription("High Fidelity Domain Server");
const QCommandLineOption versionOption = parser.addVersionOption();
const QCommandLineOption helpOption = parser.addHelpOption();

2
libraries/shared/src/SharedUtil.cpp
View file

@ -1029,7 +1029,7 @@ bool getProcessorInfo(ProcessorInfo& info) {
const QString& getInterfaceSharedMemoryName() {
static const QString applicationName = "Vircadia Interface - " + qgetenv("USERNAME");
static const QString applicationName = "High Fidelity Interface - " + qgetenv("USERNAME");
return applicationName;
}

2
libraries/shared/src/Trace.cpp
View file

@ -167,7 +167,7 @@ void Tracer::serialize(const QString& filename) {
QJsonObject {
{ "traceEvents", traceEvents },
{ "otherData", QJsonObject {
{ "version", QString { "Vircadia Interface v1.0" } +BuildInfo::VERSION }
{ "version", QString { "High Fidelity Interface v1.0" } +BuildInfo::VERSION }
} }
}
};

8
pkg-scripts/athena-server.spec
View file

@ -5,10 +5,10 @@
Name: athena-server
Version: %{version}
Release: 1%{?dist}
Summary: Vircadia metaverse platform, based on the High Fidelity Engine.
Summary: Project Athena metaverse platform, based on the High Fidelity Engine.
License: ASL 2.0
URL: https://vircadia.com
URL: https://projectathena.io
Source0: https://github.com/daleglass/athena-builder/blob/master/athena_builder
#BuildRequires: systemd-rpm-macros
@ -19,8 +19,8 @@ AutoReq: no
AutoProv: no
%description
Vircadia allows creation and sharing of VR experiences.
The Vircadia metaverse provides built-in social features, including avatar interactions, spatialized audio and interactive physics. Additionally, you have the ability to import any 3D object into your virtual environment.
Project Athena allows creation and sharing of VR experiences.
The Project Athena metaverse provides built-in social features, including avatar interactions, spatialized audio and interactive physics. Additionally, you have the ability to import any 3D object into your virtual environment.
%prep

2
tools/ac-client/src/ACClientApp.cpp
View file

@ -29,7 +29,7 @@ ACClientApp::ACClientApp(int argc, char* argv[]) :
{
// parse command-line
QCommandLineParser parser;
parser.setApplicationDescription("Vircadia AC client");
parser.setApplicationDescription("High Fidelity AC client");
const QCommandLineOption helpOption = parser.addHelpOption();

2
tools/atp-client/src/ATPClientApp.cpp
View file

@ -36,7 +36,7 @@ ATPClientApp::ATPClientApp(int argc, char* argv[]) :
{
// parse command-line
QCommandLineParser parser;
parser.setApplicationDescription("Vircadia ATP-Client");
parser.setApplicationDescription("High Fidelity ATP-Client");
const QCommandLineOption helpOption = parser.addHelpOption();

10
tools/ci-scripts/linux-package-release/package-and-upload.sh
View file

@ -8,20 +8,20 @@ for package_name in "${packages_systemd[@]}"
do
SOURCE_DESTINATION_LIST="${WORKSPACE}/build/${package_name}/${package_name}=/usr/share/hifi/${package_name}/ "
if [ "$package_name" == "domain-server" ]; then
DESCRIPTION="Vircadia Domain server."
DESCRIPTION="High Fidelity Domain server."
SOURCE_DESTINATION_LIST+="${WORKSPACE}/build/${package_name}/resources/=/usr/share/hifi/${package_name}/resources "
SOURCE_DESTINATION_LIST+="${WORKSPACE}/build/ext/makefiles/quazip/project/build/libquazip5.so.1.0.0=/usr/share/hifi/${package_name}/libquazip5.so.1"
elif [ "$package_name" == "assignment-client" ]; then
DESCRIPTION="Vircadia Assignment clients. Services target a local domain server. Different assignment clients are managed independently with systemd."
DESCRIPTION="High Fidelity Assignment clients. Services target a local domain server. Different assignment clients are managed independently with systemd."
SOURCE_DESTINATION_LIST+="${WORKSPACE}/build/${package_name}/plugins/=/usr/share/hifi/${package_name}/plugins "
SOURCE_DESTINATION_LIST+="${WORKSPACE}/build/ext/makefiles/quazip/project/build/libquazip5.so.1.0.0=/usr/share/hifi/${package_name}/libquazip5.so.1 "
SOURCE_DESTINATION_LIST+="${WORKSPACE}/build/${package_name}/oven=/usr/share/hifi/${package_name}/oven"
elif [ "$package_name" == "ice-server" ]; then
DESCRIPTION="Vircadia ICE server."
DESCRIPTION="High Fidelity ICE server."
fi
fpm -s dir -t deb -n hifi-${prefix}${package_name} -v ${VERSION} -d hifiqt5.12.3 --vendor "Vircadia" -m "<contact@vircadia.com>" \
--url "https://vircadia.com" --license "Apache License 2.0" --description "${DESCRIPTION}" -d libgomp1 -d libtbb2 -d libgl1-mesa-glx -d libnss3 \
fpm -s dir -t deb -n hifi-${prefix}${package_name} -v ${VERSION} -d hifiqt5.12.3 --vendor "High Fidelity Inc" -m "<ops@highfidelity.com>" \
--url "https://highfidelity.com" --license "Apache License 2.0" --description "${DESCRIPTION}" -d libgomp1 -d libtbb2 -d libgl1-mesa-glx -d libnss3 \
-d libxi6 -d libxcursor1 -d libxcomposite1 -d libasound2 -d libxtst6 -d libxslt1.1 --template-scripts --template-value "service"="hifi-${package_name}" \
--deb-systemd ${LOCAL_PATH}/hifi-${package_name} --before-install ${LOCAL_PATH}/${package_name}-before-install.sh \
--after-install ${LOCAL_PATH}/after-install.sh --before-remove ${LOCAL_PATH}/before-remove.sh \

2
tools/ice-client/src/ICEClientApp.cpp
View file

@ -24,7 +24,7 @@ ICEClientApp::ICEClientApp(int argc, char* argv[]) :
{
// parse command-line
QCommandLineParser parser;
parser.setApplicationDescription("Vircadia ICE client");
parser.setApplicationDescription("High Fidelity ICE client");
parser.addHelpOption();
const QCommandLineOption helpOption = parser.addHelpOption();

2
tools/nitpick/CMakeLists.txt
View file

@ -72,7 +72,7 @@ elseif (WIN32)
set(CONFIGURE_ICON_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Icon.rc")
configure_file("${HF_CMAKE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT})
set(APP_FULL_NAME "Vircadia Nitpick")
set(APP_FULL_NAME "High Fidelity Nitpick")
set(CONFIGURE_VERSION_INFO_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.rc")
configure_file("${HF_CMAKE_DIR}/templates/VersionInfo.rc.in" ${CONFIGURE_VERSION_INFO_RC_OUTPUT})

2
tools/oven/src/OvenCLIApplication.cpp
View file

@ -42,7 +42,7 @@ void OvenCLIApplication::parseCommandLine(int argc, char* argv[]) {
// parse the command line parameters
QCommandLineParser parser;
parser.setApplicationDescription("Vircadia Oven");
parser.setApplicationDescription("High Fidelity Oven");
parser.addOptions({
{ CLI_INPUT_PARAMETER, "Path to file that you would like to bake.", "input" },
{ CLI_OUTPUT_PARAMETER, "Path to folder that will be used as output.", "output" },

2
tools/oven/src/ui/OvenMainWindow.cpp
View file

@ -18,7 +18,7 @@
OvenMainWindow::OvenMainWindow(QWidget *parent, Qt::WindowFlags flags) :
QMainWindow(parent, flags)
{
setWindowTitle("Vircadia Oven");
setWindowTitle("High Fidelity Oven");
// give the window a fixed width that will never change
setFixedWidth(FIXED_WINDOW_WIDTH);

2
tools/oven/src/ui/ResultsWindow.cpp
View file

@ -23,7 +23,7 @@ ResultsWindow::ResultsWindow(QWidget* parent) :
QWidget(parent)
{
// add a title to this window to identify it
setWindowTitle("Vircadia Oven - Bake Results");
setWindowTitle("High Fidelity Oven - Bake Results");
// give this dialog the same starting width as the main application window
resize(FIXED_WINDOW_WIDTH, size().height());

2
tools/skeleton-dump/src/SkeletonDumpApp.cpp
View file

@ -19,7 +19,7 @@ SkeletonDumpApp::SkeletonDumpApp(int argc, char* argv[]) : QCoreApplication(argc
// parse command-line
QCommandLineParser parser;
parser.setApplicationDescription("Vircadia FBX Skeleton Analyzer");
parser.setApplicationDescription("High Fidelity FBX Skeleton Analyzer");
const QCommandLineOption helpOption = parser.addHelpOption();
const QCommandLineOption verboseOutput("v", "verbose output");

2
tools/udt-test/src/UDTTest.cpp
View file

@ -216,7 +216,7 @@ UDTTest::UDTTest(int& argc, char** argv) :
void UDTTest::parseArguments() {
// use a QCommandLineParser to setup command line arguments and give helpful output
_argumentParser.setApplicationDescription("Vircadia UDT Protocol Test Client");
_argumentParser.setApplicationDescription("High Fidelity UDT Protocol Test Client");
_argumentParser.addHelpOption();
const QCommandLineOption helpOption = _argumentParser.addHelpOption();

2
tools/vhacd-util/src/VHACDUtilApp.cpp
View file

@ -106,7 +106,7 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
// parse command-line
QCommandLineParser parser;
parser.setApplicationDescription("Vircadia Object Decomposer");
parser.setApplicationDescription("High Fidelity Object Decomposer");
parser.addHelpOption();
const QCommandLineOption helpOption = parser.addHelpOption();