Merge pull request #448 from kasenvr/v2020.2.1-rc

Merge 2020.2.1 into master

interface/resources/qml/OverlayLoginDialog.qml

@@ -81,7 +81,9 @@ FocusScope {
         Image {
             id: banner
             anchors.centerIn: parent
-            source: "../images/high-fidelity-banner.svg"
+            sourceSize.width: 500
+            sourceSize.height: 91
+            source: "../images/vircadia-logo.svg"
             horizontalAlignment: Image.AlignHCenter
         }
     }

interface/resources/qml/controlsUit/SpinBox.qml

@@ -109,7 +109,7 @@ SpinBox {
         id: spinboxText
         z: 2
         color: isLightColorScheme
-               ? (spinBox.activeFocus ? hifi.colors.black : hifi.colors.faintGray)
+               ? (spinBox.activeFocus ? hifi.colors.black : hifi.colors.baseGrayHighlight)
                : (spinBox.activeFocus ? hifi.colors.white : hifi.colors.lightGrayText)
         selectedTextColor: hifi.colors.black
         selectionColor: hifi.colors.primaryHighlight
@@ -130,7 +130,7 @@ SpinBox {
             }
 
             color: isLightColorScheme
-                   ? (spinBox.activeFocus ? hifi.colors.black : hifi.colors.faintGray)
+                   ? (spinBox.activeFocus ? hifi.colors.black : hifi.colors.baseGrayHighlight)
                    : (spinBox.activeFocus ? hifi.colors.white : hifi.colors.lightGrayText)
             text: suffix
             verticalAlignment: Qt.AlignVCenter

interface/resources/qml/hifi/avatarapp/AdjustWearables.qml

@@ -403,7 +403,6 @@ Rectangle {
 
             Vector3 {
                 id: positionVector
-                backgroundColor: "lightgray"
                 enabled: getCurrentWearable() !== null
 
                 function set(localPosition) {
@@ -463,7 +462,6 @@ Rectangle {
 
             Vector3 {
                 id: rotationVector
-                backgroundColor: "lightgray"
                 enabled: getCurrentWearable() !== null
 
                 function set(localRotationAngles) {
@@ -550,7 +548,7 @@ Rectangle {
                     realFrom: 0.1
                     realTo: 3.0
                     realValue: 1.0
-                    backgroundColor: "lightgray"
+                    backgroundColor: activeFocus ? "white" : "lightgray"
                     width: positionVector.spinboxWidth
                     colorScheme: hifi.colorSchemes.light
 

interface/resources/qml/hifi/avatarapp/Vector3.qml

@@ -29,7 +29,7 @@ Row {
         id: xspinner
         width: parent.spinboxWidth
         labelInside: "X:"
-        backgroundColor: parent.backgroundColor
+        backgroundColor: activeFocus ? "white" : "lightgray"
         colorLabelInside: hifi.colors.redHighlight
         colorScheme: hifi.colorSchemes.light
         decimals: root.decimals;
@@ -43,7 +43,7 @@ Row {
         id: yspinner
         width: parent.spinboxWidth
         labelInside: "Y:"
-        backgroundColor: parent.backgroundColor
+        backgroundColor: activeFocus ? "white" : "lightgray"
         colorLabelInside: hifi.colors.greenHighlight
         colorScheme: hifi.colorSchemes.light
         decimals: root.decimals;
@@ -57,7 +57,7 @@ Row {
         id: zspinner
         width: parent.spinboxWidth
         labelInside: "Z:"
-        backgroundColor: parent.backgroundColor
+        backgroundColor: activeFocus ? "white" : "lightgray"
         colorLabelInside: hifi.colors.primaryHighlight
         colorScheme: hifi.colorSchemes.light
         decimals: root.decimals;

interface/src/Menu.cpp

@@ -614,13 +614,13 @@ Menu::Menu() {
     addCheckableActionToQMenuAndActionHash(networkMenu,
         MenuOption::DisableActivityLogger,
         0,
-        false,
+        true,
         &UserActivityLogger::getInstance(),
         SLOT(disable(bool)));
     addCheckableActionToQMenuAndActionHash(networkMenu,
         MenuOption::DisableCrashLogger,
         0,
-        false,
+        true,
         &UserActivityLogger::getInstance(),
         SLOT(crashMonitorDisable(bool)));
     addActionToQMenuAndActionHash(networkMenu, MenuOption::ShowDSConnectTable, 0,

interface/src/Menu.h

@@ -86,7 +86,7 @@ namespace MenuOption {
     const QString DeleteAvatarEntitiesBookmark = "Delete Avatar Entities Bookmark";
     const QString DeleteBookmark = "Delete Bookmark...";
     const QString DisableActivityLogger = "Disable Activity Logger";
-    const QString DisableCrashLogger = "Disable Crash Logger";
+    const QString DisableCrashLogger = "Disable Crash Reporter";
     const QString DisableEyelidAdjustment = "Disable Eyelid Adjustment";
     const QString DisableLightEntities = "Disable Light Entities";
     const QString DisplayCrashOptions = "Display Crash Options";

libraries/entities/src/EntityScriptingInterface.cpp

@@ -987,8 +987,8 @@ void EntityScriptingInterface::deleteEntity(const QUuid& id) {
 
             // Deleting an entity has consequences for linked children: some can be deleted but others can't.
             // Local- and my-avatar-entities can be deleted immediately, but other-avatar-entities can't be deleted
-            // by this context, and a domain-entity must rountrip through the entity-server for authorization.
+            // by this context, and a domain-entity must round trip through the entity-server for authorization.
-            if (entity->isDomainEntity()) {
+            if (entity->isDomainEntity() && !_entityTree->isServerlessMode()) {
                 getEntityPacketSender()->queueEraseEntityMessage(id);
             } else {
                 entitiesToDeleteImmediately.push_back(entity);

libraries/networking/src/UserActivityLogger.h

@@ -59,7 +59,7 @@ private slots:
 private:
     UserActivityLogger();
     Setting::Handle<bool> _disabled { "UserActivityLoggerDisabled", true };
-    Setting::Handle<bool> _crashMonitorDisabled { "CrashMonitorDisabled", false };
+    Setting::Handle<bool> _crashMonitorDisabled { "CrashMonitorDisabled2", true };
 
     QElapsedTimer _timer;
 };

scripts/communityScripts/explore/explore.html

@@ -73,6 +73,9 @@
 <body onload="retrieveAddressList()">
 
     <h3>Explore</h3>
+    <button class="myButton" onclick="navigateBack()">< Back</button>
+    <button class="myButton" onclick="navigateHome()">Home</button>
+    <button class="myButton" onclick="navigateForward()">Forward ></button>
 
     <input type="text" id="domainAddressInput" placeholder="Type domain address here">
 
@@ -85,15 +88,36 @@
     <script>
 
         function myDomainAddressInputGoTo() {
-            var hifiUrl = document.getElementById("domainAddressInput").value;
+            var vircadiaUrl = document.getElementById("domainAddressInput").value;
-            if (hifiUrl != "") {
+            if (vircadiaUrl !== "") {
                 var readyEvent = {
                     "action": "goToUrl",
-                    "visit": hifiUrl,
+                    "visit": vircadiaUrl,
                 };
                 EventBridge.emitWebEvent(JSON.stringify(readyEvent));
             }
         }
+        
+        function navigateBack() {
+            var readyEvent = {
+                "action": "navigateBack"
+            }
+            EventBridge.emitWebEvent(JSON.stringify(readyEvent));
+        }
+        
+        function navigateHome() {
+            var readyEvent = {
+                "action": "navigateHome"
+            }
+            EventBridge.emitWebEvent(JSON.stringify(readyEvent));
+        }
+        
+        function navigateForward() {
+            var readyEvent = {
+                "action": "navigateForward"
+            }
+            EventBridge.emitWebEvent(JSON.stringify(readyEvent));
+        }
 
         function navigateTo(url) {
             var readyEvent = {

scripts/communityScripts/explore/explore.js

@@ -48,7 +48,7 @@
 
     function onWebEventReceived(event) {
         messageData = JSON.parse(event);
-        if (messageData.action == "requestAddressList") {
+        if (messageData.action === "requestAddressList") {
             goToAddresses = Settings.getValue("goToDecentral", "");
             for (var i = 0; i < goToAddresses.length; i++) {
 
@@ -80,14 +80,27 @@
 
             tablet.emitScriptEvent(JSON.stringify(readyEvent));
 
-        } else if (messageData.action == "goToUrl") {
+        } else if (messageData.action === "goToUrl") {
             Window.location = messageData.visit;
-        } else if (messageData.action == "addLocation") {
+        } else if (messageData.action === "navigateBack") {
+            location.goBack();
+        } else if (messageData.action === "navigateHome") {
+            if (LocationBookmarks.getHomeLocationAddress()) {
+                location.handleLookupString(LocationBookmarks.getHomeLocationAddress());
+            } else {
+                location.goToLocalSandbox();
+            }
+        } else if (messageData.action === "navigateForward") {
+            location.goForward();
+        } else if (messageData.action === "addLocation") {
 
             var locationBoxUserData = {
                 owner: messageData.owner,
                 domainName: messageData.domainName,
                 port: messageData.Port,
+                ipAddress: null,
+                avatarCountRadius: null,
+                customPath: null,
                 grabbableKey: {
                     grabbable: false
                 }
@@ -105,7 +118,7 @@
                 collisionless: true,
                 grabbable: false
             });
-        } else if (messageData.action == "retrievePortInformation") {
+        } else if (messageData.action === "retrievePortInformation") {
             var readyEvent = {
                 "action": "retrievePortInformationResponse",
                 "goToAddresses": goToAddresses

scripts/defaultScripts.js

@@ -23,7 +23,6 @@ var DEFAULT_SCRIPTS_COMBINED = [
     "system/pal.js", // "system/mod.js", // older UX, if you prefer
     "system/avatarapp.js",
     "system/makeUserConnection.js",
-    "system/tablet-goto.js",
     "system/marketplaces/marketplaces.js",
     "system/notifications.js",
     "system/commerce/wallet.js",
@@ -41,7 +40,7 @@ var DEFAULT_SCRIPTS_SEPARATE = [
     "system/controllers/controllerScripts.js",
     "communityModules/notificationCore/notificationCore.js",
     "simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js",
-    {"stable": "system/more/app-more.js", "beta": "https://kasenvr.github.io/community-apps/more/app-more.js"},
+    {"stable": "system/more/app-more.js", "beta": "https://cdn.vircadia.com/community-apps/more/app-more.js"},
     {"stable": "communityScripts/explore/explore.js", "beta": "https://metaverse.vircadia.com/interim/d-goto/app/explore.js"},
     {"stable": "communityModules/chat/FloofChat.js", "beta": "https://content.fluffy.ws/scripts/chat/FloofChat.js"}
     //"system/chat.js"

scripts/system/inspect.js

@@ -123,10 +123,11 @@ function orientationOf(vector) {
 }
 
 function handleRadialMode(dx, dy) {
+    var MIN_INSPECT_RADIUS = 0.1;
     azimuth += dx / AZIMUTH_RATE;
     radius += radius * dy * RADIUS_RATE;
-    if (radius < 1) {
+    if (radius < MIN_INSPECT_RADIUS) {
-        radius = 1;
+        radius = MIN_INSPECT_RADIUS;
     }
 
     vector = {