diff --git a/interface/resources/qml/OverlayLoginDialog.qml b/interface/resources/qml/OverlayLoginDialog.qml index 4e578efb92..5fb72f2689 100644 --- a/interface/resources/qml/OverlayLoginDialog.qml +++ b/interface/resources/qml/OverlayLoginDialog.qml @@ -81,6 +81,8 @@ FocusScope { Image { id: banner anchors.centerIn: parent + sourceSize.width: 500 + sourceSize.height: 91 source: "../images/vircadia-banner.svg" horizontalAlignment: Image.AlignHCenter } diff --git a/interface/resources/qml/controlsUit/SpinBox.qml b/interface/resources/qml/controlsUit/SpinBox.qml index 564157efb0..a888bbd07c 100644 --- a/interface/resources/qml/controlsUit/SpinBox.qml +++ b/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 diff --git a/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml b/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml index 15a20b491a..dfee6e60f7 100644 --- a/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml +++ b/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 diff --git a/interface/resources/qml/hifi/avatarapp/Vector3.qml b/interface/resources/qml/hifi/avatarapp/Vector3.qml index 698123104f..54f8d087e5 100644 --- a/interface/resources/qml/hifi/avatarapp/Vector3.qml +++ b/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; diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index b07117b4be..a3ef39f1e9 100644 --- a/interface/src/Menu.cpp +++ b/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, diff --git a/interface/src/Menu.h b/interface/src/Menu.h index e337b6188a..a3da179ad3 100644 --- a/interface/src/Menu.h +++ b/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"; diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index d68747b96c..fd83c99ca5 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/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. - if (entity->isDomainEntity()) { + // by this context, and a domain-entity must round trip through the entity-server for authorization. + if (entity->isDomainEntity() && !_entityTree->isServerlessMode()) { getEntityPacketSender()->queueEraseEntityMessage(id); } else { entitiesToDeleteImmediately.push_back(entity); diff --git a/libraries/networking/src/UserActivityLogger.h b/libraries/networking/src/UserActivityLogger.h index 98a707155e..39efee03c4 100644 --- a/libraries/networking/src/UserActivityLogger.h +++ b/libraries/networking/src/UserActivityLogger.h @@ -59,7 +59,7 @@ private slots: private: UserActivityLogger(); Setting::Handle _disabled { "UserActivityLoggerDisabled", true }; - Setting::Handle _crashMonitorDisabled { "CrashMonitorDisabled", false }; + Setting::Handle _crashMonitorDisabled { "CrashMonitorDisabled2", true }; QElapsedTimer _timer; }; diff --git a/scripts/communityScripts/explore/explore.html b/scripts/communityScripts/explore/explore.html index affaf0887f..6914b062c9 100644 --- a/scripts/communityScripts/explore/explore.html +++ b/scripts/communityScripts/explore/explore.html @@ -73,6 +73,9 @@

Explore

+ + + @@ -85,15 +88,36 @@