From 10eaed71f95c6fcb4a1f47a873d5e1d1071c44a6 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Thu, 24 Aug 2017 16:00:36 -0700 Subject: [PATCH 1/7] crash on shutdown --- interface/src/Application.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/src/Application.h b/interface/src/Application.h index c951b25930..6a11751061 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -707,8 +707,8 @@ private: QUrl _avatarOverrideUrl; bool _saveAvatarOverrideUrl { false }; - LaserPointerManager _laserPointerManager; RayPickManager _rayPickManager; + LaserPointerManager _laserPointerManager; }; #endif // hifi_Application_h From 35459a7b93afdc51f4edec9f1f4346f591494f87 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 28 Aug 2017 17:01:01 -0700 Subject: [PATCH 2/7] cherry-pick --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index a2d2d34837..414509cf0c 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -55,6 +55,13 @@ EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterf _displayModelBounds(false), _layeredZones(this) { + setMouseRayPickResultOperator([&](QUuid rayPickID) { + RayToEntityIntersectionResult entityResult; + return entityResult; + }); + setSetPrecisionPickingOperator([&](QUuid rayPickID, bool value) {}); + EntityRenderer::initEntityRenderers(); + REGISTER_ENTITY_TYPE_WITH_FACTORY(Model, RenderableModelEntityItem::factory) REGISTER_ENTITY_TYPE_WITH_FACTORY(Light, RenderableLightEntityItem::factory) REGISTER_ENTITY_TYPE_WITH_FACTORY(Text, RenderableTextEntityItem::factory) From b8795c3ea9b23b624f8f0fe5ad05ff0dbf4c8067 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 28 Aug 2017 17:08:59 -0700 Subject: [PATCH 3/7] remove unneeded bind-by-ref thing from lambdas --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 414509cf0c..972ca9d777 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -55,11 +55,11 @@ EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterf _displayModelBounds(false), _layeredZones(this) { - setMouseRayPickResultOperator([&](QUuid rayPickID) { + setMouseRayPickResultOperator([](QUuid rayPickID) { RayToEntityIntersectionResult entityResult; return entityResult; }); - setSetPrecisionPickingOperator([&](QUuid rayPickID, bool value) {}); + setSetPrecisionPickingOperator([](QUuid rayPickID, bool value) {}); EntityRenderer::initEntityRenderers(); REGISTER_ENTITY_TYPE_WITH_FACTORY(Model, RenderableModelEntityItem::factory) From a6aa71f8fd4a73729635eac00b587f65f777d277 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 29 Aug 2017 09:51:08 -0700 Subject: [PATCH 4/7] unmangle merge --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 972ca9d777..abb7f3bb88 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -60,7 +60,6 @@ EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterf return entityResult; }); setSetPrecisionPickingOperator([](QUuid rayPickID, bool value) {}); - EntityRenderer::initEntityRenderers(); REGISTER_ENTITY_TYPE_WITH_FACTORY(Model, RenderableModelEntityItem::factory) REGISTER_ENTITY_TYPE_WITH_FACTORY(Light, RenderableLightEntityItem::factory) From 180acbc188db5c7fb43df46dfaf4185567c7ec23 Mon Sep 17 00:00:00 2001 From: beholder Date: Tue, 29 Aug 2017 23:49:44 +0300 Subject: [PATCH 5/7] 6819 - Create button not disabled --- interface/resources/qml/hifi/toolbars/ToolbarButton.qml | 3 ++- scripts/system/edit.js | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/toolbars/ToolbarButton.qml b/interface/resources/qml/hifi/toolbars/ToolbarButton.qml index 3d4231ced7..bbf2d019fb 100644 --- a/interface/resources/qml/hifi/toolbars/ToolbarButton.qml +++ b/interface/resources/qml/hifi/toolbars/ToolbarButton.qml @@ -4,6 +4,7 @@ import QtQuick.Controls 1.4 StateImage { id: button + property string captionColorOverride: "" property bool buttonEnabled: true property bool isActive: false property bool isEntered: false @@ -97,7 +98,7 @@ StateImage { Text { id: caption - color: button.isActive ? "#000000" : "#ffffff" + color: captionColorOverride !== "" ? captionColorOverride: (button.isActive ? "#000000" : "#ffffff") text: button.isActive ? (button.isEntered ? button.activeHoverText : button.activeText) : (button.isEntered ? button.hoverText : button.text) font.bold: false font.pixelSize: 9 diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 7ee6c64858..8b61226235 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -405,9 +405,11 @@ var toolBar = (function () { } }); - var createButtonIconRsrc = ((Entities.canRez() || Entities.canRezTmp()) ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON); + var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp()); + var createButtonIconRsrc = (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON); tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); activeButton = tablet.addButton({ + captionColorOverride: hasRezPermissions ? "" : "#888888", icon: createButtonIconRsrc, activeIcon: "icons/tablet-icons/edit-a.svg", text: "CREATE", @@ -789,6 +791,7 @@ function handleDomainChange() { var hasRezPermissions = (Entities.canRez() || Entities.canRezTmp()); createButton.editProperties({ icon: (hasRezPermissions ? CREATE_ENABLED_ICON : CREATE_DISABLED_ICON), + captionColorOverride: (hasRezPermissions ? "" : "#888888"), }); } From 492d05301667a93eeca73e077e3ffdd6d02583ee Mon Sep 17 00:00:00 2001 From: Liv Date: Wed, 23 Aug 2017 17:38:24 -0700 Subject: [PATCH 6/7] Create home path for new content sets loaded in --- interface/src/Application.cpp | 6 +++++- interface/src/LocationBookmarks.cpp | 4 ++++ interface/src/LocationBookmarks.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index d3b547a54c..ea4a3db465 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -6284,7 +6284,11 @@ bool Application::askToReplaceDomainContent(const QString& url) { octreeFilePacket->write(urlData); limitedNodeList->sendPacket(std::move(octreeFilePacket), *octreeNode); }); - DependencyManager::get()->handleLookupString(DOMAIN_SPAWNING_POINT); + auto addressManager = DependencyManager::get(); + addressManager->handleLookupString(DOMAIN_SPAWNING_POINT); + QString newHomeAddress = addressManager->getHost() + DOMAIN_SPAWNING_POINT; + qCDebug(interfaceapp) << "Setting new home bookmark to: " << newHomeAddress; + DependencyManager::get()->setHomeLocationToAddress(newHomeAddress); methodDetails = "SuccessfulRequestToReplaceContent"; } else { methodDetails = "UserDeclinedToReplaceContent"; diff --git a/interface/src/LocationBookmarks.cpp b/interface/src/LocationBookmarks.cpp index eee6cdf3c8..b234f8c07b 100644 --- a/interface/src/LocationBookmarks.cpp +++ b/interface/src/LocationBookmarks.cpp @@ -63,6 +63,10 @@ void LocationBookmarks::setHomeLocation() { Bookmarks::addBookmarkToFile(HOME_BOOKMARK, bookmarkAddress); } +void LocationBookmarks::setHomeLocationToAddress(const QVariant& address) { + Bookmarks::insert("Home", address); +} + void LocationBookmarks::teleportToBookmark() { QAction* action = qobject_cast(sender()); QString address = action->data().toString(); diff --git a/interface/src/LocationBookmarks.h b/interface/src/LocationBookmarks.h index 6cac56ae04..9a800ba35e 100644 --- a/interface/src/LocationBookmarks.h +++ b/interface/src/LocationBookmarks.h @@ -27,6 +27,7 @@ public: public slots: void addBookmark(); + void setHomeLocationToAddress(const QVariant& address); protected: void addBookmarkToMenu(Menu* menubar, const QString& name, const QVariant& address) override; From 164eeaae64b8e8e080fbe79c39c8c7f8d285a798 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 31 Aug 2017 10:41:44 -0700 Subject: [PATCH 7/7] Fix the duplicated buy buttons for admins on Marketplace --- scripts/system/html/js/marketplacesInject.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js index 2675bb97b6..28d116d3ec 100644 --- a/scripts/system/html/js/marketplacesInject.js +++ b/scripts/system/html/js/marketplacesInject.js @@ -173,16 +173,16 @@ function injectHiFiItemPageCode() { if (confirmAllPurchases) { - var href = $('#side-info').find('.btn').attr('href'); - $('#side-info').find('.btn').attr('href', '#'); + var href = $('#side-info').find('.btn').first().attr('href'); + $('#side-info').find('.btn').first().attr('href', '#'); var cost = $('.item-cost').text(); if (parseInt(cost) > 0 && $('#side-info').find('#buyItemButton').size() === 0) { - $('#side-info').find('.btn').html('Own Item: ' + (parseFloat(cost / 100).toFixed(2)) + ' HFC'); + $('#side-info').find('.btn').first().html('Own Item: ' + (parseFloat(cost / 100).toFixed(2)) + ' HFC'); } - $('#side-info').find('.btn').on('click', function () { + $('#side-info').find('.btn').first().on('click', function () { buyButtonClicked(window.location.pathname.split("/")[3], $('#top-center').find('h1').text(), $('#creator').find('.value').text(),