mirror of
https://github.com/overte-org/overte.git
synced 2025-06-03 11:32:05 +02:00
Merge pull request #906 from vircadia/fix/update-references
Fix/update references
This commit is contained in:
commit
633c642d4a
22 changed files with 44 additions and 44 deletions
2
.github/workflows/pr_build.yml
vendored
2
.github/workflows/pr_build.yml
vendored
|
@ -171,7 +171,7 @@ jobs:
|
||||||
- name: Build for Android + Quest
|
- name: Build for Android + Quest
|
||||||
if: matrix.build_type == 'android'
|
if: matrix.build_type == 'android'
|
||||||
shell: bash
|
shell: bash
|
||||||
working-directory: ${{runner.workspace}}/project-athena
|
working-directory: ${{runner.workspace}}/vircadia
|
||||||
run: |
|
run: |
|
||||||
echo "Pre-cache the vcpkg managed dependencies"
|
echo "Pre-cache the vcpkg managed dependencies"
|
||||||
$PYTHON_EXEC prebuild.py --build-root ${{runner.workspace}}/build --android interface
|
$PYTHON_EXEC prebuild.py --build-root ${{runner.workspace}}/build --android interface
|
||||||
|
|
|
@ -66,7 +66,7 @@ The above code to suppress modules is not necessary, but will speed up the build
|
||||||
|
|
||||||
### Clone the repository
|
### Clone the repository
|
||||||
|
|
||||||
`git clone https://github.com/kasenvr/project-athena.git`
|
`git clone https://github.com/vircadia/vircadia.git`
|
||||||
|
|
||||||
## Building & Running
|
## Building & Running
|
||||||
|
|
||||||
|
@ -119,4 +119,4 @@ Some things you can try if you want to do a clean build
|
||||||
* In Android Studio, click _File > Invalidate Caches / Restart_ and select _Invalidate and Restart_
|
* In Android Studio, click _File > Invalidate Caches / Restart_ and select _Invalidate and Restart_
|
||||||
|
|
||||||
If you see lots of "couldn't acquire lock" errors,
|
If you see lots of "couldn't acquire lock" errors,
|
||||||
* Open Task Manager and close any running Clang / Gradle processes
|
* Open Task Manager and close any running Clang / Gradle processes
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only Linux specific instructions are found in this file.
|
Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only Linux specific instructions are found in this file.
|
||||||
|
|
||||||
You can use the [Vircadia Builder](https://github.com/kasenvr/vircadia-builder) to build on Linux more easily. Alternatively, you can follow the manual steps below.
|
You can use the [Vircadia Builder](https://github.com/vircadia/vircadia-builder) to build on Linux more easily. Alternatively, you can follow the manual steps below.
|
||||||
|
|
||||||
## Ubuntu 16.04/18.04 specific build guide
|
## Ubuntu 16.04/18.04 specific build guide
|
||||||
### Ubuntu 16.04 only
|
### Ubuntu 16.04 only
|
||||||
|
@ -78,7 +78,7 @@ sudo apt-get install nodejs
|
||||||
|
|
||||||
Clone this repository:
|
Clone this repository:
|
||||||
```bash
|
```bash
|
||||||
git clone https://github.com/kasenvr/project-athena.git
|
git clone https://github.com/vircadia/vircadia.git
|
||||||
```
|
```
|
||||||
|
|
||||||
To compile a DEV version checkout the branch you need. To get a list of all tags:
|
To compile a DEV version checkout the branch you need. To get a list of all tags:
|
||||||
|
@ -105,7 +105,7 @@ Qt must be installed in `$HIFI_QT_BASE/$VIRCADIA_USE_QT_VERSION/qt5-install`.
|
||||||
|
|
||||||
Create the build directory:
|
Create the build directory:
|
||||||
```bash
|
```bash
|
||||||
cd project-athena
|
cd vircadia
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
```
|
```
|
||||||
|
|
|
@ -107,7 +107,7 @@ Note: You can also run Interface by launching it from command line or File Explo
|
||||||
For any problems after Step #6, first try this:
|
For any problems after Step #6, first try this:
|
||||||
* Delete your locally cloned copy of the Vircadia repository
|
* Delete your locally cloned copy of the Vircadia repository
|
||||||
* Restart your computer
|
* Restart your computer
|
||||||
* Redownload the [repository](https://github.com/kasenvr/project-athena)
|
* Redownload the [repository](https://github.com/vircadia/vircadia)
|
||||||
* Restart directions from Step #6
|
* Restart directions from Step #6
|
||||||
|
|
||||||
#### CMake gives you the same error message repeatedly after the build fails
|
#### CMake gives you the same error message repeatedly after the build fails
|
||||||
|
|
|
@ -6,7 +6,7 @@ Contributing
|
||||||
2. Clone your fork of the repository locally
|
2. Clone your fork of the repository locally
|
||||||
|
|
||||||
```
|
```
|
||||||
git clone git://github.com/USERNAME/project-athena.git
|
git clone git://github.com/USERNAME/vircadia.git
|
||||||
```
|
```
|
||||||
3. Create a new branch
|
3. Create a new branch
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ Contributing
|
||||||
6. Update your branch
|
6. Update your branch
|
||||||
|
|
||||||
```
|
```
|
||||||
git remote add upstream https://github.com/kasenvr/project-athena
|
git remote add upstream https://github.com/vircadia/vircadia
|
||||||
git pull upstream master
|
git pull upstream master
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -38,10 +38,10 @@ Contributing
|
||||||
Reporting Bugs
|
Reporting Bugs
|
||||||
===
|
===
|
||||||
1. Always update to the latest code on master, we make many merges every day and it is possible the bug has already been fixed!
|
1. Always update to the latest code on master, we make many merges every day and it is possible the bug has already been fixed!
|
||||||
2. Search [issues](https://github.com/kasenvr/project-athena/issues) to make sure that somebody has not already reported the same bug.
|
2. Search [issues](https://github.com/vircadia/vircadia/issues) to make sure that somebody has not already reported the same bug.
|
||||||
3. [Add](https://github.com/kasenvr/project-athena/issues/new) your report to the issues list!
|
3. [Add](https://github.com/vircadia/vircadia/issues/new) your report to the issues list!
|
||||||
|
|
||||||
Requesting a Feature
|
Requesting a Feature
|
||||||
===
|
===
|
||||||
1. Search [issues](https://github.com/kasenvr/project-athena/issues) to make sure that somebody has not already requested the same feature.
|
1. Search [issues](https://github.com/vircadia/vircadia/issues) to make sure that somebody has not already requested the same feature.
|
||||||
2. [Add](https://github.com/kasenvr/project-athena/issues/new) your request to the issues list!
|
2. [Add](https://github.com/vircadia/vircadia/issues/new) your request to the issues list!
|
||||||
|
|
16
README.md
16
README.md
|
@ -8,17 +8,17 @@ Vircadia is a 3D social software project seeking to incrementally bring about a
|
||||||
|
|
||||||
### Releases
|
### Releases
|
||||||
|
|
||||||
[View Releases here](https://github.com/kasenvr/project-athena/releases/)
|
[View Releases here](https://github.com/vircadia/vircadia/releases/)
|
||||||
|
|
||||||
### How to build the Interface
|
### How to build the Interface
|
||||||
|
|
||||||
[For Windows](https://github.com/kasenvr/project-athena/blob/master/BUILD_WIN.md)
|
[For Windows](https://github.com/vircadia/vircadia/blob/master/BUILD_WIN.md)
|
||||||
|
|
||||||
[For Mac](https://github.com/kasenvr/project-athena/blob/master/BUILD_OSX.md)
|
[For Mac](https://github.com/vircadia/vircadia/blob/master/BUILD_OSX.md)
|
||||||
|
|
||||||
[For Linux](https://github.com/kasenvr/project-athena/blob/master/BUILD_LINUX.md)
|
[For Linux](https://github.com/vircadia/vircadia/blob/master/BUILD_LINUX.md)
|
||||||
|
|
||||||
[For Linux - Vircadia Builder](https://github.com/kasenvr/vircadia-builder)
|
[For Linux - Vircadia Builder](https://github.com/vircadia/vircadia-builder)
|
||||||
|
|
||||||
### How to deploy a Server
|
### How to deploy a Server
|
||||||
|
|
||||||
|
@ -26,13 +26,13 @@ Vircadia is a 3D social software project seeking to incrementally bring about a
|
||||||
|
|
||||||
### How to build a Server
|
### How to build a Server
|
||||||
|
|
||||||
[For Linux - Vircadia Builder](https://github.com/kasenvr/vircadia-builder)
|
[For Linux - Vircadia Builder](https://github.com/vircadia/vircadia-builder)
|
||||||
|
|
||||||
### How to generate an Installer
|
### How to generate an Installer
|
||||||
|
|
||||||
[For Windows](https://github.com/kasenvr/project-athena/blob/master/INSTALL.md)
|
[For Windows](https://github.com/vircadia/vircadia/blob/master/INSTALL.md)
|
||||||
|
|
||||||
[For Linux - AppImage - Vircadia Builder](https://github.com/kasenvr/vircadia-builder/blob/master/README.md#building-appimages)
|
[For Linux - AppImage - Vircadia Builder](https://github.com/vircadia/vircadia-builder/blob/master/README.md#building-appimages)
|
||||||
|
|
||||||
### Boot to Metaverse: The Goal
|
### Boot to Metaverse: The Goal
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@ test -z "$STABLE_BUILD" && export STABLE_BUILD=0
|
||||||
docker run \
|
docker run \
|
||||||
--rm \
|
--rm \
|
||||||
--security-opt seccomp:unconfined \
|
--security-opt seccomp:unconfined \
|
||||||
-v "${WORKSPACE}":/home/gha/project-athena \
|
-v "${WORKSPACE}":/home/gha/vircadia \
|
||||||
-e RELEASE_NUMBER \
|
-e RELEASE_NUMBER \
|
||||||
-e RELEASE_TYPE \
|
-e RELEASE_TYPE \
|
||||||
-e ANDROID_APP \
|
-e ANDROID_APP \
|
||||||
|
|
|
@ -72,17 +72,17 @@ RUN mkdir "$HIFI_BASE" && \
|
||||||
mkdir "$HIFI_ANDROID_PRECOMPILED"
|
mkdir "$HIFI_ANDROID_PRECOMPILED"
|
||||||
|
|
||||||
# Download the repo
|
# Download the repo
|
||||||
RUN git clone https://github.com/kasenvr/project-athena.git
|
RUN git clone https://github.com/vircadia/vircadia.git
|
||||||
|
|
||||||
WORKDIR /home/gha/project-athena
|
WORKDIR /home/gha/vircadia
|
||||||
|
|
||||||
RUN mkdir build
|
RUN mkdir build
|
||||||
|
|
||||||
# Pre-cache the vcpkg managed dependencies
|
# Pre-cache the vcpkg managed dependencies
|
||||||
WORKDIR /home/gha/project-athena/build
|
WORKDIR /home/gha/vircadia/build
|
||||||
RUN python3 ../prebuild.py --build-root `pwd` --android interface
|
RUN python3 ../prebuild.py --build-root `pwd` --android interface
|
||||||
|
|
||||||
# Pre-cache the gradle dependencies
|
# Pre-cache the gradle dependencies
|
||||||
WORKDIR /home/gha/project-athena/android
|
WORKDIR /home/gha/vircadia/android
|
||||||
RUN ./gradlew -m tasks -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED
|
RUN ./gradlew -m tasks -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED
|
||||||
#RUN ./gradlew extractDependencies -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED
|
#RUN ./gradlew extractDependencies -PHIFI_ANDROID_PRECOMPILED=$HIFI_ANDROID_PRECOMPILED
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
//
|
//
|
||||||
// index.html
|
// index.html
|
||||||
//
|
//
|
||||||
// Created by kasenvr@gmail.com on 21 Jul 2020
|
// Created by somnilibertas@gmail.com on 21 Jul 2020
|
||||||
// Copyright 2020 Vircadia and contributors.
|
// Copyright 2020 Vircadia and contributors.
|
||||||
//
|
//
|
||||||
// Distributed under the Apache License, Version 2.0.
|
// Distributed under the Apache License, Version 2.0.
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
// Here you can put a script that will be run by an assignment-client (AC)
|
// Here you can put a script that will be run by an assignment-client (AC)
|
||||||
// For examples, please go to https://github.com/kasenvr/project-athena/tree/master/script-archive/acScripts
|
// For examples, please go to https://github.com/vircadia/vircadia/tree/master/script-archive/acScripts
|
||||||
// The directory named acScripts contains assignment-client specific scripts you can try.
|
// The directory named acScripts contains assignment-client specific scripts you can try.
|
||||||
|
|
|
@ -81,7 +81,7 @@ endif()
|
||||||
else:
|
else:
|
||||||
print("Sorry, " + distro.name(pretty=True) + " is not supported. Please consider helping us out.")
|
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("It's also possible to build Qt for your distribution, please see the documentation at:")
|
||||||
print("https://github.com/kasenvr/project-athena/tree/master/tools/qt-builder")
|
print("https://github.com/vircadia/vircadia/tree/master/tools/qt-builder")
|
||||||
raise Exception('UNKNOWN LINUX VERSION!!!')
|
raise Exception('UNKNOWN LINUX VERSION!!!')
|
||||||
else:
|
else:
|
||||||
print("System : " + platform.system())
|
print("System : " + platform.system())
|
||||||
|
|
|
@ -54,10 +54,10 @@ Rectangle {
|
||||||
textFormat: Text.StyledText
|
textFormat: Text.StyledText
|
||||||
linkColor: "#00B4EF"
|
linkColor: "#00B4EF"
|
||||||
color: "white"
|
color: "white"
|
||||||
text: "<a href=\"https://github.com/kasenvr/project-athena\">Vircadia Github</a>."
|
text: "<a href=\"https://github.com/vircadia/vircadia\">Vircadia Github</a>."
|
||||||
size: 20
|
size: 20
|
||||||
onLinkActivated: {
|
onLinkActivated: {
|
||||||
About.openUrl("https:/github.com/kasenvr/project-athena");
|
About.openUrl("https:/github.com/vircadia/vircadia");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
// EntityScriptQMLWhitelist.qml
|
// EntityScriptQMLWhitelist.qml
|
||||||
// interface/resources/qml/hifi/dialogs/security
|
// interface/resources/qml/hifi/dialogs/security
|
||||||
//
|
//
|
||||||
// Created by Kasen IO on 2019.12.05 | realities.dev | kasenvr@gmail.com
|
// Created by Kalila L. on 2019.12.05 | realities.dev | somnilibertas@gmail.com
|
||||||
// Copyright 2019 Kasen IO
|
// Copyright 2019 Kalila L.
|
||||||
//
|
//
|
||||||
// Distributed under the Apache License, Version 2.0.
|
// Distributed under the Apache License, Version 2.0.
|
||||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||||
|
|
|
@ -314,7 +314,7 @@ Rectangle {
|
||||||
onClicked: {
|
onClicked: {
|
||||||
lightboxPopup.titleText = "Script Plugin Infrastructure";
|
lightboxPopup.titleText = "Script Plugin Infrastructure";
|
||||||
lightboxPopup.bodyText = "Toggles the activation of scripting plugins in the 'plugins/scripting' folder. \n\n"
|
lightboxPopup.bodyText = "Toggles the activation of scripting plugins in the 'plugins/scripting' folder. \n\n"
|
||||||
+ "Created by:\n humbletim@gmail.com\n kasenvr@gmail.com";
|
+ "Created by:\n humbletim@gmail.com\n somnilibertas@gmail.com";
|
||||||
lightboxPopup.button1text = "OK";
|
lightboxPopup.button1text = "OK";
|
||||||
lightboxPopup.button1method = function() {
|
lightboxPopup.button1method = function() {
|
||||||
lightboxPopup.visible = false;
|
lightboxPopup.visible = false;
|
||||||
|
|
|
@ -72,7 +72,7 @@ namespace NetworkingConstants {
|
||||||
const QUrl HELP_FORUM_URL { "https://forums.vircadia.dev" };
|
const QUrl HELP_FORUM_URL { "https://forums.vircadia.dev" };
|
||||||
const QUrl HELP_SCRIPTING_REFERENCE_URL{ "https://apidocs.vircadia.dev/" };
|
const QUrl HELP_SCRIPTING_REFERENCE_URL{ "https://apidocs.vircadia.dev/" };
|
||||||
const QUrl HELP_RELEASE_NOTES_URL{ "https://docs.vircadia.dev/release-notes.html" };
|
const QUrl HELP_RELEASE_NOTES_URL{ "https://docs.vircadia.dev/release-notes.html" };
|
||||||
const QUrl HELP_BUG_REPORT_URL{ "https://github.com/kasenvr/project-athena/issues" };
|
const QUrl HELP_BUG_REPORT_URL{ "https://github.com/vircadia/vircadia/issues" };
|
||||||
|
|
||||||
const QString DEFAULT_VIRCADIA_ADDRESS = "file:///~/serverless/tutorial.json";
|
const QString DEFAULT_VIRCADIA_ADDRESS = "file:///~/serverless/tutorial.json";
|
||||||
const QString DEFAULT_HOME_ADDRESS = "file:///~/serverless/tutorial.json";
|
const QString DEFAULT_HOME_ADDRESS = "file:///~/serverless/tutorial.json";
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
Collection of scripts to create server distribution packages. Most of these scripts assume
|
Collection of scripts to create server distribution packages. Most of these scripts assume
|
||||||
use of the build script at https://github.com/kasenvr/vircadia-builder, specifically that
|
use of the build script at https://github.com/vircadia/vircadia-builder, specifically that
|
||||||
the following directory structure exists
|
the following directory structure exists
|
||||||
|
|
||||||
base folder/
|
base folder/
|
||||||
|
|
|
@ -5,8 +5,8 @@ Maintainer: Heather Anderson <heath@odysseus.anderson.name>
|
||||||
Build-Depends: debhelper (>= 10)
|
Build-Depends: debhelper (>= 10)
|
||||||
Standards-Version: 4.1.2
|
Standards-Version: 4.1.2
|
||||||
Homepage: https://vircadia.com
|
Homepage: https://vircadia.com
|
||||||
Vcs-Git: https://github.com/kasenvr/project-athena.git
|
Vcs-Git: https://github.com/vircadia/vircadia.git
|
||||||
Vcs-Browser: https://github.com/kasenvr/project-athena
|
Vcs-Browser: https://github.com/vircadia/vircadia
|
||||||
|
|
||||||
Package: vircadia-server
|
Package: vircadia-server
|
||||||
Architecture: any
|
Architecture: any
|
||||||
|
|
|
@ -9,7 +9,7 @@ Summary: Vircadia metaverse platform, based on the High Fidelity Engine.
|
||||||
|
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://vircadia.com
|
URL: https://vircadia.com
|
||||||
Source0: https://github.com/kasenvr/vircadia-builder/blob/master/vircadia-builder
|
Source0: https://github.com/vircadia/vircadia-builder/blob/master/vircadia-builder
|
||||||
|
|
||||||
#BuildRequires: systemd-rpm-macros
|
#BuildRequires: systemd-rpm-macros
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
// plugins/JSAPIExample/src
|
// plugins/JSAPIExample/src
|
||||||
//
|
//
|
||||||
// Copyright (c) 2019-2020 humbletim (humbletim@gmail.com)
|
// Copyright (c) 2019-2020 humbletim (humbletim@gmail.com)
|
||||||
// Copyright (c) 2019 Kalila L. (kasenvr@gmail.com)
|
// Copyright (c) 2019 Kalila L. (somnilibertas@gmail.com)
|
||||||
//
|
//
|
||||||
// Distributed under the Apache License, Version 2.0.
|
// Distributed under the Apache License, Version 2.0.
|
||||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||||
|
|
|
@ -102,7 +102,7 @@ def parse_args():
|
||||||
if True:
|
if True:
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
else:
|
else:
|
||||||
args = parser.parse_args(['--android', 'questInterface', '--build-root', 'C:/git/project-athena/android/apps/questInterface/.externalNativeBuild/cmake/debug/arm64-v8a'])
|
args = parser.parse_args(['--android', 'questInterface', '--build-root', 'C:/git/vircadia/android/apps/questInterface/.externalNativeBuild/cmake/debug/arm64-v8a'])
|
||||||
return args
|
return args
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|
|
@ -5,8 +5,8 @@
|
||||||
// Created by Keb Helion, February 2020.
|
// Created by Keb Helion, February 2020.
|
||||||
// Copyright 2020 Vircadia contributors.
|
// Copyright 2020 Vircadia contributors.
|
||||||
//
|
//
|
||||||
// App maintained in: https://github.com/kasenvr/community-apps
|
// App maintained in: https://github.com/vircadia/community-apps
|
||||||
// App copied to: https://github.com/kasenvr/project-athena
|
// App copied to: https://github.com/vircadia/vircadia
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
// Distributed under the Apache License, Version 2.0.
|
// Distributed under the Apache License, Version 2.0.
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/kasenvr/project-athena.git"
|
"url": "https://github.com/vircadia/vircadia.git"
|
||||||
},
|
},
|
||||||
"main": "src/main.js",
|
"main": "src/main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
Loading…
Reference in a new issue