mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 14:29:03 +02:00
Update 'kasenvr' -> 'vircadia'
This commit is contained in:
parent
f5485e858c
commit
5d4612e400
15 changed files with 30 additions and 30 deletions
|
@ -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/project-athena.git`
|
||||||
|
|
||||||
## Building & Running
|
## Building & Running
|
||||||
|
|
||||||
|
|
|
@ -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/project-athena.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:
|
||||||
|
|
|
@ -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/project-athena)
|
||||||
* 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
|
||||||
|
|
|
@ -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/project-athena
|
||||||
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/project-athena/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/project-athena/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/project-athena/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/project-athena/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/project-athena/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/project-athena/blob/master/BUILD_WIN.md)
|
||||||
|
|
||||||
[For Mac](https://github.com/kasenvr/project-athena/blob/master/BUILD_OSX.md)
|
[For Mac](https://github.com/vircadia/project-athena/blob/master/BUILD_OSX.md)
|
||||||
|
|
||||||
[For Linux](https://github.com/kasenvr/project-athena/blob/master/BUILD_LINUX.md)
|
[For Linux](https://github.com/vircadia/project-athena/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/project-athena/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
|
||||||
|
|
||||||
|
|
|
@ -72,7 +72,7 @@ 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/project-athena.git
|
||||||
|
|
||||||
WORKDIR /home/gha/project-athena
|
WORKDIR /home/gha/project-athena
|
||||||
|
|
||||||
|
|
|
@ -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/project-athena/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/project-athena/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/project-athena\">Vircadia Github</a>."
|
||||||
size: 20
|
size: 20
|
||||||
onLinkActivated: {
|
onLinkActivated: {
|
||||||
About.openUrl("https:/github.com/kasenvr/project-athena");
|
About.openUrl("https:/github.com/vircadia/project-athena");
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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/project-athena/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/project-athena.git
|
||||||
Vcs-Browser: https://github.com/kasenvr/project-athena
|
Vcs-Browser: https://github.com/vircadia/project-athena
|
||||||
|
|
||||||
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
|
||||||
|
|
|
@ -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/project-athena
|
||||||
//
|
//
|
||||||
//
|
//
|
||||||
// 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/project-athena.git"
|
||||||
},
|
},
|
||||||
"main": "src/main.js",
|
"main": "src/main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
Loading…
Reference in a new issue