Merge branch 'master' into fix/anim-warning-spam

This commit is contained in:
Kasen IO 2020-06-30 03:01:22 -04:00
commit 2faef4f05e
4 changed files with 11 additions and 8 deletions

View file

@ -1,13 +1,13 @@
# General Build Information
*Last Updated on May 17, 2020*
*Last Updated on June 27, 2020*
### OS Specific Build Guides
* [Build Windows](BUILD_WIN.md) - complete instructions for Windows.
* [Build Linux](BUILD_LINUX.md) - additional instructions for Linux.
* [Build OSX](BUILD_OSX.md) - additional instructions for OS X.
* [Build Android](BUILD_ANDROID.md) - additional instructions for Android
* [Build Android](BUILD_ANDROID.md) - additional instructions for Android.
### Dependencies
- [git](https://git-scm.com/downloads): >= 1.6
@ -78,11 +78,11 @@ Where /path/to/directory is the path to a directory where you wish the build fil
BUILD_NUMBER
// The type of release.
RELEASE_TYPE=PRODUCTION|PR
RELEASE_BUILD=PRODUCTION|PR
RELEASE_TYPE=PRODUCTION|PR|DEV
// TODO: What do these do?
PRODUCTION_BUILD=0|1
PR_BUILD=0|1
STABLE_BUILD=0|1
// TODO: What do these do?
@ -150,4 +150,4 @@ The following build options can be used when running CMake
#### Devices
You can support external input/output devices such as Leap Motion, MIDI, and more by adding each individual SDK in the visible building path. Refer to the readme file available in each device folder in [interface/external/](interface/external) for the detailed explanation of the requirements to use the device.

View file

@ -34,8 +34,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
"system/miniTablet.js",
"system/audioMuteOverlay.js",
"system/inspect.js",
"system/keyboardShortcuts/keyboardShortcuts.js",
"system/hand-track-walk.js"
"system/keyboardShortcuts/keyboardShortcuts.js"
];
var DEFAULT_SCRIPTS_SEPARATE = [
"system/controllers/controllerScripts.js",

View file

@ -6,7 +6,7 @@
// Created by Keb Helion, February 2020.
// Copyright 2020 Vircadia contributors.
//
// This script adds a "More Apps" selector to "Vircadia" to allow the user to add optional functionalities to the tablet.
// This script adds a "More Apps" selector to Vircadia to allow the user to add optional functionalities to the tablet.
// This application has been designed to work directly from the Github repository.
//
// Distributed under the Apache License, Version 2.0.

View file

@ -42,6 +42,10 @@ p a {
color: SteelBlue;
}
.appdesc a {
color: LightBlue;
}
font.appname {
font-family: 'Merriweather', sans-serif;
font-size: 18px;