Merge branch 'kasen/core' into fix/whitelist-qml-adds

interface/resources/qml/hifi/avatarapp/MessageBoxes.qml

@@ -7,7 +7,7 @@ MessageBox {
         popup.onButton2Clicked = callback;
         popup.titleText = 'Specify Avatar URL'
         popup.bodyText = 'This will not overwrite your existing favorite if you are wearing one.<br>' +
-                '<a href="https://docs.highfidelity.com/create-and-explore/avatars/create-avatars">' +
+                '<a href="https://docs.projectathena.dev/create/avatars/create-avatars.html">' +
                 'Learn to make a custom avatar by opening this link on your desktop.' +
                 '</a>'
         popup.inputText.visible = true;

interface/resources/qml/hifi/commerce/checkout/Checkout.qml

@@ -778,7 +778,7 @@ Rectangle {
                     lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain. " +
                         "If you want to save the state of the content in this domain, create a backup before proceeding.<br><br>" +
                         "For more information about backing up and restoring content, " +
-                        "<a href='https://docs.highfidelity.com/create-and-explore/start-working-in-your-sandbox/restoring-sandbox-content'>" +
+                        "<a href='https://docs.projectathena.dev/host/maintain-domain/backup-domain.html'>" +
                         "click here to open info on your desktop browser.";
                     lightboxPopup.button1text = "CANCEL";
                     lightboxPopup.button1method = function() {

interface/resources/qml/hifi/commerce/purchases/Purchases.qml

@@ -602,7 +602,7 @@ Rectangle {
                             lightboxPopup.bodyText = "Rezzing this content set will replace the existing environment and all of the items in this domain. " +
                                 "If you want to save the state of the content in this domain, create a backup before proceeding.<br><br>" +
                                 "For more information about backing up and restoring content, " +
-                                "<a href='https://docs.highfidelity.com/create-and-explore/start-working-in-your-sandbox/restoring-sandbox-content'>" +
+                                "<a href='https://docs.projectathena.dev/host/maintain-domain/backup-domain.html'>" +
                                 "click here to open info on your desktop browser.";
                             lightboxPopup.button1text = "CANCEL";
                             lightboxPopup.button1method = function() {

interface/resources/qml/hifi/commerce/wallet/Help.qml

@@ -207,7 +207,7 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
                         if (link === "#privateKeyPath") {
                             Qt.openUrlExternally("file:///" + root.keyFilePath.substring(0, root.keyFilePath.lastIndexOf('/')));
                         } else if (link === "#blockchain") {
-                            Qt.openUrlExternally("https://docs.highfidelity.com/high-fidelity-commerce");
+                            Qt.openUrlExternally("https://docs.projectathena.dev/explore/shop.html");
                         } else if (link === "#bank") {
                             if ((Account.metaverseServerURL).toString().indexOf("staging") >= 0) {
                                 Qt.openUrlExternally("hifi://hifiqa-master-metaverse-staging"); // So that we can test in staging.

interface/src/Application.cpp

@@ -7750,7 +7750,7 @@ bool Application::askToReplaceDomainContent(const QString& url) {
             static const QString infoText = simpleWordWrap("Your domain's content will be replaced with a new content set. "
                 "If you want to save what you have now, create a backup before proceeding. For more information about backing up "
                 "and restoring content, visit the documentation page at: ", MAX_CHARACTERS_PER_LINE) +
-                "\nhttps://docs.highfidelity.com/create-and-explore/start-working-in-your-sandbox/restoring-sandbox-content";
+                "\nhttps://docs.projectathena.dev/host/maintain-domain/backup-domain.html";
 
             ModalDialogListener* dig = OffscreenUi::asyncQuestion("Are you sure you want to replace this domain's content set?",
                                                                   infoText, QMessageBox::Yes | QMessageBox::No, QMessageBox::No);

interface/src/avatar/MyAvatar.h

@@ -607,7 +607,7 @@ public:
      * <p>Note: When using pre-built animation data, it's critical that the joint orientation of the source animation and target 
      * rig are equivalent, since the animation data applies absolute values onto the joints. If the orientations are different, 
      * the avatar will move in unpredictable ways. For more information about avatar joint orientation standards, see 
-     * <a href="https://docs.highfidelity.com/create/avatars/avatar-standards">Avatar Standards</a>.</p>
+     * <a href="https://docs.projectathena.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
      * @function MyAvatar.overrideAnimation
      * @param {string} url - The URL to the animation file. Animation files may be in glTF or FBX format, but only need to 
      *     contain the avatar skeleton and animation data. glTF models may be in JSON or binary format (".gltf" or ".glb" URLs 
@@ -715,7 +715,7 @@ public:
      * <p>Note: When using pre-built animation data, it's critical that the joint orientation of the source animation and target
      * rig are equivalent, since the animation data applies absolute values onto the joints. If the orientations are different,
      * the avatar will move in unpredictable ways. For more information about avatar joint orientation standards, see 
-     * <a href="https://docs.highfidelity.com/create/avatars/avatar-standards">Avatar Standards</a>.
+     * <a href="https://docs.projectathena.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.
      * @function MyAvatar.overrideRoleAnimation
      * @param {string} role - The animation role to override
      * @param {string} url - The URL to the animation file. Animation files need to be in glTF or FBX format, but only need to 
@@ -1871,7 +1871,7 @@ public:
 
     /**jsdoc
      * Enables and disables flow simulation of physics on the avatar's hair, clothes, and body parts. See 
-     * {@link https://docs.highfidelity.com/create/avatars/add-flow.html|Add Flow to Your Avatar} for more 
+     * {@link https://docs.projectathena.dev/create/avatars/add-flow.html|Add Flow to Your Avatar} for more 
      * information.
      * @function MyAvatar.useFlow
      * @param {boolean} isActive - <code>true</code> if flow simulation is enabled on the joint, <code>false</code> if it isn't.
@@ -2236,7 +2236,7 @@ public slots:
 
     /**jsdoc
      * Gets the URL of the override animation graph.
-     * <p>See {@link https://docs.highfidelity.com/create/avatars/custom-animations.html|Custom Avatar Animations} for
+     * <p>See {@link https://docs.projectathena.dev/create/avatars/custom-animations.html|Custom Avatar Animations} for
      * information on animation graphs.</p>
      * @function MyAvatar.getAnimGraphOverrideUrl
      * @returns {string} The URL of the override animation graph JSON file. <code>""</code> if there is no override animation 
@@ -2246,7 +2246,7 @@ public slots:
 
     /**jsdoc
      * Sets the animation graph to use in preference to the default animation graph.
-     * <p>See {@link https://docs.highfidelity.com/create/avatars/custom-animations.html|Custom Avatar Animations} for
+     * <p>See {@link https://docs.projectathena.dev/create/avatars/custom-animations.html|Custom Avatar Animations} for
      * information on animation graphs.</p>
      * @function MyAvatar.setAnimGraphOverrideUrl
      * @param {string} url - The URL of the animation graph JSON file to use. Set to <code>""</code> to clear an override.
@@ -2255,7 +2255,7 @@ public slots:
 
     /**jsdoc
      * Gets the URL of animation graph (i.e., the avatar animation JSON) that's currently being used for avatar animations.
-     * <p>See {@link https://docs.highfidelity.com/create/avatars/custom-animations.html|Custom Avatar Animations} for 
+     * <p>See {@link https://docs.projectathena.dev/create/avatars/custom-animations.html|Custom Avatar Animations} for 
      * information on animation graphs.</p>
      * @function MyAvatar.getAnimGraphUrl
      * @returns {string} The URL of the current animation graph JSON file.
@@ -2266,7 +2266,7 @@ public slots:
 
     /**jsdoc
      * Sets the current animation graph  (i.e., the avatar animation JSON) to use for avatar animations and makes it the default.
-     * <p>See {@link https://docs.highfidelity.com/create/avatars/custom-animations.html|Custom Avatar Animations} for
+     * <p>See {@link https://docs.projectathena.dev/create/avatars/custom-animations.html|Custom Avatar Animations} for
      * information on animation graphs.</p>
      * @function MyAvatar.setAnimGraphUrl
      * @param {string} url - The URL of the animation graph JSON file to use.

libraries/avatars-renderer/src/avatars-renderer/Avatar.h

@@ -207,7 +207,7 @@ public:
     /**jsdoc
      * Gets the default rotation of a joint (in the current avatar) relative to its parent.
      * <p>For information on the joint hierarchy used, see
-     * <a href="https://docs.highfidelity.com/create/avatars/avatar-standards">Avatar Standards</a>.</p>
+     * <a href="https://docs.projectathena.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
      * @function MyAvatar.getDefaultJointRotation
      * @param {number} index - The joint index.
      * @returns {Quat} The default rotation of the joint if the joint index is valid, otherwise {@link Quat(0)|Quat.IDENTITY}.
@@ -218,7 +218,7 @@ public:
      * Gets the default translation of a joint (in the current avatar) relative to its parent, in model coordinates.
      * <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
      * <p>For information on the joint hierarchy used, see
-     * <a href="https://docs.highfidelity.com/create/avatars/avatar-standards">Avatar Standards</a>.</p>
+     * <a href="https://docs.projectathena.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
      * @function MyAvatar.getDefaultJointTranslation
      * @param {number} index - The joint index.
      * @returns {Vec3} The default translation of the joint (in model coordinates) if the joint index is valid, otherwise 

libraries/avatars/src/AvatarData.h

@@ -793,7 +793,7 @@ public:
      * @param {Quat} rotation - The rotation of the joint relative to its parent.
      * @param {Vec3} translation - The translation of the joint relative to its parent, in model coordinates.
      * @example <caption>Set your avatar to it's default T-pose for a while.<br />
-     * <img alt="Avatar in T-pose" src="https://docs.highfidelity.com/images/t-pose.png" /></caption>
+     * <img alt="Avatar in T-pose" src="https://apidocs.projectathena.dev/images/t-pose.png" /></caption>
      * // Set all joint translations and rotations to defaults.
      * var i, length, rotation, translation;
      * for (i = 0, length = MyAvatar.getJointNames().length; i < length; i++) {
@@ -857,7 +857,7 @@ public:
 
     /**jsdoc
      * Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see 
-     * <a href="https://docs.highfidelity.com/create/avatars/avatar-standards">Avatar Standards</a>.
+     * <a href="https://docs.projectathena.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.
      * @function Avatar.getJointRotation
      * @param {number} index - The index of the joint.
      * @returns {Quat} The rotation of the joint relative to its parent.
@@ -868,7 +868,7 @@ public:
      * Gets the translation of a joint relative to its parent, in model coordinates.
      * <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
      * <p>For information on the joint hierarchy used, see 
-     * <a href="https://docs.highfidelity.com/create/avatars/avatar-standards">Avatar Standards</a>.</p>
+     * <a href="https://docs.projectathena.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
      * @function Avatar.getJointTranslation
      * @param {number} index - The index of the joint.
      * @returns {Vec3} The translation of the joint relative to its parent, in model coordinates.
@@ -901,7 +901,7 @@ public:
      * @param {string} name - The name of the joint.
      * @param {Quat} rotation - The rotation of the joint relative to its parent.
      * @example <caption>Set your avatar to its default T-pose then rotate its right arm.<br />
-     * <img alt="Avatar in T-pose with arm rotated" src="https://docs.highfidelity.com/images/armpose.png" /></caption>
+     * <img alt="Avatar in T-pose with arm rotated" src="https://apidocs.projectathena.dev/images/armpose.png" /></caption>
      * // Set all joint translations and rotations to defaults.
      * var i, length, rotation, translation;
      * for (i = 0, length = MyAvatar.getJointNames().length; i < length; i++) {
@@ -936,7 +936,7 @@ public:
      * @param {Vec3} translation - The translation of the joint relative to its parent, in model coordinates.
      * @example <caption>Stretch your avatar's neck. Depending on the avatar you are using, you will either see a gap between 
      * the head and body or you will see the neck stretched.<br />
-     * <img alt="Avatar with neck stretched" src="https://docs.highfidelity.com/images/stretched-neck.png" /></caption>
+     * <img alt="Avatar with neck stretched" src="https://apidocs.projectathena.dev/images/stretched-neck.png" /></caption>
      * // Stretch your avatar's neck.
      * MyAvatar.setJointTranslation("Neck", Vec3.multiply(2, MyAvatar.getJointTranslation("Neck")));
      * 
@@ -978,7 +978,7 @@ public:
 
     /**jsdoc
      * Gets the rotation of a joint relative to its parent. For information on the joint hierarchy used, see 
-     * <a href="https://docs.highfidelity.com/create/avatars/avatar-standards">Avatar Standards</a>.
+     * <a href="https://docs.projectathena.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.
      * @function Avatar.getJointRotation
      * @param {string} name - The name of the joint.
      * @returns {Quat} The rotation of the joint relative to its parent.
@@ -993,7 +993,7 @@ public:
      * Gets the translation of a joint relative to its parent, in model coordinates.
      * <p><strong>Warning:</strong> These coordinates are not necessarily in meters.</p>
      * <p>For information on the joint hierarchy used, see
-     * <a href="https://docs.highfidelity.com/create/avatars/avatar-standards">Avatar Standards</a>.</p>
+     * <a href="https://docs.projectathena.dev/create/avatars/avatar-standards.html">Avatar Standards</a>.</p>
      * @function Avatar.getJointTranslation
      * @param {number} name - The name of the joint.
      * @returns {Vec3} The translation of the joint relative to its parent, in model coordinates.
@@ -1038,7 +1038,7 @@ public:
      * @param {Quat[]} jointRotations - The rotations for all joints in the avatar. The values are in the same order as the 
      * array returned by {@link MyAvatar.getJointNames}, or {@link Avatar.getJointNames} if using the <code>Avatar</code> API.
      * @example <caption>Set your avatar to its default T-pose then rotate its right arm.<br />
-     * <img alt="Avatar in T-pose" src="https://docs.highfidelity.com/images/armpose.png" /></caption>
+     * <img alt="Avatar in T-pose" src="https://apidocs.projectathena.dev/images/armpose.png" /></caption>
      * // Set all joint translations and rotations to defaults.
      * var i, length, rotation, translation;
      * for (i = 0, length = MyAvatar.getJointNames().length; i < length; i++) {
@@ -1135,7 +1135,7 @@ public:
      * animation is complete.
      * @function Avatar.setBlendshape
      * @param {string} name - The name of the blendshape, per the 
-     *     {@link https://docs.highfidelity.com/create/avatars/avatar-standards.html#blendshapes Avatar Standards}.
+     *     {@link https://docs.projectathena.dev/create/avatars/avatar-standards.html#blendshapes Avatar Standards}.
      * @param {number} value - A value between <code>0.0</code> and <code>1.0</code>.
      * @example <caption>Open your avatar's mouth wide.</caption>
      * MyAvatar.hasScriptedBlendshapes = true;

libraries/image/src/image/TextureProcessing.h

@@ -33,7 +33,7 @@ namespace TextureUsage {
 /**jsdoc
  * <p>Describes the type of texture.</p>
  * <p>See also: {@link Material} and 
- * {@link https://docs.highfidelity.com/create/3d-models/pbr-materials-guide.html|PBR Materials Guide}.</p>
+ * {@link https://docs.projectathena.dev/create/3d-models/pbr-materials-guide.html|PBR Materials Guide}.</p>
  * <table>
  *   <thead>
  *     <tr><th>Value</th><th>Name</th><th>Description</th></tr>

libraries/midi/src/Midi.h

@@ -23,7 +23,7 @@
 /**jsdoc
  * The <code>Midi</code> API provides the ability to connect Interface with musical instruments and other external or virtual 
  * devices via the MIDI protocol. For further information and examples, see the tutorial: 
- * <a href="https://docs.highfidelity.com/script/midi-tutorial.html">Use MIDI to Control Your Environment</a>.
+ * <a href="https://docs.projectathena.dev/script/midi-tutorial.html">Use MIDI to Control Your Environment</a>.
  *
  * <p><strong>Note:</strong> Only works on Windows.</p>
  *

libraries/script-engine/src/ScriptEngine.h

@@ -417,7 +417,7 @@ public:
 
     /**jsdoc
      * Provides access to methods or objects provided in an external JavaScript or JSON file. 
-     * See {@link https://docs.highfidelity.com/script/js-tips.html} for further details.
+     * See {@link https://docs.projectathena.dev/script/js-tips.html} for further details.
      * @function Script.require
      * @param {string} module - The module to use. May be a JavaScript file, a JSON file, or the name of a system module such 
      *     as <code>"appUi"</code> (i.e., the "appUi.js" system module JavaScript file).

libraries/script-engine/src/Vec3.h

@@ -24,7 +24,7 @@
 /**jsdoc
  * The <code>Vec3</code> API provides facilities for generating and manipulating 3-dimensional vectors. High Fidelity uses a 
  * right-handed Cartesian coordinate system where the y-axis is the "up" and the negative z-axis is the "front" direction.
- * <img alt="High Fidelity coordinate system" src="https://docs.highfidelity.com/images/opengl-coord-system.jpg" />
+ * <img alt="High Fidelity coordinate system" src="https://apidocs.projectathena.dev/images/opengl-coord-system.jpg" />
  *
  * @namespace Vec3
  * @variation 0

tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css

@@ -198,12 +198,12 @@ article li {
 
 nav {
     position: fixed;
-    top: 260px;
+    top: 275px;
     bottom: 0;
     left: 0;
     right: 0;
     width: 300px;
-    background-color: #000000;
+    background-color: #27343B;
     border-right: 1px solid #ccc;
     overflow-y: scroll;
     padding-left: 20px;
@@ -232,9 +232,9 @@ nav #nav-search {
     position: fixed;
     top: 0;
     left: 0;
-    height: 260px;
+    height: 275px;
     width: 300px;
-    background-color: #000000;
+    background-color: #27343B;
     color: #FFFFFF;
     text-align: center;
     margin-top: 0px;    
@@ -374,11 +374,12 @@ nav > h2 > a {
 .search-input
 {
     font-family: 'Graphik Regular', sans-serif;
-    font-size: 80%;    
+    font-size: 90%;    
     border: 1px solid #ddd;
     box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.06);
     border-radius: 0;    
-    color: #3A3F3E;
+	background: rgba(76,76,76,0.47) !important;
+	color: white;
     width: 70%;
     padding: 10px;
 }

tools/jsdoc/hifi-jsdoc-template/static/styles/night.css

@@ -0,0 +1,80 @@
+html {
+	background-color: #061F2F;
+}
+
+body h1 {
+	color: #eaeaea;
+}
+
+body {
+	color: #d3d4d4 !important;
+}
+
+section {
+	background-color: #061F2F;
+}
+
+/* Prettify */
+
+.typ {
+	color: #f8c555 !important;
+}
+
+.pun {
+	color: #c1f1f0 !important;
+}
+
+.pln {
+	color: #c1f1f0 !important;
+}
+
+.kwd {
+	color: #e8a0e8 !important;
+}
+
+.str {
+	color: #f08d49 !important;
+}
+
+.com {
+	color: #9d9d9d !important;
+}
+
+.prettyprint code {
+	background-color: #0a121b;
+}
+
+tr td a code {
+	font-weight: bold;
+}
+
+/* JSDoc */
+
+thead {
+	background: #1f3341 !important;
+}
+
+thead tr {
+	color: white !important;
+}
+
+table tr:nth-child(2n) {
+	background: #1f3341 !important;
+}
+
+.name code {
+	color: #e8a0e8 !important;
+	font-weight: bold;
+}
+
+.signature {
+	font-weight: bold;
+}
+
+#main a, #main a:visited, #main a:active, #main a:hover {
+	color: #69d3ff !important;
+}
+
+.important {
+	color: #F91E1E !important;
+}

tools/jsdoc/hifi-jsdoc-template/tmpl/layout.tmpl

@@ -4,6 +4,9 @@
     <?js if (!env.conf.docdash) { env.conf.docdash = {};} ?>
     <meta charset="utf-8">
     <title><?js= title ?></title>
+	
+	<script src="scripts/vue.min.js"></script>
+	<script src="scripts/vuetify.js"></script>
     
     <script src="scripts/prettify/prettify.js"></script>
     <script src="scripts/prettify/lang-css.js"></script>
@@ -12,6 +15,32 @@
     <![endif]-->
     <link type="text/css" rel="stylesheet" href="styles/prettify.css">
     <link type="text/css" rel="stylesheet" href="styles/jsdoc.css">
+	<link type="text/css" rel="stylesheet" href="styles/night.css">
+	<link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900" rel="stylesheet">
+	<link href="https://fonts.googleapis.com/css?family=Material+Icons|Material+Icons+Outlined|Material+Icons+Two+Tone|Material+Icons+Round|Material+Icons+Sharp" rel="stylesheet">
+	<link href="styles/materialdesignicons.min.css" rel="stylesheet">
+	<link href="styles/vuetify.css" rel="stylesheet">
+	<style>
+		.v-application--wrap {
+			min-height: 0 !important;
+		}
+		
+		/** Override Vue CSS. */
+		.theme--dark.v-application {
+			background: #27343b !important;
+		}
+	</style>
+	<script>
+	//We are running the check here to preload the theme because it may load the incorrect one first for a split second.
+		var darkDisabled = JSON.parse(localStorage.getItem('darkDisabled'));
+		if (darkDisabled == null) {
+			localStorage.setItem('darkDisabled', JSON.stringify(false));
+		} else {
+			var nightSheet = document.querySelector('[href="styles/night.css"]');
+			nightSheet.disabled = darkDisabled;
+		}
+	</script>
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, minimal-ui">
     <link href="images/fav-icon.ico" rel="shortcut icon">
 </head>
 <body>
@@ -22,6 +51,14 @@
     <input type="text" class="search-input" id="nav-search" placeholder="Search API Docs ..." />
     <?js } ?>
     <p><a href="https://docs.projectathena.dev">Looking for <strong>Project Athena</strong><br /> Documentation?</a></p>
+	<div id="app">
+		<v-app dark>
+			<v-btn @click="toggleNightMode" text dark>
+				Toggle
+				<v-icon class="ml-2">mdi-theme-light-dark</v-icon>
+			</v-btn>
+		</v-app>
+	</div>
 </div>
 
 <nav>
@@ -71,6 +108,33 @@
     <?js } ?>
 <?js } ?>
 
+<script>
+	new Vue({
+		el: '#app',
+		vuetify: new Vuetify({
+			theme: {
+				dark: true,
+			},
+		}),
+		data: () => ({
+
+		}),
+		created: function () {
+			
+		},
+		methods: {
+			toggleNightMode: function() {
+				var darkDisabled = JSON.parse(localStorage.getItem('darkDisabled'));
+				localStorage.setItem('darkDisabled', JSON.stringify(!darkDisabled));
+				darkDisabled = !darkDisabled;
+								
+				var nightSheet = document.querySelector('[href="styles/night.css"]');
+				nightSheet.disabled = darkDisabled;
+			}
+		},
+	})
+</script>
+
 <!-- Start Google Analytics Tag -->
 <!--
 <script>