Merge branch 'master' into muteWarningModified

.gitignore

@@ -99,12 +99,9 @@ tools/jsdoc/package-lock.json
 # Python compile artifacts
 **/__pycache__
 
-# ignore unneeded unity project files for avatar exporter
-tools/unity-avatar-exporter/Library
-tools/unity-avatar-exporter/Logs
-tools/unity-avatar-exporter/Packages
-tools/unity-avatar-exporter/ProjectSettings
-tools/unity-avatar-exporter/Temp
+# ignore local unity project files for avatar exporter
+tools/unity-avatar-exporter
+
 server-console/package-lock.json
 vcpkg/
 /tools/nitpick/compiledResources

android/apps/interface/build.gradle

@@ -36,11 +36,6 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 26
-    //buildToolsVersion '27.0.3'
-
-    def appVersionCode = Integer.valueOf(VERSION_CODE ?: 1)
-    def appVersionName = RELEASE_NUMBER ?: "1.0"
-
     defaultConfig {
         applicationId "io.highfidelity.hifiinterface"
         minSdkVersion 24

android/apps/questFramePlayer/src/main/cpp/RenderThread.cpp

@@ -117,7 +117,8 @@ void RenderThread::setup() {
     { std::unique_lock<std::mutex> lock(_frameLock); }
 
     ovr::VrHandler::initVr();
-    ovr::VrHandler::setHandler(this);
+    // Enable KHR_no_error for this context
+    ovr::VrHandler::setHandler(this, true);
 
     makeCurrent();
 

android/apps/questInterface/build.gradle

@@ -18,12 +18,11 @@ task renameHifiACTaskRelease(type: Copy) {
 
 android {
     compileSdkVersion 28
-
     defaultConfig {
         applicationId "io.highfidelity.questInterface"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 1
+        versionCode appVersionCode
         versionName appVersionName
         ndk { abiFilters 'arm64-v8a' }
         externalNativeBuild {

assignment-client/src/audio/AudioMixerSlavePool.cpp

@@ -64,10 +64,6 @@ bool AudioMixerSlaveThread::try_pop(SharedNodePointer& node) {
     return _pool._queue.try_pop(node);
 }
 
-#ifdef AUDIO_SINGLE_THREADED
-static AudioMixerSlave slave;
-#endif
-
 void AudioMixerSlavePool::processPackets(ConstIter begin, ConstIter end) {
     _function = &AudioMixerSlave::processPackets;
     _configure = [](AudioMixerSlave& slave) {};
@@ -87,19 +83,9 @@ void AudioMixerSlavePool::run(ConstIter begin, ConstIter end) {
     _begin = begin;
     _end = end;
 
-#ifdef AUDIO_SINGLE_THREADED
-    _configure(slave);
-    std::for_each(begin, end, [&](const SharedNodePointer& node) {
-        _function(slave, node);
-    });
-#else
     // fill the queue
     std::for_each(_begin, _end, [&](const SharedNodePointer& node) {
-#if defined(__clang__) && defined(Q_OS_LINUX)
         _queue.push(node);
-#else
-        _queue.emplace(node);
-#endif
     });
 
     {
@@ -119,17 +105,12 @@ void AudioMixerSlavePool::run(ConstIter begin, ConstIter end) {
     }
 
     assert(_queue.empty());
-#endif
 }
 
 void AudioMixerSlavePool::each(std::function<void(AudioMixerSlave& slave)> functor) {
-#ifdef AUDIO_SINGLE_THREADED
-    functor(slave);
-#else
     for (auto& slave : _slaves) {
         functor(*slave.get());
     }
-#endif
 }
 
 void AudioMixerSlavePool::setNumThreads(int numThreads) {
@@ -155,9 +136,6 @@ void AudioMixerSlavePool::setNumThreads(int numThreads) {
 void AudioMixerSlavePool::resize(int numThreads) {
     assert(_numThreads == (int)_slaves.size());
 
-#ifdef AUDIO_SINGLE_THREADED
-    qDebug("%s: running single threaded", __FUNCTION__, numThreads);
-#else
     qDebug("%s: set %d threads (was %d)", __FUNCTION__, numThreads, _numThreads);
 
     Lock lock(_mutex);
@@ -205,5 +183,4 @@ void AudioMixerSlavePool::resize(int numThreads) {
 
     _numThreads = _numStarted = _numFinished = numThreads;
     assert(_numThreads == (int)_slaves.size());
-#endif
 }

assignment-client/src/avatars/AvatarMixer.cpp

@@ -23,6 +23,7 @@
 #include <QtCore/QRegularExpression>
 #include <QtCore/QTimer>
 #include <QtCore/QThread>
+#include <QtCore/QJsonDocument>
 
 #include <AABox.h>
 #include <AvatarLogging.h>
@@ -32,6 +33,10 @@
 #include <SharedUtil.h>
 #include <UUID.h>
 #include <TryLocker.h>
+#include "../AssignmentDynamicFactory.h"
+#include "../entities/AssignmentParentFinder.h"
+#include <model-networking/ModelCache.h>
+#include <hfm/ModelFormatRegistry.h>
 
 const QString AVATAR_MIXER_LOGGING_NAME = "avatar-mixer";
 
@@ -55,6 +60,12 @@ AvatarMixer::AvatarMixer(ReceivedMessage& message) :
     ThreadedAssignment(message),
     _slavePool(&_slaveSharedData)
 {
+    DependencyManager::registerInheritance<EntityDynamicFactoryInterface, AssignmentDynamicFactory>();
+    DependencyManager::set<AssignmentDynamicFactory>();
+    DependencyManager::set<ModelFormatRegistry>();
+    DependencyManager::set<ModelCache>();
+    DependencyManager::set<ResourceCacheSharedItems>();
+    DependencyManager::set<ResourceManager>();
     // make sure we hear about node kills so we can tell the other nodes
     connect(DependencyManager::get<NodeList>().data(), &NodeList::nodeKilled, this, &AvatarMixer::handleAvatarKilled);
 
@@ -69,6 +80,8 @@ AvatarMixer::AvatarMixer(ReceivedMessage& message) :
     packetReceiver.registerListener(PacketType::RequestsDomainListData, this, "handleRequestsDomainListDataPacket");
     packetReceiver.registerListener(PacketType::SetAvatarTraits, this, "queueIncomingPacket");
     packetReceiver.registerListener(PacketType::BulkAvatarTraitsAck, this, "queueIncomingPacket");
+    packetReceiver.registerListenerForTypes({ PacketType::OctreeStats, PacketType::EntityData, PacketType::EntityErase },
+        this, "handleOctreePacket");
 
     packetReceiver.registerListenerForTypes({
         PacketType::ReplicatedAvatarIdentity,
@@ -240,6 +253,10 @@ void AvatarMixer::start() {
 
         int lockWait, nodeTransform, functor;
 
+        {
+            _entityViewer.queryOctree();
+        }
+
         // Allow nodes to process any pending/queued packets across our worker threads
         {
             auto start = usecTimestampNow();
@@ -252,6 +269,10 @@ void AvatarMixer::start() {
             }, &lockWait, &nodeTransform, &functor);
             auto end = usecTimestampNow();
             _processQueuedAvatarDataPacketsElapsedTime += (end - start);
+
+            _broadcastAvatarDataLockWait += lockWait;
+            _broadcastAvatarDataNodeTransform += nodeTransform;
+            _broadcastAvatarDataNodeFunctor += functor;
         }
 
         // process pending display names... this doesn't currently run on multiple threads, because it
@@ -269,6 +290,10 @@ void AvatarMixer::start() {
             }, &lockWait, &nodeTransform, &functor);
             auto end = usecTimestampNow();
             _displayNameManagementElapsedTime += (end - start);
+
+            _broadcastAvatarDataLockWait += lockWait;
+            _broadcastAvatarDataNodeTransform += nodeTransform;
+            _broadcastAvatarDataNodeFunctor += functor;
         }
 
         // this is where we need to put the real work...
@@ -691,8 +716,11 @@ void AvatarMixer::handleRadiusIgnoreRequestPacket(QSharedPointer<ReceivedMessage
 }
 
 void AvatarMixer::sendStatsPacket() {
-    auto start = usecTimestampNow();
+    if (!_numTightLoopFrames) {
+        return;
+    }
 
+    auto start = usecTimestampNow();
 
     QJsonObject statsObject;
 
@@ -775,6 +803,7 @@ void AvatarMixer::sendStatsPacket() {
     slavesAggregatObject["sent_4_averageDataBytes"] = TIGHT_LOOP_STAT(aggregateStats.numDataBytesSent);
     slavesAggregatObject["sent_5_averageTraitsBytes"] = TIGHT_LOOP_STAT(aggregateStats.numTraitsBytesSent);
     slavesAggregatObject["sent_6_averageIdentityBytes"] = TIGHT_LOOP_STAT(aggregateStats.numIdentityBytesSent);
+    slavesAggregatObject["sent_7_averageHeroAvatars"] = TIGHT_LOOP_STAT(aggregateStats.numHeroesIncluded);
 
     slavesAggregatObject["timing_1_processIncomingPackets"] = TIGHT_LOOP_STAT_UINT64(aggregateStats.processIncomingPacketsElapsedTime);
     slavesAggregatObject["timing_2_ignoreCalculation"] = TIGHT_LOOP_STAT_UINT64(aggregateStats.ignoreCalculationElapsedTime);
@@ -882,13 +911,15 @@ AvatarMixerClientData* AvatarMixer::getOrCreateClientData(SharedNodePointer node
 void AvatarMixer::domainSettingsRequestComplete() {
     auto nodeList = DependencyManager::get<NodeList>();
     nodeList->addSetOfNodeTypesToNodeInterestSet({
-        NodeType::Agent, NodeType::EntityScriptServer,
+        NodeType::Agent, NodeType::EntityScriptServer, NodeType::EntityServer,
         NodeType::UpstreamAvatarMixer, NodeType::DownstreamAvatarMixer
     });
 
     // parse the settings to pull out the values we need
     parseDomainServerSettings(nodeList->getDomainHandler().getSettingsObject());
 
+    setupEntityQuery();
+
     // start our tight loop...
     start();
 }
@@ -939,6 +970,14 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) {
         qCDebug(avatars) << "Avatar mixer will automatically determine number of threads to use. Using:" << _slavePool.numThreads() << "threads.";
     }
 
+    {
+        const QString CONNECTION_RATE = "connection_rate";
+        auto nodeList = DependencyManager::get<NodeList>();
+        auto defaultConnectionRate = nodeList->getMaxConnectionRate();
+        int connectionRate = avatarMixerGroupObject[CONNECTION_RATE].toInt((int)defaultConnectionRate);
+        nodeList->setMaxConnectionRate(connectionRate);
+    }
+
     const QString AVATARS_SETTINGS_KEY = "avatars";
 
     static const QString MIN_HEIGHT_OPTION = "min_avatar_height";
@@ -976,3 +1015,62 @@ void AvatarMixer::parseDomainServerSettings(const QJsonObject& domainSettings) {
         qCDebug(avatars) << "Avatars other than" << _slaveSharedData.skeletonURLWhitelist << "will be replaced by" << (_slaveSharedData.skeletonReplacementURL.isEmpty() ? "default" : _slaveSharedData.skeletonReplacementURL.toString());
     }
 }
+
+void AvatarMixer::setupEntityQuery() {
+    _entityViewer.init();
+    DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
+    DependencyManager::set<AssignmentParentFinder>(_entityViewer.getTree());
+    _slaveSharedData.entityTree = _entityViewer.getTree();
+
+    // ES query: {"avatarPriority": true, "type": "Zone"}
+    QJsonObject priorityZoneQuery;
+    priorityZoneQuery["avatarPriority"] = true;
+    priorityZoneQuery["type"] = "Zone";
+
+    _entityViewer.getOctreeQuery().setJSONParameters(priorityZoneQuery);
+}
+
+void AvatarMixer::handleOctreePacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {
+    PacketType packetType = message->getType();
+
+    switch (packetType) {
+    case PacketType::OctreeStats:
+    {   // Ignore stats, but may have a different Entity packet appended.
+        OctreeHeadlessViewer::parseOctreeStats(message, senderNode);
+        const auto piggyBackedSizeWithHeader = message->getBytesLeftToRead();
+        if (piggyBackedSizeWithHeader > 0) {
+            // pull out the piggybacked packet and create a new QSharedPointer<NLPacket> for it
+            auto buffer = std::unique_ptr<char[]>(new char[piggyBackedSizeWithHeader]);
+            memcpy(buffer.get(), message->getRawMessage() + message->getPosition(), piggyBackedSizeWithHeader);
+
+            auto newPacket = NLPacket::fromReceivedPacket(std::move(buffer), piggyBackedSizeWithHeader, message->getSenderSockAddr());
+            auto newMessage = QSharedPointer<ReceivedMessage>::create(*newPacket);
+            handleOctreePacket(newMessage, senderNode);
+        }
+        break;
+    }
+
+    case PacketType::EntityData:
+        _entityViewer.processDatagram(*message, senderNode);
+        break;
+
+    case PacketType::EntityErase:
+        _entityViewer.processEraseMessage(*message, senderNode);
+        break;
+
+    default:
+        qCDebug(avatars) << "Unexpected packet type:" << packetType;
+        break;
+    }
+}
+
+void AvatarMixer::aboutToFinish() {
+    DependencyManager::destroy<ResourceManager>();
+    DependencyManager::destroy<ResourceCacheSharedItems>();
+    DependencyManager::destroy<ModelCache>();
+    DependencyManager::destroy<ModelFormatRegistry>();
+    DependencyManager::destroy<AssignmentDynamicFactory>();
+    DependencyManager::destroy<AssignmentParentFinder>();
+
+    ThreadedAssignment::aboutToFinish();
+}

assignment-client/src/avatars/AvatarMixer.h

@@ -20,6 +20,7 @@
 #include <PortableHighResolutionClock.h>
 
 #include <ThreadedAssignment.h>
+#include "../entities/EntityTreeHeadlessViewer.h"
 #include "AvatarMixerClientData.h"
 
 #include "AvatarMixerSlavePool.h"
@@ -29,6 +30,7 @@ class AvatarMixer : public ThreadedAssignment {
     Q_OBJECT
 public:
     AvatarMixer(ReceivedMessage& message);
+    virtual void aboutToFinish() override;
 
     static bool shouldReplicateTo(const Node& from, const Node& to) {
         return to.getType() == NodeType::DownstreamAvatarMixer &&
@@ -57,6 +59,7 @@ private slots:
     void handleReplicatedBulkAvatarPacket(QSharedPointer<ReceivedMessage> message);
     void domainSettingsRequestComplete();
     void handlePacketVersionMismatch(PacketType type, const HifiSockAddr& senderSockAddr, const QUuid& senderUUID);
+    void handleOctreePacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode);
     void start();
 
 private:
@@ -71,8 +74,13 @@ private:
 
     void optionallyReplicatePacket(ReceivedMessage& message, const Node& node);
 
+    void setupEntityQuery();
+
     p_high_resolution_clock::time_point _lastFrameTimestamp;
 
+    // Attach to entity tree for avatar-priority zone info.
+    EntityTreeHeadlessViewer _entityViewer;
+
     // FIXME - new throttling - use these values somehow
     float _trailingMixRatio { 0.0f };
     float _throttlingRatio { 0.0f };

assignment-client/src/avatars/AvatarMixerClientData.cpp

@@ -16,6 +16,10 @@
 
 #include <DependencyManager.h>
 #include <NodeList.h>
+#include <EntityTree.h>
+#include <ZoneEntityItem.h>
+
+#include "AvatarLogging.h"
 
 #include "AvatarMixerSlave.h"
 
@@ -62,7 +66,7 @@ int AvatarMixerClientData::processPackets(const SlaveSharedData& slaveSharedData
 
         switch (packet->getType()) {
             case PacketType::AvatarData:
-                parseData(*packet);
+                parseData(*packet, slaveSharedData);
                 break;
             case PacketType::SetAvatarTraits:
                 processSetTraitsMessage(*packet, slaveSharedData, *node);
@@ -80,7 +84,42 @@ int AvatarMixerClientData::processPackets(const SlaveSharedData& slaveSharedData
     return packetsProcessed;
 }
 
-int AvatarMixerClientData::parseData(ReceivedMessage& message) {
+namespace {
+    using std::static_pointer_cast;
+
+    // Operator to find if a point is within an avatar-priority (hero) Zone Entity.
+    struct FindPriorityZone {
+        glm::vec3 position;
+        bool isInPriorityZone { false };
+        float zoneVolume { std::numeric_limits<float>::max() };
+
+        static bool operation(const OctreeElementPointer& element, void* extraData) {
+            auto findPriorityZone = static_cast<FindPriorityZone*>(extraData);
+            if (element->getAACube().contains(findPriorityZone->position)) {
+                const EntityTreeElementPointer entityTreeElement = static_pointer_cast<EntityTreeElement>(element);
+                entityTreeElement->forEachEntity([&findPriorityZone](EntityItemPointer item) {
+                    if (item->getType() == EntityTypes::Zone 
+                        && item->contains(findPriorityZone->position)) {
+                        auto zoneItem = static_pointer_cast<ZoneEntityItem>(item);
+                        if (zoneItem->getAvatarPriority() != COMPONENT_MODE_INHERIT) {
+                            float volume = zoneItem->getVolumeEstimate();
+                            if (volume < findPriorityZone->zoneVolume) { // Smaller volume wins
+                                findPriorityZone->isInPriorityZone = zoneItem->getAvatarPriority() == COMPONENT_MODE_ENABLED;
+                                findPriorityZone->zoneVolume = volume;
+                            }
+                        }
+                    }
+                });
+                return true;  // Keep recursing 
+            } else {  // Position isn't within this subspace, so end recursion.
+                return false;
+            }
+        }
+    };
+
+}  // Close anonymous namespace.
+
+int AvatarMixerClientData::parseData(ReceivedMessage& message, const SlaveSharedData& slaveSharedData) {
     // pull the sequence number from the data first
     uint16_t sequenceNumber;
 
@@ -90,9 +129,37 @@ int AvatarMixerClientData::parseData(ReceivedMessage& message) {
         incrementNumOutOfOrderSends();
     }
     _lastReceivedSequenceNumber = sequenceNumber;
+    glm::vec3 oldPosition = getPosition();
+    bool oldHasPriority = _avatar->getHasPriority();
 
     // compute the offset to the data payload
-    return _avatar->parseDataFromBuffer(message.readWithoutCopy(message.getBytesLeftToRead()));
+    if (!_avatar->parseDataFromBuffer(message.readWithoutCopy(message.getBytesLeftToRead()))) {
+        return false;
+    }
+
+    // Regardless of what the client says, restore the priority as we know it without triggering any update.
+    _avatar->setHasPriorityWithoutTimestampReset(oldHasPriority);
+
+    auto newPosition = getPosition();
+    if (newPosition != oldPosition) {
+//#define AVATAR_HERO_TEST_HACK
+#ifdef AVATAR_HERO_TEST_HACK
+        {
+            const static QString heroKey { "HERO" };
+            _avatar->setPriorityAvatar(_avatar->getDisplayName().contains(heroKey));
+        }
+#else
+        EntityTree& entityTree = *slaveSharedData.entityTree;
+        FindPriorityZone findPriorityZone { newPosition, false } ;
+        entityTree.recurseTreeWithOperation(&FindPriorityZone::operation, &findPriorityZone);
+        _avatar->setHasPriority(findPriorityZone.isInPriorityZone);
+        //if (findPriorityZone.isInPriorityZone) {
+        //    qCWarning(avatars) << "Avatar" << _avatar->getSessionDisplayName() << "in hero zone";
+        //}
+#endif
+    }
+
+    return true;
 }
 
 void AvatarMixerClientData::processSetTraitsMessage(ReceivedMessage& message,

assignment-client/src/avatars/AvatarMixerClientData.h

@@ -21,7 +21,7 @@
 #include <QtCore/QJsonObject>
 #include <QtCore/QUrl>
 
-#include <AvatarData.h>
+#include "MixerAvatar.h"
 #include <AssociatedTraitValues.h>
 #include <NodeData.h>
 #include <NumericalConstants.h>
@@ -45,11 +45,12 @@ public:
     using HRCTime = p_high_resolution_clock::time_point;
     using PerNodeTraitVersions = std::unordered_map<Node::LocalID, AvatarTraits::TraitVersions>;
 
-    int parseData(ReceivedMessage& message) override;
-    AvatarData& getAvatar() { return *_avatar; }
-    const AvatarData& getAvatar() const { return *_avatar; }
-    const AvatarData* getConstAvatarData() const { return _avatar.get(); }
-    AvatarSharedPointer getAvatarSharedPointer() const { return _avatar; }
+    using NodeData::parseData;  // Avoid clang warning about hiding.
+    int parseData(ReceivedMessage& message, const SlaveSharedData& SlaveSharedData);
+    MixerAvatar& getAvatar() { return *_avatar; }
+    const MixerAvatar& getAvatar() const { return *_avatar; }
+    const MixerAvatar* getConstAvatarData() const { return _avatar.get(); }
+    MixerAvatarSharedPointer getAvatarSharedPointer() const { return _avatar; }
 
     uint16_t getLastBroadcastSequenceNumber(NLPacket::LocalID nodeID) const;
     void setLastBroadcastSequenceNumber(NLPacket::LocalID nodeID, uint16_t sequenceNumber)
@@ -163,7 +164,7 @@ private:
     };
     PacketQueue _packetQueue;
 
-    AvatarSharedPointer _avatar { new AvatarData() };
+    MixerAvatarSharedPointer _avatar { new MixerAvatar() };
 
     uint16_t _lastReceivedSequenceNumber { 0 };
     std::unordered_map<NLPacket::LocalID, uint16_t> _lastBroadcastSequenceNumbers;

assignment-client/src/avatars/AvatarMixerSlave.cpp

@@ -281,7 +281,34 @@ AABox computeBubbleBox(const AvatarData& avatar, float bubbleExpansionFactor) {
     return box;
 }
 
+namespace {
+    class SortableAvatar : public PrioritySortUtil::Sortable {
+    public:
+        SortableAvatar() = delete;
+        SortableAvatar(const MixerAvatar* avatar, const Node* avatarNode, uint64_t lastEncodeTime)
+            : _avatar(avatar), _node(avatarNode), _lastEncodeTime(lastEncodeTime) {
+        }
+        glm::vec3 getPosition() const override { return _avatar->getClientGlobalPosition(); }
+        float getRadius() const override {
+            glm::vec3 nodeBoxScale = _avatar->getGlobalBoundingBox().getScale();
+            return 0.5f * glm::max(nodeBoxScale.x, glm::max(nodeBoxScale.y, nodeBoxScale.z));
+        }
+        uint64_t getTimestamp() const override {
+            return _lastEncodeTime;
+        }
+        const Node* getNode() const { return _node; }
+        const MixerAvatar* getAvatar() const { return _avatar; }
+
+    private:
+        const MixerAvatar* _avatar;
+        const Node* _node;
+        uint64_t _lastEncodeTime;
+    };
+
+}  // Close anonymous namespace.
+
 void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node) {
+    const float AVATAR_HERO_FRACTION { 0.4f };
     const Node* destinationNode = node.data();
 
     auto nodeList = DependencyManager::get<NodeList>();
@@ -293,29 +320,30 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
 
     _stats.nodesBroadcastedTo++;
 
-    AvatarMixerClientData* nodeData = reinterpret_cast<AvatarMixerClientData*>(destinationNode->getLinkedData());
+    AvatarMixerClientData* destinationNodeData = reinterpret_cast<AvatarMixerClientData*>(destinationNode->getLinkedData());
 
-    nodeData->resetInViewStats();
+    destinationNodeData->resetInViewStats();
 
-    const AvatarData& avatar = nodeData->getAvatar();
-    glm::vec3 myPosition = avatar.getClientGlobalPosition();
+    const AvatarData& avatar = destinationNodeData->getAvatar();
+    glm::vec3 destinationPosition = avatar.getClientGlobalPosition();
 
     // reset the internal state for correct random number distribution
     distribution.reset();
 
     // Estimate number to sort on number sent last frame (with min. of 20).
-    const int numToSendEst = std::max(int(nodeData->getNumAvatarsSentLastFrame() * 2.5f), 20);
+    const int numToSendEst = std::max(int(destinationNodeData->getNumAvatarsSentLastFrame() * 2.5f), 20);
 
     // reset the number of sent avatars
-    nodeData->resetNumAvatarsSentLastFrame();
+    destinationNodeData->resetNumAvatarsSentLastFrame();
 
     // keep track of outbound data rate specifically for avatar data
     int numAvatarDataBytes = 0;
     int identityBytesSent = 0;
     int traitBytesSent = 0;
 
-    // max number of avatarBytes per frame
-    int maxAvatarBytesPerFrame = int(_maxKbpsPerNode * BYTES_PER_KILOBIT / AVATAR_MIXER_BROADCAST_FRAMES_PER_SECOND);
+    // max number of avatarBytes per frame (13 900, typical)
+    const int maxAvatarBytesPerFrame = int(_maxKbpsPerNode * BYTES_PER_KILOBIT / AVATAR_MIXER_BROADCAST_FRAMES_PER_SECOND);
+    const int maxHeroBytesPerFrame = int(maxAvatarBytesPerFrame * AVATAR_HERO_FRACTION);  // 5555, typical
 
     // keep track of the number of other avatars held back in this frame
     int numAvatarsHeldBack = 0;
@@ -325,8 +353,8 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
 
     // When this is true, the AvatarMixer will send Avatar data to a client
     // about avatars they've ignored or that are out of view
-    bool PALIsOpen = nodeData->getRequestsDomainListData();
-    bool PALWasOpen = nodeData->getPrevRequestsDomainListData();
+    bool PALIsOpen = destinationNodeData->getRequestsDomainListData();
+    bool PALWasOpen = destinationNodeData->getPrevRequestsDomainListData();
 
     // When this is true, the AvatarMixer will send Avatar data to a client about avatars that have ignored them
     bool getsAnyIgnored = PALIsOpen && destinationNode->getCanKick();
@@ -337,36 +365,23 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
 
     // compute node bounding box
     const float MY_AVATAR_BUBBLE_EXPANSION_FACTOR = 4.0f; // magic number determined emperically
-    AABox nodeBox = computeBubbleBox(avatar, MY_AVATAR_BUBBLE_EXPANSION_FACTOR);
-
-    class SortableAvatar: public PrioritySortUtil::Sortable {
-    public:
-        SortableAvatar() = delete;
-        SortableAvatar(const AvatarData* avatar, const Node* avatarNode, uint64_t lastEncodeTime)
-            : _avatar(avatar), _node(avatarNode), _lastEncodeTime(lastEncodeTime) {}
-        glm::vec3 getPosition() const override { return _avatar->getClientGlobalPosition(); }
-        float getRadius() const override {
-            glm::vec3 nodeBoxScale = _avatar->getGlobalBoundingBox().getScale();
-            return 0.5f * glm::max(nodeBoxScale.x, glm::max(nodeBoxScale.y, nodeBoxScale.z));
-        }
-        uint64_t getTimestamp() const override {
-            return _lastEncodeTime;
-        }
-        const Node* getNode() const { return _node; }
-
-    private:
-        const AvatarData* _avatar;
-        const Node* _node;
-        uint64_t _lastEncodeTime;
-    };
+    AABox destinationNodeBox = computeBubbleBox(avatar, MY_AVATAR_BUBBLE_EXPANSION_FACTOR);
 
     // prepare to sort
-    const auto& cameraViews = nodeData->getViewFrustums();
-    PrioritySortUtil::PriorityQueue<SortableAvatar> sortedAvatars(cameraViews,
-            AvatarData::_avatarSortCoefficientSize,
-            AvatarData::_avatarSortCoefficientCenter,
-            AvatarData::_avatarSortCoefficientAge);
-    sortedAvatars.reserve(_end - _begin);
+    const auto& cameraViews = destinationNodeData->getViewFrustums();
+
+    using AvatarPriorityQueue = PrioritySortUtil::PriorityQueue<SortableAvatar>;
+    // Keep two independent queues, one for heroes and one for the riff-raff.
+    enum PriorityVariants { kHero, kNonhero };
+    AvatarPriorityQueue avatarPriorityQueues[2] =
+    {
+        {cameraViews, AvatarData::_avatarSortCoefficientSize, 
+            AvatarData::_avatarSortCoefficientCenter, AvatarData::_avatarSortCoefficientAge},
+        {cameraViews, AvatarData::_avatarSortCoefficientSize,
+            AvatarData::_avatarSortCoefficientCenter, AvatarData::_avatarSortCoefficientAge}
+    };
+
+    avatarPriorityQueues[kNonhero].reserve(_end - _begin);
 
     for (auto listedNode = _begin; listedNode != _end; ++listedNode) {
         Node* otherNodeRaw = (*listedNode).data();
@@ -376,47 +391,47 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
             continue;
         }
 
-        auto avatarNode = otherNodeRaw;
+        auto sourceAvatarNode = otherNodeRaw;
 
-        bool shouldIgnore = false;
+        bool sendAvatar = true;  // We will consider this source avatar for sending.
         // We ignore other nodes for a couple of reasons:
         //   1) ignore bubbles and ignore specific node
         //   2) the node hasn't really updated it's frame data recently, this can
         //      happen if for example the avatar is connected on a desktop and sending
         //      updates at ~30hz. So every 3 frames we skip a frame.
 
-        assert(avatarNode); // we can't have gotten here without the avatarData being a valid key in the map
+        assert(sourceAvatarNode); // we can't have gotten here without the avatarData being a valid key in the map
 
-        const AvatarMixerClientData* avatarClientNodeData = reinterpret_cast<const AvatarMixerClientData*>(avatarNode->getLinkedData());
-        assert(avatarClientNodeData); // we can't have gotten here without avatarNode having valid data
+        const AvatarMixerClientData* sourceAvatarNodeData = reinterpret_cast<const AvatarMixerClientData*>(sourceAvatarNode->getLinkedData());
+        assert(sourceAvatarNodeData); // we can't have gotten here without sourceAvatarNode having valid data
         quint64 startIgnoreCalculation = usecTimestampNow();
 
         // make sure we have data for this avatar, that it isn't the same node,
         // and isn't an avatar that the viewing node has ignored
         // or that has ignored the viewing node
-        if ((destinationNode->isIgnoringNodeWithID(avatarNode->getUUID()) && !PALIsOpen)
-            || (avatarNode->isIgnoringNodeWithID(destinationNode->getUUID()) && !getsAnyIgnored)) {
-            shouldIgnore = true;
+        if ((destinationNode->isIgnoringNodeWithID(sourceAvatarNode->getUUID()) && !PALIsOpen)
+            || (sourceAvatarNode->isIgnoringNodeWithID(destinationNode->getUUID()) && !getsAnyIgnored)) {
+            sendAvatar = false;
         } else {
             // Check to see if the space bubble is enabled
             // Don't bother with these checks if the other avatar has their bubble enabled and we're gettingAnyIgnored
-            if (nodeData->isIgnoreRadiusEnabled() || (avatarClientNodeData->isIgnoreRadiusEnabled() && !getsAnyIgnored)) {
+            if (destinationNodeData->isIgnoreRadiusEnabled() || (sourceAvatarNodeData->isIgnoreRadiusEnabled() && !getsAnyIgnored)) {
                 // Perform the collision check between the two bounding boxes
-                AABox otherNodeBox = avatarClientNodeData->getAvatar().getDefaultBubbleBox();
-                if (nodeBox.touches(otherNodeBox)) {
-                    nodeData->ignoreOther(destinationNode, avatarNode);
-                    shouldIgnore = !getsAnyIgnored;
+                AABox sourceNodeBox = sourceAvatarNodeData->getAvatar().getDefaultBubbleBox();
+                if (destinationNodeBox.touches(sourceNodeBox)) {
+                    destinationNodeData->ignoreOther(destinationNode, sourceAvatarNode);
+                    sendAvatar = getsAnyIgnored;
                 }
             }
             // Not close enough to ignore
-            if (!shouldIgnore) {
-                nodeData->removeFromRadiusIgnoringSet(avatarNode->getUUID());
+            if (sendAvatar) {
+                destinationNodeData->removeFromRadiusIgnoringSet(sourceAvatarNode->getUUID());
             }
         }
 
-        if (!shouldIgnore) {
-            AvatarDataSequenceNumber lastSeqToReceiver = nodeData->getLastBroadcastSequenceNumber(avatarNode->getLocalID());
-            AvatarDataSequenceNumber lastSeqFromSender = avatarClientNodeData->getLastReceivedSequenceNumber();
+        if (sendAvatar) {
+            AvatarDataSequenceNumber lastSeqToReceiver = destinationNodeData->getLastBroadcastSequenceNumber(sourceAvatarNode->getLocalID());
+            AvatarDataSequenceNumber lastSeqFromSender = sourceAvatarNodeData->getLastReceivedSequenceNumber();
 
             // FIXME - This code does appear to be working. But it seems brittle.
             //         It supports determining if the frame of data for this "other"
@@ -430,26 +445,28 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
             // or that somehow we haven't sent
             if (lastSeqToReceiver == lastSeqFromSender && lastSeqToReceiver != 0) {
                 ++numAvatarsHeldBack;
-                shouldIgnore = true;
+                sendAvatar = false;
             } else if (lastSeqFromSender == 0) {
-                // We have have not yet recieved any data about this avatar. Ignore it for now
+                // We have have not yet received any data about this avatar. Ignore it for now
                 // This is important for Agent scripts that are not avatar
                 // so that they don't appear to be an avatar at the origin
-                shouldIgnore = true;
+                sendAvatar = false;
             } else if (lastSeqFromSender - lastSeqToReceiver > 1) {
                 // this is a skip - we still send the packet but capture the presence of the skip so we see it happening
                 ++numAvatarsWithSkippedFrames;
             }
         }
+
         quint64 endIgnoreCalculation = usecTimestampNow();
         _stats.ignoreCalculationElapsedTime += (endIgnoreCalculation - startIgnoreCalculation);
 
-        if (!shouldIgnore) {
+        if (sendAvatar) {
             // sort this one for later
-            const AvatarData* avatarNodeData = avatarClientNodeData->getConstAvatarData();
-            auto lastEncodeTime = nodeData->getLastOtherAvatarEncodeTime(avatarNode->getLocalID());
+            const MixerAvatar* avatarNodeData = sourceAvatarNodeData->getConstAvatarData();
+            auto lastEncodeTime = destinationNodeData->getLastOtherAvatarEncodeTime(sourceAvatarNode->getLocalID());
 
-            sortedAvatars.push(SortableAvatar(avatarNodeData, avatarNode, lastEncodeTime));
+            avatarPriorityQueues[avatarNodeData->getHasPriority() ? kHero : kNonhero].push(
+                SortableAvatar(avatarNodeData, sourceAvatarNode, lastEncodeTime));
         }
         
         // If Avatar A's PAL WAS open but is no longer open, AND
@@ -459,135 +476,153 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
         // will be sent when it doesn't need to be (but where it _should_ be OK to send).
         // However, it's less heavy-handed than using `shouldIgnore`.
         if (PALWasOpen && !PALIsOpen &&
-            (destinationNode->isIgnoringNodeWithID(avatarNode->getUUID()) ||
-                avatarNode->isIgnoringNodeWithID(destinationNode->getUUID()))) {
+            (destinationNode->isIgnoringNodeWithID(sourceAvatarNode->getUUID()) ||
+                sourceAvatarNode->isIgnoringNodeWithID(destinationNode->getUUID()))) {
             // ...send a Kill Packet to Node A, instructing Node A to kill Avatar B,
             // then have Node A cleanup the killed Node B.
             auto packet = NLPacket::create(PacketType::KillAvatar, NUM_BYTES_RFC4122_UUID + sizeof(KillAvatarReason), true);
-            packet->write(avatarNode->getUUID().toRfc4122());
+            packet->write(sourceAvatarNode->getUUID().toRfc4122());
             packet->writePrimitive(KillAvatarReason::AvatarIgnored);
             nodeList->sendPacket(std::move(packet), *destinationNode);
-            nodeData->cleanupKilledNode(avatarNode->getUUID(), avatarNode->getLocalID());
+            destinationNodeData->cleanupKilledNode(sourceAvatarNode->getUUID(), sourceAvatarNode->getLocalID());
         }
 
-        nodeData->setPrevRequestsDomainListData(PALIsOpen);
+        destinationNodeData->setPrevRequestsDomainListData(PALIsOpen);
     }
 
     // loop through our sorted avatars and allocate our bandwidth to them accordingly
 
-    int remainingAvatars = (int)sortedAvatars.size();
+    int remainingAvatars = (int)avatarPriorityQueues[kHero].size() + (int)avatarPriorityQueues[kNonhero].size();
     auto traitsPacketList = NLPacketList::create(PacketType::BulkAvatarTraits, QByteArray(), true, true);
 
     auto avatarPacket = NLPacket::create(PacketType::BulkAvatarData);
     const int avatarPacketCapacity = avatarPacket->getPayloadCapacity();
     int avatarSpaceAvailable = avatarPacketCapacity;
     int numPacketsSent = 0;
+    int numAvatarsSent = 0;
     auto identityPacketList = NLPacketList::create(PacketType::AvatarIdentity, QByteArray(), true, true);
 
-    const auto& sortedAvatarVector = sortedAvatars.getSortedVector(numToSendEst);
-    for (const auto& sortedAvatar : sortedAvatarVector) {
-        const Node* otherNode = sortedAvatar.getNode();
-        auto lastEncodeForOther = sortedAvatar.getTimestamp();
+    // Loop over two priorities - hero avatars then everyone else:
+    for (PriorityVariants currentVariant = kHero; currentVariant <= kNonhero; ++((int&)currentVariant)) {
+        const auto& sortedAvatarVector = avatarPriorityQueues[currentVariant].getSortedVector(numToSendEst);
+        for (const auto& sortedAvatar : sortedAvatarVector) {
+            const Node* sourceNode = sortedAvatar.getNode();
+            auto lastEncodeForOther = sortedAvatar.getTimestamp();
 
-        assert(otherNode); // we can't have gotten here without the avatarData being a valid key in the map
+            assert(sourceNode); // we can't have gotten here without the avatarData being a valid key in the map
 
-        AvatarData::AvatarDataDetail detail = AvatarData::NoData;
+            AvatarData::AvatarDataDetail detail = AvatarData::NoData;
 
-        // NOTE: Here's where we determine if we are over budget and drop remaining avatars,
-        // or send minimal avatar data in uncommon case of PALIsOpen.
-        int minimRemainingAvatarBytes = minimumBytesPerAvatar * remainingAvatars;
-        auto frameByteEstimate = identityBytesSent + traitBytesSent + numAvatarDataBytes + minimRemainingAvatarBytes;
-        bool overBudget = frameByteEstimate > maxAvatarBytesPerFrame;
-        if (overBudget) {
-            if (PALIsOpen) {
-                _stats.overBudgetAvatars++;
-                detail = AvatarData::PALMinimum;
-            } else {
-                _stats.overBudgetAvatars += remainingAvatars;
-                break;
+            // NOTE: Here's where we determine if we are over budget and drop remaining avatars,
+            // or send minimal avatar data in uncommon case of PALIsOpen.
+            int minimRemainingAvatarBytes = minimumBytesPerAvatar * remainingAvatars;
+            auto frameByteEstimate = identityBytesSent + traitBytesSent + numAvatarDataBytes + minimRemainingAvatarBytes;
+            bool overBudget = frameByteEstimate > maxAvatarBytesPerFrame;
+            if (overBudget) {
+                if (PALIsOpen) {
+                    _stats.overBudgetAvatars++;
+                    detail = AvatarData::PALMinimum;
+                } else {
+                    _stats.overBudgetAvatars += remainingAvatars;
+                    break;
+                }
+            }
+
+            bool overHeroBudget = currentVariant == kHero && numAvatarDataBytes > maxHeroBytesPerFrame;
+            if (overHeroBudget) {
+                break;  // No more heroes (this frame).
+            }
+
+            auto startAvatarDataPacking = chrono::high_resolution_clock::now();
+
+            const AvatarMixerClientData* sourceNodeData = reinterpret_cast<const AvatarMixerClientData*>(sourceNode->getLinkedData());
+            const MixerAvatar* sourceAvatar = sourceNodeData->getConstAvatarData();
+
+            // Typically all out-of-view avatars but such avatars' priorities will rise with time:
+            bool isLowerPriority = currentVariant != kHero && sortedAvatar.getPriority() <= OUT_OF_VIEW_THRESHOLD;  // XXX: hero handling?
+
+            if (isLowerPriority) {
+                detail = PALIsOpen ? AvatarData::PALMinimum : AvatarData::MinimumData;
+                destinationNodeData->incrementAvatarOutOfView();
+            } else if (!overBudget) {
+                detail = distribution(generator) < AVATAR_SEND_FULL_UPDATE_RATIO ? AvatarData::SendAllData : AvatarData::CullSmallData;
+                destinationNodeData->incrementAvatarInView();
+
+                // If the time that the mixer sent AVATAR DATA about Avatar B to Avatar A is BEFORE OR EQUAL TO
+                // the time that Avatar B flagged an IDENTITY DATA change, send IDENTITY DATA about Avatar B to Avatar A.
+                if (sourceAvatar->hasProcessedFirstIdentity()
+                    && destinationNodeData->getLastBroadcastTime(sourceNode->getLocalID()) <= sourceNodeData->getIdentityChangeTimestamp()) {
+                    identityBytesSent += sendIdentityPacket(*identityPacketList, sourceNodeData, *destinationNode);
+
+                    // remember the last time we sent identity details about this other node to the receiver
+                    destinationNodeData->setLastBroadcastTime(sourceNode->getLocalID(), usecTimestampNow());
+                }
+            }
+
+            QVector<JointData>& lastSentJointsForOther = destinationNodeData->getLastOtherAvatarSentJoints(sourceNode->getLocalID());
+
+            const bool distanceAdjust = true;
+            const bool dropFaceTracking = false;
+            AvatarDataPacket::SendStatus sendStatus;
+            sendStatus.sendUUID = true;
+
+            do {
+                auto startSerialize = chrono::high_resolution_clock::now();
+                QByteArray bytes = sourceAvatar->toByteArray(detail, lastEncodeForOther, lastSentJointsForOther,
+                    sendStatus, dropFaceTracking, distanceAdjust, destinationPosition,
+                    &lastSentJointsForOther, avatarSpaceAvailable);
+                auto endSerialize = chrono::high_resolution_clock::now();
+                _stats.toByteArrayElapsedTime +=
+                    (quint64)chrono::duration_cast<chrono::microseconds>(endSerialize - startSerialize).count();
+
+                avatarPacket->write(bytes);
+                avatarSpaceAvailable -= bytes.size();
+                numAvatarDataBytes += bytes.size();
+                if (!sendStatus || avatarSpaceAvailable < (int)AvatarDataPacket::MIN_BULK_PACKET_SIZE) {
+                    // Weren't able to fit everything.
+                    nodeList->sendPacket(std::move(avatarPacket), *destinationNode);
+                    ++numPacketsSent;
+                    avatarPacket = NLPacket::create(PacketType::BulkAvatarData);
+                    avatarSpaceAvailable = avatarPacketCapacity;
+                }
+            } while (!sendStatus);
+
+            if (detail != AvatarData::NoData) {
+                _stats.numOthersIncluded++;
+                if (sourceAvatar->getHasPriority()) {
+                    _stats.numHeroesIncluded++;
+                }
+
+                // increment the number of avatars sent to this receiver
+                destinationNodeData->incrementNumAvatarsSentLastFrame();
+
+                // set the last sent sequence number for this sender on the receiver
+                destinationNodeData->setLastBroadcastSequenceNumber(sourceNode->getLocalID(),
+                    sourceNodeData->getLastReceivedSequenceNumber());
+                destinationNodeData->setLastOtherAvatarEncodeTime(sourceNode->getLocalID(), usecTimestampNow());
+            }
+
+            auto endAvatarDataPacking = chrono::high_resolution_clock::now();
+            _stats.avatarDataPackingElapsedTime +=
+                (quint64)chrono::duration_cast<chrono::microseconds>(endAvatarDataPacking - startAvatarDataPacking).count();
+
+            if (!overBudget) {
+                // use helper to add any changed traits to our packet list
+                traitBytesSent += addChangedTraitsToBulkPacket(destinationNodeData, sourceNodeData, *traitsPacketList);
+            }
+            numAvatarsSent++;
+            remainingAvatars--;
+        }
+
+        if (currentVariant == kHero) {  // Dump any remaining heroes into the commoners.
+            for (auto avIter = sortedAvatarVector.begin() + numAvatarsSent; avIter < sortedAvatarVector.end(); ++avIter) {
+                avatarPriorityQueues[kNonhero].push(*avIter);
             }
         }
-
-        auto startAvatarDataPacking = chrono::high_resolution_clock::now();
-
-        const AvatarMixerClientData* otherNodeData = reinterpret_cast<const AvatarMixerClientData*>(otherNode->getLinkedData());
-        const AvatarData* otherAvatar = otherNodeData->getConstAvatarData();
-
-        // Typically all out-of-view avatars but such avatars' priorities will rise with time:
-        bool isLowerPriority = sortedAvatar.getPriority() <= OUT_OF_VIEW_THRESHOLD;
-
-        if (isLowerPriority) {
-            detail = PALIsOpen ? AvatarData::PALMinimum : AvatarData::MinimumData;
-            nodeData->incrementAvatarOutOfView();
-        } else if (!overBudget) {
-            detail = distribution(generator) < AVATAR_SEND_FULL_UPDATE_RATIO ? AvatarData::SendAllData : AvatarData::CullSmallData;
-            nodeData->incrementAvatarInView();
-
-            // If the time that the mixer sent AVATAR DATA about Avatar B to Avatar A is BEFORE OR EQUAL TO
-            // the time that Avatar B flagged an IDENTITY DATA change, send IDENTITY DATA about Avatar B to Avatar A.
-            if (otherAvatar->hasProcessedFirstIdentity()
-                && nodeData->getLastBroadcastTime(otherNode->getLocalID()) <= otherNodeData->getIdentityChangeTimestamp()) {
-                identityBytesSent += sendIdentityPacket(*identityPacketList, otherNodeData, *destinationNode);
-
-                // remember the last time we sent identity details about this other node to the receiver
-                nodeData->setLastBroadcastTime(otherNode->getLocalID(), usecTimestampNow());
-            }
-        }
-
-        QVector<JointData>& lastSentJointsForOther = nodeData->getLastOtherAvatarSentJoints(otherNode->getLocalID());
-
-        const bool distanceAdjust = true;
-        const bool dropFaceTracking = false;
-        AvatarDataPacket::SendStatus sendStatus;
-        sendStatus.sendUUID = true;
-
-        do {
-            auto startSerialize = chrono::high_resolution_clock::now();
-            QByteArray bytes = otherAvatar->toByteArray(detail, lastEncodeForOther, lastSentJointsForOther,
-                sendStatus, dropFaceTracking, distanceAdjust, myPosition,
-                &lastSentJointsForOther, avatarSpaceAvailable);
-            auto endSerialize = chrono::high_resolution_clock::now();
-            _stats.toByteArrayElapsedTime +=
-                (quint64)chrono::duration_cast<chrono::microseconds>(endSerialize - startSerialize).count();
-
-            avatarPacket->write(bytes);
-            avatarSpaceAvailable -= bytes.size();
-            numAvatarDataBytes += bytes.size();
-            if (!sendStatus || avatarSpaceAvailable < (int)AvatarDataPacket::MIN_BULK_PACKET_SIZE) {
-                // Weren't able to fit everything.
-                nodeList->sendPacket(std::move(avatarPacket), *destinationNode);
-                ++numPacketsSent;
-                avatarPacket = NLPacket::create(PacketType::BulkAvatarData);
-                avatarSpaceAvailable = avatarPacketCapacity;
-            }
-        } while (!sendStatus);
-
-        if (detail != AvatarData::NoData) {
-            _stats.numOthersIncluded++;
-
-            // increment the number of avatars sent to this receiver
-            nodeData->incrementNumAvatarsSentLastFrame();
-
-            // set the last sent sequence number for this sender on the receiver
-            nodeData->setLastBroadcastSequenceNumber(otherNode->getLocalID(),
-                otherNodeData->getLastReceivedSequenceNumber());
-            nodeData->setLastOtherAvatarEncodeTime(otherNode->getLocalID(), usecTimestampNow());
-        }
-
-        auto endAvatarDataPacking = chrono::high_resolution_clock::now();
-        _stats.avatarDataPackingElapsedTime +=
-            (quint64) chrono::duration_cast<chrono::microseconds>(endAvatarDataPacking - startAvatarDataPacking).count();
-
-        if (!overBudget) {
-            // use helper to add any changed traits to our packet list
-            traitBytesSent += addChangedTraitsToBulkPacket(nodeData, otherNodeData, *traitsPacketList);
-        }
-
-        remainingAvatars--;
     }
 
-    if (nodeData->getNumAvatarsSentLastFrame() > numToSendEst) {
-        qCWarning(avatars) << "More avatars sent than upper estimate" << nodeData->getNumAvatarsSentLastFrame()
+    if (destinationNodeData->getNumAvatarsSentLastFrame() > numToSendEst) {
+        qCWarning(avatars) << "More avatars sent than upper estimate" << destinationNodeData->getNumAvatarsSentLastFrame()
             << " / " << numToSendEst;
     }
 
@@ -618,12 +653,12 @@ void AvatarMixerSlave::broadcastAvatarDataToAgent(const SharedNodePointer& node)
     }
 
     // record the bytes sent for other avatar data in the AvatarMixerClientData
-    nodeData->recordSentAvatarData(numAvatarDataBytes, traitBytesSent);
+    destinationNodeData->recordSentAvatarData(numAvatarDataBytes, traitBytesSent);
 
 
     // record the number of avatars held back this frame
-    nodeData->recordNumOtherAvatarStarves(numAvatarsHeldBack);
-    nodeData->recordNumOtherAvatarSkips(numAvatarsWithSkippedFrames);
+    destinationNodeData->recordNumOtherAvatarStarves(numAvatarsHeldBack);
+    destinationNodeData->recordNumOtherAvatarSkips(numAvatarsWithSkippedFrames);
 
     quint64 endPacketSending = usecTimestampNow();
     _stats.packetSendingElapsedTime += (endPacketSending - startPacketSending);

assignment-client/src/avatars/AvatarMixerSlave.h

@@ -32,6 +32,7 @@ public:
     int numIdentityPacketsSent { 0 };
     int numOthersIncluded { 0 };
     int overBudgetAvatars { 0 };
+    int numHeroesIncluded { 0 };
 
     quint64 ignoreCalculationElapsedTime { 0 };
     quint64 avatarDataPackingElapsedTime { 0 };
@@ -57,6 +58,7 @@ public:
         numIdentityPacketsSent = 0;
         numOthersIncluded = 0;
         overBudgetAvatars = 0;
+        numHeroesIncluded = 0;
 
         ignoreCalculationElapsedTime = 0;
         avatarDataPackingElapsedTime = 0;
@@ -80,6 +82,7 @@ public:
         numIdentityPacketsSent += rhs.numIdentityPacketsSent;
         numOthersIncluded += rhs.numOthersIncluded;
         overBudgetAvatars += rhs.overBudgetAvatars;
+        numHeroesIncluded += rhs.numHeroesIncluded;
 
         ignoreCalculationElapsedTime += rhs.ignoreCalculationElapsedTime;
         avatarDataPackingElapsedTime += rhs.avatarDataPackingElapsedTime;
@@ -90,9 +93,13 @@ public:
     }
 };
 
+class EntityTree;
+using EntityTreePointer = std::shared_ptr<EntityTree>;
+
 struct SlaveSharedData {
     QStringList skeletonURLWhitelist;
     QUrl skeletonReplacementURL;
+    EntityTreePointer entityTree;
 };
 
 class AvatarMixerSlave {

assignment-client/src/avatars/AvatarMixerSlavePool.cpp

@@ -63,10 +63,6 @@ bool AvatarMixerSlaveThread::try_pop(SharedNodePointer& node) {
     return _pool._queue.try_pop(node);
 }
 
-#ifdef AVATAR_SINGLE_THREADED
-static AvatarMixerSlave slave;
-#endif
-
 void AvatarMixerSlavePool::processIncomingPackets(ConstIter begin, ConstIter end) {
     _function = &AvatarMixerSlave::processIncomingPackets;
     _configure = [=](AvatarMixerSlave& slave) { 
@@ -89,19 +85,9 @@ void AvatarMixerSlavePool::run(ConstIter begin, ConstIter end) {
     _begin = begin;
     _end = end;
 
-#ifdef AUDIO_SINGLE_THREADED
-    _configure(slave);
-    std::for_each(begin, end, [&](const SharedNodePointer& node) {
-        _function(slave, node);
-});
-#else
     // fill the queue
     std::for_each(_begin, _end, [&](const SharedNodePointer& node) {
-#if defined(__clang__) && defined(Q_OS_LINUX)
         _queue.push(node);
-#else
-        _queue.emplace(node);
-#endif
     });
 
     {
@@ -121,18 +107,13 @@ void AvatarMixerSlavePool::run(ConstIter begin, ConstIter end) {
     }
 
     assert(_queue.empty());
-#endif
 }
 
 
 void AvatarMixerSlavePool::each(std::function<void(AvatarMixerSlave& slave)> functor) {
-#ifdef AVATAR_SINGLE_THREADED
-    functor(slave);
-#else
     for (auto& slave : _slaves) {
         functor(*slave.get());
     }
-#endif
 }
 
 void AvatarMixerSlavePool::setNumThreads(int numThreads) {
@@ -158,9 +139,6 @@ void AvatarMixerSlavePool::setNumThreads(int numThreads) {
 void AvatarMixerSlavePool::resize(int numThreads) {
     assert(_numThreads == (int)_slaves.size());
 
-#ifdef AVATAR_SINGLE_THREADED
-    qDebug("%s: running single threaded", __FUNCTION__, numThreads);
-#else
     qDebug("%s: set %d threads (was %d)", __FUNCTION__, numThreads, _numThreads);
 
     Lock lock(_mutex);
@@ -208,5 +186,4 @@ void AvatarMixerSlavePool::resize(int numThreads) {
 
     _numThreads = _numStarted = _numFinished = numThreads;
     assert(_numThreads == (int)_slaves.size());
-#endif
 }

assignment-client/src/avatars/MixerAvatar.h

@@ -0,0 +1,28 @@
+//
+//  MixerAvatar.h
+//  assignment-client/src/avatars
+//
+//  Created by Simon Walton Feb 2019.
+//  Copyright 2019 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+// Avatar class for use within the avatar mixer - encapsulates data required only for
+// sorting priorities within the mixer.
+
+#ifndef hifi_MixerAvatar_h
+#define hifi_MixerAvatar_h
+
+#include <AvatarData.h>
+
+class MixerAvatar : public AvatarData {
+public:
+
+private:
+};
+
+using MixerAvatarSharedPointer = std::shared_ptr<MixerAvatar>;
+
+#endif  // hifi_MixerAvatar_h

assignment-client/src/octree/OctreeServer.cpp

@@ -1203,7 +1203,8 @@ void OctreeServer::beginRunning() {
     auto nodeList = DependencyManager::get<NodeList>();
 
     // we need to ask the DS about agents so we can ping/reply with them
-    nodeList->addSetOfNodeTypesToNodeInterestSet({ NodeType::Agent, NodeType::EntityScriptServer });
+    nodeList->addSetOfNodeTypesToNodeInterestSet({ NodeType::Agent, NodeType::EntityScriptServer,
+        NodeType::AvatarMixer });
 
     beforeRun(); // after payload has been processed
 

cmake/macros/TargetOculusMobile.cmake

@@ -1,6 +1,6 @@
 
 macro(target_oculus_mobile)
-    set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/oculus/VrApi)
+    set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/oculus_1.22/VrApi)
 
     # Mobile SDK
     set(OVR_MOBILE_INCLUDE_DIRS ${INSTALL_DIR}/Include)

domain-server/resources/describe-settings.json

@@ -1302,6 +1302,14 @@
           "placeholder": "1",
           "default": "1",
           "advanced": true
+        },
+        {
+          "name": "connection_rate",
+          "label": "Connection Rate",
+          "help": "Number of new agents that can connect to the mixer every second",
+          "placeholder": "50",
+          "default": "50",
+          "advanced": true
         }
       ]
     },

domain-server/src/DomainServer.cpp

@@ -1243,12 +1243,11 @@ void DomainServer::broadcastNewNode(const SharedNodePointer& addedNode) {
 
     limitedNodeList->eachMatchingNode(
         [this, addedNode](const SharedNodePointer& node)->bool {
-            if (node->getLinkedData() && node->getActiveSocket() && node != addedNode) {
-                // is the added Node in this node's interest list?
-                return isInInterestSet(node, addedNode);
-            } else {
-                return false;
-            }
+            // is the added Node in this node's interest list?
+            return node->getLinkedData()
+                && node->getActiveSocket()
+                && node != addedNode
+                && isInInterestSet(node, addedNode);
         },
         [this, &addNodePacket, connectionSecretIndex, addedNode, limitedNodeListWeak](const SharedNodePointer& node) {
             // send off this packet to the node

hifi_android.py

@@ -45,10 +45,10 @@ ANDROID_PACKAGES = {
         'sharedLibFolder': 'lib',
         'includeLibs': ['libnvtt.so', 'libnvmath.so', 'libnvimage.so', 'libnvcore.so']
     },
-    'oculus': {
-        'file': 'ovr_sdk_mobile_1.19.0.zip',
-        'versionId': 's_RN1vlEvUi3pnT7WPxUC4pQ0RJBs27y',
-        'checksum': '98f0afb62861f1f02dd8110b31ed30eb',
+    'oculus_1.22': {
+        'file': 'ovr_sdk_mobile_1.22.zip',
+        'versionId': 'InhomR5gwkzyiLAelH3X9k4nvV3iIpA_',
+        'checksum': '1ac3c5b0521e5406f287f351015daff8',
         'sharedLibFolder': 'VrApi/Libs/Android/arm64-v8a/Release',
         'includeLibs': ['libvrapi.so']
     },

interface/resources/avatar/avatar-animation.json

@@ -1016,8 +1016,8 @@
                                                                                                 "type": "clip",
                                                                                                 "data": {
                                                                                                     "url": "qrc:///avatar/animations/run_fwd.fbx",
-                                                                                                    "startFrame": 0.0,
-                                                                                                    "endFrame": 21.0,
+                                                                                                    "startFrame": 1.0,
+                                                                                                    "endFrame": 22.0,
                                                                                                     "timeScale": 1.0,
                                                                                                     "loopFlag": true
                                                                                                 },

interface/resources/fonts/hifi-glyphs-1.38/fonts/hifi-glyphs.svg

@@ -14,7 +14,6 @@
 <glyph glyph-name="headphones-mic" unicode="&#102;" d="M419 348l-22 0c-3 48-42 83-89 83l-105 0c-47 0-86-35-89-83l-20 0c-25 0-45-19-45-44l0-71c0-25 20-45 45-45l19 0c1-27 14-50 33-66-3-17 5-35 20-45l41-25c7-4 15-7 23-7 3 0 6 1 10 2 11 2 21 9 27 19 13 21 6 48-14 60l-41 26c-10 6-21 8-33 5-8-2-15-6-20-11-12 11-20 27-20 45l0 152c0 34 29 62 64 62l105 0c35 0 64-28 64-62l0-152c0-1-1-3-1-3l48 0c25 0 46 20 46 45l0 71c0 25-21 44-46 44z m-306-134l-19 0c-10 0-19 9-19 19l0 71c0 10 9 19 19 19l19 0z m61-90c3 4 7 6 11 7 2 1 3 1 4 1 4 0 7-1 9-3l41-25c8-5 11-16 6-24-3-4-7-7-11-8-5-1-10 0-14 2l-40 25c-8 6-11 16-6 25z m264 109c0-10-8-19-19-19l-22 0 0 109 22 0c11 0 19-9 19-19z"/>
 <glyph glyph-name="gamepad" unicode="&#103;" d="M107 136c-10 0-20 3-29 10-46 37-8 131-4 141l1 1c1 4 3 7 5 11 16 30 37 73 81 73l182 0c51 0 71-47 87-85 5-10 44-101 4-138-28-26-67-1-102 22-21 13-42 26-56 26l-39 0c-13 0-33-13-53-27-25-16-52-34-77-34z m-10 141c-10-24-30-90-3-112 17-13 47 7 76 26 24 16 47 31 67 31l40 0c20 0 44-15 68-30 28-18 59-37 72-25 23 22 0 89-10 110-17 42-31 70-64 70l-182 0c-29 0-45-33-59-60-2-3-3-7-5-10z m247-36l-3 0c-7 0-13 6-13 13 0 7 6 13 13 13l3 0c7 0 13-6 13-13 0-7-6-13-13-13z m0 55l-3 0c-7 0-13 6-13 13 0 7 6 13 13 13l3 0c7 0 13-6 13-13 0-7-6-13-13-13z m-29-29l-2 0c-8 0-13 6-13 13 0 8 5 13 13 13l2 0c8 0 13-5 13-13 0-7-5-13-13-13z m57 0l-3 0c-7 0-13 6-13 13 0 8 6 13 13 13l3 0c7 0 13-5 13-13 0-7-6-13-13-13z m-172 26l-12 0 0 13c0 7-6 13-13 13-7 0-13-6-13-13l0-13-13 0c-7 0-13-6-13-13 0-7 6-13 13-13l13 0 0-12c0-8 6-14 13-14 7 0 13 6 13 14l0 12 12 0c8 0 13 6 13 13 0 7-5 13-13 13z"/>
 <glyph glyph-name="headphones" unicode="&#104;" d="M141 168l0 152c0 35 28 65 63 65l106 0c34 0 62-30 62-65l0-151c0-1 1-3 0-4l48 0c25 0 47 21 47 46l0 70c0 25-22 45-47 45l-21 0c-4 47-42 83-89 83l-106 0c-47 0-86-36-89-83l-19 0c-25 0-45-20-45-45l0-70c0-25 20-46 45-46l45 0z m-63 43l0 70c0 11 7 19 18 19l19 0 0-108-19 0c-11 0-18 8-18 19z m362 0c0-11-9-19-20-19l-20 0 0 108 20 0c11 0 20-8 20-19z"/>
-<glyph glyph-name="mic" unicode="&#105;" d="M318 370c0 33-26 59-59 59l-6 0c-33 0-59-26-59-59l0-105c0-33 26-59 59-59l6 0c33 0 59 26 59 59z m-25-103c0-19-15-34-34-34l-7 0c-19 0-34 15-34 34l0 104c0 19 15 34 34 34l7 0c19 0 34-15 34-34z m82 8c0 7-6 13-12 13-7 0-13-6-13-13 0-51-42-93-93-93-52 0-93 42-93 93 0 7-6 13-13 13-7 0-12-6-12-13 0-60 46-110 104-117l0-34-80 0c-8 0-14-6-14-14 0-7 6-13 14-13l186 0c7 0 13 6 13 13 0 8-6 14-13 14l-80 0 0 34c60 6 106 56 106 117z"/>
 <glyph glyph-name="upload" unicode="&#106;" d="M330 193l-83 86-84-86 52 0 0-141 61 23 0 118z m-12 247c-39 0-76-15-105-41-23-21-40-49-47-80-9 3-19 4-29 4-53 0-97-43-97-97 0-54 44-98 97-98 1 0 19 0 45 0l0 29c-26 0-44 0-45 0-37 0-68 31-68 69 0 37 31 68 68 68 12 0 23-3 34-9l19-11 2 23c3 31 18 59 41 81 23 21 54 33 85 33 70 0 127-57 127-127 0-70-57-127-127-127 0 0-5 0-10 0l0-29c5 0 10 0 10 0 86 0 156 70 156 156 0 86-70 156-156 156z"/>
 <glyph glyph-name="script" unicode="&#107;" d="M283 80l-150 0c-30 0-56 15-73 44-13 21-17 42-17 42l-3 15 91 0 0 252 315 0 0-238c1-7 5-58-21-87-13-14-29-21-50-21-42 0-63 23-73 41-6 11-9 21-10 29l-220 0c2-6 5-13 9-20 13-21 31-32 52-32l150 0c7 0 13-6 13-13 0-6-6-12-13-12z m-127 101l158 0 1-12c0 0 1-15 9-30 10-18 27-28 51-28 13 0 23 5 31 13 10 11 14 29 15 42 1 15 0 27 0 27l0 1 0 214-265 0z m225 168l-185 0c-8 0-14 6-14 13 0 8 6 14 14 14l185 0c8 0 14-6 14-14 0-7-6-13-14-13z m0-61l-185 0c-8 0-14 7-14 14 0 8 6 14 14 14l185 0c8 0 14-6 14-14 0-7-6-14-14-14z m0-60l-185 0c-8 0-14 6-14 14 0 7 6 13 14 13l185 0c8 0 14-6 14-13 0-8-6-14-14-14z"/>
 <glyph glyph-name="text" unicode="&#108;" d="M220 134l-81 232c-1 2-3 4-6 4l-10 0c-3 0-5-2-6-4l-83-233c-1-2 0-5 1-7 1-1 3-3 6-3l16 0c3 0 5 3 6 5l27 79 74 0 27-79c1-2 4-5 7-5l16 0c2 0 4 2 5 4 2 1 2 4 1 7z m-120 102l26 73c1 2 1 3 2 5 0-2 1-3 2-4l24-74z m252 60c-10 12-25 18-44 18-17 0-35-5-53-14-3-2-4-6-3-9l5-14c1-2 2-3 4-4 2-1 4 0 6 1 14 8 28 12 41 12 11 0 19-3 23-10 5-7 8-18 8-33l0-4-23-1c-25 0-44-6-58-16-14-11-21-26-21-45 0-17 4-31 14-40 10-10 23-16 40-16 12 0 23 3 32 8 6 4 11 8 17 14l1-13c1-4 4-7 7-7l10 0c4 0 8 4 8 8l0 115c0 23-5 39-14 50z m-87-119c0 11 4 19 11 24 8 5 22 9 42 10l19 1 0-10c0-17-4-30-12-39-8-9-19-13-33-13-9 0-16 2-20 7-5 4-7 11-7 20z m186-105c-10 0-15 8-15 18 0 22 0 298 0 320 0 10 5 19 15 19 0 0 0 0 0 0 10 0 15-8 15-18 1-22 1-299 1-321 0-10-6-18-16-18 0 0 0 0 0 0z"/>
@@ -97,7 +96,6 @@
 <glyph glyph-name="acceleration" unicode="&#57347;" d="M207 350c3 2 8 3 14 3 3 0 5 0 8-1 2 0 4-1 5-2 2-1 3-2 4-4 1-1 2-3 2-4l0 0c1 1 2 3 3 4 2 1 3 3 5 4 2 1 4 2 7 2 2 1 5 1 8 1 5 0 8 0 11-1 3-2 5-3 7-5 1-2 2-5 3-7 1-3 1-6 1-8l0-35-15 0 0 35c0 1 0 3 0 4 0 2-1 4-2 5-1 1-2 2-3 3-2 1-4 1-7 1-2 0-4 0-6-1-2-1-4-2-6-4-1-1-2-3-3-5-1-2-1-4-1-7l0-31-14 0 0 35c0 1-1 3-1 4 0 2-1 3-1 5-1 1-2 2-4 3-2 1-4 1-7 1-2 0-4 0-6-1-2-1-4-2-5-4-2-1-3-3-3-5-1-2-2-4-2-7l0-32-14 0 0 41c0 3 0 5 0 8 0 2 0 4-1 6l14 0c0-1 1-3 1-5 0-2 0-3 0-4l0 0c2 3 4 6 8 8z m112-92c0-2 0-4-1-5 0-1-1-3-2-4 0-2-1-3-2-4-1-2-2-3-3-5l-11-15 18 0 0-6-25 0 0 6 14 20c2 2 3 4 4 6 1 2 1 4 1 6 0 3 0 5-1 6-1 2-3 3-5 3-2 0-4-1-5-2-1-2-2-3-2-6l-7 1c1 4 3 7 5 9 2 2 5 3 9 3 2 0 4 0 6-1 1 0 3-1 4-3 1-1 2-2 2-4 1-2 1-3 1-5z m-112-18c-1 1-2 2-3 3-1 1-3 1-5 1-1 0-3 0-4-2-1-1-2-3-2-5 0-2 1-3 2-4 1-1 3-2 6-3 1-1 2-1 3-2 2-1 3-2 4-3 1-1 2-2 2-4 1-1 1-3 1-5 0-2 0-4-1-6-1-2-2-3-3-5-1-1-3-2-4-2-2-1-4-1-6-1-3 0-5 0-7 1-3 1-4 3-6 5l5 5c1-2 2-3 3-4 2 0 3-1 5-1 2 0 4 1 5 2 1 2 2 3 2 6 0 1 0 2-1 3 0 1-1 2-2 2 0 1-1 1-2 2-1 0-2 1-3 1-2 1-3 1-4 2-1 0-2 1-3 2-1 1-1 2-2 4 0 1-1 3-1 5 0 2 1 4 1 5 1 2 2 3 3 5 1 1 3 2 4 2 2 1 4 1 6 1 2 0 5 0 7-1 2-1 3-2 5-4z m18-16c0-2 0-4 0-6 1-2 1-4 2-5 1-1 2-3 3-3 1-1 3-2 4-2 2 0 4 1 5 2 1 2 2 3 3 5l6-3c-2-3-3-6-6-8-2-1-5-2-8-2-5 0-10 2-13 6-3 4-4 10-4 18 0 4 0 7 1 10 1 3 2 6 4 8 1 2 3 3 5 5 2 1 4 1 7 1 2 0 5 0 7-1 2-2 3-3 5-5 1-2 2-5 2-7 1-3 1-6 1-9l0-4-24 0z m16 6c0 4 0 7-2 10-1 2-3 4-6 4-1 0-3-1-4-2-1-1-2-2-2-3-1-2-1-3-2-5 0-1 0-2 0-4l16 0z m31-28c-3 0-5 0-7 1-2 2-4 3-5 5-2 3-3 5-3 8-1 3-1 6-1 10 0 4 0 7 1 10 0 3 1 5 3 8 1 2 3 3 5 5 2 1 5 1 7 1 3 0 5 0 6-1 2-1 3-1 4-2l-4-6c0 1-1 1-2 2-1 0-2 1-4 1-1 0-2-1-3-2-1-1-2-2-3-3-1-2-1-4-2-6 0-2 0-4 0-7 0-2 0-5 0-7 1-2 1-4 2-5 1-2 2-3 3-4 1-1 2-1 4-1 1 0 3 0 4 1 1 0 1 1 2 2l4-6c-3-3-6-4-11-4z m17 74l-107 0c-2 0-4 2-4 4 0 2 2 4 4 4l107 0c2 0 4-2 4-4 0-2-2-4-4-4z"/>
 <glyph glyph-name="particles" unicode="&#57348;" d="M332 229c0 12 10 23 23 23 13 0 23-11 23-23 0-13-10-24-23-24-13 0-23 11-23 24z m-54-68c0 13 10 23 23 23 13 0 23-10 23-23 0-13-10-23-23-23-13 0-23 10-23 23z m-62-18c0 13 11 23 24 23 12 0 23-10 23-23 0-13-11-23-23-23-13 0-24 10-24 23z m-46 60c0 13 10 23 23 23 13 0 23-10 23-23 0-13-10-23-23-23-13 0-23 10-23 23z m81-138c-5 3-8 9-9 15-1 6 1 12 4 17 4 5 9 8 15 9 6 1 13 0 18-4 5-4 8-9 9-15 1-6-1-13-4-18-4-4-9-8-16-9-6-1-12 1-17 5z m-183 201c0 13 10 23 23 23 13 0 23-10 23-23 0-13-10-23-23-23-13 0-23 10-23 23z m111 46c0 13 10 24 23 24 13 0 23-11 23-24 0-12-10-23-23-23-13 0-23 11-23 23z m71-94c0 13 11 23 24 23 12 0 23-10 23-23 0-13-11-23-23-23-13 0-24 10-24 23z m163 52c0 13 10 23 23 23 13 0 23-10 23-23 0-13-10-23-23-23-12 0-23 10-23 23z m-111 38c0 13 11 23 23 23 13 0 24-10 24-23 0-13-11-23-24-23-12 0-23 10-23 23z m-170 90c0 13 11 24 24 24 12 0 23-11 23-24 0-12-11-23-23-23-13 0-24 11-24 23z m235-23c0 13 10 23 23 23 13 0 23-10 23-23 0-13-10-23-23-23-13 0-23 10-23 23z"/>
 <glyph glyph-name="voxels" unicode="&#57349;" d="M434 379l-85 49c-4 2-10 2-14 0l-77-45-79 46c-4 2-10 2-14 0l-85-49c-4-3-7-7-7-12l0-98c0-5 3-10 7-13l78-45 0-89c0-5 3-10 7-12l85-49c2-2 5-2 7-2 2 0 5 0 7 2l85 49c4 2 7 7 7 12l0 88 78 45c5 3 7 7 7 12l0 99c0 5-2 9-7 12z m-21-88l-59 34 0 68 59-35z m-69-55l-73 42 0 80 59 35 0-68-29-17c-6-3-8-11-4-16 2-4 6-6 10-6 2 0 4 0 6 1l29 17 60-34z m-75-57l0 66 59-34 0-66z m-26 113l-59 34 0 68 59-34z m-142 68l59 34 0-68-31-18c-6-3-8-11-5-17 2-3 7-6 11-6 2 0 4 1 6 2l31 18 59-34-60-34-70 41z m156-270l-71 41 0 81 59 34 0-67-28-16c-6-3-8-11-5-17 3-3 7-6 11-6 2 0 4 1 6 2l28 16 59-34z"/>
-<glyph glyph-name="lock" unicode="&#57350;" d="M389 233l0 62c0 68-55 124-123 124-69 0-124-56-124-124l0-62c-24-4-44-26-44-52l0-74c0-29 24-52 52-52l230 0c29 0 53 23 53 52l0 74c0 26-18 48-44 52z m-123 129c37 0 67-30 67-67l0-61-135 0 0 61c0 37 31 67 68 67z"/>
 <glyph glyph-name="visible" unicode="&#57351;" d="M258 116c-55 0-106 17-147 51-31 25-47 51-47 52-4 7-4 16 1 23 2 4 66 98 195 96 133-3 192-93 195-97 4-6 4-15 0-22 0-1-15-27-46-53-29-23-79-50-151-50 0 0 0 0 0 0z m-148 113c7-7 17-18 30-29 34-27 73-40 118-40 0 0 0 0 0 0 47 0 88 13 122 40 13 10 23 21 29 29-7 7-16 16-30 26-34 25-74 38-119 38-81 2-130-42-150-64z m-27 1z m227-4c0-25-21-46-47-46-26 0-47 21-47 46 0 26 21 47 47 47 26 0 47-21 47-47z"/>
 <glyph glyph-name="model" unicode="&#57352;" d="M494 395c-2 5-8 8-13 7l-90-16 45 72c3 5 2 11-1 15-4 4-10 5-15 3l-213-98c-15 5-72 27-111 43 0 0-1 0-1 0 0 0 0 0 0 0 0 0-1 0-1 1 0 0-1 0-1 0 0 0-1 0-1 0 0 0 0 0 0 0-1 0-1 0-2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0-1 0-1 0 0 0 0 0 0-1-1 0-1 0-2 0 0 0 0 0 0 0 0 0-1 0-1 0 0 0 0-1 0-1-1 0-2 0-3-1 0 0 0 0 0 0 0-1-1-1-1-1 0 0 0 0 0 0 0 0 0-1 0-1-1 0-1 0-1 0 0 0 0 0 0-1 0 0 0 0-1-1l-27-52-33-40c-3-4-3-10 0-15 2-3 6-5 10-5 1 0 2 0 4 1l50 17 40 2-26-51c-3-4-2-9 1-13 1-1 26-30 52-58 15-17 28-30 38-40 6-6 11-11 15-14l-16-61-46-18c-6-3-9-10-6-16 2-5 6-8 11-8 1 0 3 1 4 1l45 18 17-15c2-3 5-4 8-4 4 0 7 2 9 5 5 5 4 12-1 17l-17 15 16 61 76-90c2-2 6-4 9-4 1 0 2 0 3 0l85 23c5 2 8 6 9 11 0 5-2 9-7 12l-136 72 45 91 178 123c5 3 6 9 4 15z m-200-117l-122 55 41 21 181 83z m-148 73l-24 33c16-6 39-15 54-21z m-59-6l-9 13 15 29 27-38 2-2z m36-77l23 44c18-45 35-91 47-121-19 20-45 49-70 77z m194-194l-57 68 105-55z m-94 101c-5 14-42 104-30 77 0-2-21 49-28 66l121-59-48-95z m108 120l43 63 70 16z"/>
 <glyph glyph-name="avatar-2" unicode="&#57353;" d="M256 88c-93 0-169 75-169 168 0 93 76 169 169 169 93 0 169-76 169-169 0-93-76-168-169-168z m0 316c-81 0-148-66-148-148 0-81 67-147 148-147 81 0 148 66 148 147 0 82-67 148-148 148z m97-90l-1 1c-3 3-7 4-10 4-1 0-61-9-86-9-1 0-1 0-2 0-25 0-87 10-87 10-5 0-10-2-13-6l-1-2c-2-3-2-7-1-10 1-4 3-6 6-8 12-5 49-20 60-22 2 0 5 0 6-7 1-8-3-46-7-65-5-17-13-40-13-41-2-6 1-13 7-15l8-3c3-1 6-1 9 1 3 1 5 4 6 7l21 65 20-67c1-3 3-6 6-7 2-1 4-1 5-1 2 0 3 0 5 0l7 3c5 2 8 8 7 14 0 0-6 24-11 44-3 12-4 30-5 45 0 9-1 16-2 22 0 1 0 4 5 5 0 0 1 0 2 0l55 22c4 2 6 5 7 9 1 4 0 8-3 11z m-68 37c0-16-13-29-29-29-16 0-29 13-29 29 0 16 13 29 29 29 16 0 29-13 29-29z"/>
@@ -137,7 +135,6 @@
 <glyph glyph-name="wallet" unicode="&#57383;" d="M400 400c-3 10-8 19-15 24-7 5-15 8-24 7l-227 0c-19 0-35-15-35-34l0-58c-19-2-34-18-34-37l0-95c0-19 15-35 34-37l0-53c0-19 16-34 35-34l228 0c20 0 30 16 38 31l0 1c1 2 21 53 21 139 0 83-19 140-21 146z m-309-193l0 95c0 6 5 11 11 11l86 0c6 0 11-5 11-11l0-95c0-6-5-11-11-11l-86 0c-6 0-11 5-11 11z m285-82c-8-16-11-16-14-16l-228 0c-5 0-9 4-9 8l0 53 63 0c21 0 37 17 37 37l0 95c0 20-16 37-37 37l-63 0 0 58c0 4 4 8 9 8l228 0c3 0 10 1 13-13l0 0 0-1c1 0 20-55 20-137 0-77-17-124-19-129z"/>
 <glyph glyph-name="send" unicode="&#57384;" d="M391 376c4-4 4-10 2-16-7-21-14-42-22-63-21-63-43-125-65-188-1-4-4-7-6-10-8-6-17-4-22 5-15 28-30 56-44 85-1 1 0 3 0 4 18 21 35 43 53 64 5 6 10 12 15 18 4 6 5 10 1 14-4 4-8 3-14-1-18-15-36-30-54-44-9-8-19-16-28-24-1-1-3-1-4 0-29 14-57 29-85 44-6 3-8 8-8 14 1 7 5 11 11 13 36 13 72 25 107 37 49 17 97 34 145 51 7 2 13 2 18-3z"/>
 <glyph glyph-name="password" unicode="&#57385;" d="M104 267l0 41 22 0 0-41 35 20 11-19-35-20 35-20-11-20-35 20 0-40-22 0 0 40-35-20-11 20 35 20-35 20 11 19z m136 0l0 41 23 0 0-41 35 20 11-19-35-20 35-20-11-20-35 20 0-40-23 0 0 40-35-20-11 20 35 20-35 20 11 19z m137 0l0 41 23 0 0-41 34 20 12-19-35-20 35-20-12-20-35 20 0-40-22 0 0 40-35-20-11 20 35 20-35 20 11 19z"/>
-<glyph glyph-name="rez" unicode="&#57381;" d="M373 321c-2 5-6 8-11 8l-49 8 55 61c4 4 5 9 3 14-2 5-7 8-12 8 0 0 0 0 0 0l-114-1c-5-1-10-4-12-9l-54-136c-1-4-1-8 1-11 2-4 6-6 9-7l38-5-54-136c-2-6 0-13 6-16 2-1 4-2 7-2 3 0 7 2 10 5l175 206c3 4 3 9 2 13z"/>
 <glyph glyph-name="keyboard-collapse" unicode="&#57387;" d="M373 249l-26 0 0 25 26 0z m-35 0l-27 0 0 25 27 0z m-36 0l-27 0 0 25 27 0z m-36 0l-26 0 0 25 26 0z m-35 0l-27 0 0 25 27 0z m-36 0l-27 0 0 25 27 0z m-36 0l-26 0 0 25 26 0z m224-1l18 0c7 0 13 6 13 13 0 7-6 13-13 13l-18 0m-262 0l-17 0c-7 0-13-6-13-13 0-7 6-13 13-13l17 0m252 39l-31 0 0 25 31 0z m-42 0l-31 0 0 25 31 0z m-41 0l-32 0 0 25 32 0z m-42 0l-32 0 0 25 32 0z m-42 0l-32 0 0 25 32 0z m-41 0l-32 0 0 25 32 0z m218-1l18 0c7 0 13 6 13 13 0 8-6 14-13 14l-18 0m-262 0l-17 0c-7 0-13-6-13-14 0-7 6-13 13-13l17 0m288-124l-315 0c-33 0-59 28-59 61l0 76c0 34 26 61 59 61l315 0c33 0 59-27 59-61l0-76c1-33-26-61-59-61z m-315 172c-18 0-33-16-33-34l0-77c0-19 15-34 33-34l315 0c18 0 33 15 33 34l0 77c0 19-15 34-33 34z m248-99l32 0 0-25-32 0z m-41 0l31 0 0-25-31 0z m-42 0l31 0 0-25-31 0z m-43 0l32 0 0-25-32 0z m-42 0l32 0 0-25-32 0z m-41 0l31 0 0-25-31 0z m250-26l18 0c7 0 13 6 13 14 0 7-6 13-13 13l-18 0m-262 0l-17 0c-7 0-13-6-13-13 0-8 6-13 13-13l17 0m81-82l50-50 53 54-107 0"/>
 <glyph glyph-name="image" unicode="&#57386;" d="M257 428c52 0 104 0 156 0 24 0 37-13 37-37 1-90 1-179 0-269 0-25-13-38-39-38-103 0-207 0-311 0-26 0-39 13-39 40 0 88 0 176 0 263 0 28 13 41 41 41 51 0 103 0 155 0z m167-263c0 7 0 10 0 14 0 69 0 138 0 206 0 17 0 17-17 17-101 0-202 0-303 0-16 0-17-1-17-17 0-58 0-115 0-173 0-3 0-7 0-12 8 3 14 6 19 9 17 8 30 7 44-6 5-5 10-10 15-15 5-7 11-8 19-4 40 21 81 41 121 61 19 10 31 8 46-7 9-9 18-18 27-27 15-15 29-29 46-46z m-328-54c7 0 11-1 15-1 98 0 197 0 296 0 6 0 14 2 16 6 5 7 0 14-6 20-27 26-54 53-80 80-8 9-15 9-26 4-67-35-135-68-203-102-3-2-6-4-12-7z m-8 26c21 10 40 20 63 31-8 7-14 12-20 17-2 2-7 3-10 3-30-9-36-17-34-48 0 0 0-1 1-3z m134 169c1-25-21-46-46-46-25-1-46 20-47 46 0 25 21 46 47 47 25 0 46-21 46-47z m-46 22c-12 0-22-9-22-21 0-13 9-22 21-23 13 0 23 9 23 22 0 13-10 22-22 22z"/>
 <glyph glyph-name="environments" unicode="&#57388;" d="M256 454c-110 0-199-89-199-199 0-110 89-199 199-199 0 0 0 0 0 0l2-1 0 1c109 1 197 90 197 199 0 110-89 199-199 199z m114-204l0 0 0 5c0 0 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 1 0 2l0 4 0 0c-1 22-4 43-10 63 21 5 36 11 46 15 15-26 24-56 24-87 0-30-8-59-23-85-8 4-23 11-47 16 6 21 9 42 10 64z m-19 102c-13 30-30 53-46 69 34-10 64-30 86-57-9-4-22-8-40-12z m-6-95c0-23-4-45-11-66-20 4-42 6-65 6l0 120c23 1 45 3 66 6 6-21 10-43 10-66z m-46-170c17 17 37 41 52 75 20-5 34-10 42-13-24-31-57-53-94-62z m-30 256l0 77c17-14 40-37 56-73-17-2-36-4-56-4z m0-248l0 77c20-1 39-3 56-5-16-35-40-59-56-72z m-83 252c17 35 40 59 56 73l0-77c-19 0-38 1-56 4z m-19-90c0 23 4 45 10 65 20-3 42-5 65-5l0-120c-23 0-45-1-65-4-6 20-10 42-10 64z m-47 106c22 28 52 48 86 58-15-16-33-39-46-70-18 4-31 8-40 12z m40-199c15-36 37-61 53-77-38 10-72 32-96 64 9 4 24 9 43 13z m82 8l0-77c-16 13-39 37-56 73 18 2 37 3 56 4z m-100 92l-1 0 0-4c0-1 0-1 0-2 0 0 0 0 0-1 0 0 0 0 0-1 0 0 0-1 0-1l0-5 1 0c0-21 4-42 10-62-23-5-39-10-49-15-14 25-21 53-21 82 0 30 8 60 23 86 10-4 25-10 47-14-6-20-10-41-10-63z"/>
@@ -156,4 +153,10 @@
 <glyph glyph-name="avatar-1" unicode="&#84;" d="M396 344l-2 2c-4 4-9 5-15 5-1 0-88-13-124-14-1 0-2 0-3 0-37 0-126 15-127 15-7 1-14-2-18-8l-2-4c-3-4-3-9-2-14 2-5 5-9 10-11 16-7 69-22 85-29 3-1 10-4 10-14 1-11-4-67-10-93-7-26-18-60-19-60-3-9 2-19 11-22l11-4c4-2 9-1 13 1 5 2 8 6 9 10l31 94 28-96c2-5 5-9 9-11 3-1 5-2 8-2 2 0 4 0 7 1l10 4c8 3 12 12 10 20 0 1-8 36-16 65-4 17-6 43-7 64-1 13-1 21-3 30 0 1 2 11 10 14 10 4 81 29 80 28 6 2 10 7 11 13 1 6-1 12-5 16z m-98 54c0-24-19-43-43-43-24 0-43 19-43 43 0 23 19 42 43 42 24 0 43-19 43-42z"/>
 <glyph glyph-name="steam-square" unicode="&#57397;" d="M391 327c0 15-5 28-16 39-11 11-24 16-39 16-15 0-28-5-39-16-11-11-16-24-16-39 0-15 5-28 16-39 11-11 24-16 39-16 15 0 28 5 39 16 11 11 16 24 16 39z m-174-168c0-16-5-29-16-40-11-11-25-16-40-16-11 0-21 2-30 8-9 5-16 13-20 22 9-4 19-8 28-12 11-4 22-4 34 1 11 5 19 13 24 25 5 11 5 22 0 34-5 11-13 19-25 24l-23 9c4 1 8 2 12 2 15 0 29-6 40-17 11-11 16-24 16-40z m258 234l0-274c0-23-8-42-24-58-16-16-35-24-58-24l-274 0c-23 0-42 8-58 24-16 16-24 35-24 58l0 44 49-20c4-18 12-32 26-44 14-11 30-17 49-17 19 0 37 7 51 20 15 14 23 30 25 50l99 72c28 0 53 10 73 30 20 20 30 44 30 73 0 28-10 52-30 73-20 20-45 30-73 30-28 0-53-10-73-30-20-20-30-44-30-72l-64-92c-2 0-5 0-8 0-15 0-28-4-40-11l-84 34 0 134c0 23 8 42 24 58 16 16 35 24 58 24l274 0c23 0 42-8 58-24 16-16 24-35 24-58z m-70-66c0-19-7-36-20-49-14-14-30-20-49-20-19 0-36 6-49 20-13 13-20 30-20 49 0 19 7 35 20 48 13 14 30 21 49 21 19 0 35-7 49-20 13-14 20-30 20-49z"/>
 <glyph glyph-name="oculus" unicode="&#57398;" d="M431 363c-16 13-34 22-54 26-11 3-23 4-34 5-9 0-18 0-26 0-41 0-82 0-123 0-9 0-18 0-26 0-12-1-24-2-35-5-20-4-38-13-54-26-32-26-51-65-51-106 0-41 19-80 51-106 16-13 34-22 54-27 12-2 23-3 35-4 8 0 17 0 26 0 41 0 82 0 123 0 8 0 17 0 26 0 11 0 23 2 34 4 20 5 38 14 54 27 32 26 51 65 51 106 0 41-19 80-51 106z m-60-143c-6-4-13-7-20-8-7-1-14-1-22-1-49 0-99 0-148 0-8 0-15 0-22 1-7 1-14 4-20 8-12 8-19 22-19 37 0 15 7 29 19 37 6 4 13 7 20 8 7 1 14 1 22 1 49 0 99 0 148 0 8 0 15 0 22-1 7-1 14-4 20-8 12-8 19-22 19-37 0-15-7-29-19-37z"/>
+<glyph glyph-name="check-circled" unicode="&#57399;" d="M258 74c-48 0-94 19-128 53-34 34-53 80-53 130 0 47 19 92 53 126 35 34 80 53 128 53 0 0 0 0 0 0 49 0 95-19 129-54 34-34 52-80 52-129 0-47-19-92-53-126-35-34-80-53-128-53z m0 324c-38 0-74-15-101-42-27-27-42-62-42-100 0-39 15-75 42-102 27-27 63-42 101-42 38 0 74 15 101 42 27 27 42 62 42 99 0 39-15 75-42 102-27 28-62 43-101 43 0 0 0 0 0 0z m-25-164c-2 3-3 5-4 6-13 13-26 26-39 39-10 11-26 12-36 2-10-10-10-25 1-36 20-21 40-41 60-61 11-10 26-10 36 0 36 35 71 71 106 107 4 3 7 9 8 14 2 10-3 21-13 26-10 4-21 3-29-5-28-29-57-57-85-86-2-1-3-3-5-6z"/>
+<glyph glyph-name="rez-01" unicode="&#57381;" d="M373 321c-2 5-6 8-11 8l-49 8 55 61c4 4 5 9 3 14-2 5-7 8-12 8 0 0 0 0 0 0l-114-1c-5-1-10-4-12-9l-54-136c-1-4-1-8 1-11 2-4 6-6 9-7l38-5-54-136c-2-6 0-13 6-16 2-1 4-2 7-2 3 0 7 2 10 5l175 206c3 4 3 9 2 13z"/>
+<glyph glyph-name="locked" unicode="&#57350;" d="M367 271c-7 7-15 12-23 17l0 64c0 27-9 50-28 69-19 19-42 28-69 28l-6 0c-27 0-50-9-70-28-19-19-28-42-28-69l0-65c-8-4-16-10-23-16-19-19-29-42-29-69l0-43c0-27 10-50 29-68 20-19 43-28 70-28l108 0c27 0 50 9 69 28 19 19 28 42 28 68l0 43c0 27-9 50-28 69z m-187 81c0 17 6 31 18 42 12 12 26 18 43 18l6 0c17 0 31-6 43-18 12-11 18-25 18-42l0-54c-3 1-7 1-10 1l-108 0c-4 0-7 0-10-1z m179-193c0-17-6-30-18-42-12-12-26-18-43-18l-108 0c-17 0-31 6-43 18-12 12-18 25-18 42l0 43c0 17 6 30 18 42 12 12 26 18 43 18l108 0c17 0 31-6 43-18 12-12 18-25 18-42z m-116 55c-12 0-22-10-22-22l0-55c0-12 10-22 22-22 13 0 23 10 23 22l0 55c0 12-10 22-23 22z"/>
+<glyph glyph-name="unlocked" unicode="&#57401;" d="M243 214c-12 0-22-10-22-22l0-55c0-12 10-22 22-22 13 0 23 10 23 22l0 55c0 12-10 22-23 22z m237 207c-19 19-42 28-69 28l-6 0c-27 0-50-9-69-28-20-19-29-42-29-69l0-53c-3 0-6 0-9 0l-108 0c-27 0-50-9-70-28-19-19-29-42-29-69l0-43c0-27 10-50 29-68 19-19 43-28 69-28l109 0c27 0 50 9 69 28 18 19 28 42 28 68l0 43c0 27-9 50-28 69-7 7-15 12-23 17l0 64c0 17 6 31 18 42 12 12 26 18 43 18l6 0c17 0 31-6 43-18 12-11 18-25 18-42l0-81 36 0 0 81c0 27-9 50-28 69z m-121-219l0-43c0-17-6-30-18-42-12-12-26-18-43-18l-108 0c-17 0-31 6-43 18-12 12-18 25-18 42l0 43c0 17 6 30 18 42 12 12 26 18 43 18l108 0c17 0 31-6 43-18 12-12 18-26 18-42z"/>
+<glyph glyph-name="mic" unicode="&#105;" d="M299 347l0 47c0 21-17 38-40 38-21 0-39-17-39-38l0-47z m-79-41l0-46c0-21 18-38 39-38 22 0 40 17 40 38l0 46z m159 3l0-56c0-55-43-98-98-108l0-36 46 0c11 0 20-9 20-19 0-11-9-20-20-20l-131 0c-10 0-19 9-19 20 0 10 9 19 19 19l46 0 0 36c-55 9-98 53-98 108l0 58c0 11 10 19 20 18 10 0 17-9 17-20l0-56c0-40 37-72 80-72 44 0 80 32 80 72l0 55c0 11 8 19 18 19 10 0 20-7 20-18z"/>
+<glyph glyph-name="92-lock-01" unicode="&#57400;" d="M389 233l0 62c0 68-55 124-123 124-69 0-124-56-124-124l0-62c-24-4-44-26-44-52l0-74c0-29 24-52 52-52l230 0c29 0 53 23 53 52l0 74c0 26-18 48-44 52z m-123 129c37 0 67-30 67-67l0-61-135 0 0 61c0 37 31 67 68 67z"/>
 </font></defs></svg>

interface/resources/fonts/hifi-glyphs-1.38/icons-reference.html

@@ -12,7 +12,7 @@
   <body>
     <div class="container">
       <h1>HiFi Glyphs</h1>
-      <p class="small">This font was created for use in <a href="http://highfidelity.io/">High Fidelity</a></p>
+      <p class="small">This font was created with<a href="http://fontastic.me/">Fontastic</a></p>
       <h2>CSS mapping</h2>
       <ul class="glyphs css-mapping">
         <li>
@@ -43,10 +43,6 @@
           <div class="icon icon-headphones"></div>
           <input type="text" readonly="readonly" value="headphones">
         </li>
-        <li>
-          <div class="icon icon-mic"></div>
-          <input type="text" readonly="readonly" value="mic">
-        </li>
         <li>
           <div class="icon icon-upload"></div>
           <input type="text" readonly="readonly" value="upload">
@@ -375,10 +371,6 @@
           <div class="icon icon-voxels"></div>
           <input type="text" readonly="readonly" value="voxels">
         </li>
-        <li>
-          <div class="icon icon-lock"></div>
-          <input type="text" readonly="readonly" value="lock">
-        </li>
         <li>
           <div class="icon icon-visible"></div>
           <input type="text" readonly="readonly" value="visible">
@@ -535,10 +527,6 @@
           <div class="icon icon-password"></div>
           <input type="text" readonly="readonly" value="password">
         </li>
-        <li>
-          <div class="icon icon-rez"></div>
-          <input type="text" readonly="readonly" value="rez">
-        </li>
         <li>
           <div class="icon icon-keyboard-collapse"></div>
           <input type="text" readonly="readonly" value="keyboard-collapse">
@@ -611,6 +599,30 @@
           <div class="icon icon-oculus"></div>
           <input type="text" readonly="readonly" value="oculus">
         </li>
+        <li>
+          <div class="icon icon-check-circled"></div>
+          <input type="text" readonly="readonly" value="check-circled">
+        </li>
+        <li>
+          <div class="icon icon-rez-01"></div>
+          <input type="text" readonly="readonly" value="rez-01">
+        </li>
+        <li>
+          <div class="icon icon-locked"></div>
+          <input type="text" readonly="readonly" value="locked">
+        </li>
+        <li>
+          <div class="icon icon-unlocked"></div>
+          <input type="text" readonly="readonly" value="unlocked">
+        </li>
+        <li>
+          <div class="icon icon-mic"></div>
+          <input type="text" readonly="readonly" value="mic">
+        </li>
+        <li>
+          <div class="icon icon-92-lock-01"></div>
+          <input type="text" readonly="readonly" value="92-lock-01">
+        </li>
       </ul>
       <h2>Character mapping</h2>
       <ul class="glyphs character-mapping">
@@ -642,10 +654,6 @@
           <div data-icon="h" class="icon"></div>
           <input type="text" readonly="readonly" value="h">
         </li>
-        <li>
-          <div data-icon="i" class="icon"></div>
-          <input type="text" readonly="readonly" value="i">
-        </li>
         <li>
           <div data-icon="j" class="icon"></div>
           <input type="text" readonly="readonly" value="j">
@@ -974,10 +982,6 @@
           <div data-icon="&#xe005;" class="icon"></div>
           <input type="text" readonly="readonly" value="&amp;#xe005;">
         </li>
-        <li>
-          <div data-icon="&#xe006;" class="icon"></div>
-          <input type="text" readonly="readonly" value="&amp;#xe006;">
-        </li>
         <li>
           <div data-icon="&#xe007;" class="icon"></div>
           <input type="text" readonly="readonly" value="&amp;#xe007;">
@@ -1134,10 +1138,6 @@
           <div data-icon="&#xe029;" class="icon"></div>
           <input type="text" readonly="readonly" value="&amp;#xe029;">
         </li>
-        <li>
-          <div data-icon="&#xe025;" class="icon"></div>
-          <input type="text" readonly="readonly" value="&amp;#xe025;">
-        </li>
         <li>
           <div data-icon="&#xe02b;" class="icon"></div>
           <input type="text" readonly="readonly" value="&amp;#xe02b;">
@@ -1210,6 +1210,30 @@
           <div data-icon="&#xe036;" class="icon"></div>
           <input type="text" readonly="readonly" value="&amp;#xe036;">
         </li>
+        <li>
+          <div data-icon="&#xe037;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe037;">
+        </li>
+        <li>
+          <div data-icon="&#xe025;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe025;">
+        </li>
+        <li>
+          <div data-icon="&#xe006;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe006;">
+        </li>
+        <li>
+          <div data-icon="&#xe039;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe039;">
+        </li>
+        <li>
+          <div data-icon="i" class="icon"></div>
+          <input type="text" readonly="readonly" value="i">
+        </li>
+        <li>
+          <div data-icon="&#xe038;" class="icon"></div>
+          <input type="text" readonly="readonly" value="&amp;#xe038;">
+        </li>
       </ul>
     </div>
     <script>(function() {
@@ -1229,4 +1253,4 @@
 
     </script>
   </body>
-</html>
+</html>

interface/resources/fonts/hifi-glyphs-1.38/styles.css

@@ -59,9 +59,6 @@
 .icon-headphones:before {
   content: "\68";
 }
-.icon-mic:before {
-  content: "\69";
-}
 .icon-upload:before {
   content: "\6a";
 }
@@ -308,9 +305,6 @@
 .icon-voxels:before {
   content: "\e005";
 }
-.icon-lock:before {
-  content: "\e006";
-}
 .icon-visible:before {
   content: "\e007";
 }
@@ -428,9 +422,6 @@
 .icon-password:before {
   content: "\e029";
 }
-.icon-rez:before {
-  content: "\e025";
-}
 .icon-keyboard-collapse:before {
   content: "\e02b";
 }
@@ -485,3 +476,21 @@
 .icon-oculus:before {
   content: "\e036";
 }
+.icon-check-circled:before {
+  content: "\e037";
+}
+.icon-rez-01:before {
+  content: "\e025";
+}
+.icon-locked:before {
+  content: "\e006";
+}
+.icon-unlocked:before {
+  content: "\e039";
+}
+.icon-mic:before {
+  content: "\69";
+}
+.icon-92-lock-01:before {
+  content: "\e038";
+}

interface/resources/icons/standalone-optimized.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 66.7 66" style="enable-background:new 0 0 66.7 66;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#00B4EF;}
+</style>
+<path class="st0" d="M66.7,29.5l-7-5.9l1.3-9l-8.9-2l-3.1-8.5l-8.9,2.3l-6.7-6.1l-6.7,6.1l-8.9-2.3l-3.1,8.5l-8.9,2l1.3,9l-7,5.9
+	l5.3,7.4l-3.4,8.4l8.2,4.1l0.9,9l9.2-0.2l5.1,7.5l8-4.4l8,4.4l5.1-7.5l9.2,0.2l0.9-9l8.2-4.1l-3.4-8.4L66.7,29.5z M33.3,58.4
+	C19.3,58.4,8,47,8,33S19.3,7.6,33.3,7.6c14,0,25.4,11.4,25.4,25.4S47.3,58.4,33.3,58.4z M45.5,22.9H21.2c-3,0-5.5,2.3-5.8,5.2h-1.5
+	c-1.1,0-2.1,0.9-2.1,2c0,0,0,0,0,0v5.7c0,1.1,0.9,2.1,2,2.1c0,0,0,0,0,0h1.5c0.1,0.5,0.2,0.9,0.3,1.3l0.1,0.2
+	c0.6,1.5,1.8,2.7,3.3,3.3h0.1c0.3,0.1,0.6,0.2,1,0.2c0.1,0,0.2,0.1,0.3,0.1H27c1.1,0,2.2-0.4,3-1.2c0.9-0.9,2.1-1.4,3.3-1.3
+	c1.2,0,2.4,0.4,3.3,1.3c0.8,0.8,1.9,1.2,3,1.2h5.9c2.9,0,5.4-2.2,5.8-5.1h1.5c1.1,0,2.1-0.9,2.1-2c0,0,0,0,0,0v-5.7
+	c-0.1-1.1-1-1.9-2.1-1.9h-1.4C51,25.2,48.5,22.9,45.5,22.9z M15.3,36.7h-1.4c-0.4,0-0.7-0.3-0.7-0.7c0,0,0,0,0,0v-5.7
+	c0-0.4,0.3-0.7,0.7-0.7h1.4V36.7z M33.3,38.1c-1,0-1.8-0.8-1.8-1.8s0.8-1.8,1.8-1.8s1.8,0.8,1.8,1.8S34.3,38.1,33.3,38.1z
+	 M37.2,34.8C37,34.9,36.9,35,36.7,35c-0.3,0-0.6-0.1-0.7-0.4c-0.6-0.9-1.6-1.5-2.7-1.5c-1.1,0-2.1,0.5-2.7,1.5
+	c-0.3,0.4-0.8,0.5-1.2,0.3c-0.4-0.3-0.5-0.8-0.3-1.2c0.9-1.4,2.5-2.2,4.1-2.2c1.7,0,3.2,0.8,4.1,2.3C37.7,34,37.6,34.6,37.2,34.8z
+	 M39.8,33.1c-0.1,0.1-0.3,0.1-0.5,0.1c-0.3,0-0.6-0.1-0.7-0.4C37.4,31,35.5,30,33.3,30c-2.1,0-4.1,1.1-5.3,2.9
+	c-0.3,0.4-0.8,0.5-1.2,0.3c-0.4-0.3-0.5-0.8-0.3-1.2c1.5-2.3,4-3.7,6.8-3.7c2.7,0,5.3,1.4,6.8,3.7C40.3,32.3,40.2,32.8,39.8,33.1z
+	 M42.5,31.5c-0.1,0.1-0.3,0.1-0.5,0.1c-0.3,0-0.6-0.1-0.7-0.4c-1.8-2.8-4.7-4.4-8-4.4c-3.2,0-6.2,1.6-8,4.4
+	c-0.3,0.4-0.8,0.5-1.2,0.3c-0.4-0.3-0.5-0.8-0.3-1.2c2.1-3.3,5.6-5.2,9.5-5.2c3.9,0,7.4,2,9.5,5.2C43,30.7,42.9,31.3,42.5,31.5z
+	 M51.3,29.6h1.4c0.4,0,0.7,0.3,0.7,0.7v5.7c0,0.4-0.3,0.7-0.7,0.7h-1.4V29.6z M30.9,16.9l2.4-1.8l2.4,1.8l-0.9-2.8l2.4-1.8h-3
+	l-0.9-2.8l-0.9,2.8h-3l2.4,1.8L30.9,16.9z M35.8,49.1l-2.4,1.8l-2.4-1.8l0.9,2.8l-2.4,1.8h3l0.9,2.8l0.9-2.8h3l-2.4-1.8L35.8,49.1z
+	 M42,17.4l1.3,2.7l0.6-2.9l3-0.4l-2.6-1.5l0.6-2.9l-2.2,2L40,13l1.3,2.7l-2.2,2L42,17.4z M24.7,48.6l-1.3-2.7l-0.6,2.9l-3,0.4
+	l2.6,1.5l-0.6,2.9l2.2-2l2.6,1.5l-1.3-2.7l2.2-2L24.7,48.6z M43.8,48.8l-0.6-2.9L42,48.6l-3-0.4l2.2,2L40,53l2.6-1.5l2.2,2l-0.6-2.9
+	l2.6-1.5L43.8,48.8z M22.8,17.2l0.6,2.9l1.3-2.7l3,0.4l-2.2-2l1.3-2.7l-2.6,1.5l-2.2-2l0.6,2.9l-2.6,1.5L22.8,17.2z"/>
+</svg>

interface/resources/qml/+android_interface/Stats.qml

@@ -113,6 +113,10 @@ Item {
                         visible: root.expanded
                         text: "Avatars Updated: " + root.updatedAvatarCount
                     }
+                    StatText {
+                        visible: root.expanded
+                        text: "Heroes Count/Updated: " + root.heroAvatarCount + "/" + root.updatedHeroAvatarCount
+                    }
                     StatText {
                         visible: root.expanded
                         text: "Avatars NOT Updated: " + root.notUpdatedAvatarCount

interface/resources/qml/Stats.qml

@@ -115,6 +115,10 @@ Item {
                         visible: root.expanded
                         text: "Avatars Updated: " + root.updatedAvatarCount
                     }
+                    StatText {
+                        visible: root.expanded
+                        text: "Heroes Count/Updated: " + root.heroAvatarCount + "/" + root.updatedHeroAvatarCount
+                    }
                     StatText {
                         visible: root.expanded
                         text: "Avatars NOT Updated: " + root.notUpdatedAvatarCount

interface/resources/qml/controlsUit/Switch.qml

@@ -27,6 +27,7 @@ Item {
     property string labelGlyphOnText: "";
     property int labelGlyphOnSize: 32;
     property alias checked: originalSwitch.checked;
+    property string backgroundOnColor: "#252525";
     signal onCheckedChanged;
     signal clicked;
 
@@ -40,10 +41,10 @@ Item {
         onClicked: rootSwitch.clicked();
         hoverEnabled: true
 
-        topPadding: 3;
+        topPadding: 1;
         leftPadding: 3;
         rightPadding: 3;
-        bottomPadding: 3;
+        bottomPadding: 1;
 
         onHoveredChanged: {
             if (hovered) {
@@ -54,7 +55,7 @@ Item {
         }
 
         background: Rectangle {
-            color: "#252525";
+            color: checked ? backgroundOnColor : "#252525";
             implicitWidth: rootSwitch.switchWidth;
             implicitHeight: rootSwitch.height;
             radius: rootSwitch.switchRadius;

interface/resources/qml/dialogs/CustomQueryDialog.qml

@@ -273,11 +273,7 @@ ModalWindow {
             onTriggered: {
                 root.result = null;
                 root.canceled();
-                // FIXME we are leaking memory to avoid a crash
-                // root.destroy();
-
-                root.disableFade = true
-                visible = false;
+                root.destroy();
             }
         }
 
@@ -299,11 +295,7 @@ ModalWindow {
                 }
                 root.result = JSON.stringify(result);
                 root.selected(root.result);
-                // FIXME we are leaking memory to avoid a crash
-                // root.destroy();
-
-                root.disableFade = true
-                visible = false;
+                root.destroy();
             }
         }
     }

interface/resources/qml/dialogs/FileDialog.qml

@@ -815,7 +815,7 @@ ModalWindow {
         Action {
             id: cancelAction
             text: "Cancel"
-            onTriggered: { canceled(); root.shown = false; }
+            onTriggered: { canceled(); root.destroy(); }
         }
     }
 

interface/resources/qml/dialogs/QueryDialog.qml

@@ -168,11 +168,7 @@ ModalWindow {
             shortcut: "Esc"
             onTriggered: {
                 root.canceled();
-                // FIXME we are leaking memory to avoid a crash
-                // root.destroy();
-
-                root.disableFade = true
-                visible = false;
+                root.destroy();
             }
         }
 
@@ -183,11 +179,7 @@ ModalWindow {
             onTriggered: {
                 root.result = items ? comboBox.currentText : textResult.text
                 root.selected(root.result);
-                // FIXME we are leaking memory to avoid a crash
-                // root.destroy();
-
-                root.disableFade = true
-                visible = false;
+                root.destroy();
             }
         }
     }

interface/resources/qml/hifi/Card.qml

@@ -30,6 +30,7 @@ Item {
     property string imageUrl: "";
     property var goFunction: null;
     property string storyId: "";
+    property bool standaloneOptimized: false;
 
     property bool drillDownToPlace: false;
     property bool showPlace: isConcurrency;
@@ -40,6 +41,7 @@ Item {
     property bool isAnnouncement: action === 'announcement';
     property bool isStacked: !isConcurrency && drillDownToPlace;
 
+
     property int textPadding: 10;
     property int smallMargin: 4;
     property int messageHeight: 40;
@@ -267,9 +269,33 @@ Item {
         hoverEnabled: false
         onClicked: {
             Tablet.playSound(TabletEnums.ButtonClick);
-            goFunction("hifi://" + hifiUrl);
+            goFunction("hifi://" + hifiUrl, standaloneOptimized);
         }
     }
+
+    Image {
+        id: standaloneOptomizedBadge
+
+        anchors {
+            right: actionIcon.left
+            top: actionIcon.top
+            topMargin: 2
+            rightMargin: 3
+        }
+        height: root.standaloneOptimized ? 25 : 0
+        width: 25
+        
+        visible: root.standaloneOptimized && isConcurrency
+        fillMode: Image.PreserveAspectFit
+        source: "../../icons/standalone-optimized.svg"
+    }
+    ColorOverlay {
+        anchors.fill: standaloneOptomizedBadge
+        source: standaloneOptomizedBadge
+        color: hifi.colors.blueHighlight
+        visible: root.standaloneOptimized && isConcurrency
+    }
+
     StateImage {
         id: actionIcon;
         visible: !isAnnouncement;
@@ -281,7 +307,8 @@ Item {
             right: parent.right;
             margins: smallMargin;
         }
-    }
+    }  
+
     function go() {
         Tablet.playSound(TabletEnums.ButtonClick);
         goFunction(drillDownToPlace ? ("/places/" + placeName) : ("/user_stories/" + storyId));

interface/resources/qml/hifi/Feed.qml

@@ -82,6 +82,7 @@ Column {
             action: data.action || "",
             thumbnail_url: resolveUrl(thumbnail_url),
             image_url: resolveUrl(data.details && data.details.image_url),
+            standalone_optimized: data.standalone_optimized,
 
             metaverseId: (data.id || "").toString(), // Some are strings from server while others are numbers. Model objects require uniformity.
 
@@ -127,6 +128,7 @@ Column {
             hifiUrl: model.place_name + model.path;
             thumbnail: model.thumbnail_url;
             imageUrl: model.image_url;
+            standaloneOptimized: model.standalone_optimized;
             action: model.action;
             timestamp: model.created_at;
             onlineUsers: model.online_users;
@@ -187,4 +189,14 @@ Column {
             }
         }
     }
+    function isStandalone(address) {
+        var lowerAddress = address.toLowerCase();
+
+        for (var i=0; i < suggestions.count; i++) {
+            if (suggestions.get(i).place_name.toLowerCase() === lowerAddress) {
+                return suggestions.get(i).standalone_optimized;
+            }
+        }
+        return false;
+    }
 }

interface/resources/qml/hifi/NameCard.qml

@@ -376,7 +376,7 @@ Item {
     }
     FiraSansRegular {
         id: nameCardConnectionInfoText
-        visible: selected && !isMyCard && pal.activeTab == "connectionsTab" && !isMyCard
+        visible: selected && !isMyCard && pal.activeTab == "connectionsTab"
         width: parent.width
         height: displayNameTextPixelSize
         size: displayNameTextPixelSize - 4
@@ -412,7 +412,7 @@ Item {
     }
     FiraSansRegular {
         id: nameCardRemoveConnectionText
-        visible: selected && !isMyCard && pal.activeTab == "connectionsTab" && !isMyCard
+        visible: selected && !isMyCard && pal.activeTab == "connectionsTab"
         width: parent.width
         height: displayNameTextPixelSize
         size: displayNameTextPixelSize - 4
@@ -425,7 +425,7 @@ Item {
     }
     HifiControls.Button {
         id: visitConnectionButton
-        visible: selected && !isMyCard && pal.activeTab == "connectionsTab" && !isMyCard
+        visible: selected && !isMyCard && pal.activeTab == "connectionsTab"
         text: "Visit"
         enabled: thisNameCard.placeName !== ""
         anchors.verticalCenter: nameCardRemoveConnectionImage.verticalCenter
@@ -450,7 +450,7 @@ Item {
         // Style
         radius: 4
         color: "#c5c5c5"
-        visible: (isMyCard || (selected && pal.activeTab == "nearbyTab")) && isPresent
+        visible: (!isMyCard && (selected && pal.activeTab == "nearbyTab")) && isPresent
         // Rectangle for the zero-gain point on the VU meter
         Rectangle {
             id: vuMeterZeroGain
@@ -481,7 +481,7 @@ Item {
             id: vuMeterBase
             // Anchors
             anchors.fill: parent
-            visible: isMyCard || selected
+            visible: !isMyCard && selected
             // Style
             color: parent.color
             radius: parent.radius
@@ -489,7 +489,7 @@ Item {
         // Rectangle for the VU meter audio level
         Rectangle {
             id: vuMeterLevel
-            visible: isMyCard || selected
+            visible: !isMyCard && selected
             // Size
             width: (thisNameCard.audioLevel) * parent.width
             // Style
@@ -525,7 +525,7 @@ Item {
         anchors.verticalCenter: nameCardVUMeter.verticalCenter;
         anchors.left: nameCardVUMeter.left;
         // Properties
-        visible: (isMyCard || (selected && pal.activeTab == "nearbyTab")) && isPresent;
+        visible: (!isMyCard && (selected && pal.activeTab == "nearbyTab")) && isPresent;
         minimumValue: -60.0
         maximumValue: 20.0
         stepSize: 5
@@ -572,19 +572,7 @@ Item {
                 implicitHeight: 16
             }
         }
-         RalewayRegular {
-            // The slider for my card is special, it controls the master gain
-            id: gainSliderText;
-            visible: isMyCard;
-            text: "master volume";
-            size: hifi.fontSizes.tabularData;
-            anchors.left: parent.right;
-            anchors.leftMargin: 8;
-            color: hifi.colors.baseGrayHighlight;
-            horizontalAlignment: Text.AlignLeft;
-            verticalAlignment: Text.AlignTop;
-        }
-   }
+    }
 
     function updateGainFromQML(avatarUuid, sliderValue, isReleased) {
         if (Users.getAvatarGain(avatarUuid) != sliderValue) {

interface/resources/qml/hifi/audio/Audio.qml

@@ -11,12 +11,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-import QtQuick 2.5
+import QtQuick 2.7
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 
 import stylesUit 1.0
-import controlsUit 1.0 as HifiControls
+import controlsUit 1.0 as HifiControlsUit
 import "../../windows"
 import "./" as AudioControls
 
@@ -26,7 +26,11 @@ Rectangle {
     HifiConstants { id: hifi; }
 
     property var eventBridge;
+    // leave as blank, this is user's volume for the avatar mixer
+    property var myAvatarUuid: ""
     property string title: "Audio Settings"
+    property int switchHeight: 16
+    property int switchWidth: 40
     signal sendToScript(var message);
 
     color: hifi.colors.baseGray;
@@ -38,7 +42,7 @@ Rectangle {
 
 
     property bool isVR: AudioScriptingInterface.context === "VR"
-    property real rightMostInputLevelPos: 0
+    property real rightMostInputLevelPos: 450
     //placeholder for control sizes and paddings
     //recalculates dynamically in case of UI size is changed
     QtObject {
@@ -80,16 +84,16 @@ Rectangle {
         });
     }
 
-    function disablePeakValues() {
-        root.showPeaks = false;
-        AudioScriptingInterface.devices.input.peakValuesEnabled = false;
+    function updateMyAvatarGainFromQML(sliderValue, isReleased) {
+        if (Users.getAvatarGain(myAvatarUuid) != sliderValue) {
+            Users.setAvatarGain(myAvatarUuid, sliderValue);
+        }
     }
 
     Component.onCompleted: enablePeakValues();
-    Component.onDestruction: disablePeakValues();
-    onVisibleChanged: visible ? enablePeakValues() : disablePeakValues();
 
     Column {
+        id: column
         spacing: 12;
         anchors.top: bar.bottom
         anchors.bottom: parent.bottom
@@ -98,65 +102,68 @@ Rectangle {
 
         Separator { }
 
-        RalewayRegular {
-            x: margins.paddings + muteMic.boxSize + muteMic.spacing;
-            size: 16;
-            color: "white";
-            text: qsTr("Input Device Settings")
-        }
-
-        ColumnLayout {
-            x: margins.paddings;
-            spacing: 16;
+        RowLayout {
+            x: 2 * margins.paddings;
+            spacing: columnOne.width;
             width: parent.width;
 
             // mute is in its own row
-            RowLayout {
-                spacing: (margins.sizeCheckBox - 10.5) * 3;
-                AudioControls.CheckBox {
-                    id: muteMic
-                    text: qsTr("Mute microphone");
-                    spacing: margins.sizeCheckBox - boxSize
-                    isRedCheck: true;
+            ColumnLayout {
+                id: columnOne
+                spacing: 24;
+                x: margins.paddings
+                HifiControlsUit.Switch {
+                    id: muteMic;
+                    height: root.switchHeight;
+                    switchWidth: root.switchWidth;
+                    labelTextOn: "Mute microphone";
+                    backgroundOnColor: "#E3E3E3";
                     checked: AudioScriptingInterface.muted;
-                    onClicked: {
+                    onCheckedChanged: {
                         AudioScriptingInterface.muted = checked;
                         checked = Qt.binding(function() { return AudioScriptingInterface.muted; }); // restore binding
                     }
                 }
 
-                AudioControls.CheckBox {
-                    id: stereoMic
-                    spacing: muteMic.spacing;
-                    text: qsTr("Enable stereo input");
+                HifiControlsUit.Switch {
+                    id: stereoInput;
+                    height: root.switchHeight;
+                    switchWidth: root.switchWidth;
+                    labelTextOn:  qsTr("Stereo input");
+                    backgroundOnColor: "#E3E3E3";
                     checked: AudioScriptingInterface.isStereoInput;
-                    onClicked: {
+                    onCheckedChanged: {
                         AudioScriptingInterface.isStereoInput = checked;
                         checked = Qt.binding(function() { return AudioScriptingInterface.isStereoInput; }); // restore binding
                     }
                 }
             }
 
-            RowLayout {
-                spacing: muteMic.spacing*2; //make it visually distinguish
-                AudioControls.CheckBox {
-                    spacing: muteMic.spacing
-                    text: qsTr("Enable noise reduction");
+            ColumnLayout {
+                spacing: 24;
+                HifiControlsUit.Switch {
+                    height: root.switchHeight;
+                    switchWidth: root.switchWidth;
+                    labelTextOn: "Noise Reduction";
+                    backgroundOnColor: "#E3E3E3";
                     checked: AudioScriptingInterface.noiseReduction;
-                    onClicked: {
+                    onCheckedChanged: {
                         AudioScriptingInterface.noiseReduction = checked;
                         checked = Qt.binding(function() { return AudioScriptingInterface.noiseReduction; }); // restore binding
                     }
                 }
-                AudioControls.CheckBox {
-                    spacing: muteMic.spacing
-                    text: qsTr("Show audio level meter");
+
+                HifiControlsUit.Switch {
+                    id: audioLevelSwitch
+                    height: root.switchHeight;
+                    switchWidth: root.switchWidth;
+                    labelTextOn: qsTr("Audio Level Meter");
+                    backgroundOnColor: "#E3E3E3";
                     checked: AvatarInputs.showAudioTools;
-                    onClicked: {
+                    onCheckedChanged: {
                         AvatarInputs.showAudioTools = checked;
                         checked = Qt.binding(function() { return AvatarInputs.showAudioTools; }); // restore binding
                     }
-                    onXChanged: rightMostInputLevelPos = x + width
                 }
             }
 
@@ -184,7 +191,7 @@ Rectangle {
             HiFiGlyphs {
                 width: margins.sizeCheckBox
                 text: hifi.glyphs.mic;
-                color: hifi.colors.primaryHighlight;
+                color: hifi.colors.white;
                 anchors.left: parent.left
                 anchors.leftMargin: -size/4 //the glyph has empty space at left about 25%
                 anchors.verticalCenter: parent.verticalCenter;
@@ -196,8 +203,8 @@ Rectangle {
                 anchors.left: parent.left
                 anchors.leftMargin: margins.sizeCheckBox
                 size: 16;
-                color: hifi.colors.lightGrayText;
-                text: qsTr("CHOOSE INPUT DEVICE");
+                color: hifi.colors.white;
+                text: qsTr("Choose input device");
             }
         }
 
@@ -223,7 +230,7 @@ Rectangle {
                     width: parent.width - inputLevel.width
                     clip: true
                     checkable: !checked
-                    checked: bar.currentIndex === 0 ? selectedDesktop :  selectedHMD;
+                    checked: bar.currentIndex === 0 ? selectedDesktop : selectedHMD;
                     boxSize: margins.sizeCheckBox / 2
                     isRound: true
                     text: devicename
@@ -235,7 +242,7 @@ Rectangle {
                         }
                     }
                 }
-                InputPeak {
+                AudioControls.InputPeak {
                     id: inputLevel
                     anchors.right: parent.right
                     peak: model.peak;
@@ -246,6 +253,13 @@ Rectangle {
                 }
             }
         }
+        AudioControls.LoopbackAudio {
+            x: margins.paddings
+
+            visible: (bar.currentIndex === 1 && isVR) ||
+                (bar.currentIndex === 0 && !isVR);
+            anchors { left: parent.left; leftMargin: margins.paddings }
+        }
 
         Separator {}
 
@@ -260,7 +274,7 @@ Rectangle {
                 anchors.verticalCenter: parent.verticalCenter;
                 width: margins.sizeCheckBox
                 text: hifi.glyphs.unmuted;
-                color: hifi.colors.primaryHighlight;
+                color: hifi.colors.white;
                 size: 36;
             }
 
@@ -270,8 +284,8 @@ Rectangle {
                 anchors.leftMargin: margins.sizeCheckBox
                 anchors.verticalCenter: parent.verticalCenter;
                 size: 16;
-                color: hifi.colors.lightGrayText;
-                text: qsTr("CHOOSE OUTPUT DEVICE");
+                color: hifi.colors.white;
+                text: qsTr("Choose output device");
             }
         }
 
@@ -306,7 +320,68 @@ Rectangle {
                 }
             }
         }
-        PlaySampleSound {
+
+        Item {
+            id: gainContainer
+            x: margins.paddings;
+            width: parent.width - margins.paddings*2
+            height: gainSliderTextMetrics.height
+
+            HifiControlsUit.Slider {
+                id: gainSlider
+                anchors.right: parent.right
+                height: parent.height
+                width: 200
+                minimumValue: -60.0
+                maximumValue: 20.0
+                stepSize: 5
+                value: Users.getAvatarGain(myAvatarUuid)
+                onValueChanged: {
+                    updateMyAvatarGainFromQML(value, false);
+                }
+                onPressedChanged: {
+                    if (!pressed) {
+                        updateMyAvatarGainFromQML(value, false);
+                    }
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+                    onWheel: {
+                        // Do nothing.
+                    }
+                    onDoubleClicked: {
+                        gainSlider.value = 0.0
+                    }
+                    onPressed: {
+                        // Pass through to Slider
+                        mouse.accepted = false
+                    }
+                    onReleased: {
+                        // the above mouse.accepted seems to make this
+                        // never get called, nonetheless...
+                        mouse.accepted = false
+                    }
+                }
+            }
+            TextMetrics {
+                id: gainSliderTextMetrics
+                text: gainSliderText.text
+                font: gainSliderText.font
+            }
+            RalewayRegular {
+                // The slider for my card is special, it controls the master gain
+                id: gainSliderText;
+                text: "Avatar volume";
+                size: 16;
+                anchors.left: parent.left;
+                color: hifi.colors.white;
+                horizontalAlignment: Text.AlignLeft;
+                verticalAlignment: Text.AlignTop;
+            }
+        }
+
+        AudioControls.PlaySampleSound {
             x: margins.paddings
 
             visible: (bar.currentIndex === 1 && isVR) ||

interface/resources/qml/hifi/audio/LoopbackAudio.qml

@@ -14,7 +14,7 @@ import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 
 import stylesUit 1.0
-import controlsUit 1.0 as HifiControls
+import controlsUit 1.0 as HifiControlsUit
 
 RowLayout {
     property bool audioLoopedBack: AudioScriptingInterface.getServerEcho();
@@ -24,7 +24,7 @@ RowLayout {
             AudioScriptingInterface.setServerEcho(true);
         }
     }
-    function stopAudioLoopback () {
+    function stopAudioLoopback() {
         if (audioLoopedBack) {
             audioLoopedBack = false;
             AudioScriptingInterface.setServerEcho(false);
@@ -33,36 +33,35 @@ RowLayout {
 
     HifiConstants { id: hifi; }
 
-    Button {
-        id: control
-        background: Rectangle {
-            implicitWidth: 20;
-            implicitHeight: 20;
-            radius: hifi.buttons.radius;
-            gradient: Gradient {
-                GradientStop {
-                    position: 0.2;
-                    color: audioLoopedBack ? hifi.buttons.colorStart[hifi.buttons.blue] : hifi.buttons.colorStart[hifi.buttons.black];
-                }
-                GradientStop {
-                    position: 1.0;
-                    color: audioLoopedBack ? hifi.buttons.colorFinish[hifi.buttons.blue] : hifi.buttons.colorFinish[hifi.buttons.black];
-                }
+    Timer {
+        id: loopbackTimer
+        interval: 8000;
+        running: false;
+        repeat: false;
+        onTriggered: {
+            stopAudioLoopback();
+        }
+    }
+
+    HifiControlsUit.Button {
+        text: audioLoopedBack ? qsTr("STOP TESTING YOUR VOICE") : qsTr("TEST YOUR VOICE");
+        color: audioLoopedBack ? hifi.buttons.red : hifi.buttons.blue;
+        onClicked: {
+            if (audioLoopedBack) {
+                loopbackTimer.stop();
+                stopAudioLoopback();
+            } else {
+                loopbackTimer.restart();
+                startAudioLoopback();
             }
         }
-        contentItem: HiFiGlyphs {
-            size: 14;
-            color: (control.pressed || control.hovered) ? (audioLoopedBack ? "black" : hifi.colors.primaryHighlight) : "white";
-            text: audioLoopedBack ? hifi.glyphs.stop_square : hifi.glyphs.playback_play;
-        }
-
-        onClicked: audioLoopedBack ? stopAudioLoopback() : startAudioLoopback();
     }
 
     RalewayRegular {
         Layout.leftMargin: 2;
         size: 14;
         color: "white";
-        text: audioLoopedBack ? qsTr("Disable Audio Loopback") : qsTr("Enable Audio Loopback");
+        font.italic: true
+        text: audioLoopedBack ? qsTr("Speak in your input") : "";
     }
 }

interface/resources/qml/hifi/audio/PlaySampleSound.qml

@@ -14,7 +14,7 @@ import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 
 import stylesUit 1.0
-import controlsUit 1.0 as HifiControls
+import controlsUit 1.0 as HifiControlsUit
 
 RowLayout {
     property var sound: null;
@@ -55,32 +55,9 @@ RowLayout {
 
     HifiConstants { id: hifi; }
 
-    Button {
-        id: control
-        background: Rectangle {
-            implicitWidth: 20;
-            implicitHeight: 20;
-            radius: hifi.buttons.radius;
-            gradient: Gradient {
-                GradientStop {
-                    position: 0.2;
-                    color: isPlaying ? hifi.buttons.colorStart[hifi.buttons.blue] : hifi.buttons.colorStart[hifi.buttons.black];
-                }
-                GradientStop {
-                    position: 1.0;
-                    color: isPlaying ? hifi.buttons.colorFinish[hifi.buttons.blue] : hifi.buttons.colorFinish[hifi.buttons.black];
-                }
-            }
-        }
-        contentItem: HiFiGlyphs {
-            // absolutely position due to asymmetry in glyph
-//            x: isPlaying ? 0 : 1;
-//            y: 1;
-            size: 14;
-            color: (control.pressed || control.hovered) ? (isPlaying ? "black" : hifi.colors.primaryHighlight) : "white";
-            text: isPlaying ? hifi.glyphs.stop_square : hifi.glyphs.playback_play;
-        }
-
+    HifiControlsUit.Button {
+        text: isPlaying ? qsTr("STOP TESTING YOUR SOUND") : qsTr("TEST YOUR SOUND");
+        color: isPlaying ? hifi.buttons.red : hifi.buttons.blue;
         onClicked: isPlaying ? stopSound() : playSound();
     }
 
@@ -88,7 +65,7 @@ RowLayout {
         Layout.leftMargin: 2;
         size: 14;
         color: "white";
-        text: isPlaying ? qsTr("Stop sample sound") : qsTr("Play sample sound");
+        font.italic: true
+        text: isPlaying ? qsTr("Listen to your output") : "";
     }
-
 }

interface/resources/qml/hifi/avatarPackager/AvatarProject.qml

@@ -213,6 +213,63 @@ Item {
         popup.open();
     }
 
+    HiFiGlyphs {
+        id: errorsGlyph
+        visible: !AvatarPackagerCore.currentAvatarProject || AvatarPackagerCore.currentAvatarProject.hasErrors
+        text: hifi.glyphs.alert
+        size: 315
+        color: "#EA4C5F"
+        anchors {
+            top: parent.top
+            topMargin: -30
+            horizontalCenter: parent.horizontalCenter
+        }
+    }
+
+    Image {
+        id: successGlyph
+        visible: AvatarPackagerCore.currentAvatarProject && !AvatarPackagerCore.currentAvatarProject.hasErrors
+        anchors {
+            top: parent.top
+            topMargin: 52
+            horizontalCenter: parent.horizontalCenter
+        }
+        width: 149.6
+        height: 149
+        source: "../../../icons/checkmark-stroke.svg"
+    }
+
+    RalewayRegular {
+        id: doctorStatusMessage
+
+        states: [
+            State {
+               when: AvatarPackagerCore.currentAvatarProject && !AvatarPackagerCore.currentAvatarProject.hasErrors
+               name: "noErrors"
+                PropertyChanges {
+                    target: doctorStatusMessage
+                    text: "Your avatar looks fine."
+                }
+            },
+            State {
+                when: !AvatarPackagerCore.currentAvatarProject || AvatarPackagerCore.currentAvatarProject.hasErrors
+                name: "errors"
+                PropertyChanges {
+                    target: doctorStatusMessage
+                    text: "Your avatar has a few issues."
+                }
+            }
+        ]
+        color: 'white'
+        size: 20
+
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: errorsGlyph.bottom
+
+        wrapMode: Text.Wrap
+    }
+
     RalewayRegular {
         id: infoMessage
 
@@ -240,7 +297,7 @@ Item {
 
         anchors.left: parent.left
         anchors.right: parent.right
-        anchors.top: parent.top
+        anchors.top: doctorStatusMessage.bottom
 
         anchors.bottomMargin: 24
 
@@ -249,6 +306,53 @@ Item {
         text: "You can upload your files to our servers to always access them, and to make your avatar visible to other users."
     }
 
+    RalewayRegular {
+        id: notForSaleMessage
+
+        visible: root.hasSuccessfullyUploaded
+
+        color: 'white'
+        linkColor: '#00B4EF'
+        size: 20
+
+        anchors.left: parent.left
+        anchors.right: parent.right
+        anchors.top: infoMessage.bottom
+        anchors.topMargin: 10
+
+        anchors.bottomMargin: 24
+
+        wrapMode: Text.Wrap
+        text: "This item is not for sale yet, <a href='#'>learn more</a>."
+
+        onLinkActivated: {
+            Qt.openUrlExternally("https://docs.highfidelity.com/sell/add-item/upload-avatar.html");
+        }
+    }
+
+    RalewayRegular {
+        id: showErrorsLink
+
+        color: 'white'
+        linkColor: '#00B4EF'
+
+        visible: AvatarPackagerCore.currentAvatarProject && AvatarPackagerCore.currentAvatarProject.hasErrors
+
+        anchors {
+            top: notForSaleMessage.bottom
+            topMargin: 16
+            horizontalCenter: parent.horizontalCenter
+        }
+
+        size: 28
+
+        text: "<a href='toggle'>View all errors</a>"
+
+        onLinkActivated: {
+            avatarPackager.state = AvatarPackagerState.avatarDoctorErrorReport;
+        }
+    }
+
     HifiControls.Button {
         id: openFolderButton
 

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

@@ -40,9 +40,9 @@ Rectangle {
     property string itemHref;
     property string itemAuthor;
     property int itemEdition: -1;
-    property bool hasSomethingToTradeIn: alreadyOwned && (itemEdition > 0); // i.e., don't trade in your artist's proof
-    property bool isTradingIn: isUpdating && hasSomethingToTradeIn;
-    property bool isStocking: availability === 'not for sale' && creator === Account.username;
+    property bool hasSomethingToTradeIn: itemEdition > 0; // i.e., don't trade in your artist's proof
+    property bool isTradingIn: canUpdate && hasSomethingToTradeIn;
+    property bool isStocking: (availability === 'not for sale') && (creator === Account.username) && !updated_item_id;
     property string certificateId;
     property double balanceAfterPurchase;
     property bool alreadyOwned: false; // Including proofs
@@ -59,8 +59,9 @@ Rectangle {
     property bool canRezCertifiedItems: Entities.canRezCertified() || Entities.canRezTmpCertified();
     property string referrer;
     property bool isInstalled;
-    property bool isUpdating;
+    property bool canUpdate;
     property string availability: "available";
+    property string updated_item_id: "";
     property string creator: "";
     property string baseAppURL;
     property int currentUpdatesPage: 1;
@@ -144,6 +145,7 @@ Rectangle {
         }
 
         onAvailableUpdatesResult: {
+            // Answers the updatable original item cert data still owned by this user that are EITHER instances of this marketplace id, or update to this marketplace id.
             if (result.status !== 'success') {
                 console.log("Failed to get Available Updates", result.data.message);
             } else {
@@ -155,7 +157,7 @@ Rectangle {
                         if (root.itemEdition !== -1 && root.itemEdition !== parseInt(result.data.updates[i].edition_number)) {
                             continue;
                         }
-                        root.isUpdating = true;
+                        root.canUpdate = true;
                         root.baseItemName = result.data.updates[i].base_item_title;
                         // This CertID is the one corresponding to the base item CertID that the user already owns
                         root.certificateId = result.data.updates[i].certificate_id;
@@ -166,7 +168,7 @@ Rectangle {
                     }
                 }
 
-                if (result.data.updates.length === 0 || root.isUpdating) {
+                if (result.data.updates.length === 0 || root.canUpdate) {
                     root.availableUpdatesReceived = true;
                     refreshBuyUI();
                 } else {
@@ -178,7 +180,7 @@ Rectangle {
 
         onUpdateItemResult: {
             if (result.status !== 'success') {
-                failureErrorText.text = result.message;
+                failureErrorText.text = result.data ? (result.data.message || "Unknown Error") : JSON.stringify(result);
                 root.activeView = "checkoutFailure";
             } else {
                 root.itemHref = result.data.download_url;
@@ -266,13 +268,6 @@ Rectangle {
             }
         }
     }
-    MouseArea {
-        enabled: titleBarContainer.usernameDropdownVisible;
-        anchors.fill: parent;
-        onClicked: {
-            titleBarContainer.usernameDropdownVisible = false;
-        }
-    }
     //
     // TITLE BAR END
     //
@@ -481,7 +476,7 @@ Rectangle {
                 FiraSansSemiBold {
                     id: itemPriceText;
                     text: isTradingIn ? "FREE\nUPDATE" : 
-                        (isStocking ? "Free for creator" :
+                       (isStocking ? "Free for creator" :
                             ((root.itemPrice === -1) ? "--" : ((root.itemPrice > 0) ? root.itemPrice : "FREE")));
                     // Text size
                     size: isTradingIn ? 20 : 26;
@@ -580,7 +575,7 @@ Rectangle {
             // "View in Inventory" button
             HifiControlsUit.Button {
                 id: viewInMyPurchasesButton;
-                visible: isCertified && dataReady && (isUpdating ? !hasSomethingToTradeIn : alreadyOwned);
+                visible: isCertified && dataReady && (isTradingIn ? hasSomethingToTradeIn : alreadyOwned);
                 color: hifi.buttons.blue;
                 colorScheme: hifi.colorSchemes.light;
                 anchors.top: buyTextContainer.visible ? buyTextContainer.bottom : checkoutActionButtonsContainer.top;
@@ -588,9 +583,9 @@ Rectangle {
                 height: 50;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
-                text: root.isUpdating ? "UPDATE TO THIS ITEM FOR FREE" : "VIEW THIS ITEM IN YOUR INVENTORY";
+                text: (canUpdate && !isTradingIn) ? "UPDATE TO THIS ITEM FOR FREE" : "VIEW THIS ITEM IN YOUR INVENTORY";
                 onClicked: {
-                    if (root.isUpdating) {
+                    if (root.canUpdate) {
                         sendToScript({method: 'checkout_goToPurchases', filterText: root.baseItemName});
                     } else {
                         sendToScript({method: 'checkout_goToPurchases', filterText: root.itemName});
@@ -602,7 +597,11 @@ Rectangle {
             HifiControlsUit.Button {
                 id: buyButton;
                 visible: isTradingIn || !alreadyOwned || isStocking || !(root.itemType === "avatar" || root.itemType === "app");
-                enabled: (root.balanceAfterPurchase >= 0 && dataReady) || (!root.isCertified) || root.isUpdating;
+                property bool checkBalance: dataReady && (root.availability === "available")
+                enabled: (checkBalance && (balanceAfterPurchase >= 0)) || !isCertified || isTradingIn || isStocking;
+                text: isTradingIn ? "Confirm Update" :
+                    (enabled ? (viewInMyPurchasesButton.visible ? "Get It Again" : (dataReady ? "Get Item" : "--")) :
+                        (checkBalance ? "Insufficient Funds" : availability))
                 color: viewInMyPurchasesButton.visible ? hifi.buttons.white : hifi.buttons.blue;
                 colorScheme: hifi.colorSchemes.light;
                 anchors.top: viewInMyPurchasesButton.visible ? viewInMyPurchasesButton.bottom :
@@ -611,13 +610,6 @@ Rectangle {
                 height: 50;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
-                text: isTradingIn ?
-                    "CONFIRM UPDATE" : 
-                    (((root.isCertified) ? 
-                        (dataReady ?
-                            ((viewInMyPurchasesButton.visible && !root.isUpdating) ? "Get It Again" : "Confirm") :
-                            "--") :
-                        "Get Item"));
                 onClicked: {
                     if (isTradingIn) {
                         // If we're updating an app, the existing app needs to be uninstalled.
@@ -1110,6 +1102,7 @@ Rectangle {
         root.itemAuthor = result.data.creator;
         root.itemType = result.data.item_type || "unknown";
         root.availability = result.data.availability;
+        root.updated_item_id = result.data.updated_item_id || ""
         root.creator = result.data.creator;
         if (root.itemType === "unknown") {
             root.itemHref = result.data.review_url;
@@ -1209,7 +1202,7 @@ Rectangle {
                 buyText.text = "";
 
                 // If the user IS on the checkout page for the updated version of an owned item...
-                if (root.isUpdating) {
+                if (root.canUpdate) {
                     // If the user HAS already selected a specific edition to update...
                     if (hasSomethingToTradeIn) {
                         buyText.text = "By pressing \"Confirm Update\", you agree to trade in your old item for the updated item that replaces it.";

interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml

@@ -30,6 +30,8 @@ Rectangle {
     property string dateAcquired: "--";
     property string itemCost: "--";
     property string marketplace_item_id: "";
+    property bool   standaloneOptimized: false;
+    property bool   standaloneIncompatible: false;
     property string certTitleTextColor: hifi.colors.darkGray;
     property string certTextColor: hifi.colors.white;
     property string infoTextColor: hifi.colors.blueAccent;
@@ -71,6 +73,8 @@ Rectangle {
             } else {
                 root.marketplace_item_id = result.data.marketplace_item_id;
                 root.isMyCert = result.isMyCert ? result.isMyCert : false;
+                root.standaloneOptimized = result.data.standalone_optimized;
+                root.standaloneIncompatible = result.data.standalone_incompatible;
 
                 if (root.certInfoReplaceMode > 3) {
                     root.itemName = result.data.marketplace_item_name;
@@ -421,6 +425,24 @@ Rectangle {
         anchors.rightMargin: 24;
         height: root.useGoldCert ? 220 : 372;
 
+        HiFiGlyphs {
+            id: standaloneOptomizedBadge
+
+            anchors {
+                right: parent.right
+                top: ownedByHeader.top
+                rightMargin: 15
+                topMargin: 28
+            }
+            
+            visible: root.standaloneOptimized
+
+            text: hifi.glyphs.hmd
+            size: 34
+            horizontalAlignment: Text.AlignHCenter
+            color: hifi.colors.blueHighlight
+        }
+
         RalewayRegular {
             id: errorText;
             visible: !root.useGoldCert;
@@ -467,6 +489,7 @@ Rectangle {
             color: root.infoTextColor;
             elide: Text.ElideRight;
         }
+        
         AnonymousProRegular {
             id: isMyCertText;
             visible: root.isMyCert && ownedBy.text !== "--" && ownedBy.text !== "";
@@ -485,14 +508,46 @@ Rectangle {
             verticalAlignment: Text.AlignVCenter;
         }
 
+        RalewayRegular {
+            id: standaloneHeader;
+            text: root.standaloneOptimized ? "STAND-ALONE OPTIMIZED" : "STAND-ALONE INCOMPATIBLE";
+            // Text size
+            size: 16;
+            // Anchors
+            anchors.top: ownedBy.bottom;
+            anchors.topMargin: 15;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            visible: root.standaloneOptimized || root.standaloneIncompatible;
+            height: visible ? paintedHeight : 0;
+            // Style
+            color: hifi.colors.darkGray;
+        }
+
+        RalewayRegular {
+            id: standaloneText;
+            text: root.standaloneOptimized ? "This item is stand-alone optimized" : "This item is incompatible with stand-alone devices";
+            // Text size
+            size: 18;
+            // Anchors
+            anchors.top: standaloneHeader.bottom;
+            anchors.topMargin: 8;
+            anchors.left: standaloneHeader.left;
+            visible: root.standaloneOptimized || root.standaloneIncompatible;
+            height: visible ? paintedHeight : 0;
+            // Style
+            color: root.infoTextColor;
+            elide: Text.ElideRight;
+        }
+
         RalewayRegular {
             id: dateAcquiredHeader;
             text: "ACQUISITION DATE";
             // Text size
             size: 16;
             // Anchors
-            anchors.top: ownedBy.bottom;
-            anchors.topMargin: 28;
+            anchors.top: standaloneText.bottom;
+            anchors.topMargin: 20;
             anchors.left: parent.left;
             anchors.right: parent.horizontalCenter;
             anchors.rightMargin: 8;
@@ -521,8 +576,8 @@ Rectangle {
             // Text size
             size: 16;
             // Anchors
-            anchors.top: ownedBy.bottom;
-            anchors.topMargin: 28;
+            anchors.top: standaloneText.bottom;
+            anchors.topMargin: 20;
             anchors.left: parent.horizontalCenter;
             anchors.right: parent.right;
             height: paintedHeight;

interface/resources/qml/hifi/commerce/marketplace/Marketplace.qml

@@ -41,6 +41,7 @@ Rectangle {
     property string searchScopeString: "Featured"
     property bool isLoggedIn: false
     property bool supports3DHTML: true
+    property bool pendingGetMarketplaceItemCall: false
 
     anchors.fill: (typeof parent === undefined) ? undefined : parent
 
@@ -90,6 +91,14 @@ Rectangle {
                     id: -1,
                     name: "Everything"
                 });
+                categoriesModel.append({
+                    id: -1,
+                    name: "Stand-alone Optimized"
+                });
+                categoriesModel.append({
+                    id: -1,
+                    name: "Stand-alone Compatible"
+                });
                 result.data.items.forEach(function(category) {
                     categoriesModel.append({
                         id: category.id,
@@ -100,7 +109,9 @@ Rectangle {
             getMarketplaceItems();
         }
         onGetMarketplaceItemsResult: {
-            marketBrowseModel.handlePage(result.status !== "success" && result.message, result);
+            if (!pendingGetMarketplaceItemCall) {
+                marketBrowseModel.handlePage(result.status !== "success" && result.message, result);
+            }
         }
         
         onGetMarketplaceItemResult: {
@@ -112,7 +123,7 @@ Rectangle {
                 marketplaceItem.image_url = result.data.thumbnail_url;
                 marketplaceItem.name = result.data.title;
                 marketplaceItem.likes = result.data.likes;
-                if(result.data.has_liked !== undefined) {
+                if (result.data.has_liked !== undefined) {
                     marketplaceItem.liked = result.data.has_liked;
                 }
                 marketplaceItem.creator = result.data.creator;
@@ -122,10 +133,14 @@ Rectangle {
                 marketplaceItem.attributions = result.data.attributions;
                 marketplaceItem.license = result.data.license;
                 marketplaceItem.availability = result.data.availability;
+                marketplaceItem.updated_item_id = result.data.updated_item_id || "";
                 marketplaceItem.created_at = result.data.created_at;
+                marketplaceItem.standaloneOptimized = result.data.standalone_optimized;
+                marketplaceItem.standaloneVisible = result.data.standalone_optimized || result.data.standalone_incompatible;
                 marketplaceItemScrollView.contentHeight = marketplaceItemContent.height;
                 itemsList.visible = false;
                 marketplaceItemView.visible = true;
+                pendingGetMarketplaceItemCall = false;
             }
         }
     }
@@ -186,16 +201,16 @@ Rectangle {
             visible: true
 
             Image {
-                id: marketplaceHeaderImage;
-                source: "../common/images/marketplaceHeaderImage.png";
-                anchors.top: parent.top;
-                anchors.topMargin: 2;
-                anchors.bottom: parent.bottom;
-                anchors.bottomMargin: 0;
-                anchors.left: parent.left;
-                anchors.leftMargin: 8;
-                width: 140;
-                fillMode: Image.PreserveAspectFit;
+                id: marketplaceHeaderImage
+                source: "../common/images/marketplaceHeaderImage.png"
+                anchors.top: parent.top
+                anchors.topMargin: 2
+                anchors.bottom: parent.bottom
+                anchors.bottomMargin: 0
+                anchors.left: parent.left
+                anchors.leftMargin: 8
+                width: 140
+                fillMode: Image.PreserveAspectFit
 
                 MouseArea {
                     anchors.fill: parent;
@@ -541,7 +556,8 @@ Rectangle {
                 price: model.cost
                 availability: model.availability
                 isLoggedIn: root.isLoggedIn;
-
+                standaloneOptimized: model.standalone_optimized
+    
                 onShowItem: {
                     MarketplaceScriptingInterface.getMarketplaceItem(item_id);
                 }
@@ -979,7 +995,6 @@ Rectangle {
                         xhr.open("GET", url);
                         xhr.onreadystatechange = function() {
                             if (xhr.readyState == XMLHttpRequest.DONE) {
-                                console.log(xhr.responseText);
                                 licenseText.text = xhr.responseText;
                                 licenseInfo.visible = true;
                             }
@@ -1224,6 +1239,7 @@ Rectangle {
                     console.log("A message with method 'updateMarketplaceQMLItem' was sent without an itemId!");
                     return;
                 }
+                pendingGetMarketplaceItemCall = true;
                 marketplaceItem.edition = message.params.edition ? message.params.edition : -1;
                 MarketplaceScriptingInterface.getMarketplaceItem(message.params.itemId);
                 break;

interface/resources/qml/hifi/commerce/marketplace/MarketplaceItem.qml

@@ -2,7 +2,7 @@
 //  MarketplaceListItem.qml
 //  qml/hifi/commerce/marketplace
 //
-//  MarketplaceListItem
+//  MarketplaceItem
 //
 //  Created by Roxanne Skelly on 2019-01-22
 //  Copyright 2019 High Fidelity, Inc.
@@ -15,6 +15,7 @@ import Hifi 1.0 as Hifi
 import QtQuick 2.9
 import QtQuick.Controls 2.2
 import stylesUit 1.0
+import QtGraphicalEffects 1.0
 import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../common" as HifiCommerceCommon
@@ -34,15 +35,17 @@ Rectangle {
     property var categories: []
     property int price: 0
     property string availability: "unknown"
+    property string updated_item_id: ""
     property var attributions: []
     property string description: ""
     property string license: ""
     property string posted: ""
     property string created_at: ""
-    property bool isLoggedIn: false;
-    property int edition: -1;
-    property bool supports3DHTML: false;
-
+    property bool isLoggedIn: false
+    property int edition: -1
+    property bool supports3DHTML: false
+    property bool standaloneVisible: false
+    property bool standaloneOptimized: false
     
     onCategoriesChanged: {
         categoriesListModel.clear();
@@ -52,13 +55,7 @@ Rectangle {
     }
     
     onDescriptionChanged: {
-    
-        if(root.supports3DHTML) {
-            descriptionTextModel.clear();
-            descriptionTextModel.append({text: description});
-        } else {
-            descriptionText.text = description;
-        }
+        descriptionText.text = description;
     }
 
     onAttributionsChanged: {
@@ -246,11 +243,43 @@ Rectangle {
             right: parent.right;
             top: itemImage.bottom;
         }
-        height: categoriesList.y - buyButton.y + categoriesList.height
+        height: categoriesList.y - badges.y + categoriesList.height
         
         function evalHeight() {
-            height = categoriesList.y - buyButton.y + categoriesList.height;
-            console.log("HEIGHT: " + height);
+            height = categoriesList.y - badges.y + categoriesList.height;
+        }
+        
+        Item {
+            id: badges
+            
+            anchors {
+                right: buyButton.left
+                top: parent.top
+                rightMargin: 10
+            }
+            height: childrenRect.height
+            
+            Image {
+                id: standaloneOptomizedBadge
+
+                anchors {
+                    topMargin: 15
+                    right: parent.right
+                    top: parent.top
+                }
+                height: root.standaloneOptimized ? 50 : 0
+                width: 50
+                
+                visible: root.standaloneOptimized
+                fillMode: Image.PreserveAspectFit
+                source: "../../../../icons/standalone-optimized.svg"
+            }
+            ColorOverlay {
+                anchors.fill: standaloneOptomizedBadge
+                source: standaloneOptomizedBadge
+                color: hifi.colors.blueHighlight
+                visible: root.standaloneOptimized
+            }
         }
         
         HifiControlsUit.Button {
@@ -259,22 +288,22 @@ Rectangle {
             anchors {
                 right: parent.right
                 top: parent.top
-                left: parent.left
                 topMargin: 15
             }
-            height: 50 
+            height: 50
+            width: 180
 
-            property bool isNFS: availability === "not for sale" // Note: server will say "sold out" or "invalidated" before it says NFS
-            property bool isMine: creator === Account.username
-            property bool isUpgrade: root.edition >= 0
-            property int costToMe: ((isMine && isNFS) || isUpgrade) ? 0 : price
-            property bool isAvailable: costToMe >= 0
-
-            text: isUpgrade ? "UPGRADE FOR FREE" : (isAvailable ?  (costToMe || "FREE") : availability)
-            enabled: isAvailable
-            buttonGlyph: isAvailable ? (costToMe ? hifi.glyphs.hfc : "") : ""
+            property bool isUpdate: root.edition >= 0  // Special case of updating from a specific older item
+            property bool isStocking: (creator === Account.username) && (availability === "not for sale") && !updated_item_id // Note: server will say "sold out" or "invalidated" before it says NFS
+            property bool isFreeSpecial: isStocking || isUpdate
+            enabled: isFreeSpecial || (availability === 'available')
+            buttonGlyph: (enabled && !isUpdate && (price > 0)) ? hifi.glyphs.hfc : ""
+            text: isUpdate ? "UPDATE FOR FREE" : (isStocking ? "FREE STOCK" : (enabled ? (price || "FREE") : availability))
             color: hifi.buttons.blue
-            
+
+            buttonGlyphSize: 24
+            fontSize: 24
+
             onClicked: root.buy();
         }
         
@@ -282,11 +311,11 @@ Rectangle {
             id: creatorItem
 
             anchors {
-                top: buyButton.bottom
+                top: parent.top
                 leftMargin: 15
                 topMargin: 15
             }
-            width: parent.width
+            width: paintedWidth
             height: childrenRect.height
             
             RalewaySemiBold {
@@ -535,13 +564,55 @@ Rectangle {
                 }
             }
         }
+        
+        Item {
+            id: standaloneItem
+            
+            anchors {
+                top: licenseItem.bottom
+                topMargin: 15
+                left: parent.left
+                right: parent.right
+            }
+            height: root.standaloneVisible ? childrenRect.height : 0
+            
+            visible: root.standaloneVisible
+            
+            RalewaySemiBold {
+                id: standaloneLabel
+                
+                anchors.top: parent.top
+                anchors.left: parent.left
+                width: paintedWidth
+                height: 20
+
+                text: root.standaloneOptimized  ? "STAND-ALONE OPTIMIZED:" : "STAND-ALONE INCOMPATIBLE:"
+                size: 14
+                color: hifi.colors.lightGrayText
+                verticalAlignment: Text.AlignVCenter
+            }
+            
+            RalewaySemiBold {
+                id: standaloneOptimizedText
+
+                anchors.top: standaloneLabel.bottom
+                anchors.left: parent.left
+                anchors.topMargin: 5
+                width: paintedWidth
+
+                text: root.standaloneOptimized ? "This item is stand-alone optimized" : "This item is incompatible with stand-alone devices"
+                size: 14
+                color: hifi.colors.lightGray
+                verticalAlignment: Text.AlignVCenter
+            }
+        }
 
         Item {
             id: descriptionItem
             property string text: ""
 
             anchors {
-                top: licenseItem.bottom
+                top: standaloneItem.bottom
                 topMargin: 15
                 left: parent.left
                 right: parent.right

interface/resources/qml/hifi/commerce/marketplace/MarketplaceListItem.qml

@@ -35,8 +35,9 @@ Rectangle {
     property string category: ""
     property int price: 0
     property string availability: "unknown"
-    property bool isLoggedIn: false;
-
+    property bool isLoggedIn: false
+    property bool standaloneOptimized: false
+    
     signal buy()
     signal showItem()
     signal categoryClicked(string category)
@@ -226,6 +227,7 @@ Rectangle {
                     top: parent.top
                     left: parent.left
                     leftMargin: 15
+                    topMargin: 10
                 }
                 width: paintedWidth
                 
@@ -239,16 +241,18 @@ Rectangle {
                 id: creatorText
 
                 anchors {
-                    top: creatorLabel.top;
-                    left: creatorLabel.right;
-                    leftMargin: 15;
+                    top: creatorLabel.top
+                    left: creatorLabel.right
+                    leftMargin: 15
+                    right: badges.left
                 }
-                width: paintedWidth;
+                width: paintedWidth
 
-                text: root.creator;
-                size: 14;
-                color: hifi.colors.lightGray;
-                verticalAlignment: Text.AlignVCenter;
+                text: root.creator
+                size: 14
+                elide: Text.ElideRight
+                color: hifi.colors.lightGray
+                verticalAlignment: Text.AlignVCenter
             }
 
             RalewaySemiBold {
@@ -259,12 +263,12 @@ Rectangle {
                     left: parent.left
                     leftMargin: 15
                 }
-                width: paintedWidth;      
+                width: paintedWidth   
 
-                text: "IN:";
-                size: 14;
-                color: hifi.colors.lightGrayText;
-                verticalAlignment: Text.AlignVCenter;
+                text: "IN:"
+                size: 14
+                color: hifi.colors.lightGrayText
+                verticalAlignment: Text.AlignVCenter
             }
 
             RalewaySemiBold {
@@ -274,22 +278,56 @@ Rectangle {
                     top: categoryLabel.top
                     left: categoryLabel.right
                     leftMargin: 15
+                    right: badges.left
                 }
                 width: paintedWidth
 
                 text: root.category
                 size: 14
-                color: hifi.colors.blueHighlight;
-                verticalAlignment: Text.AlignVCenter;
-                
+                color: hifi.colors.blueHighlight
+                verticalAlignment: Text.AlignVCenter
+                elide: Text.ElideRight
                 MouseArea {
                     anchors.fill: parent
 
                     onClicked: root.categoryClicked(root.category);
                 }
             }
+            Item {
+                id: badges
+                
+                anchors {
+                    right: buyButton.left
+                    top: parent.top
+                    topMargin: 10
+                    rightMargin: 10
+                }
+                height: 50
+                
+                Image {
+                    id: standaloneOptomizedBadge
+
+                    anchors {
+                        right: parent.right
+                        top: parent.top
+                    }
+                    height: root.standaloneOptimized ? 40 : 0
+                    width: 40
+                    
+                    visible: root.standaloneOptimized
+                    fillMode: Image.PreserveAspectFit
+                    source: "../../../../icons/standalone-optimized.svg"
+                }
+                ColorOverlay {
+                    anchors.fill: standaloneOptomizedBadge
+                    source: standaloneOptomizedBadge
+                    color: hifi.colors.blueHighlight
+                    visible: root.standaloneOptimized
+                }
+            }            
 
             HifiControlsUit.Button {
+                id: buyButton
                 anchors {
                     right: parent.right
                     top: parent.top
@@ -298,19 +336,21 @@ Rectangle {
                     topMargin:10
                     bottomMargin: 10
                 }
+                width: 180
 
                 property bool isNFS: availability === "not for sale" // Note: server will say "sold out" or "invalidated" before it says NFS
                 property bool isMine: creator === Account.username
                 property bool isUpgrade: root.edition >= 0
                 property int costToMe: ((isMine && isNFS) || isUpgrade) ? 0 : price
-                property bool isAvailable: costToMe >= 0
+                property bool isAvailable: availability === "available"
 
                 text: isUpgrade ? "UPGRADE FOR FREE" : (isAvailable ?  (costToMe || "FREE") : availability)
                 enabled: isAvailable
                 buttonGlyph: isAvailable ? (costToMe ? hifi.glyphs.hfc : "") : ""
 
                 color: hifi.buttons.blue;
-
+                buttonGlyphSize: 24
+                fontSize: 24
                 onClicked: root.buy();
             }
         }

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

@@ -13,6 +13,7 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
+import QtGraphicalEffects 1.0
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import stylesUit 1.0
@@ -50,6 +51,8 @@ Item {
     property string upgradeTitle;
     property bool updateAvailable: root.updateItemId && root.updateItemId !== "";
     property bool valid;
+    property bool standaloneOptimized;
+    property bool standaloneIncompatible;
 
     property string originalStatusText;
     property string originalStatusColor;
@@ -380,7 +383,7 @@ Item {
                         if (updateButton.visible && uninstallButton.visible) {
                             item.itemButtonText = "";
                             item.glyphSize = 20;
-                        } else {
+                        } else if (item) {
                             item.itemButtonText = "Send to Trash";
                             item.glyphSize = 30;
                         }
@@ -403,7 +406,9 @@ Item {
                     id: permissionExplanationText;
                     anchors.fill: parent;
                     text: {
-                        if (root.itemType === "contentSet") {
+                        if (root.standaloneIncompatible) {
+                            "This item is incompatible with stand-alone devices. <a href='#standaloneIncompatible'>Learn more</a>";
+                        } else if (root.itemType === "contentSet") {
                             "You do not have 'Replace Content' permissions in this domain. <a href='#replaceContentPermission'>Learn more</a>";
                         } else if (root.itemType === "entity") {
                             "You do not have 'Rez Certified' permissions in this domain. <a href='#rezCertifiedPermission'>Learn more</a>";
@@ -417,7 +422,11 @@ Item {
                     verticalAlignment: Text.AlignVCenter;
 
                     onLinkActivated: {
-                        sendToPurchases({method: 'showPermissionsExplanation', itemType: root.itemType});
+                        if (link === "#standaloneIncompatible") {
+                            sendToPurchases({method: 'showStandaloneIncompatibleExplanation'});                            
+                        } else {
+                            sendToPurchases({method: 'showPermissionsExplanation', itemType: root.itemType});
+                        }
                     }
                 }
             }
@@ -699,7 +708,8 @@ Item {
             anchors.bottomMargin: 8;
             width: 160;
             height: 40;
-            enabled: root.hasPermissionToRezThis &&
+            enabled: !root.standaloneIncompatible && 
+                root.hasPermissionToRezThis &&
                 MyAvatar.skeletonModelURL !== root.itemHref &&
                 !root.wornEntityID &&
                 root.valid;
@@ -838,6 +848,28 @@ Item {
                     root.sendToPurchases({ method: 'flipCard' });
                 }
             }
+        } 
+        Image {
+            id: standaloneOptomizedBadge
+
+            anchors {
+                right: parent.right
+                bottom: parent.bottom
+                rightMargin: 15
+                bottomMargin:12
+            }
+            height: root.standaloneOptimized ? 36 : 0
+            width: 36
+            
+            visible: root.standaloneOptimized
+            fillMode: Image.PreserveAspectFit
+            source: "../../../../icons/standalone-optimized.svg"
+        }
+        ColorOverlay {
+            anchors.fill: standaloneOptomizedBadge
+            source: standaloneOptomizedBadge
+            color: hifi.colors.blueHighlight
+            visible: root.standaloneOptimized
         }
     }
 

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

@@ -12,7 +12,7 @@
 //
 
 import Hifi 1.0 as Hifi
-import QtQuick 2.5
+import QtQuick 2.9
 import stylesUit 1.0
 import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
@@ -33,6 +33,7 @@ Rectangle {
     property bool purchasesReceived: false;
     property bool punctuationMode: false;
     property bool isDebuggingFirstUseTutorial: false;
+    property bool isStandalone: false;
     property string installedApps;
     property bool keyboardRaised: false;
     property int numUpdatesAvailable: 0;
@@ -44,6 +45,7 @@ Rectangle {
         purchasesModel.getFirstPage();
         Commerce.getAvailableUpdates();
     }
+
     Connections {
         target: Commerce;
 
@@ -110,6 +112,10 @@ Rectangle {
         }
     }
 
+    Component.onCompleted: {
+        isStandalone = PlatformInfo.isStandalone();
+    }
+    
     HifiCommerceCommon.CommerceLightbox {
         id: lightboxPopup;
         z: 999;
@@ -527,6 +533,7 @@ Rectangle {
         ListView {
             id: purchasesContentsList;
             visible: purchasesModel.count !== 0;
+            interactive: !lightboxPopup.visible;
             clip: true;
             model: purchasesModel;
             snapMode: ListView.NoSnap;
@@ -553,6 +560,8 @@ Rectangle {
                 upgradeTitle: model.upgrade_title;
                 itemType: model.item_type;
                 valid: model.valid;
+                standaloneOptimized: model.standalone_optimized
+                standaloneIncompatible: root.isStandalone && model.standalone_incompatible
                 anchors.topMargin: 10;
                 anchors.bottomMargin: 10;
 
@@ -673,6 +682,14 @@ Rectangle {
                                 lightboxPopup.visible = false;
                             }
                             lightboxPopup.visible = true;
+                        } else if (msg.method === "showStandaloneIncompatibleExplanation") {
+                            lightboxPopup.titleText = "Stand-alone Incompatible";
+                            lightboxPopup.bodyText = "The item is incompatible with stand-alone devices.";
+                            lightboxPopup.button1text = "CLOSE";
+                            lightboxPopup.button1method = function() {
+                                lightboxPopup.visible = false;
+                            }
+                            lightboxPopup.visible = true;
                         } else if (msg.method === "setFilterText") {
                             filterBar.text = msg.filterText;
                         } else if (msg.method === "flipCard") {

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

@@ -40,10 +40,6 @@ Rectangle {
         source: "images/wallet-bg.jpg";
     }
 
-    Component.onDestruction: {
-        KeyboardScriptingInterface.raised = false;
-    }
-
     Connections {
         target: Commerce;
 

interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml

@@ -97,10 +97,11 @@ Rectangle {
             textFormat: Text.StyledText
             linkColor: "#00B4EF"
             color: "white"
-            text: "Blockchain technology from <a href=\"https://elementsproject.org/elements/\">Elements</a>."
+            property string link: "https://eos.io/"
+            text: "Blockchain technology from <a href=\"" + link + "\">EOS</a>."
             size: 14
             onLinkActivated: {
-                HiFiAbout.openUrl("https://elementsproject.org/elements/");
+                HiFiAbout.openUrl(link);
             }
         }
         RalewayRegular {

interface/resources/qml/hifi/tablet/OculusConfiguration.qml

@@ -0,0 +1,59 @@
+//
+//  Created by Dante Ruiz on 3/4/19.
+//  Copyright 2019 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+
+import QtQuick 2.5
+
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
+
+
+Rectangle {
+    id: root
+    anchors.fill: parent
+    property string pluginName: ""
+    property var displayInformation: null
+    HifiConstants { id: hifi }
+
+    color: hifi.colors.baseGray
+
+    HifiControls.CheckBox {
+        id: box
+        width: 15
+        height: 15
+
+        anchors {
+            left: root.left
+            leftMargin: 75
+        }
+
+        onClicked: {
+            sendConfigurationSettings( { trackControllersInOculusHome: checked });
+        }
+    }
+
+    RalewaySemiBold {
+        id: head
+
+        text: "Track hand controllers in Oculus Home"
+        size: 12
+
+        color: "white"
+        anchors.left: box.right
+        anchors.leftMargin: 5
+    }
+
+    function displayConfiguration() {
+        var configurationSettings = InputConfiguration.configurationSettings(root.pluginName);
+        box.checked = configurationSettings.trackControllersInOculusHome;
+    }
+
+    function sendConfigurationSettings(settings) {
+        InputConfiguration.setConfigurationSettings(settings, root.pluginName);
+    }
+}

interface/resources/qml/hifi/tablet/TADLightbox.qml

@@ -0,0 +1,144 @@
+//
+//  TADLightbox.qml
+//  qml/hifi/tablet
+//
+//  TADLightbox
+//
+//  Created by Roxanne Skelly on 2019-03-07
+//  Copyright 2019 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtGraphicalEffects 1.0
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
+import "qrc:////qml//controls" as HifiControls
+
+// references XXX from root context
+
+Rectangle {
+    property string titleText;
+    property string bodyImageSource;
+    property string bodyText;
+    property string button1color: hifi.buttons.noneBorderlessGray;
+    property string button1text;
+    property var button1method;
+    property string button2color: hifi.buttons.blue;
+    property string button2text;
+    property var button2method;
+    property string buttonLayout: "leftright";
+
+    id: root;
+    visible: false;
+    anchors.fill: parent;
+    color: Qt.rgba(0, 0, 0, 0.5);
+    z: 999;
+
+    HifiConstants { id: hifi; }
+
+    // This object is always used in a popup.
+    // This MouseArea is used to prevent a user from being
+    //     able to click on a button/mouseArea underneath the popup.
+    MouseArea {
+        anchors.fill: parent;
+        propagateComposedEvents: false;
+        hoverEnabled: true;
+    }
+
+    Rectangle {
+        anchors.centerIn: parent;
+        width: 376;
+        height: childrenRect.height + 30;
+        color: "white";
+
+        RalewaySemiBold {
+            id: titleText;
+            text: root.titleText;
+            anchors.top: parent.top;
+            anchors.topMargin: 30;
+            anchors.left: parent.left;
+            anchors.leftMargin: 30;
+            anchors.right: parent.right;
+            anchors.rightMargin: 30;
+            height: paintedHeight;
+            color: hifi.colors.black;
+            size: 24;
+            verticalAlignment: Text.AlignTop;
+            wrapMode: Text.WordWrap;
+        }
+
+        RalewayRegular {
+            id: bodyText;
+            text: root.bodyText;
+            anchors.top: root.bodyImageSource ? bodyImage.bottom : (root.titleText ? titleText.bottom : parent.top);
+            anchors.topMargin: root.bodyImageSource ? 20 : (root.titleText ? 20 : 30);
+            anchors.left: parent.left;
+            anchors.leftMargin: 30;
+            anchors.right: parent.right;
+            anchors.rightMargin: 30;
+            height: paintedHeight;
+            color: hifi.colors.black;
+            size: 20;
+            verticalAlignment: Text.AlignTop;
+            wrapMode: Text.WordWrap;
+
+        }
+
+        Item {
+            id: buttons;
+            anchors.top: bodyText.bottom;
+            anchors.topMargin: 30;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            height: root.buttonLayout === "leftright" ? 70 : 150;
+
+            // Button 1
+            HifiControlsUit.Button {
+                id: button1;
+                color: root.button1color;
+                colorScheme: hifi.colorSchemes.light;
+                anchors.top: root.buttonLayout === "leftright" ? parent.top : parent.top;
+                anchors.left: parent.left;
+                anchors.leftMargin: root.buttonLayout === "leftright" ? 30 : 10;
+                anchors.right: root.buttonLayout === "leftright" ? undefined : parent.right;
+                anchors.rightMargin: root.buttonLayout === "leftright" ? undefined : 10;
+                width: root.buttonLayout === "leftright" ? (root.button2text ? parent.width/2 - anchors.leftMargin*2 : parent.width - anchors.leftMargin * 2) :
+                    (undefined);
+                height: 40;
+                text: root.button1text;
+                onClicked: {
+                    button1method();
+                }
+                visible: (root.button1text !== "");
+            }
+
+            // Button 2
+            HifiControlsUit.Button {
+                id: button2;
+                visible: root.button2text;
+                color: root.button2color;
+                colorScheme: hifi.colorSchemes.light;
+                anchors.top: root.buttonLayout === "leftright" ? parent.top : button1.bottom;
+                anchors.topMargin: root.buttonLayout === "leftright" ? undefined : 20;
+                anchors.left: root.buttonLayout === "leftright" ? undefined : parent.left;
+                anchors.leftMargin: root.buttonLayout === "leftright" ? undefined : 10;
+                anchors.right: parent.right;
+                anchors.rightMargin: root.buttonLayout === "leftright" ? 30 : 10;
+                width: root.buttonLayout === "leftright" ? parent.width/2 - anchors.rightMargin*2 : undefined;
+                height: 40;
+                text: root.button2text;
+                onClicked: {
+                    button2method();
+                }
+            }
+        }
+    }
+
+    //
+    // FUNCTION DEFINITIONS END
+    //
+}

interface/resources/qml/hifi/tablet/TabletAddressDialog.qml

@@ -73,7 +73,7 @@ StackView {
     function resetAfterTeleport() {
         //storyCardFrame.shown = root.shown = false;
     }
-    function goCard(targetString) {
+    function goCard(targetString, standaloneOptimized) {
         if (0 !== targetString.indexOf('hifi://')) {
             var card = tabletWebView.createObject();
             card.url = addressBarDialog.metaverseServerUrl + targetString;
@@ -82,7 +82,7 @@ StackView {
             return;
         }
         location.text = targetString;
-        toggleOrGo(targetString, true);
+        toggleOrGo(targetString, true, standaloneOptimized);
         clearAddressLineTimer.start();
     }
 
@@ -230,7 +230,7 @@ StackView {
                     updateLocationText(text.length > 0);
                 }
                 onAccepted: {
-                    toggleOrGo();
+                    toggleOrGo(addressLine.text, false, places.isStandalone(addressLine.text));
                 }
 
                 // unfortunately TextField from Quick Controls 2 disallow customization of placeHolderText color without creation of new style
@@ -392,7 +392,18 @@ StackView {
                 right: parent.right
             }
         }
+    }
 
+    TADLightbox {
+        id: unoptimizedDomain
+        titleText: "Unoptimized Domain"
+        bodyText:  "You're trying to access a place that hasn't been optimized for your device. Are you sure you want to continue."
+        button1text: "CANCEL"
+        button2text: "YES CONTINUE"
+        visible: false
+        button1method: function() {
+            visible = false;
+        }
     }
 
     function updateLocationText(enteringAddress) {
@@ -407,14 +418,30 @@ StackView {
         }
     }
 
-    function toggleOrGo(address, fromSuggestions) {
-        if (address !== undefined && address !== "") {
-            addressBarDialog.loadAddress(address, fromSuggestions);
-            clearAddressLineTimer.start();
-        } else if (addressLine.text !== "") {
-            addressBarDialog.loadAddress(addressLine.text, fromSuggestions);
-            clearAddressLineTimer.start();
+    function toggleOrGo(address, fromSuggestions, standaloneOptimized) {
+
+        var goTarget = function () {
+            if (address !== undefined && address !== "") {
+                addressBarDialog.loadAddress(address, fromSuggestions);
+                clearAddressLineTimer.start();
+            } else if (addressLine.text !== "") {
+                addressBarDialog.loadAddress(addressLine.text, fromSuggestions);
+                clearAddressLineTimer.start();
+            }
+            DialogsManager.hideAddressBar();
+        }
+
+        unoptimizedDomain.button2method = function() {
+            Settings.setValue("ShowUnoptimizedDomainWarning", false);
+            goTarget();
+        }
+
+        var showPopup = PlatformInfo.isStandalone() && !standaloneOptimized && Settings.getValue("ShowUnoptimizedDomainWarning", true);
+
+        if(!showPopup) {
+            goTarget();
+        } else {
+            unoptimizedDomain.visible = true;
         }
-        DialogsManager.hideAddressBar();
     }
 }

interface/src/AboutUtil.h

@@ -16,8 +16,8 @@
 #include <QObject>
 
 /**jsdoc
- * The <code>HifiAbout</code> API provides information about the version of Interface that is currently running. It also 
- * provides the ability to open a Web page in an Interface browser window.
+ * The <code>HifiAbout</code> API provides information about the version of Interface that is currently running. It also
+ * has the functionality to open a web page in an Interface browser window.
  *
  * @namespace HifiAbout
  *
@@ -30,9 +30,9 @@
  * @property {string} qtVersion - The Qt version used in Interface that is currently running. <em>Read-only.</em>
  *
  * @example <caption>Report build information for the version of Interface currently running.</caption>
- * print("HiFi build date: " + HifiAbout.buildDate);  // 11 Feb 2019
- * print("HiFi version: " + HifiAbout.buildVersion);  // 0.78.0
- * print("Qt version: " + HifiAbout.qtVersion);  // 5.10.1
+ * print("HiFi build date: " + HifiAbout.buildDate);  // Returns the build date of the version of Interface currently running on your machine.
+ * print("HiFi version: " + HifiAbout.buildVersion);  // Returns the build version of Interface currently running on your machine.
+ * print("Qt version: " + HifiAbout.qtVersion);  // Returns the Qt version details of the version of Interface currently running on your machine.
  */
 
 class AboutUtil : public QObject {
@@ -52,9 +52,9 @@ public:
 public slots:
 
     /**jsdoc
-     * Display a Web page in an Interface browser window.
+     * Display a web page in an Interface browser window.
      * @function HifiAbout.openUrl
-     * @param {string} url - The URL of the Web page to display.
+     * @param {string} url - The URL of the web page you want to view in Interface.
      */
     void openUrl(const QString &url) const;
 private:

interface/src/Application.cpp

@@ -246,6 +246,8 @@
 
 #include "AboutUtil.h"
 
+#include <DisableDeferred.h>
+
 #if defined(Q_OS_WIN)
 #include <VersionHelpers.h>
 
@@ -289,13 +291,6 @@ static const QString DISABLE_WATCHDOG_FLAG{ "HIFI_DISABLE_WATCHDOG" };
 static bool DISABLE_WATCHDOG = nsightActive() || QProcessEnvironment::systemEnvironment().contains(DISABLE_WATCHDOG_FLAG);
 #endif
 
-#if defined(USE_GLES)
-static bool DISABLE_DEFERRED = true;
-#else
-static const QString RENDER_FORWARD{ "HIFI_RENDER_FORWARD" };
-static bool DISABLE_DEFERRED = QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD);
-#endif
-
 #if !defined(Q_OS_ANDROID)
 static const uint32_t MAX_CONCURRENT_RESOURCE_DOWNLOADS = 16;
 #else
@@ -755,6 +750,11 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     bool isStore = cmdOptionExists(argc, const_cast<const char**>(argv), OCULUS_STORE_ARG);
     qApp->setProperty(hifi::properties::OCULUS_STORE, isStore);
 
+    // emulate standalone device
+    static const auto STANDALONE_ARG = "--standalone";
+    bool isStandalone = cmdOptionExists(argc, const_cast<const char**>(argv), STANDALONE_ARG);
+    qApp->setProperty(hifi::properties::STANDALONE, isStandalone);
+
     // Ignore any previous crashes if running from command line with a test script.
     bool inTestMode { false };
     for (int i = 0; i < argc; ++i) {
@@ -1061,6 +1061,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     connect(PluginManager::getInstance().data(), &PluginManager::inputDeviceRunningChanged,
         controllerScriptingInterface, &controller::ScriptingInterface::updateRunningInputDevices);
 
+    EntityTree::setEntityClicksCapturedOperator([this] {
+        return _controllerScriptingInterface->areEntityClicksCaptured();
+    });
+
     _entityClipboard->createRootElement();
 
 #ifdef Q_OS_WIN
@@ -2342,6 +2346,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
             } else {
                 QObject::connect(webSurface.data(), &hifi::qml::OffscreenSurface::rootContextCreated, rootItemLoadedFunctor);
             }
+            auto surfaceContext = webSurface->getSurfaceContext();
+            surfaceContext->setContextProperty("KeyboardScriptingInterface", DependencyManager::get<KeyboardScriptingInterface>().data());
         } else {
             // FIXME: the tablet should use the OffscreenQmlSurfaceCache
             webSurface = QSharedPointer<OffscreenQmlSurface>(new OffscreenQmlSurface(), [](OffscreenQmlSurface* webSurface) {
@@ -3024,6 +3030,10 @@ void Application::initializeUi() {
     };
     OffscreenQmlSurface::addWhitelistContextHandler({
         QUrl{ "hifi/commerce/marketplace/Marketplace.qml" },
+        QUrl{ "hifi/commerce/purchases/Purchases.qml" },
+        QUrl{ "hifi/commerce/wallet/Wallet.qml" },
+        QUrl{ "hifi/commerce/wallet/WalletHome.qml" },
+        QUrl{ "hifi/tablet/TabletAddressDialog.qml" },
         }, platformInfoCallback);
 
     QmlContextCallback ttsCallback = [](QQmlContext* context) {
@@ -3278,6 +3288,7 @@ void Application::setupQmlSurface(QQmlContext* surfaceContext, bool setAdditiona
     surfaceContext->setContextProperty("MyAvatar", DependencyManager::get<AvatarManager>()->getMyAvatar().get());
     surfaceContext->setContextProperty("Entities", DependencyManager::get<EntityScriptingInterface>().data());
     surfaceContext->setContextProperty("Snapshot", DependencyManager::get<Snapshot>().data());
+    surfaceContext->setContextProperty("KeyboardScriptingInterface", DependencyManager::get<KeyboardScriptingInterface>().data());
 
     if (setAdditionalContextProperties) {
         auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
@@ -3288,7 +3299,6 @@ void Application::setupQmlSurface(QQmlContext* surfaceContext, bool setAdditiona
 
         surfaceContext->setContextProperty("Settings", SettingsScriptingInterface::getInstance());
         surfaceContext->setContextProperty("MenuInterface", MenuScriptingInterface::getInstance());
-        surfaceContext->setContextProperty("KeyboardScriptingInterface", DependencyManager::get<KeyboardScriptingInterface>().data());
 
         surfaceContext->setContextProperty("Account", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
         surfaceContext->setContextProperty("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
@@ -4392,7 +4402,6 @@ void Application::mouseMoveEvent(QMouseEvent* event) {
     if (compositor.getReticleVisible() || !isHMDMode() || !compositor.getReticleOverDesktop() ||
         getOverlays().getOverlayAtPoint(glm::vec2(transformedPos.x(), transformedPos.y())) != UNKNOWN_ENTITY_ID) {
         getEntities()->mouseMoveEvent(&mappedEvent);
-        getOverlays().mouseMoveEvent(&mappedEvent);
     }
 
     _controllerScriptingInterface->emitMouseMoveEvent(&mappedEvent); // send events to any registered scripts
@@ -4426,14 +4435,8 @@ void Application::mousePressEvent(QMouseEvent* event) {
 #endif
 
     QMouseEvent mappedEvent(event->type(), transformedPos, event->screenPos(), event->button(), event->buttons(), event->modifiers());
-    std::pair<float, QUuid> entityResult;
-    if (!_controllerScriptingInterface->areEntityClicksCaptured()) {
-        entityResult = getEntities()->mousePressEvent(&mappedEvent);
-    }
-    std::pair<float, QUuid> overlayResult = getOverlays().mousePressEvent(&mappedEvent);
-
-    QUuid focusedEntity = entityResult.first < overlayResult.first ? entityResult.second : overlayResult.second;
-    setKeyboardFocusEntity(getEntities()->wantsKeyboardFocus(focusedEntity) ? focusedEntity : UNKNOWN_ENTITY_ID);
+    QUuid result = getEntities()->mousePressEvent(&mappedEvent);
+    setKeyboardFocusEntity(getEntities()->wantsKeyboardFocus(result) ? result : UNKNOWN_ENTITY_ID);
 
     _controllerScriptingInterface->emitMousePressEvent(&mappedEvent); // send events to any registered scripts
 
@@ -4472,11 +4475,7 @@ void Application::mouseDoublePressEvent(QMouseEvent* event) {
         transformedPos,
         event->screenPos(), event->button(),
         event->buttons(), event->modifiers());
-
-    if (!_controllerScriptingInterface->areEntityClicksCaptured()) {
-        getEntities()->mouseDoublePressEvent(&mappedEvent);
-    }
-    getOverlays().mouseDoublePressEvent(&mappedEvent);
+    getEntities()->mouseDoublePressEvent(&mappedEvent);
 
     // if one of our scripts have asked to capture this event, then stop processing it
     if (_controllerScriptingInterface->isMouseCaptured()) {
@@ -4501,7 +4500,6 @@ void Application::mouseReleaseEvent(QMouseEvent* event) {
         event->buttons(), event->modifiers());
 
     getEntities()->mouseReleaseEvent(&mappedEvent);
-    getOverlays().mouseReleaseEvent(&mappedEvent);
 
     _controllerScriptingInterface->emitMouseReleaseEvent(&mappedEvent); // send events to any registered scripts
 
@@ -6951,7 +6949,7 @@ void Application::clearDomainOctreeDetails(bool clearAll) {
     });
 
     // reset the model renderer
-    clearAll ? getEntities()->clear() : getEntities()->clearNonLocalEntities();
+    clearAll ? getEntities()->clear() : getEntities()->clearDomainAndNonOwnedEntities();
 
     auto skyStage = DependencyManager::get<SceneScriptingInterface>()->getSkyStage();
 

interface/src/avatar/AvatarDoctor.cpp

@@ -12,10 +12,52 @@
 #include "AvatarDoctor.h"
 #include <model-networking/ModelCache.h>
 #include <AvatarConstants.h>
+#include <Rig.h>
 #include <ResourceManager.h>
+#include <QDir>
+#include <FSTReader.h>
 
+const int NETWORKED_JOINTS_LIMIT = 256;
+const float HIPS_GROUND_MIN_Y = 0.01f;
+const float HIPS_SPINE_CHEST_MIN_SEPARATION = 0.001f;
+const QString LEFT_JOINT_PREFIX = "Left";
+const QString RIGHT_JOINT_PREFIX = "Right";
 
-AvatarDoctor::AvatarDoctor(QUrl avatarFSTFileUrl) :
+const QStringList LEG_MAPPING_SUFFIXES = {
+    "UpLeg"
+    "Leg",
+    "Foot",
+    "ToeBase",
+};
+
+static QStringList ARM_MAPPING_SUFFIXES = {
+    "Shoulder",
+    "Arm",
+    "ForeArm",
+    "Hand",
+};
+
+static QStringList HAND_MAPPING_SUFFIXES = {
+    "HandIndex3",
+    "HandIndex2",
+    "HandIndex1",
+    "HandPinky3",
+    "HandPinky2",
+    "HandPinky1",
+    "HandMiddle3",
+    "HandMiddle2",
+    "HandMiddle1",
+    "HandRing3",
+    "HandRing2",
+    "HandRing1",
+    "HandThumb3",
+    "HandThumb2",
+    "HandThumb1",
+};
+
+const QUrl DEFAULT_DOCS_URL = QUrl("https://docs.highfidelity.com/create/avatars/create-avatars.html#create-your-own-avatar");
+
+AvatarDoctor::AvatarDoctor(const QUrl& avatarFSTFileUrl) :
     _avatarFSTFileUrl(avatarFSTFileUrl) {
 
     connect(this, &AvatarDoctor::complete, this, [this](QVariantList errors) {
@@ -39,136 +81,215 @@ void AvatarDoctor::startDiagnosing() {
 
     const auto resource = DependencyManager::get<ModelCache>()->getGeometryResource(_avatarFSTFileUrl);
     resource->refresh();
-    const QUrl DEFAULT_URL = QUrl("https://docs.highfidelity.com/create/avatars/create-avatars.html#create-your-own-avatar");
-    const auto resourceLoaded = [this, resource, DEFAULT_URL](bool success) {
+
+    const auto resourceLoaded = [this, resource](bool success) {
         // MODEL
         if (!success) {
-            _errors.push_back({ "Model file cannot be opened", DEFAULT_URL });
+            _errors.push_back({ "Model file cannot be opened.", DEFAULT_DOCS_URL });
             emit complete(getErrors());
             return;
         }
+        _model = resource;
         const auto model = resource.data();
         const auto avatarModel = resource.data()->getHFMModel();
         if (!avatarModel.originalURL.endsWith(".fbx")) {
-            _errors.push_back({ "Unsupported avatar model format", DEFAULT_URL });
+            _errors.push_back({ "Unsupported avatar model format.", DEFAULT_DOCS_URL });
             emit complete(getErrors());
             return;
         }
 
         // RIG
         if (avatarModel.joints.isEmpty()) {
-            _errors.push_back({ "Avatar has no rig", DEFAULT_URL });
+            _errors.push_back({ "Avatar has no rig.", DEFAULT_DOCS_URL });
         } else {
-            if (avatarModel.joints.length() > 256) {
-                _errors.push_back({ "Avatar has over 256 bones", DEFAULT_URL });
+            auto jointNames = avatarModel.getJointNames();
+
+            if (avatarModel.joints.length() > NETWORKED_JOINTS_LIMIT) {
+                _errors.push_back({tr( "Avatar has over %n bones.", "", NETWORKED_JOINTS_LIMIT), DEFAULT_DOCS_URL });
             }
             // Avatar does not have Hips bone mapped	
-            if (!avatarModel.getJointNames().contains("Hips")) {
-                _errors.push_back({ "Hips are not mapped", DEFAULT_URL });
+            if (!jointNames.contains("Hips")) {
+                _errors.push_back({ "Hips are not mapped.", DEFAULT_DOCS_URL });
             }
-            if (!avatarModel.getJointNames().contains("Spine")) {
-                _errors.push_back({ "Spine is not mapped", DEFAULT_URL });
+            if (!jointNames.contains("Spine")) {
+                _errors.push_back({ "Spine is not mapped.", DEFAULT_DOCS_URL });
             }
-            if (!avatarModel.getJointNames().contains("Head")) {
-                _errors.push_back({ "Head is not mapped", DEFAULT_URL });
+            if (!jointNames.contains("Spine1")) {
+                _errors.push_back({ "Chest (Spine1) is not mapped.", DEFAULT_DOCS_URL });
+            }
+            if (!jointNames.contains("Neck")) {
+                _errors.push_back({ "Neck is not mapped.", DEFAULT_DOCS_URL });
+            }
+            if (!jointNames.contains("Head")) {
+                _errors.push_back({ "Head is not mapped.", DEFAULT_DOCS_URL });
+            }
+
+            if (!jointNames.contains("LeftEye")) {
+                if (jointNames.contains("RightEye")) {
+                    _errors.push_back({ "LeftEye is not mapped.", DEFAULT_DOCS_URL });
+                } else {
+                    _errors.push_back({ "Eyes are not mapped.", DEFAULT_DOCS_URL });
+                }
+            } else if (!jointNames.contains("RightEye")) {
+                _errors.push_back({ "RightEye is not mapped.", DEFAULT_DOCS_URL });
+            }
+
+            const auto checkJointAsymmetry = [jointNames] (const QStringList& jointMappingSuffixes) {
+                for (const QString& jointSuffix : jointMappingSuffixes) {
+                    if (jointNames.contains(LEFT_JOINT_PREFIX + jointSuffix) !=
+                        jointNames.contains(RIGHT_JOINT_PREFIX + jointSuffix)) {
+                        return true;
+                    }
+                }
+                return false;
+            };
+
+            const auto isDescendantOfJointWhenJointsExist = [avatarModel, jointNames] (const QString& jointName, const QString& ancestorName) {
+                if (!jointNames.contains(jointName) || !jointNames.contains(ancestorName)) {
+                    return true;
+                }
+                auto currentJoint = avatarModel.joints[avatarModel.jointIndices[jointName] - 1];
+                while (currentJoint.parentIndex != -1) {
+                    currentJoint = avatarModel.joints[currentJoint.parentIndex];
+                    if (currentJoint.name == ancestorName) {
+                        return true;
+                    }
+                }
+                return false;
+            };
+
+            if (checkJointAsymmetry(ARM_MAPPING_SUFFIXES)) {
+                _errors.push_back({ "Asymmetrical arm bones.", DEFAULT_DOCS_URL });
+            }
+            if (checkJointAsymmetry(HAND_MAPPING_SUFFIXES)) {
+                _errors.push_back({ "Asymmetrical hand bones.", DEFAULT_DOCS_URL });
+            }
+            if (checkJointAsymmetry(LEG_MAPPING_SUFFIXES)) {
+                _errors.push_back({ "Asymmetrical leg bones.", DEFAULT_DOCS_URL });
+            }
+
+            // Multiple skeleton root joints checkup
+            int skeletonRootJoints = 0;
+            for (const HFMJoint& joint: avatarModel.joints) {
+                if (joint.parentIndex == -1 && joint.isSkeletonJoint) {
+                    skeletonRootJoints++;
+                }
+            }
+
+            if (skeletonRootJoints > 1) {
+                _errors.push_back({ "Multiple top-level joints found.", DEFAULT_DOCS_URL });
+            }
+
+            Rig rig;
+            rig.reset(avatarModel);
+            const float eyeHeight = rig.getUnscaledEyeHeight();
+            const float ratio = eyeHeight / DEFAULT_AVATAR_HEIGHT;
+            const float avatarHeight = eyeHeight + ratio * DEFAULT_AVATAR_EYE_TO_TOP_OF_HEAD;
+
+            // SCALE
+            const float RECOMMENDED_MIN_HEIGHT = DEFAULT_AVATAR_HEIGHT * 0.25f;
+            const float RECOMMENDED_MAX_HEIGHT = DEFAULT_AVATAR_HEIGHT * 1.5f;
+
+            if (avatarHeight < RECOMMENDED_MIN_HEIGHT) {
+                _errors.push_back({ "Avatar is possibly too short.", DEFAULT_DOCS_URL });
+            } else if (avatarHeight > RECOMMENDED_MAX_HEIGHT) {
+                _errors.push_back({ "Avatar is possibly too tall.", DEFAULT_DOCS_URL });
+            }
+
+            // HipsNotOnGround
+            auto hipsIndex = rig.indexOfJoint("Hips");
+            if (hipsIndex >= 0) {
+                glm::vec3 hipsPosition;
+                if (rig.getJointPosition(hipsIndex, hipsPosition)) {
+                    const auto hipJoint = avatarModel.joints.at(avatarModel.getJointIndex("Hips"));
+
+                    if (hipsPosition.y < HIPS_GROUND_MIN_Y) {
+                        _errors.push_back({ "Hips are on ground.", DEFAULT_DOCS_URL });
+                    }
+                }
+            }
+
+            // HipsSpineChestNotCoincident
+            auto spineIndex = rig.indexOfJoint("Spine");
+            auto chestIndex = rig.indexOfJoint("Spine1");
+            if (hipsIndex >= 0 && spineIndex >= 0 && chestIndex >= 0) {
+                glm::vec3 hipsPosition;
+                glm::vec3 spinePosition;
+                glm::vec3 chestPosition;
+                if (rig.getJointPosition(hipsIndex, hipsPosition) &&
+                    rig.getJointPosition(spineIndex, spinePosition) &&
+                    rig.getJointPosition(chestIndex, chestPosition)) {
+
+                    const auto hipsToSpine = glm::length(hipsPosition - spinePosition);
+                    const auto spineToChest = glm::length(spinePosition - chestPosition);
+                    if (hipsToSpine < HIPS_SPINE_CHEST_MIN_SEPARATION && spineToChest < HIPS_SPINE_CHEST_MIN_SEPARATION) {
+                        _errors.push_back({ "Hips/Spine/Chest overlap.", DEFAULT_DOCS_URL });
+                    }
+                }
+            }
+
+            auto mapping = resource->getMapping();
+
+            if (mapping.contains(JOINT_NAME_MAPPING_FIELD) && mapping[JOINT_NAME_MAPPING_FIELD].type() == QVariant::Hash) {
+                const auto& jointNameMappings = mapping[JOINT_NAME_MAPPING_FIELD].toHash();
+                QStringList jointValues;
+                for (const auto& jointVariant: jointNameMappings.values()) {
+                    jointValues << jointVariant.toString();
+                }
+                
+                const auto& uniqueJointValues = jointValues.toSet();
+                for (const auto& jointName: uniqueJointValues) {
+                    if (jointValues.count(jointName) > 1) {
+                        _errors.push_back({ tr("%1 is mapped multiple times.").arg(jointName), DEFAULT_DOCS_URL });
+                    }
+                }
+            }
+
+            if (!isDescendantOfJointWhenJointsExist("Spine", "Hips")) {
+                _errors.push_back({ "Spine is not a child of Hips.", DEFAULT_DOCS_URL });
+            }
+
+            if (!isDescendantOfJointWhenJointsExist("Spine1", "Spine")) {
+                _errors.push_back({ "Spine1 is not a child of Spine.", DEFAULT_DOCS_URL });
+            }
+
+            if (!isDescendantOfJointWhenJointsExist("Head", "Spine1")) {
+                _errors.push_back({ "Head is not a child of Spine1.", DEFAULT_DOCS_URL });
             }
         }
 
-        // SCALE
-        const float RECOMMENDED_MIN_HEIGHT = DEFAULT_AVATAR_HEIGHT * 0.25f;
-        const float RECOMMENDED_MAX_HEIGHT = DEFAULT_AVATAR_HEIGHT * 1.5f;
-        
-        const float avatarHeight = avatarModel.bindExtents.largestDimension();
-        if (avatarHeight < RECOMMENDED_MIN_HEIGHT) {
-            _errors.push_back({ "Avatar is possibly too small.", DEFAULT_URL });
-        } else if (avatarHeight > RECOMMENDED_MAX_HEIGHT) {
-            _errors.push_back({ "Avatar is possibly too large.", DEFAULT_URL });
-        }
-
-        // TEXTURES
-        QStringList externalTextures{};
-        QSet<QString> textureNames{};
-        auto addTextureToList = [&externalTextures](hfm::Texture texture) mutable {
-            if (!texture.filename.isEmpty() && texture.content.isEmpty() && !externalTextures.contains(texture.name)) {
-                externalTextures << texture.name;
+        auto materialMappingHandled = [this]() mutable {
+            _materialMappingLoadedCount++;
+            // Continue diagnosing the textures as soon as the material mappings have tried to load.
+            if (_materialMappingLoadedCount == _materialMappingCount) {
+                // TEXTURES
+                diagnoseTextures();
             }
         };
-        
-        foreach(const HFMMaterial material, avatarModel.materials) {
-            addTextureToList(material.normalTexture);
-            addTextureToList(material.albedoTexture);
-            addTextureToList(material.opacityTexture);
-            addTextureToList(material.glossTexture);
-            addTextureToList(material.roughnessTexture);
-            addTextureToList(material.specularTexture);
-            addTextureToList(material.metallicTexture);
-            addTextureToList(material.emissiveTexture);
-            addTextureToList(material.occlusionTexture);
-            addTextureToList(material.scatteringTexture);
-            addTextureToList(material.lightmapTexture);
-        }
 
-        if (!externalTextures.empty()) {
-            // Check External Textures:
-            auto modelTexturesURLs = model->getTextures();
-            _externalTextureCount = externalTextures.length();
-            foreach(const QString textureKey, externalTextures) {
-                if (!modelTexturesURLs.contains(textureKey)) {
-                    _missingTextureCount++;
-                    _checkedTextureCount++;
-                    continue;
-                }
-
-                const QUrl textureURL = modelTexturesURLs[textureKey].toUrl();
-
-                auto textureResource = DependencyManager::get<TextureCache>()->getTexture(textureURL);
-                auto checkTextureLoadingComplete = [this, DEFAULT_URL] () mutable {
-                    qDebug() << "checkTextureLoadingComplete" << _checkedTextureCount << "/" << _externalTextureCount;
-
-                    if (_checkedTextureCount == _externalTextureCount) {
-                        if (_missingTextureCount > 0) {
-                            _errors.push_back({ tr("Missing %n texture(s).","", _missingTextureCount), DEFAULT_URL });
-                        }
-                        if (_unsupportedTextureCount > 0) {
-                            _errors.push_back({ tr("%n unsupported texture(s) found.", "", _unsupportedTextureCount), DEFAULT_URL });
-                        }
-                        emit complete(getErrors());
-                    }
-                };
-
-                auto textureLoaded = [this, textureResource, checkTextureLoadingComplete] (bool success) mutable {
-                    if (!success) {
-                        auto normalizedURL = DependencyManager::get<ResourceManager>()->normalizeURL(textureResource->getURL());
-                        if (normalizedURL.isLocalFile()) {
-                            QFile textureFile(normalizedURL.toLocalFile());
-                            if (textureFile.exists()) {
-                                _unsupportedTextureCount++;
-                            } else {
-                                _missingTextureCount++;
-                            }
-                        } else {
-                            _missingTextureCount++;
-                        }
-                    }
-                    _checkedTextureCount++;
-                    checkTextureLoadingComplete();
-                };
-
-                if (textureResource) {
-                    textureResource->refresh();
-                    if (textureResource->isLoaded()) {
-                        textureLoaded(!textureResource->isFailed());
-                    } else {
-                        connect(textureResource.data(), &NetworkTexture::finished, this, textureLoaded);
-                    }
+        _materialMappingCount = (int)model->getMaterialMapping().size();
+        _materialMappingLoadedCount = 0;
+        for (const auto& materialMapping : model->getMaterialMapping()) {
+            // refresh the texture mappings
+            auto materialMappingResource = materialMapping.second;
+            if (materialMappingResource) {
+                materialMappingResource->refresh();
+                if (materialMappingResource->isLoaded()) {
+                    materialMappingHandled();
                 } else {
-                    _missingTextureCount++;
-                    _checkedTextureCount++;
-                    checkTextureLoadingComplete();
+                    connect(materialMappingResource.data(), &NetworkTexture::finished, this,
+                        [materialMappingHandled](bool success) mutable {
+                        
+                        materialMappingHandled();
+                    });
                 }
+            } else {
+                materialMappingHandled();
             }
-        } else {
-            emit complete(getErrors());
+        }
+        if (_materialMappingCount == 0) {
+            // TEXTURES
+            diagnoseTextures();
         }
     };
 
@@ -179,11 +300,117 @@ void AvatarDoctor::startDiagnosing() {
             connect(resource.data(), &GeometryResource::finished, this, resourceLoaded);
         }
     } else {
-        _errors.push_back({ "Model file cannot be opened", DEFAULT_URL });
+        _errors.push_back({ "Model file cannot be opened", DEFAULT_DOCS_URL });
         emit complete(getErrors());
     }    
 }
 
+void AvatarDoctor::diagnoseTextures() {
+    const auto model = _model.data();
+    const auto avatarModel = _model.data()->getHFMModel();
+    QVector<QString> externalTextures{};
+    QVector<QString> textureNames{};
+    int texturesFound = 0;
+    auto addTextureToList = [&externalTextures, &texturesFound](hfm::Texture texture) mutable {
+        if (texture.filename.isEmpty()) {
+            return;
+        }
+        if (texture.content.isEmpty() && !externalTextures.contains(texture.name)) {
+            externalTextures << texture.name;
+        }
+        texturesFound++;
+    };
+
+    for (const auto& material : avatarModel.materials) {
+        addTextureToList(material.normalTexture);
+        addTextureToList(material.albedoTexture);
+        addTextureToList(material.opacityTexture);
+        addTextureToList(material.glossTexture);
+        addTextureToList(material.roughnessTexture);
+        addTextureToList(material.specularTexture);
+        addTextureToList(material.metallicTexture);
+        addTextureToList(material.emissiveTexture);
+        addTextureToList(material.occlusionTexture);
+        addTextureToList(material.scatteringTexture);
+        addTextureToList(material.lightmapTexture);
+    }
+
+    for (const auto& materialMapping : model->getMaterialMapping()) {
+        for (const auto& networkMaterial : materialMapping.second.data()->parsedMaterials.networkMaterials) {
+            texturesFound += (int)networkMaterial.second->getTextureMaps().size();
+        }
+    }
+
+    auto normalizedURL = DependencyManager::get<ResourceManager>()->normalizeURL(
+        QUrl(avatarModel.originalURL)).resolved(QUrl("textures"));
+
+    if (texturesFound == 0) {
+        _errors.push_back({ tr("No textures assigned."), DEFAULT_DOCS_URL });
+    }
+
+    if (!externalTextures.empty()) {
+        // Check External Textures:
+        auto modelTexturesURLs = model->getTextures();
+        _externalTextureCount = externalTextures.length();
+
+        auto checkTextureLoadingComplete = [this]() mutable {
+            if (_checkedTextureCount == _externalTextureCount) {
+                if (_missingTextureCount > 0) {
+                    _errors.push_back({ tr("Missing %n texture(s).","", _missingTextureCount), DEFAULT_DOCS_URL });
+                }
+                if (_unsupportedTextureCount > 0) {
+                    _errors.push_back({ tr("%n unsupported texture(s) found.", "", _unsupportedTextureCount),
+                        DEFAULT_DOCS_URL });
+                }
+
+                emit complete(getErrors());
+            }
+        };
+
+        for (const QString& textureKey : externalTextures) {
+            if (!modelTexturesURLs.contains(textureKey)) {
+                _missingTextureCount++;
+                _checkedTextureCount++;
+                continue;
+            }
+            const QUrl textureURL = modelTexturesURLs[textureKey].toUrl();
+            auto textureResource = DependencyManager::get<TextureCache>()->getTexture(textureURL);
+            auto textureLoaded = [this, textureResource, checkTextureLoadingComplete](bool success) mutable {
+                if (!success) {
+                    auto normalizedURL = DependencyManager::get<ResourceManager>()->normalizeURL(textureResource->getURL());
+                    if (normalizedURL.isLocalFile()) {
+                        QFile textureFile(normalizedURL.toLocalFile());
+                        if (textureFile.exists()) {
+                            _unsupportedTextureCount++;
+                        } else {
+                            _missingTextureCount++;
+                        }
+                    } else {
+                        _missingTextureCount++;
+                    }
+                }
+                _checkedTextureCount++;
+                checkTextureLoadingComplete();
+            };
+
+            if (textureResource) {
+                textureResource->refresh();
+                if (textureResource->isLoaded()) {
+                    textureLoaded(!textureResource->isFailed());
+                } else {
+                    connect(textureResource.data(), &NetworkTexture::finished, this, textureLoaded);
+                }
+            } else {
+                _missingTextureCount++;
+                _checkedTextureCount++;
+            }
+        }
+        checkTextureLoadingComplete();
+    } else {
+        emit complete(getErrors());
+    }
+}
+
 QVariantList AvatarDoctor::getErrors() const {
     QVariantList result;
     for (const auto& error : _errors) {

interface/src/avatar/AvatarDoctor.h

@@ -16,6 +16,7 @@
 #include <QUrl>
 #include <QVector>
 #include <QVariantMap>
+#include "GeometryCache.h"
 
 struct AvatarDiagnosticResult {
     QString message;
@@ -27,7 +28,7 @@ Q_DECLARE_METATYPE(QVector<AvatarDiagnosticResult>)
 class AvatarDoctor : public QObject {
     Q_OBJECT
 public:
-    AvatarDoctor(QUrl avatarFSTFileUrl);
+    AvatarDoctor(const QUrl& avatarFSTFileUrl);
 
     Q_INVOKABLE void startDiagnosing();
 
@@ -37,6 +38,8 @@ signals:
     void complete(QVariantList errors);
 
 private:
+    void diagnoseTextures();
+
     QUrl _avatarFSTFileUrl;
     QVector<AvatarDiagnosticResult> _errors;
 
@@ -45,6 +48,11 @@ private:
     int _missingTextureCount = 0;
     int _unsupportedTextureCount = 0;
 
+    int _materialMappingCount = 0;
+    int _materialMappingLoadedCount = 0;
+
+    GeometryResource::Pointer _model;
+
     bool _isDiagnosing = false;
 };
 

interface/src/avatar/AvatarManager.cpp

@@ -232,96 +232,142 @@ void AvatarManager::updateOtherAvatars(float deltaTime) {
     auto avatarMap = getHashCopy();
 
     const auto& views = qApp->getConicalViews();
-    PrioritySortUtil::PriorityQueue<SortableAvatar> sortedAvatars(views,
-            AvatarData::_avatarSortCoefficientSize,
-            AvatarData::_avatarSortCoefficientCenter,
-            AvatarData::_avatarSortCoefficientAge);
-    sortedAvatars.reserve(avatarMap.size() - 1); // don't include MyAvatar
+    // Prepare 2 queues for heros and for crowd avatars
+    using AvatarPriorityQueue = PrioritySortUtil::PriorityQueue<SortableAvatar>;
+    // Keep two independent queues, one for heroes and one for the riff-raff.
+    enum PriorityVariants
+    {
+        kHero = 0,
+        kNonHero,
+        NumVariants
+    };
+    AvatarPriorityQueue avatarPriorityQueues[NumVariants] = {
+             { views,
+               AvatarData::_avatarSortCoefficientSize,
+               AvatarData::_avatarSortCoefficientCenter,
+               AvatarData::_avatarSortCoefficientAge },
+             { views,
+               AvatarData::_avatarSortCoefficientSize,
+               AvatarData::_avatarSortCoefficientCenter,
+               AvatarData::_avatarSortCoefficientAge } };
+    // Reserve space
+    //avatarPriorityQueues[kHero].reserve(10);  // just few
+    avatarPriorityQueues[kNonHero].reserve(avatarMap.size() - 1);  // don't include MyAvatar
 
     // Build vector and compute priorities
     auto nodeList = DependencyManager::get<NodeList>();
     AvatarHash::iterator itr = avatarMap.begin();
     while (itr != avatarMap.end()) {
-        const auto& avatar = std::static_pointer_cast<Avatar>(*itr);
+        auto avatar = std::static_pointer_cast<Avatar>(*itr);
         // DO NOT update _myAvatar!  Its update has already been done earlier in the main loop.
         // DO NOT update or fade out uninitialized Avatars
         if (avatar != _myAvatar && avatar->isInitialized() && !nodeList->isPersonalMutingNode(avatar->getID())) {
-            sortedAvatars.push(SortableAvatar(avatar));
+            if (avatar->getHasPriority()) {
+                avatarPriorityQueues[kHero].push(SortableAvatar(avatar));
+            } else {
+                avatarPriorityQueues[kNonHero].push(SortableAvatar(avatar));
+            }
         }
         ++itr;
     }
-    // Sort
-    const auto& sortedAvatarVector = sortedAvatars.getSortedVector();
+
+    _numHeroAvatars = (int)avatarPriorityQueues[kHero].size();
 
     // process in sorted order
     uint64_t startTime = usecTimestampNow();
-    uint64_t updateExpiry = startTime + MAX_UPDATE_AVATARS_TIME_BUDGET;
+
+    const uint64_t MAX_UPDATE_HEROS_TIME_BUDGET = uint64_t(0.8 * MAX_UPDATE_AVATARS_TIME_BUDGET);
+
+    uint64_t updatePriorityExpiries[NumVariants] = { startTime + MAX_UPDATE_HEROS_TIME_BUDGET, startTime + MAX_UPDATE_AVATARS_TIME_BUDGET };
+    int numHerosUpdated = 0;
     int numAvatarsUpdated = 0;
-    int numAVatarsNotUpdated = 0;
+    int numAvatarsNotUpdated = 0;
 
     render::Transaction renderTransaction;
     workload::Transaction workloadTransaction;
-    for (auto it = sortedAvatarVector.begin(); it != sortedAvatarVector.end(); ++it) {
-        const SortableAvatar& sortData = *it;
-        const auto avatar = std::static_pointer_cast<OtherAvatar>(sortData.getAvatar());
-        if (!avatar->_isClientAvatar) {
-            avatar->setIsClientAvatar(true);
-        }
-        // TODO: to help us scale to more avatars it would be nice to not have to poll this stuff every update
-        if (avatar->getSkeletonModel()->isLoaded()) {
-            // remove the orb if it is there
-            avatar->removeOrb();
-            if (avatar->needsPhysicsUpdate()) {
-                _avatarsToChangeInPhysics.insert(avatar);
-            }
-        } else {
-            avatar->updateOrbPosition();
-        }
+ 
+    for (int p = kHero; p < NumVariants; p++) {
+        auto& priorityQueue = avatarPriorityQueues[p];
+        // Sorting the current queue HERE as part of the measured timing.
+        const auto& sortedAvatarVector = priorityQueue.getSortedVector();
 
-        // for ALL avatars...
-        if (_shouldRender) {
-            avatar->ensureInScene(avatar, qApp->getMain3DScene());
-        }
-        avatar->animateScaleChanges(deltaTime);
+        auto passExpiry = updatePriorityExpiries[p];
 
-        uint64_t now = usecTimestampNow();
-        if (now < updateExpiry) {
-            // we're within budget
-            bool inView = sortData.getPriority() > OUT_OF_VIEW_THRESHOLD;
-            if (inView && avatar->hasNewJointData()) {
-                numAvatarsUpdated++;
+        for (auto it = sortedAvatarVector.begin(); it != sortedAvatarVector.end(); ++it) {
+            const SortableAvatar& sortData = *it;
+            const auto avatar = std::static_pointer_cast<OtherAvatar>(sortData.getAvatar());
+            if (!avatar->_isClientAvatar) {
+                avatar->setIsClientAvatar(true);
             }
-            auto transitStatus = avatar->_transit.update(deltaTime, avatar->_serverPosition, _transitConfig);
-            if (avatar->getIsNewAvatar() && (transitStatus == AvatarTransit::Status::START_TRANSIT || transitStatus == AvatarTransit::Status::ABORT_TRANSIT)) {
-                avatar->_transit.reset();
-                avatar->setIsNewAvatar(false);
-            }
-            avatar->simulate(deltaTime, inView);
-            if (avatar->getSkeletonModel()->isLoaded() && avatar->getWorkloadRegion() == workload::Region::R1) {
-                _myAvatar->addAvatarHandsToFlow(avatar);
-            }
-            avatar->updateRenderItem(renderTransaction);
-            avatar->updateSpaceProxy(workloadTransaction);
-            avatar->setLastRenderUpdateTime(startTime);
-        } else {
-            // we've spent our full time budget --> bail on the rest of the avatar updates
-            // --> more avatars may freeze until their priority trickles up
-            // --> some scale animations may glitch
-            // --> some avatar velocity measurements may be a little off
-
-            // no time to simulate, but we take the time to count how many were tragically missed
-            while (it != sortedAvatarVector.end()) {
-                const SortableAvatar& newSortData = *it;
-                const auto& newAvatar = newSortData.getAvatar();
-                bool inView = newSortData.getPriority() > OUT_OF_VIEW_THRESHOLD;
-                // Once we reach an avatar that's not in view, all avatars after it will also be out of view
-                if (!inView) {
-                    break;
+            // TODO: to help us scale to more avatars it would be nice to not have to poll this stuff every update
+            if (avatar->getSkeletonModel()->isLoaded()) {
+                // remove the orb if it is there
+                avatar->removeOrb();
+                if (avatar->needsPhysicsUpdate()) {
+                    _avatarsToChangeInPhysics.insert(avatar);
                 }
-                numAVatarsNotUpdated += (int)(newAvatar->hasNewJointData());
-                ++it;
+            } else {
+                avatar->updateOrbPosition();
             }
-            break;
+
+            // for ALL avatars...
+            if (_shouldRender) {
+                avatar->ensureInScene(avatar, qApp->getMain3DScene());
+            }
+
+            avatar->animateScaleChanges(deltaTime);
+
+            uint64_t now = usecTimestampNow();
+            if (now < passExpiry) {
+                // we're within budget
+                bool inView = sortData.getPriority() > OUT_OF_VIEW_THRESHOLD;
+                if (inView && avatar->hasNewJointData()) {
+                    numAvatarsUpdated++;
+                }
+                auto transitStatus = avatar->_transit.update(deltaTime, avatar->_serverPosition, _transitConfig);
+                if (avatar->getIsNewAvatar() && (transitStatus == AvatarTransit::Status::START_TRANSIT ||
+                                                 transitStatus == AvatarTransit::Status::ABORT_TRANSIT)) {
+                    avatar->_transit.reset();
+                    avatar->setIsNewAvatar(false);
+                }
+                avatar->simulate(deltaTime, inView);
+                if (avatar->getSkeletonModel()->isLoaded() && avatar->getWorkloadRegion() == workload::Region::R1) {
+                    _myAvatar->addAvatarHandsToFlow(avatar);
+                }
+                avatar->updateRenderItem(renderTransaction);
+                avatar->updateSpaceProxy(workloadTransaction);
+                avatar->setLastRenderUpdateTime(startTime);
+            } else {
+                // we've spent our time budget for this priority bucket
+                // let's deal with the reminding avatars if this pass and BREAK from the for loop
+
+                if (p == kHero) {
+                    // Hero,
+                    // --> put them back in the non hero queue
+
+                    auto& crowdQueue = avatarPriorityQueues[kNonHero];
+                    while (it != sortedAvatarVector.end()) {
+                        crowdQueue.push(SortableAvatar((*it).getAvatar()));
+                        ++it;
+                    }
+                } else {
+                    // Non Hero
+                    // --> bail on the rest of the avatar updates
+                    // --> more avatars may freeze until their priority trickles up
+                    // --> some scale animations may glitch
+                    // --> some avatar velocity measurements may be a little off
+
+                    // no time to simulate, but we take the time to count how many were tragically missed
+                    numAvatarsNotUpdated = sortedAvatarVector.end() - it;
+                }
+
+                // We had to cut short this pass, we must break out of the for loop here
+                break;
+            }
+        }
+
+        if (p == kHero) {
+            numHerosUpdated = numAvatarsUpdated;
         }
     }
 
@@ -337,7 +383,8 @@ void AvatarManager::updateOtherAvatars(float deltaTime) {
     _space->enqueueTransaction(workloadTransaction);
 
     _numAvatarsUpdated = numAvatarsUpdated;
-    _numAvatarsNotUpdated = numAVatarsNotUpdated;
+    _numAvatarsNotUpdated = numAvatarsNotUpdated;
+    _numHeroAvatarsUpdated = numHerosUpdated;
 
     simulateAvatarFades(deltaTime);
 

interface/src/avatar/AvatarManager.h

@@ -90,6 +90,8 @@ public:
 
     int getNumAvatarsUpdated() const { return _numAvatarsUpdated; }
     int getNumAvatarsNotUpdated() const { return _numAvatarsNotUpdated; }
+    int getNumHeroAvatars() const { return _numHeroAvatars; }
+    int getNumHeroAvatarsUpdated() const { return _numHeroAvatarsUpdated; }
     float getAvatarSimulationTime() const { return _avatarSimulationTime; }
 
     void updateMyAvatar(float deltaTime);
@@ -242,6 +244,8 @@ private:
     RateCounter<> _myAvatarSendRate;
     int _numAvatarsUpdated { 0 };
     int _numAvatarsNotUpdated { 0 };
+    int _numHeroAvatars{ 0 };
+    int _numHeroAvatarsUpdated{ 0 };
     float _avatarSimulationTime { 0.0f };
     bool _shouldRender { true };
     bool _myAvatarDataPacketsPaused { false };

interface/src/avatar/AvatarProject.h

@@ -77,7 +77,10 @@ public:
         return QDir::cleanPath(QDir(_projectPath).absoluteFilePath(_fst->getModelPath()));
     }
     Q_INVOKABLE bool getHasErrors() const { return _hasErrors; }
-    Q_INVOKABLE void setHasErrors(bool hasErrors) { _hasErrors = hasErrors; }
+    Q_INVOKABLE void setHasErrors(bool hasErrors) {
+        _hasErrors = hasErrors;
+        emit hasErrorsChanged();
+    }
 
     /**
      * returns the AvatarProject or a nullptr on failure.

interface/src/avatar/MyAvatar.cpp

@@ -910,7 +910,7 @@ void MyAvatar::simulate(float deltaTime, bool inView) {
         recorder->recordFrame(FRAME_TYPE, toFrame(*this));
     }
 
-    locationChanged();
+    locationChanged(true, false);
     // if a entity-child of this avatar has moved outside of its queryAACube, update the cube and tell the entity server.
     auto entityTreeRenderer = qApp->getEntities();
     EntityTreePointer entityTree = entityTreeRenderer ? entityTreeRenderer->getTree() : nullptr;
@@ -920,6 +920,7 @@ void MyAvatar::simulate(float deltaTime, bool inView) {
             zoneInteractionProperties = entityTreeRenderer->getZoneInteractionProperties();
             EntityEditPacketSender* packetSender = qApp->getEntityEditPacketSender();
             forEachDescendant([&](SpatiallyNestablePointer object) {
+                locationChanged(true, false);
                 // we need to update attached queryAACubes in our own local tree so point-select always works
                 // however we don't want to flood the update pipeline with AvatarEntity updates, so we assume
                 // others have all info required to properly update queryAACube of AvatarEntities on their end
@@ -2324,23 +2325,25 @@ void MyAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
 
     std::shared_ptr<QMetaObject::Connection> skeletonConnection = std::make_shared<QMetaObject::Connection>();
     *skeletonConnection = QObject::connect(_skeletonModel.get(), &SkeletonModel::skeletonLoaded, [this, skeletonModelChangeCount, skeletonConnection]() {
-       if (skeletonModelChangeCount == _skeletonModelChangeCount) {
+        if (skeletonModelChangeCount == _skeletonModelChangeCount) {
 
-           if (_fullAvatarModelName.isEmpty()) {
-               // Store the FST file name into preferences
-               const auto& mapping = _skeletonModel->getGeometry()->getMapping();
-               if (mapping.value("name").isValid()) {
-                   _fullAvatarModelName = mapping.value("name").toString();
-               }
-           }
+            if (_fullAvatarModelName.isEmpty()) {
+                // Store the FST file name into preferences
+                const auto& mapping = _skeletonModel->getGeometry()->getMapping();
+                if (mapping.value("name").isValid()) {
+                    _fullAvatarModelName = mapping.value("name").toString();
+                }
+            }
 
-           initHeadBones();
-           _skeletonModel->setCauterizeBoneSet(_headBoneSet);
-           _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl();
-           initAnimGraph();
-           _skeletonModelLoaded = true;
-       }
-       QObject::disconnect(*skeletonConnection);
+            initHeadBones();
+            _skeletonModel->setCauterizeBoneSet(_headBoneSet);
+            _fstAnimGraphOverrideUrl = _skeletonModel->getGeometry()->getAnimGraphOverrideUrl();
+            initAnimGraph();
+            initFlowFromFST();
+
+            _skeletonModelLoaded = true;
+        }
+        QObject::disconnect(*skeletonConnection);
     });
     
     saveAvatarUrl();
@@ -5330,10 +5333,22 @@ void MyAvatar::addAvatarHandsToFlow(const std::shared_ptr<Avatar>& otherAvatar)
 }
 
 void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& physicsConfig, const QVariantMap& collisionsConfig) {
+    if (QThread::currentThread() != thread()) {
+        QMetaObject::invokeMethod(this, "useFlow",
+            Q_ARG(bool, isActive),
+            Q_ARG(bool, isCollidable),
+            Q_ARG(const QVariantMap&, physicsConfig),
+            Q_ARG(const QVariantMap&, collisionsConfig));
+        return;
+    }
     if (_skeletonModel->isLoaded()) {
-        _skeletonModel->getRig().initFlow(isActive);
         auto &flow = _skeletonModel->getRig().getFlow();
         auto &collisionSystem = flow.getCollisionSystem();
+        if (!flow.isInitialized() && isActive) {
+            _skeletonModel->getRig().initFlow(true);
+        } else {
+            flow.setActive(isActive);
+        }
         collisionSystem.setActive(isCollidable);
         auto physicsGroups = physicsConfig.keys();
         if (physicsGroups.size() > 0) {
@@ -5384,6 +5399,102 @@ void MyAvatar::useFlow(bool isActive, bool isCollidable, const QVariantMap& phys
     }
 }
 
+QVariantMap MyAvatar::getFlowData() {
+    QVariantMap result;
+    if (QThread::currentThread() != thread()) {
+        BLOCKING_INVOKE_METHOD(this, "getFlowData",
+            Q_RETURN_ARG(QVariantMap, result));
+        return result;
+    }
+    if (_skeletonModel->isLoaded()) {
+        auto jointNames = getJointNames();
+        auto &flow = _skeletonModel->getRig().getFlow();
+        auto &collisionSystem = flow.getCollisionSystem();
+        bool initialized = flow.isInitialized();
+        result.insert("initialized", initialized);
+        result.insert("active", flow.getActive());
+        result.insert("colliding", collisionSystem.getActive());
+        QVariantMap physicsData;
+        QVariantMap collisionsData;
+        QVariantMap threadData;
+        std::map<QString, QVariantList> groupJointsMap;
+        QVariantList jointCollisionData;
+        auto &groups = flow.getGroupSettings();
+        for (auto &joint : flow.getJoints()) {
+            auto &groupName = joint.second.getGroup();
+            if (groups.find(groupName) != groups.end()) {
+                if (groupJointsMap.find(groupName) == groupJointsMap.end()) {
+                    groupJointsMap.insert(std::pair<QString, QVariantList>(groupName, QVariantList()));
+                }
+                groupJointsMap[groupName].push_back(joint.second.getIndex());
+            }
+        }        
+        for (auto &group : groups) {
+            QVariantMap settingsObject;
+            QString groupName = group.first;
+            FlowPhysicsSettings groupSettings = group.second;
+            settingsObject.insert("active", groupSettings._active);
+            settingsObject.insert("damping", groupSettings._damping);
+            settingsObject.insert("delta", groupSettings._delta);
+            settingsObject.insert("gravity", groupSettings._gravity);
+            settingsObject.insert("inertia", groupSettings._inertia);
+            settingsObject.insert("radius", groupSettings._radius);
+            settingsObject.insert("stiffness", groupSettings._stiffness);
+            settingsObject.insert("jointIndices", groupJointsMap[groupName]);
+            physicsData.insert(groupName, settingsObject);
+        }
+
+        auto &collisions = collisionSystem.getCollisions();
+        for (auto &collision : collisions) {
+            QVariantMap collisionObject;
+            collisionObject.insert("offset", vec3toVariant(collision._offset));
+            collisionObject.insert("radius", collision._radius);
+            collisionObject.insert("jointIndex", collision._jointIndex);
+            QString jointName = jointNames.size() > collision._jointIndex ? jointNames[collision._jointIndex] : "unknown";
+            collisionsData.insert(jointName, collisionObject);
+        }
+        for (auto &thread : flow.getThreads()) {
+            QVariantList indices;
+            for (int index : thread._joints) {
+                indices.append(index);
+            }
+            threadData.insert(thread._jointsPointer->at(thread._joints[0]).getName(), indices);
+        }
+        result.insert("physics", physicsData);
+        result.insert("collisions", collisionsData);
+        result.insert("threads", threadData);
+    }
+    return result;
+}
+
+QVariantList MyAvatar::getCollidingFlowJoints() {
+    QVariantList result;
+    if (QThread::currentThread() != thread()) {
+        BLOCKING_INVOKE_METHOD(this, "getCollidingFlowJoints",
+            Q_RETURN_ARG(QVariantList, result));
+        return result;
+    }
+
+    if (_skeletonModel->isLoaded()) {
+        auto& flow = _skeletonModel->getRig().getFlow();
+        for (auto &joint : flow.getJoints()) {
+            if (joint.second.isColliding()) {
+                result.append(joint.second.getIndex());
+            }
+        }
+    }
+    return result;
+}
+
+void MyAvatar::initFlowFromFST() {
+    if (_skeletonModel->isLoaded()) {
+        auto &flowData = _skeletonModel->getHFMModel().flowData;
+        if (flowData.shouldInitFlow()) {
+            useFlow(true, flowData.shouldInitCollisions(), flowData._physicsConfig, flowData._collisionsConfig);
+        }
+    }
+}
+
 void MyAvatar::sendPacket(const QUuid& entityID, const EntityItemProperties& properties) const {
     auto treeRenderer = DependencyManager::get<EntityTreeRenderer>();
     EntityTreePointer entityTree = treeRenderer ? treeRenderer->getTree() : nullptr;

interface/src/avatar/MyAvatar.h

@@ -1198,6 +1198,19 @@ public:
     */
     Q_INVOKABLE void useFlow(bool isActive, bool isCollidable, const QVariantMap& physicsConfig = QVariantMap(), const QVariantMap& collisionsConfig = QVariantMap());
 
+    /**jsdoc
+    * @function MyAvatar.getFlowData
+    * @returns {object}
+    */
+    Q_INVOKABLE QVariantMap getFlowData();
+
+    /**jsdoc
+    * returns the indices of every colliding flow joint
+    * @function MyAvatar.getCollidingFlowJoints
+    * @returns {int[]}
+    */
+    Q_INVOKABLE QVariantList getCollidingFlowJoints();
+
 public slots:
 
     /**jsdoc
@@ -1751,6 +1764,7 @@ private:
     void updateCollisionSound(const glm::vec3& penetration, float deltaTime, float frequency);
     void initHeadBones();
     void initAnimGraph();
+    void initFlowFromFST();
 
     // Avatar Preferences
     QUrl _fullAvatarURLFromPreferences;

interface/src/avatar/OtherAvatar.cpp

@@ -200,17 +200,6 @@ void OtherAvatar::resetDetailedMotionStates() {
 
 void OtherAvatar::setWorkloadRegion(uint8_t region) {
     _workloadRegion = region;
-    QString printRegion = "";
-    if (region == workload::Region::R1) {
-        printRegion = "R1";
-    } else if (region == workload::Region::R2) {
-        printRegion = "R2";
-    } else if (region == workload::Region::R3) {
-        printRegion = "R3";
-    } else {
-        printRegion = "invalid";
-    }
-    qCDebug(avatars) << "Setting workload region to " << printRegion;
     computeShapeLOD();
 }
 
@@ -235,7 +224,6 @@ void OtherAvatar::computeShapeLOD() {
     if (newLOD != _bodyLOD) {
         _bodyLOD = newLOD;
         if (isInPhysicsSimulation()) {
-            qCDebug(avatars) << "Changing to body LOD " << newLOD;
             _needsReinsertion = true;
         }
     }
@@ -503,6 +491,7 @@ void OtherAvatar::handleChangedAvatarEntityData() {
                 // then set the the original ID for the changes to take effect
                 // TODO: This is a horrible hack and once properties.constructFromBuffer no longer causes
                 // side effects...remove the following three lines
+
                 const QUuid NULL_ID = QUuid("{00000000-0000-0000-0000-000000000005}");
                 entity->setParentID(NULL_ID);
                 entity->setParentID(oldParentID);

interface/src/commerce/Wallet.h

@@ -62,8 +62,8 @@ public:
      *     <tr><th>Value</th><th>Meaning</th><th>Description</th></tr>
      *   </thead>
      *   <tbody>
-     *     <tr><td><code>0</code></td><td>Not logged in</td><td>The user isn't logged in.</td></tr>
-     *     <tr><td><code>1</code></td><td>Not set up</td><td>The user's wallet isn't set up.</td></tr>
+     *     <tr><td><code>0</code></td><td>Not logged in</td><td>The user is not logged in.</td></tr>
+     *     <tr><td><code>1</code></td><td>Not set up</td><td>The user's wallet has not been set up.</td></tr>
      *     <tr><td><code>2</code></td><td>Pre-existing</td><td>There is a wallet present on the server but not one 
      *       locally.</td></tr>
      *     <tr><td><code>3</code></td><td>Conflicting</td><td>There is a wallet present on the server plus one present locally, 
@@ -73,8 +73,8 @@ public:
      *     <tr><td><code>5</code></td><td>Ready</td><td>The wallet is ready for use.</td></tr>
      *   </tbody>
      * </table>
-     * <p>Wallets used to be stored locally but now they're stored on the server, unless the computer once had a wallet stored
-     * locally in which case the wallet may be present in both places.</p>
+     * <p>Wallets used to be stored locally but now they're only stored on the server. A wallet is present in both places if 
+     * your computer previously stored its information locally.</p>
      * @typedef {number} WalletScriptingInterface.WalletStatus
      */
     enum WalletStatus {

interface/src/raypick/LaserPointer.cpp

@@ -172,7 +172,10 @@ void LaserPointer::RenderState::update(const glm::vec3& origin, const glm::vec3&
         properties.setVisible(true);
         properties.setIgnorePickIntersection(doesPathIgnorePicks());
         QVector<float> widths;
-        widths.append(getLineWidth() * parentScale);
+        float width = getLineWidth() * parentScale;
+        widths.append(width);
+        widths.append(width);
+        properties.setStrokeWidths(widths);
         DependencyManager::get<EntityScriptingInterface>()->editEntity(getPathID(), properties);
     }
 }

interface/src/raypick/RayPick.cpp

@@ -89,6 +89,8 @@ glm::vec3 RayPick::intersectRayWithEntityXYPlane(const QUuid& entityID, const gl
     return intersectRayWithXYPlane(origin, direction, props.getPosition(), props.getRotation(), props.getRegistrationPoint());
 }
 
+
+
 glm::vec2 RayPick::projectOntoXYPlane(const glm::vec3& worldPos, const glm::vec3& position, const glm::quat& rotation, const glm::vec3& dimensions, const glm::vec3& registrationPoint, bool unNormalized) {
     glm::quat invRot = glm::inverse(rotation);
     glm::vec3 localPos = invRot * (worldPos - position);
@@ -102,6 +104,19 @@ glm::vec2 RayPick::projectOntoXYPlane(const glm::vec3& worldPos, const glm::vec3
     return pos2D;
 }
 
+glm::vec2 RayPick::projectOntoXZPlane(const glm::vec3& worldPos, const glm::vec3& position, const glm::quat& rotation, const glm::vec3& dimensions, const glm::vec3& registrationPoint, bool unNormalized) {
+    glm::quat invRot = glm::inverse(rotation);
+    glm::vec3 localPos = invRot * (worldPos - position);
+
+    glm::vec3 normalizedPos = (localPos / dimensions) + registrationPoint;
+
+    glm::vec2 pos2D = glm::vec2(normalizedPos.x, (1.0f - normalizedPos.z));
+    if (unNormalized) {
+        pos2D *= glm::vec2(dimensions.x, dimensions.z);
+    }
+    return pos2D;
+}
+
 glm::vec2 RayPick::projectOntoEntityXYPlane(const QUuid& entityID, const glm::vec3& worldPos, bool unNormalized) {
     EntityPropertyFlags desiredProperties;
     desiredProperties += PROP_POSITION;

interface/src/raypick/RayPick.h

@@ -86,6 +86,7 @@ public:
     static glm::vec2 projectOntoEntityXYPlane(const QUuid& entityID, const glm::vec3& worldPos, bool unNormalized = true);
 
     static glm::vec2 projectOntoXYPlane(const glm::vec3& worldPos, const glm::vec3& position, const glm::quat& rotation, const glm::vec3& dimensions, const glm::vec3& registrationPoint, bool unNormalized);
+    static glm::vec2 projectOntoXZPlane(const glm::vec3& worldPos, const glm::vec3& position, const glm::quat& rotation, const glm::vec3& dimensions, const glm::vec3& registrationPoint, bool unNoemalized);
 
 private:
     static glm::vec3 intersectRayWithXYPlane(const glm::vec3& origin, const glm::vec3& direction, const glm::vec3& point, const glm::quat& rotation, const glm::vec3& registration);

interface/src/raypick/StylusPick.cpp

@@ -155,15 +155,33 @@ PickResultPointer StylusPick::getEntityIntersection(const StylusTip& pick) {
 
         const auto entityRotation = entity->getWorldOrientation();
         const auto entityPosition = entity->getWorldPosition();
+        const auto entityType = entity->getType();
+        glm::vec3 normal;
 
-        glm::vec3 normal = entityRotation * Vectors::UNIT_Z;
+        // TODO: Use the xz projection method for Sphere and Quad.
+        if (entityType == EntityTypes::Gizmo) {
+            normal = entityRotation * Vectors::UNIT_Y;
+        } else {
+            normal = entityRotation * Vectors::UNIT_Z;
+        }
         float distance = glm::dot(pick.position - entityPosition, normal);
         if (distance < nearestTarget.distance) {
             const auto entityDimensions = entity->getScaledDimensions();
             const auto entityRegistrationPoint = entity->getRegistrationPoint();
             glm::vec3 intersection = pick.position - (normal * distance);
-            glm::vec2 pos2D = RayPick::projectOntoXYPlane(intersection, entityPosition, entityRotation,
-                                                          entityDimensions, entityRegistrationPoint, false);
+            glm::vec2 pos2D;
+
+
+            auto entityType = entity->getType();
+
+            if (entityType == EntityTypes::Gizmo) {
+                pos2D = RayPick::projectOntoXZPlane(intersection, entityPosition, entityRotation,
+                                                    entityDimensions, entityRegistrationPoint, false);
+            } else {
+                pos2D = RayPick::projectOntoXYPlane(intersection, entityPosition, entityRotation,
+                                                    entityDimensions, entityRegistrationPoint, false);
+            }
+
             if (pos2D == glm::clamp(pos2D, glm::vec2(0), glm::vec2(1))) {
                 IntersectionType type = IntersectionType::ENTITY;
                 if (getFilter().doesPickLocalEntities()) {

interface/src/scripting/AccountServicesScriptingInterface.cpp

@@ -115,8 +115,8 @@ DownloadInfoResult::DownloadInfoResult() :
 /**jsdoc
  * Information on the assets currently being downloaded and pending download.
  * @typedef {object} AccountServices.DownloadInfoResult
- * @property {number[]} downloading - The percentage complete for each asset currently being downloaded.
- * @property {number} pending - The number of assets waiting to be download.
+ * @property {number[]} downloading - The download percentage remaining of each asset currently downloading.
+ * @property {number} pending - The number of assets pending download.
  */
 QScriptValue DownloadInfoResultToScriptValue(QScriptEngine* engine, const DownloadInfoResult& result) {
     QScriptValue object = engine->newObject();

interface/src/scripting/AccountServicesScriptingInterface.h

@@ -38,19 +38,19 @@ class AccountServicesScriptingInterface : public QObject {
     Q_OBJECT
 
     /**jsdoc
-     * The <code>AccountServices</code> API provides functions related to user connectivity, visibility, and asset download 
-     * progress.
+     * The <code>AccountServices</code> API provides functions that give information on user connectivity, visibility, and 
+     * asset download progress.
      * 
      * @hifi-interface
      * @hifi-client-entity
      * @hifi-avatar
      *
      * @namespace AccountServices
-     * @property {string} username - The user name if the user is logged in, otherwise <code>"Unknown user"</code>.
-     *     <em>Read-only.</em>
+     * @property {string} username - The user name of the user logged in. If there is no user logged in, it is
+     *     <code>"Unknown user"</code>. <em>Read-only.</em>
      * @property {boolean} loggedIn - <code>true</code> if the user is logged in, otherwise <code>false</code>. 
      *     <em>Read-only.</em>
-     * @property {string} findableBy - The user's visibility to other people:<br />
+     * @property {string} findableBy - The user's visibility to other users:<br />
      *     <code>"none"</code> - user appears offline.<br />
      *     <code>"friends"</code> - user is visible only to friends.<br />
      *     <code>"connections"</code> - user is visible to friends and connections.<br />
@@ -74,23 +74,23 @@ public:
 public slots:
 
     /**jsdoc
-     * Get information on the progress of downloading assets in the domain.
+     * Gets information on the download progress of assets in the domain.
      * @function AccountServices.getDownloadInfo
-     * @returns {AccountServices.DownloadInfoResult} Information on the progress of assets download.
+     * @returns {AccountServices.DownloadInfoResult} Information on the download progress of assets.
      */
     DownloadInfoResult getDownloadInfo();
 
     /**jsdoc
-     * Cause a {@link AccountServices.downloadInfoChanged|downloadInfoChanged} signal to be triggered with information on the 
-     * current progress of the download of assets in the domain.
+     * Triggers a {@link AccountServices.downloadInfoChanged|downloadInfoChanged} signal with information on the current 
+     * download progress of the assets in the domain.
      * @function AccountServices.updateDownloadInfo
      */
     void updateDownloadInfo();
 
     /**jsdoc
-     * Check whether the user is logged in.
+     * Checks whether the user is logged in.
      * @function AccountServices.isLoggedIn
-     * @returns {boolean} <code>true</code> if the user is logged in, <code>false</code> otherwise.
+     * @returns {boolean} <code>true</code> if the user is logged in, <code>false</code> if not.
      * @example <caption>Report whether you are logged in.</caption>
      * var isLoggedIn = AccountServices.isLoggedIn();
      * print("You are logged in: " + isLoggedIn);  // true or false
@@ -98,9 +98,9 @@ public slots:
     bool isLoggedIn();
 
     /**jsdoc
-     * Prompts the user to log in (the login dialog is displayed) if they're not already logged in.
+     * The function returns the login status of the user and prompts the user to log in (with a login dialog) if they're not already logged in.
      * @function AccountServices.checkAndSignalForAccessToken
-     * @returns {boolean} <code>true</code> if the user is already logged in, <code>false</code> otherwise.
+     * @returns {boolean} <code>true</code> if the user is logged in, <code>false</code> if not.
      */
     bool checkAndSignalForAccessToken();
 
@@ -140,7 +140,7 @@ signals:
     /**jsdoc
      * Triggered when the username logged in with changes, i.e., when the user logs in or out.
      * @function AccountServices.myUsernameChanged
-     * @param {string} username - The username logged in with if the user is logged in, otherwise <code>""</code>.
+     * @param {string} username - The user name of the user logged in. If there is no user logged in, it is <code>""</code>.
      * @returns {Signal}
      * @example <caption>Report when your username changes.</caption>
      * AccountServices.myUsernameChanged.connect(function (username) {
@@ -150,9 +150,9 @@ signals:
     void myUsernameChanged(const QString& username);
 
     /**jsdoc
-     * Triggered when the progress of the download of assets for the domain changes.
+     * Triggered when the download progress of the assets in the domain changes.
      * @function AccountServices.downloadInfoChanged
-     * @param {AccountServices.DownloadInfoResult} downloadInfo - Information on the progress of assets download.
+     * @param {AccountServices.DownloadInfoResult} downloadInfo - Information on the download progress of assets.
      * @returns {Signal}
      */
     void downloadInfoChanged(DownloadInfoResult info);
@@ -186,7 +186,7 @@ signals:
     /**jsdoc
      * Triggered when the login status of the user changes.
      * @function AccountServices.loggedInChanged
-     * @param {boolean} loggedIn - <code>true</code> if the user is logged in, otherwise <code>false</code>.
+     * @param {boolean} loggedIn - <code>true</code> if the user is logged in, <code>false</code> if not.
      * @returns {Signal}
      * @example <caption>Report when your login status changes.</caption>
      * AccountServices.loggedInChanged.connect(function(loggedIn) {

interface/src/scripting/PlatformInfoScriptingInterface.cpp

@@ -7,7 +7,7 @@
 //
 #include "PlatformInfoScriptingInterface.h"
 #include "Application.h"
-
+#include <shared/GlobalAppProperties.h>
 #include <thread>
 
 #ifdef Q_OS_WIN
@@ -138,6 +138,14 @@ bool PlatformInfoScriptingInterface::has3DHTML() {
 #if defined(Q_OS_ANDROID)
     return false;
 #else
-    return true;
+    return !qApp->property(hifi::properties::STANDALONE).toBool();
+#endif
+}
+
+bool PlatformInfoScriptingInterface::isStandalone() {
+#if defined(Q_OS_ANDROID)
+    return false;
+#else
+    return qApp->property(hifi::properties::STANDALONE).toBool();
 #endif
 }

interface/src/scripting/PlatformInfoScriptingInterface.h

@@ -68,9 +68,15 @@ public slots:
 
     /**jsdoc
     * Returns true if device supports 3d HTML
-    * @function Window.hasRift
+    * @function Window.has3DHTML
     * @returns {boolean} <code>true</code> if device supports 3d HTML, otherwise <code>false</code>.*/
     bool has3DHTML();
+
+    /**jsdoc
+    * Returns true if device is standalone
+    * @function Window.hasRift
+    * @returns {boolean} <code>true</code> if device is a standalone device, otherwise <code>false</code>.*/
+    bool isStandalone();
 };
 
 #endif  // hifi_PlatformInfoScriptingInterface_h

interface/src/scripting/WalletScriptingInterface.h

@@ -41,8 +41,8 @@ public:
  *
  * @property {WalletScriptingInterface.WalletStatus} walletStatus - The status of the user's wallet. <em>Read-only.</em>
  * @property {boolean} limitedCommerce - <code>true</code> if Interface is running in limited commerce mode. In limited commerce 
- *     mode, certain Interface functionality is disabled, e.g., users can't buy non-free items from the Marketplace. The Oculus 
- *     Store version of Interface runs in limited commerce mode. <em>Read-only.</em>
+ *     mode, certain Interface functionalities are disabled, e.g., users can't buy items that are not free from the Marketplace. 
+ *     The Oculus Store version of Interface runs in limited commerce mode. <em>Read-only.</em>
  */
 class WalletScriptingInterface : public QObject, public Dependency {
     Q_OBJECT
@@ -55,16 +55,16 @@ public:
     WalletScriptingInterface();
 
     /**jsdoc
-     * Check and update the user's wallet status.
+     * Checks and updates the user's wallet status.
      * @function WalletScriptingInterface.refreshWalletStatus
      */
     Q_INVOKABLE void refreshWalletStatus();
 
     /**jsdoc
-     * Get the current status of the user's wallet.
+     * Gets the current status of the user's wallet.
      * @function WalletScriptingInterface.getWalletStatus
      * @returns {WalletScriptingInterface.WalletStatus}
-     * @example <caption>Two ways to report your wallet status.</caption>
+     * @example <caption>Use two methods to report your wallet's status.</caption>
      * print("Wallet status: " + WalletScriptingInterface.walletStatus);  // Same value as next line.
      * print("Wallet status: " + WalletScriptingInterface.getWalletStatus());
      */
@@ -74,11 +74,11 @@ public:
      * Check that a certified avatar entity is owned by the avatar whose entity it is. The result of the check is provided via 
      * the {@link WalletScriptingInterface.ownershipVerificationSuccess|ownershipVerificationSuccess} and 
      * {@link WalletScriptingInterface.ownershipVerificationFailed|ownershipVerificationFailed} signals.<br />
-     * <strong>Warning:</strong> Neither of these signals fire if the entity is not an avatar entity or it's not a certified 
-     * entity.
+     * <strong>Warning:</strong> Neither of these signals are triggered if the entity is not an avatar entity or is not 
+     * certified.
      * @function WalletScriptingInterface.proveAvatarEntityOwnershipVerification
-     * @param {Uuid} entityID - The ID of the avatar entity to check.
-     * @example <caption>Check ownership of all nearby certified avatar entities.</caption>
+     * @param {Uuid} entityID - The avatar entity's ID.
+     * @example <caption>Check the ownership of all nearby certified avatar entities.</caption>
      * // Set up response handling.
      * function ownershipSuccess(entityID) {
      *     print("Ownership test succeeded for: " + entityID);
@@ -118,7 +118,7 @@ public:
 signals:
 
     /**jsdoc
-     * Triggered when the status of the user's wallet changes.
+     * Triggered when the user's wallet status changes.
      * @function WalletScriptingInterface.walletStatusChanged
      * @returns {Signal}
      * @example <caption>Report when your wallet status changes, e.g., when you log in and out.</caption>
@@ -136,7 +136,7 @@ signals:
     void limitedCommerceChanged();
 
     /**jsdoc
-     * Triggered when the user rezzes a certified entity but the user's wallet is not ready and so the certified location of the 
+     * Triggered when the user rezzes a certified entity but the user's wallet is not ready. So the certified location of the
      * entity cannot be updated in the metaverse.
      * @function WalletScriptingInterface.walletNotSetup
      * @returns {Signal}

interface/src/ui/Keyboard.cpp

@@ -65,7 +65,7 @@ static const glm::vec3 KEYBOARD_TABLET_OFFSET{0.30f, -0.38f, -0.04f};
 static const glm::vec3 KEYBOARD_TABLET_DEGREES_OFFSET{-45.0f, 0.0f, 0.0f};
 static const glm::vec3 KEYBOARD_TABLET_LANDSCAPE_OFFSET{-0.2f, -0.27f, -0.05f};
 static const glm::vec3 KEYBOARD_TABLET_LANDSCAPE_DEGREES_OFFSET{-45.0f, 0.0f, -90.0f};
-static const glm::vec3 KEYBOARD_AVATAR_OFFSET{-0.6f, 0.3f, -0.7f};
+static const glm::vec3 KEYBOARD_AVATAR_OFFSET{-0.3f, 0.0f, -0.7f};
 static const glm::vec3 KEYBOARD_AVATAR_DEGREES_OFFSET{0.0f, 180.0f, 0.0f};
 
 static const QString SOUND_FILE = PathUtils::resourcesUrl() + "sounds/keyboardPress.mp3";
@@ -373,6 +373,12 @@ void Keyboard::raiseKeyboardAnchor(bool raise) const {
 void Keyboard::scaleKeyboard(float sensorToWorldScale) {
     auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
 
+    {
+        EntityItemProperties properties;
+        properties.setDimensions(_anchor.originalDimensions * sensorToWorldScale);
+        entityScriptingInterface->editEntity(_anchor.entityID, properties);
+    }
+
     {
         EntityItemProperties properties;
         properties.setLocalPosition(_backPlate.localPosition * sensorToWorldScale);

interface/src/ui/PreferencesDialog.cpp

@@ -15,6 +15,7 @@
 #include <OffscreenUi.h>
 #include <Preferences.h>
 #include <RenderShadowTask.h>
+#include <plugins/PluginUtils.h>
 #include <display-plugins/CompositorHelper.h>
 
 #include "Application.h"

interface/src/ui/Stats.cpp

@@ -125,8 +125,10 @@ void Stats::updateStats(bool force) {
     auto avatarManager = DependencyManager::get<AvatarManager>();
     // we need to take one avatar out so we don't include ourselves
     STAT_UPDATE(avatarCount, avatarManager->size() - 1);
+    STAT_UPDATE(heroAvatarCount, avatarManager->getNumHeroAvatars());
     STAT_UPDATE(physicsObjectCount, qApp->getNumCollisionObjects());
     STAT_UPDATE(updatedAvatarCount, avatarManager->getNumAvatarsUpdated());
+    STAT_UPDATE(updatedHeroAvatarCount, avatarManager->getNumHeroAvatarsUpdated());
     STAT_UPDATE(notUpdatedAvatarCount, avatarManager->getNumAvatarsNotUpdated());
     STAT_UPDATE(serverCount, (int)nodeList->size());
     STAT_UPDATE_FLOAT(renderrate, qApp->getRenderLoopRate(), 0.1f);

interface/src/ui/Stats.h

@@ -49,8 +49,10 @@ private: \
  * @property {number} presentdroprate - <em>Read-only.</em>
  * @property {number} gameLoopRate - <em>Read-only.</em>
  * @property {number} avatarCount - <em>Read-only.</em>
+ * @property {number} heroAvatarCount - <em>Read-only.</em>
  * @property {number} physicsObjectCount - <em>Read-only.</em>
  * @property {number} updatedAvatarCount - <em>Read-only.</em>
+ * @property {number} updatedHeroAvatarCount - <em>Read-only.</em>
  * @property {number} notUpdatedAvatarCount - <em>Read-only.</em>
  * @property {number} packetInCount - <em>Read-only.</em>
  * @property {number} packetOutCount - <em>Read-only.</em>
@@ -203,8 +205,10 @@ class Stats : public QQuickItem {
     STATS_PROPERTY(float, presentdroprate, 0)
     STATS_PROPERTY(int, gameLoopRate, 0)
     STATS_PROPERTY(int, avatarCount, 0)
+    STATS_PROPERTY(int, heroAvatarCount, 0)
     STATS_PROPERTY(int, physicsObjectCount, 0)
     STATS_PROPERTY(int, updatedAvatarCount, 0)
+    STATS_PROPERTY(int, updatedHeroAvatarCount, 0)
     STATS_PROPERTY(int, notUpdatedAvatarCount, 0)
     STATS_PROPERTY(int, packetInCount, 0)
     STATS_PROPERTY(int, packetOutCount, 0)
@@ -436,6 +440,13 @@ signals:
      */
     void avatarCountChanged();
 
+    /**jsdoc
+     * Triggered when the value of the <code>heroAvatarCount</code> property changes.
+     * @function Stats.heroAvatarCountChanged
+     * @returns {Signal}
+     */
+    void heroAvatarCountChanged();
+
     /**jsdoc
      * Triggered when the value of the <code>updatedAvatarCount</code> property changes.
      * @function Stats.updatedAvatarCountChanged
@@ -443,6 +454,13 @@ signals:
      */
     void updatedAvatarCountChanged();
 
+    /**jsdoc
+     * Triggered when the value of the <code>updatedHeroAvatarCount</code> property changes.
+     * @function Stats.updatedHeroAvatarCountChanged
+     * @returns {Signal}
+     */
+    void updatedHeroAvatarCountChanged();
+
     /**jsdoc
      * Triggered when the value of the <code>notUpdatedAvatarCount</code> property changes.
      * @function Stats.notUpdatedAvatarCountChanged

interface/src/ui/overlays/Overlays.cpp

@@ -43,14 +43,6 @@ std::unordered_map<QString, QString> Overlays::_entityToOverlayTypes;
 std::unordered_map<QString, QString> Overlays::_overlayToEntityTypes;
 
 Overlays::Overlays() {
-    auto pointerManager = DependencyManager::get<PointerManager>();
-    connect(pointerManager.data(), &PointerManager::hoverBeginOverlay, this, &Overlays::hoverEnterPointerEvent);
-    connect(pointerManager.data(), &PointerManager::hoverContinueOverlay, this, &Overlays::hoverOverPointerEvent);
-    connect(pointerManager.data(), &PointerManager::hoverEndOverlay, this, &Overlays::hoverLeavePointerEvent);
-    connect(pointerManager.data(), &PointerManager::triggerBeginOverlay, this, &Overlays::mousePressPointerEvent);
-    connect(pointerManager.data(), &PointerManager::triggerContinueOverlay, this, &Overlays::mouseMovePointerEvent);
-    connect(pointerManager.data(), &PointerManager::triggerEndOverlay, this, &Overlays::mouseReleasePointerEvent);
-
     ADD_TYPE_MAP(Box, cube);
     ADD_TYPE_MAP(Sphere, sphere);
     _overlayToEntityTypes["rectangle3d"] = "Shape";
@@ -81,13 +73,23 @@ void Overlays::cleanupAllOverlays() {
 
 void Overlays::init() {
     auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>().data();
-    auto pointerManager = DependencyManager::get<PointerManager>();
-    connect(pointerManager.data(), &PointerManager::hoverBeginOverlay, entityScriptingInterface , &EntityScriptingInterface::hoverEnterEntity);
-    connect(pointerManager.data(), &PointerManager::hoverContinueOverlay, entityScriptingInterface, &EntityScriptingInterface::hoverOverEntity);
-    connect(pointerManager.data(), &PointerManager::hoverEndOverlay, entityScriptingInterface, &EntityScriptingInterface::hoverLeaveEntity);
-    connect(pointerManager.data(), &PointerManager::triggerBeginOverlay, entityScriptingInterface, &EntityScriptingInterface::mousePressOnEntity);
-    connect(pointerManager.data(), &PointerManager::triggerContinueOverlay, entityScriptingInterface, &EntityScriptingInterface::mouseMoveOnEntity);
-    connect(pointerManager.data(), &PointerManager::triggerEndOverlay, entityScriptingInterface, &EntityScriptingInterface::mouseReleaseOnEntity);
+    auto pointerManager = DependencyManager::get<PointerManager>().data();
+    connect(pointerManager, &PointerManager::hoverBeginOverlay, entityScriptingInterface , &EntityScriptingInterface::hoverEnterEntity);
+    connect(pointerManager, &PointerManager::hoverContinueOverlay, entityScriptingInterface, &EntityScriptingInterface::hoverOverEntity);
+    connect(pointerManager, &PointerManager::hoverEndOverlay, entityScriptingInterface, &EntityScriptingInterface::hoverLeaveEntity);
+    connect(pointerManager, &PointerManager::triggerBeginOverlay, entityScriptingInterface, &EntityScriptingInterface::mousePressOnEntity);
+    connect(pointerManager, &PointerManager::triggerContinueOverlay, entityScriptingInterface, &EntityScriptingInterface::mouseMoveOnEntity);
+    connect(pointerManager, &PointerManager::triggerEndOverlay, entityScriptingInterface, &EntityScriptingInterface::mouseReleaseOnEntity);
+
+    connect(entityScriptingInterface, &EntityScriptingInterface::mousePressOnEntity, this, &Overlays::mousePressOnPointerEvent);
+    connect(entityScriptingInterface, &EntityScriptingInterface::mousePressOffEntity, this, &Overlays::mousePressOffPointerEvent);
+    connect(entityScriptingInterface, &EntityScriptingInterface::mouseDoublePressOnEntity, this, &Overlays::mouseDoublePressOnPointerEvent);
+    connect(entityScriptingInterface, &EntityScriptingInterface::mouseDoublePressOffEntity, this, &Overlays::mouseDoublePressOffPointerEvent);
+    connect(entityScriptingInterface, &EntityScriptingInterface::mouseReleaseOnEntity, this, &Overlays::mouseReleasePointerEvent);
+    connect(entityScriptingInterface, &EntityScriptingInterface::mouseMoveOnEntity, this, &Overlays::mouseMovePointerEvent);
+    connect(entityScriptingInterface, &EntityScriptingInterface::hoverEnterEntity , this, &Overlays::hoverEnterPointerEvent);
+    connect(entityScriptingInterface, &EntityScriptingInterface::hoverOverEntity, this, &Overlays::hoverOverPointerEvent);
+    connect(entityScriptingInterface, &EntityScriptingInterface::hoverLeaveEntity, this, &Overlays::hoverLeavePointerEvent);
 }
 
 void Overlays::update(float deltatime) {
@@ -202,7 +204,8 @@ QString Overlays::overlayToEntityType(const QString& type) {
 #define RENAME_PROP(o, e)                                   \
     {                                                       \
         auto iter = overlayProps.find(#o);                  \
-        if (iter != overlayProps.end()) {                   \
+        if (iter != overlayProps.end() &&                   \
+                !overlayProps.contains(#e)) {               \
             overlayProps[#e] = iter.value();                \
         }                                                   \
     }
@@ -491,15 +494,34 @@ EntityItemProperties Overlays::convertOverlayToEntityProperties(QVariantMap& ove
         RENAME_PROP_CONVERT(p1, p1, [](const QVariant& v) { return vec3toVariant(glm::vec3(0.0f)); });
         RENAME_PROP_CONVERT(p2, p2, [=](const QVariant& v) {
             glm::vec3 position;
+            bool hasPosition = false;
+            glm::quat rotation;
+            bool hasRotation = false;
+
             auto iter2 = overlayProps.find("position");
             if (iter2 != overlayProps.end()) {
                 position = vec3FromVariant(iter2.value());
-            } else if (!add) {
-                EntityPropertyFlags desiredProperties;
-                desiredProperties += PROP_POSITION;
-                position = DependencyManager::get<EntityScriptingInterface>()->getEntityProperties(id, desiredProperties).getPosition();
+                hasPosition = true;
             }
-            return vec3toVariant(vec3FromVariant(v) - position);
+            iter2 = overlayProps.find("rotation");
+            if (iter2 != overlayProps.end()) {
+                rotation = quatFromVariant(iter2.value());
+                hasRotation = true;
+            }
+
+            if (!add && !(hasPosition && hasRotation)) {
+                auto entity = DependencyManager::get<EntityTreeRenderer>()->getEntity(id);
+                if (entity) {
+                    if (!hasPosition) {
+                        position = entity->getWorldPosition();
+                    }
+                    if (!hasRotation) {
+                        rotation = entity->getWorldOrientation();
+                    }
+                }
+            }
+
+            return vec3toVariant(glm::inverse(rotation) * (vec3FromVariant(v) - position));
         });
 
         RENAME_PROP(localStart, p1);
@@ -1159,7 +1181,7 @@ bool Overlays::isAddedOverlay(const QUuid& id) {
 }
 
 void Overlays::sendMousePressOnOverlay(const QUuid& id, const PointerEvent& event) {
-    mousePressPointerEvent(id, event);
+    mousePressOnPointerEvent(id, event);
 }
 
 void Overlays::sendMouseReleaseOnOverlay(const QUuid& id, const PointerEvent& event) {
@@ -1206,57 +1228,66 @@ float Overlays::height() {
     return offscreenUi->getWindow()->size().height();
 }
 
-static uint32_t toPointerButtons(const QMouseEvent& event) {
-    uint32_t buttons = 0;
-    buttons |= event.buttons().testFlag(Qt::LeftButton) ? PointerEvent::PrimaryButton : 0;
-    buttons |= event.buttons().testFlag(Qt::RightButton) ? PointerEvent::SecondaryButton : 0;
-    buttons |= event.buttons().testFlag(Qt::MiddleButton) ? PointerEvent::TertiaryButton : 0;
-    return buttons;
-}
-
-static PointerEvent::Button toPointerButton(const QMouseEvent& event) {
-    switch (event.button()) {
-        case Qt::LeftButton:
-            return PointerEvent::PrimaryButton;
-        case Qt::RightButton:
-            return PointerEvent::SecondaryButton;
-        case Qt::MiddleButton:
-            return PointerEvent::TertiaryButton;
-        default:
-            return PointerEvent::NoButtons;
-    }
-}
-
-RayToOverlayIntersectionResult getPrevPickResult() {
-    RayToOverlayIntersectionResult overlayResult;
-    overlayResult.intersects = false;
-    auto pickResult = DependencyManager::get<PickManager>()->getPrevPickResultTyped<RayPickResult>(DependencyManager::get<EntityTreeRenderer>()->getMouseRayPickID());
-    if (pickResult) {
-        overlayResult.intersects = pickResult->type == IntersectionType::LOCAL_ENTITY;
-        if (overlayResult.intersects) {
-            overlayResult.intersection = pickResult->intersection;
-            overlayResult.distance = pickResult->distance;
-            overlayResult.surfaceNormal = pickResult->surfaceNormal;
-            overlayResult.overlayID = pickResult->objectID;
-            overlayResult.extraInfo = pickResult->extraInfo;
+void Overlays::mousePressOnPointerEvent(const QUuid& id, const PointerEvent& event) {
+    auto keyboard = DependencyManager::get<Keyboard>();
+    // Do not send keyboard key event to scripts to prevent malignant scripts from gathering what you typed
+    if (!keyboard->getKeyIDs().contains(id)) {
+        auto entity = DependencyManager::get<EntityTreeRenderer>()->getEntity(id);
+        if (entity && entity->isLocalEntity()) {
+            emit mousePressOnOverlay(id, event);
         }
     }
-    return overlayResult;
 }
 
-PointerEvent Overlays::calculateOverlayPointerEvent(const QUuid& id, const PickRay& ray,
-                                                    const RayToOverlayIntersectionResult& rayPickResult, QMouseEvent* event,
-                                                    PointerEvent::EventType eventType) {
-    glm::vec2 pos2D = RayPick::projectOntoEntityXYPlane(id, rayPickResult.intersection);
-    return PointerEvent(eventType, PointerManager::MOUSE_POINTER_ID, pos2D, rayPickResult.intersection, rayPickResult.surfaceNormal,
-                        ray.direction, toPointerButton(*event), toPointerButtons(*event), event->modifiers());
+void Overlays::mousePressOffPointerEvent() {
+    emit mousePressOffOverlay();
+}
+
+void Overlays::mouseDoublePressOnPointerEvent(const QUuid& id, const PointerEvent& event) {
+    auto keyboard = DependencyManager::get<Keyboard>();
+    // Do not send keyboard key event to scripts to prevent malignant scripts from gathering what you typed
+    if (!keyboard->getKeyIDs().contains(id)) {
+        auto entity = DependencyManager::get<EntityTreeRenderer>()->getEntity(id);
+        if (entity && entity->isLocalEntity()) {
+            emit mouseDoublePressOnOverlay(id, event);
+        }
+    }
+}
+
+void Overlays::mouseDoublePressOffPointerEvent() {
+    emit mouseDoublePressOffOverlay();
+}
+
+void Overlays::mouseReleasePointerEvent(const QUuid& id, const PointerEvent& event) {
+    auto keyboard = DependencyManager::get<Keyboard>();
+    // Do not send keyboard key event to scripts to prevent malignant scripts from gathering what you typed
+    if (!keyboard->getKeyIDs().contains(id)) {
+        auto entity = DependencyManager::get<EntityTreeRenderer>()->getEntity(id);
+        if (entity && entity->isLocalEntity()) {
+            emit mouseReleaseOnOverlay(id, event);
+        }
+    }
+}
+
+void Overlays::mouseMovePointerEvent(const QUuid& id, const PointerEvent& event) {
+    auto keyboard = DependencyManager::get<Keyboard>();
+    // Do not send keyboard key event to scripts to prevent malignant scripts from gathering what you typed
+    if (!keyboard->getKeyIDs().contains(id)) {
+        auto entity = DependencyManager::get<EntityTreeRenderer>()->getEntity(id);
+        if (entity && entity->isLocalEntity()) {
+            emit mouseMoveOnOverlay(id, event);
+        }
+    }
 }
 
 void Overlays::hoverEnterPointerEvent(const QUuid& id, const PointerEvent& event) {
     auto keyboard = DependencyManager::get<Keyboard>();
     // Do not send keyboard key event to scripts to prevent malignant scripts from gathering what you typed
     if (!keyboard->getKeyIDs().contains(id)) {
-        emit hoverEnterOverlay(id, event);
+        auto entity = DependencyManager::get<EntityTreeRenderer>()->getEntity(id);
+        if (entity && entity->isLocalEntity()) {
+            emit hoverEnterOverlay(id, event);
+        }
     }
 }
 
@@ -1264,7 +1295,10 @@ void Overlays::hoverOverPointerEvent(const QUuid& id, const PointerEvent& event)
     auto keyboard = DependencyManager::get<Keyboard>();
     // Do not send keyboard key event to scripts to prevent malignant scripts from gathering what you typed
     if (!keyboard->getKeyIDs().contains(id)) {
-        emit hoverOverOverlay(id, event);
+        auto entity = DependencyManager::get<EntityTreeRenderer>()->getEntity(id);
+        if (entity && entity->isLocalEntity()) {
+            emit hoverOverOverlay(id, event);
+        }
     }
 }
 
@@ -1272,113 +1306,10 @@ void Overlays::hoverLeavePointerEvent(const QUuid& id, const PointerEvent& event
     auto keyboard = DependencyManager::get<Keyboard>();
     // Do not send keyboard key event to scripts to prevent malignant scripts from gathering what you typed
     if (!keyboard->getKeyIDs().contains(id)) {
-        emit hoverLeaveOverlay(id, event);
-    }
-}
-
-std::pair<float, QUuid> Overlays::mousePressEvent(QMouseEvent* event) {
-    PerformanceTimer perfTimer("Overlays::mousePressEvent");
-
-    PickRay ray = qApp->computePickRay(event->x(), event->y());
-    RayToOverlayIntersectionResult rayPickResult = getPrevPickResult();
-    if (rayPickResult.intersects) {
-        _currentClickingOnOverlayID = rayPickResult.overlayID;
-
-        PointerEvent pointerEvent = calculateOverlayPointerEvent(_currentClickingOnOverlayID, ray, rayPickResult, event, PointerEvent::Press);
-        mousePressPointerEvent(_currentClickingOnOverlayID, pointerEvent);
-        return { rayPickResult.distance, rayPickResult.overlayID };
-    }
-    emit mousePressOffOverlay();
-    return { FLT_MAX, UNKNOWN_ENTITY_ID };
-}
-
-void Overlays::mousePressPointerEvent(const QUuid& id, const PointerEvent& event) {
-    auto keyboard = DependencyManager::get<Keyboard>();
-    // Do not send keyboard key event to scripts to prevent malignant scripts from gathering what you typed
-    if (!keyboard->getKeyIDs().contains(id)) {
-        emit mousePressOnOverlay(id, event);
-    }
-}
-
-bool Overlays::mouseDoublePressEvent(QMouseEvent* event) {
-    PerformanceTimer perfTimer("Overlays::mouseDoublePressEvent");
-
-    PickRay ray = qApp->computePickRay(event->x(), event->y());
-    RayToOverlayIntersectionResult rayPickResult = getPrevPickResult();
-    if (rayPickResult.intersects) {
-        _currentClickingOnOverlayID = rayPickResult.overlayID;
-
-        auto pointerEvent = calculateOverlayPointerEvent(_currentClickingOnOverlayID, ray, rayPickResult, event, PointerEvent::Press);
-        emit mouseDoublePressOnOverlay(_currentClickingOnOverlayID, pointerEvent);
-        return true;
-    }
-    emit mouseDoublePressOffOverlay();
-    return false;
-}
-
-bool Overlays::mouseReleaseEvent(QMouseEvent* event) {
-    PerformanceTimer perfTimer("Overlays::mouseReleaseEvent");
-
-    PickRay ray = qApp->computePickRay(event->x(), event->y());
-    RayToOverlayIntersectionResult rayPickResult = getPrevPickResult();
-    if (rayPickResult.intersects) {
-        auto pointerEvent = calculateOverlayPointerEvent(rayPickResult.overlayID, ray, rayPickResult, event, PointerEvent::Release);
-        mouseReleasePointerEvent(rayPickResult.overlayID, pointerEvent);
-    }
-
-    _currentClickingOnOverlayID = UNKNOWN_ENTITY_ID;
-    return false;
-}
-
-void Overlays::mouseReleasePointerEvent(const QUuid& id, const PointerEvent& event) {
-    auto keyboard = DependencyManager::get<Keyboard>();
-    // Do not send keyboard key event to scripts to prevent malignant scripts from gathering what you typed
-    if (!keyboard->getKeyIDs().contains(id)) {
-        emit mouseReleaseOnOverlay(id, event);
-    }
-}
-
-bool Overlays::mouseMoveEvent(QMouseEvent* event) {
-    PerformanceTimer perfTimer("Overlays::mouseMoveEvent");
-
-    PickRay ray = qApp->computePickRay(event->x(), event->y());
-    RayToOverlayIntersectionResult rayPickResult = getPrevPickResult();
-    if (rayPickResult.intersects) {
-        auto pointerEvent = calculateOverlayPointerEvent(rayPickResult.overlayID, ray, rayPickResult, event, PointerEvent::Move);
-        mouseMovePointerEvent(rayPickResult.overlayID, pointerEvent);
-
-        // If previously hovering over a different overlay then leave hover on that overlay.
-        if (_currentHoverOverOverlayID != UNKNOWN_ENTITY_ID && rayPickResult.overlayID != _currentHoverOverOverlayID) {
-            auto pointerEvent = calculateOverlayPointerEvent(_currentHoverOverOverlayID, ray, rayPickResult, event, PointerEvent::Move);
-            hoverLeavePointerEvent(_currentHoverOverOverlayID, pointerEvent);
+        auto entity = DependencyManager::get<EntityTreeRenderer>()->getEntity(id);
+        if (entity && entity->isLocalEntity()) {
+            emit hoverLeaveOverlay(id, event);
         }
-
-        // If hovering over a new overlay then enter hover on that overlay.
-        if (rayPickResult.overlayID != _currentHoverOverOverlayID) {
-            hoverEnterPointerEvent(rayPickResult.overlayID, pointerEvent);
-        }
-
-        // Hover over current overlay.
-        hoverOverPointerEvent(rayPickResult.overlayID, pointerEvent);
-
-        _currentHoverOverOverlayID = rayPickResult.overlayID;
-    } else {
-        // If previously hovering an overlay then leave hover.
-        if (_currentHoverOverOverlayID != UNKNOWN_ENTITY_ID) {
-            auto pointerEvent = calculateOverlayPointerEvent(_currentHoverOverOverlayID, ray, rayPickResult, event, PointerEvent::Move);
-            hoverLeavePointerEvent(_currentHoverOverOverlayID, pointerEvent);
-
-            _currentHoverOverOverlayID = UNKNOWN_ENTITY_ID;
-        }
-    }
-    return false;
-}
-
-void Overlays::mouseMovePointerEvent(const QUuid& id, const PointerEvent& event) {
-    auto keyboard = DependencyManager::get<Keyboard>();
-    // Do not send keyboard key event to scripts to prevent malignant scripts from gathering what you typed
-    if (!keyboard->getKeyIDs().contains(id)) {
-        emit mouseMoveOnOverlay(id, event);
     }
 }
 

interface/src/ui/overlays/Overlays.h

@@ -112,11 +112,6 @@ public:
         const QVector<EntityItemID>& discard,
         bool visibleOnly = false, bool collidableOnly = false);
 
-    std::pair<float, QUuid> mousePressEvent(QMouseEvent* event);
-    bool mouseDoublePressEvent(QMouseEvent* event);
-    bool mouseReleaseEvent(QMouseEvent* event);
-    bool mouseMoveEvent(QMouseEvent* event);
-
     void cleanupAllOverlays();
 
     mutable QScriptEngine _scriptEngine;
@@ -719,9 +714,6 @@ private:
     PointerEvent calculateOverlayPointerEvent(const QUuid& id, const PickRay& ray, const RayToOverlayIntersectionResult& rayPickResult,
         QMouseEvent* event, PointerEvent::EventType eventType);
 
-    QUuid _currentClickingOnOverlayID;
-    QUuid _currentHoverOverOverlayID;
-
     static QString entityToOverlayType(const QString& type);
     static QString overlayToEntityType(const QString& type);
     static std::unordered_map<QString, QString> _entityToOverlayTypes;
@@ -732,12 +724,17 @@ private:
     EntityItemProperties convertOverlayToEntityProperties(QVariantMap& overlayProps, std::pair<glm::quat, bool>& rotationToSave, const QString& type, bool add, const QUuid& id = QUuid());
 
 private slots:
-    void mousePressPointerEvent(const QUuid& id, const PointerEvent& event);
-    void mouseMovePointerEvent(const QUuid& id, const PointerEvent& event);
+    void mousePressOnPointerEvent(const QUuid& id, const PointerEvent& event);
+    void mousePressOffPointerEvent();
+    void mouseDoublePressOnPointerEvent(const QUuid& id, const PointerEvent& event);
+    void mouseDoublePressOffPointerEvent();
     void mouseReleasePointerEvent(const QUuid& id, const PointerEvent& event);
+    void mouseMovePointerEvent(const QUuid& id, const PointerEvent& event);
     void hoverEnterPointerEvent(const QUuid& id, const PointerEvent& event);
     void hoverOverPointerEvent(const QUuid& id, const PointerEvent& event);
     void hoverLeavePointerEvent(const QUuid& id, const PointerEvent& event);
+
+
 };
 
 #define ADD_TYPE_MAP(entity, overlay) \

libraries/animation/src/AnimPose.cpp

@@ -11,7 +11,6 @@
 #include "AnimPose.h"
 #include <GLMHelpers.h>
 #include <algorithm>
-#include <glm/gtc/matrix_transform.hpp>
 #include "AnimUtil.h"
 
 const AnimPose AnimPose::identity = AnimPose(glm::vec3(1.0f),
@@ -19,16 +18,29 @@ const AnimPose AnimPose::identity = AnimPose(glm::vec3(1.0f),
                                              glm::vec3(0.0f));
 
 AnimPose::AnimPose(const glm::mat4& mat) {
-    static const float EPSILON = 0.0001f;
-    _scale = extractScale(mat);
-    // quat_cast doesn't work so well with scaled matrices, so cancel it out.
-    glm::mat4 tmp = glm::scale(mat, 1.0f / _scale);
+    glm::mat3 m(mat);
+    _scale = glm::vec3(glm::length(m[0]), glm::length(m[1]), glm::length(m[2]));
+    float det = glm::determinant(m);
+
+    glm::mat3 tmp;
+    if (det < 0.0f) {
+        _scale *= -1.0f;
+    }
+
+    // quat_cast doesn't work so well with scaled matrices, so cancel out scale.
+    // also, as a side effect, multiply mirrored matrices by -1 to get the right rotation out.
+    tmp[0] = m[0] * (1.0f / _scale[0]);
+    tmp[1] = m[1] * (1.0f / _scale[1]);
+    tmp[2] = m[2] * (1.0f / _scale[2]);
     _rot = glm::quat_cast(tmp);
+
+    // normalize quat if necessary
     float lengthSquared = glm::length2(_rot);
     if (glm::abs(lengthSquared - 1.0f) > EPSILON) {
         float oneOverLength = 1.0f / sqrtf(lengthSquared);
         _rot = glm::quat(_rot.w * oneOverLength, _rot.x * oneOverLength, _rot.y * oneOverLength, _rot.z * oneOverLength);
     }
+
     _trans = extractTranslation(mat);
 }
 

libraries/animation/src/AnimTwoBoneIK.cpp

@@ -156,7 +156,7 @@ const AnimPoseVec& AnimTwoBoneIK::evaluate(const AnimVariantMap& animVars, const
     glm::quat relMidRot = glm::angleAxis(midAngle, _midHingeAxis);
 
     // insert new relative pose into the chain and rebuild it.
-    ikChain.setRelativePoseAtJointIndex(_midJointIndex, AnimPose(relMidRot, underPoses[_midJointIndex].trans()));
+    ikChain.setRelativePoseAtJointIndex(_midJointIndex, AnimPose(underPoses[_midJointIndex].scale(), relMidRot, underPoses[_midJointIndex].trans()));
     ikChain.buildDirtyAbsolutePoses();
 
     // recompute tip pose after mid joint has been rotated
@@ -180,7 +180,7 @@ const AnimPoseVec& AnimTwoBoneIK::evaluate(const AnimVariantMap& animVars, const
 
         // transform result back into parent relative frame.
         glm::quat relBaseRot = glm::inverse(baseParentPose.rot()) * absRot;
-        ikChain.setRelativePoseAtJointIndex(_baseJointIndex, AnimPose(relBaseRot, underPoses[_baseJointIndex].trans()));
+        ikChain.setRelativePoseAtJointIndex(_baseJointIndex, AnimPose(underPoses[_baseJointIndex].scale(), relBaseRot, underPoses[_baseJointIndex].trans()));
     }
 
     // recompute midJoint pose after base has been rotated.
@@ -189,7 +189,7 @@ const AnimPoseVec& AnimTwoBoneIK::evaluate(const AnimVariantMap& animVars, const
 
     // transform target rotation in to parent relative frame.
     glm::quat relTipRot = glm::inverse(midJointPose.rot()) * targetPose.rot();
-    ikChain.setRelativePoseAtJointIndex(_tipJointIndex, AnimPose(relTipRot, underPoses[_tipJointIndex].trans()));
+    ikChain.setRelativePoseAtJointIndex(_tipJointIndex, AnimPose(underPoses[_tipJointIndex].scale(), relTipRot, underPoses[_tipJointIndex].trans()));
 
     // blend with the underChain
     ikChain.blend(underChain, alpha);

libraries/animation/src/Flow.cpp

@@ -463,6 +463,7 @@ void Flow::calculateConstraints(const std::shared_ptr<AnimSkeleton>& skeleton,
     auto flowPrefix = FLOW_JOINT_PREFIX.toUpper();
     auto simPrefix = SIM_JOINT_PREFIX.toUpper();
     std::vector<int> handsIndices;
+    _groupSettings.clear();
 
     for (int i = 0; i < skeleton->getNumJoints(); i++) {
         auto name = skeleton->getJointName(i);
@@ -509,6 +510,7 @@ void Flow::calculateConstraints(const std::shared_ptr<AnimSkeleton>& skeleton,
                     auto flowJoint = FlowJoint(i, parentIndex, -1, name, group, jointSettings);
                     _flowJointData.insert(std::pair<int, FlowJoint>(i, flowJoint));
                 }
+                updateGroupSettings(group, jointSettings);
             }
         } else {
             if (PRESET_COLLISION_DATA.find(name) != PRESET_COLLISION_DATA.end()) {
@@ -727,6 +729,7 @@ void Flow::setPhysicsSettingsForGroup(const QString& group, const FlowPhysicsSet
             joint.second.setSettings(settings);
         }
     }
+    updateGroupSettings(group, settings);
 }
 
 bool Flow::getJointPositionInWorldFrame(const AnimPoseVec& absolutePoses, int jointIndex, glm::vec3& position, glm::vec3 translation, glm::quat rotation) const {
@@ -780,4 +783,12 @@ Flow& Flow::operator=(const Flow& otherFlow) {
         }
     }
     return *this;
+}
+
+void Flow::updateGroupSettings(const QString& group, const FlowPhysicsSettings& settings) {
+    if (_groupSettings.find(group) == _groupSettings.end()) {
+        _groupSettings.insert(std::pair<QString, FlowPhysicsSettings>(group, settings));
+    } else {
+        _groupSettings[group] = settings;
+    }
 }

libraries/animation/src/Flow.h

@@ -149,6 +149,7 @@ public:
     void setCollisionSettingsByJoint(int jointIndex, const FlowCollisionSettings& settings);
     void setActive(bool active) { _active = active; }
     bool getActive() const { return _active; }
+    const std::vector<FlowCollisionSphere>& getCollisions() const { return _selfCollisions; }
 protected:
     std::vector<FlowCollisionSphere> _selfCollisions;
     std::vector<FlowCollisionSphere> _othersCollisions;
@@ -221,6 +222,7 @@ public:
     const glm::quat& getCurrentRotation() const { return _currentRotation; }
     const glm::vec3& getCurrentTranslation() const { return _initialTranslation; }
     const glm::vec3& getInitialPosition() const { return _initialPosition; }
+    bool isColliding() const { return _colliding; }
 
 protected:
 
@@ -293,6 +295,7 @@ public:
     void setOthersCollision(const QUuid& otherId, int jointIndex, const glm::vec3& position);
     FlowCollisionSystem& getCollisionSystem() { return _collisionSystem; }
     void setPhysicsSettingsForGroup(const QString& group, const FlowPhysicsSettings& settings);
+    const std::map<QString, FlowPhysicsSettings>& getGroupSettings() const { return _groupSettings; }
     void cleanUp();
 
 signals:
@@ -309,6 +312,7 @@ private:
     void setJoints(AnimPoseVec& relativePoses, const std::vector<bool>& overrideFlags);
     void updateJoints(AnimPoseVec& relativePoses, AnimPoseVec& absolutePoses);
     bool updateRootFramePositions(const AnimPoseVec& absolutePoses, size_t threadIndex);
+    void updateGroupSettings(const QString& group, const FlowPhysicsSettings& settings);
     void setScale(float scale);
     
     float _scale { 1.0f };
@@ -316,6 +320,7 @@ private:
     glm::vec3 _entityPosition;
     glm::quat _entityRotation;
     std::map<int, FlowJoint> _flowJointData;
+    std::map<QString, FlowPhysicsSettings> _groupSettings;
     std::vector<FlowThread> _jointThreads;
     std::vector<QString> _flowJointKeywords;
     FlowCollisionSystem _collisionSystem;

libraries/animation/src/Rig.cpp

@@ -1066,13 +1066,6 @@ void Rig::computeMotionAnimationState(float deltaTime, const glm::vec3& worldPos
 
         if (_enableInverseKinematics) {
             _animVars.set("ikOverlayAlpha", 1.0f);
-            _animVars.set("splineIKEnabled", true);
-            _animVars.set("leftHandIKEnabled", true);
-            _animVars.set("rightHandIKEnabled", true);
-            _animVars.set("leftFootIKEnabled", true);
-            _animVars.set("rightFootIKEnabled", true);
-            _animVars.set("leftFootPoleVectorEnabled", true);
-            _animVars.set("rightFootPoleVectorEnabled", true);
         } else {
             _animVars.set("ikOverlayAlpha", 0.0f);
             _animVars.set("splineIKEnabled", false);
@@ -1086,6 +1079,7 @@ void Rig::computeMotionAnimationState(float deltaTime, const glm::vec3& worldPos
             _animVars.set("rightFootPoleVectorEnabled", false);
         }
         _lastEnableInverseKinematics = _enableInverseKinematics;
+
     }
     _lastForward = forward;
     _lastPosition = worldPosition;
@@ -2185,3 +2179,52 @@ void Rig::initFlow(bool isActive) {
         _networkFlow.cleanUp();
     }
 }
+
+float Rig::getUnscaledEyeHeight() const {
+    // Normally the model offset transform will contain the avatar scale factor, we explicitly remove it here.
+    AnimPose modelOffsetWithoutAvatarScale(glm::vec3(1.0f), getModelOffsetPose().rot(), getModelOffsetPose().trans());
+    AnimPose geomToRigWithoutAvatarScale = modelOffsetWithoutAvatarScale * getGeometryOffsetPose();
+
+    // This factor can be used to scale distances in the geometry frame into the unscaled rig frame.
+    // Typically it will be the unit conversion from cm to m.
+    float scaleFactor = geomToRigWithoutAvatarScale.scale().x;  // in practice this always a uniform scale factor.
+
+    int headTopJoint = indexOfJoint("HeadTop_End");
+    int headJoint = indexOfJoint("Head");
+    int eyeJoint = indexOfJoint("LeftEye") != -1 ? indexOfJoint("LeftEye") : indexOfJoint("RightEye");
+    int toeJoint = indexOfJoint("LeftToeBase") != -1 ? indexOfJoint("LeftToeBase") : indexOfJoint("RightToeBase");
+
+    // Makes assumption that the y = 0 plane in geometry is the ground plane.
+    // We also make that assumption in Rig::computeAvatarBoundingCapsule()
+    const float GROUND_Y = 0.0f;
+
+    // Values from the skeleton are in the geometry coordinate frame.
+    auto skeleton = getAnimSkeleton();
+    if (eyeJoint >= 0 && toeJoint >= 0) {
+        // Measure from eyes to toes.
+        float eyeHeight = skeleton->getAbsoluteDefaultPose(eyeJoint).trans().y - skeleton->getAbsoluteDefaultPose(toeJoint).trans().y;
+        return scaleFactor * eyeHeight;
+    } else if (eyeJoint >= 0) {
+        // Measure Eye joint to y = 0 plane.
+        float eyeHeight = skeleton->getAbsoluteDefaultPose(eyeJoint).trans().y - GROUND_Y;
+        return scaleFactor * eyeHeight;
+    } else if (headTopJoint >= 0 && toeJoint >= 0) {
+        // Measure from ToeBase joint to HeadTop_End joint, then remove forehead distance.
+        const float ratio = DEFAULT_AVATAR_EYE_TO_TOP_OF_HEAD / DEFAULT_AVATAR_HEIGHT;
+        float height = skeleton->getAbsoluteDefaultPose(headTopJoint).trans().y - skeleton->getAbsoluteDefaultPose(toeJoint).trans().y;
+        return scaleFactor * (height - height * ratio);
+    } else if (headTopJoint >= 0) {
+        // Measure from HeadTop_End joint to the ground, then remove forehead distance.
+        const float ratio = DEFAULT_AVATAR_EYE_TO_TOP_OF_HEAD / DEFAULT_AVATAR_HEIGHT;
+        float headHeight = skeleton->getAbsoluteDefaultPose(headTopJoint).trans().y - GROUND_Y;
+        return scaleFactor * (headHeight - headHeight * ratio);
+    } else if (headJoint >= 0) {
+        // Measure Head joint to the ground, then add in distance from neck to eye.
+        const float DEFAULT_AVATAR_NECK_TO_EYE = DEFAULT_AVATAR_NECK_TO_TOP_OF_HEAD - DEFAULT_AVATAR_EYE_TO_TOP_OF_HEAD;
+        const float ratio = DEFAULT_AVATAR_NECK_TO_EYE / DEFAULT_AVATAR_NECK_HEIGHT;
+        float neckHeight = skeleton->getAbsoluteDefaultPose(headJoint).trans().y - GROUND_Y;
+        return scaleFactor * (neckHeight + neckHeight * ratio);
+    } else {
+        return DEFAULT_AVATAR_EYE_HEIGHT;
+    }
+}

libraries/animation/src/Rig.h

@@ -26,6 +26,7 @@
 #include "SimpleMovingAverage.h"
 #include "AnimUtil.h"
 #include "Flow.h"
+#include "AvatarConstants.h"
 
 class Rig;
 class AnimInverseKinematics;
@@ -237,6 +238,8 @@ public:
     void initFlow(bool isActive);
     Flow& getFlow() { return _internalFlow; }
 
+    float getUnscaledEyeHeight() const;
+
 
 signals:
     void onLoadComplete();

libraries/audio-client/src/AudioClient.h

@@ -213,13 +213,13 @@ public slots:
     void setWarnWhenMuted(bool isNoiseGateEnabled, bool emitSignal = true);
     bool isWarnWhenMutedEnabled() const { return _warnWhenMuted; }
 
-    bool getLocalEcho() { return _shouldEchoLocally; }
-    void setLocalEcho(bool localEcho) { _shouldEchoLocally = localEcho; }
-    void toggleLocalEcho() { _shouldEchoLocally = !_shouldEchoLocally; }
+    virtual bool getLocalEcho() override { return _shouldEchoLocally; }
+    virtual void setLocalEcho(bool localEcho) override { _shouldEchoLocally = localEcho; }
+    virtual void toggleLocalEcho() override { _shouldEchoLocally = !_shouldEchoLocally; }
 
-    bool getServerEcho() { return _shouldEchoToServer; }
-    void setServerEcho(bool serverEcho) { _shouldEchoToServer = serverEcho; }
-    void toggleServerEcho() { _shouldEchoToServer = !_shouldEchoToServer; }
+    virtual bool getServerEcho() override { return _shouldEchoToServer; }
+    virtual void setServerEcho(bool serverEcho) override { _shouldEchoToServer = serverEcho; }
+    virtual void toggleServerEcho() override { _shouldEchoToServer = !_shouldEchoToServer; }
 
     void processReceivedSamples(const QByteArray& inputBuffer, QByteArray& outputBuffer);
     void sendMuteEnvironmentPacket();

libraries/audio/src/AbstractAudioInterface.h

@@ -47,6 +47,14 @@ public slots:
     virtual bool setIsStereoInput(bool stereo) = 0;
     virtual bool isStereoInput() = 0;
 
+    virtual bool getLocalEcho() = 0;
+    virtual void setLocalEcho(bool localEcho) = 0;
+    virtual void toggleLocalEcho() = 0;
+
+    virtual bool getServerEcho() = 0;
+    virtual void setServerEcho(bool serverEcho) = 0;
+    virtual void toggleServerEcho() = 0;
+
 signals:
     void isStereoInputChanged(bool isStereo);
 };

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

@@ -2040,54 +2040,7 @@ float Avatar::getUnscaledEyeHeightFromSkeleton() const {
     // TODO: if performance becomes a concern we can cache this value rather then computing it everytime.
 
     if (_skeletonModel) {
-        auto& rig = _skeletonModel->getRig();
-
-        // Normally the model offset transform will contain the avatar scale factor, we explicitly remove it here.
-        AnimPose modelOffsetWithoutAvatarScale(glm::vec3(1.0f), rig.getModelOffsetPose().rot(), rig.getModelOffsetPose().trans());
-        AnimPose geomToRigWithoutAvatarScale = modelOffsetWithoutAvatarScale * rig.getGeometryOffsetPose();
-
-        // This factor can be used to scale distances in the geometry frame into the unscaled rig frame.
-        // Typically it will be the unit conversion from cm to m.
-        float scaleFactor = geomToRigWithoutAvatarScale.scale().x;  // in practice this always a uniform scale factor.
-
-        int headTopJoint = rig.indexOfJoint("HeadTop_End");
-        int headJoint = rig.indexOfJoint("Head");
-        int eyeJoint = rig.indexOfJoint("LeftEye") != -1 ? rig.indexOfJoint("LeftEye") : rig.indexOfJoint("RightEye");
-        int toeJoint = rig.indexOfJoint("LeftToeBase") != -1 ? rig.indexOfJoint("LeftToeBase") : rig.indexOfJoint("RightToeBase");
-
-        // Makes assumption that the y = 0 plane in geometry is the ground plane.
-        // We also make that assumption in Rig::computeAvatarBoundingCapsule()
-        const float GROUND_Y = 0.0f;
-
-        // Values from the skeleton are in the geometry coordinate frame.
-        auto skeleton = rig.getAnimSkeleton();
-        if (eyeJoint >= 0 && toeJoint >= 0) {
-            // Measure from eyes to toes.
-            float eyeHeight = skeleton->getAbsoluteDefaultPose(eyeJoint).trans().y - skeleton->getAbsoluteDefaultPose(toeJoint).trans().y;
-            return scaleFactor * eyeHeight;
-        } else if (eyeJoint >= 0) {
-            // Measure Eye joint to y = 0 plane.
-            float eyeHeight = skeleton->getAbsoluteDefaultPose(eyeJoint).trans().y - GROUND_Y;
-            return scaleFactor * eyeHeight;
-        } else if (headTopJoint >= 0 && toeJoint >= 0) {
-            // Measure from ToeBase joint to HeadTop_End joint, then remove forehead distance.
-            const float ratio = DEFAULT_AVATAR_EYE_TO_TOP_OF_HEAD / DEFAULT_AVATAR_HEIGHT;
-            float height = skeleton->getAbsoluteDefaultPose(headTopJoint).trans().y - skeleton->getAbsoluteDefaultPose(toeJoint).trans().y;
-            return scaleFactor * (height - height * ratio);
-        } else if (headTopJoint >= 0) {
-            // Measure from HeadTop_End joint to the ground, then remove forehead distance.
-            const float ratio = DEFAULT_AVATAR_EYE_TO_TOP_OF_HEAD / DEFAULT_AVATAR_HEIGHT;
-            float headHeight = skeleton->getAbsoluteDefaultPose(headTopJoint).trans().y - GROUND_Y;
-            return scaleFactor * (headHeight - headHeight * ratio);
-        } else if (headJoint >= 0) {
-            // Measure Head joint to the ground, then add in distance from neck to eye.
-            const float DEFAULT_AVATAR_NECK_TO_EYE = DEFAULT_AVATAR_NECK_TO_TOP_OF_HEAD - DEFAULT_AVATAR_EYE_TO_TOP_OF_HEAD;
-            const float ratio = DEFAULT_AVATAR_NECK_TO_EYE / DEFAULT_AVATAR_NECK_HEIGHT;
-            float neckHeight = skeleton->getAbsoluteDefaultPose(headJoint).trans().y - GROUND_Y;
-            return scaleFactor * (neckHeight + neckHeight * ratio);
-        } else {
-            return DEFAULT_AVATAR_EYE_HEIGHT;
-        }
+        return _skeletonModel->getRig().getUnscaledEyeHeight();
     } else {
         return DEFAULT_AVATAR_EYE_HEIGHT;
     }

libraries/avatars/src/AvatarData.cpp

@@ -564,6 +564,11 @@ QByteArray AvatarData::toByteArray(AvatarDataDetail dataDetail, quint64 lastSent
             setAtBit16(flags, COLLIDE_WITH_OTHER_AVATARS);
         }
 
+        // Avatar has hero priority
+        if (getHasPriority()) {
+            setAtBit16(flags, HAS_HERO_PRIORITY);
+        }
+
         data->flags = flags;
         destinationBuffer += sizeof(AvatarDataPacket::AdditionalFlags);
 
@@ -1152,7 +1157,8 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
         auto newHasProceduralEyeFaceMovement = oneAtBit16(bitItems, PROCEDURAL_EYE_FACE_MOVEMENT);
         auto newHasProceduralBlinkFaceMovement = oneAtBit16(bitItems, PROCEDURAL_BLINK_FACE_MOVEMENT);
         auto newCollideWithOtherAvatars = oneAtBit16(bitItems, COLLIDE_WITH_OTHER_AVATARS);
-        
+        auto newHasPriority = oneAtBit16(bitItems, HAS_HERO_PRIORITY);        
+
         bool keyStateChanged = (_keyState != newKeyState);
         bool handStateChanged = (_handState != newHandState);
         bool faceStateChanged = (_headData->_isFaceTrackerConnected != newFaceTrackerConnected);
@@ -1161,8 +1167,10 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
         bool proceduralEyeFaceMovementChanged = (_headData->getHasProceduralEyeFaceMovement() != newHasProceduralEyeFaceMovement);
         bool proceduralBlinkFaceMovementChanged = (_headData->getHasProceduralBlinkFaceMovement() != newHasProceduralBlinkFaceMovement);
         bool collideWithOtherAvatarsChanged = (_collideWithOtherAvatars != newCollideWithOtherAvatars);
+        bool hasPriorityChanged = (getHasPriority() != newHasPriority);
         bool somethingChanged = keyStateChanged || handStateChanged || faceStateChanged || eyeStateChanged || audioEnableFaceMovementChanged || 
-                                proceduralEyeFaceMovementChanged || proceduralBlinkFaceMovementChanged || collideWithOtherAvatarsChanged;
+                                proceduralEyeFaceMovementChanged ||
+                                proceduralBlinkFaceMovementChanged || collideWithOtherAvatarsChanged || hasPriorityChanged;
 
         _keyState = newKeyState;
         _handState = newHandState;
@@ -1172,6 +1180,7 @@ int AvatarData::parseDataFromBuffer(const QByteArray& buffer) {
         _headData->setHasProceduralEyeFaceMovement(newHasProceduralEyeFaceMovement);
         _headData->setHasProceduralBlinkFaceMovement(newHasProceduralBlinkFaceMovement);
         _collideWithOtherAvatars = newCollideWithOtherAvatars;
+        setHasPriorityWithoutTimestampReset(newHasPriority);
 
         sourceBuffer += sizeof(AvatarDataPacket::AdditionalFlags);
 

libraries/avatars/src/AvatarData.h

@@ -100,6 +100,9 @@ const quint32 AVATAR_MOTION_SCRIPTABLE_BITS =
 // Procedural audio to mouth movement is enabled 8th bit
 // Procedural Blink is enabled 9th bit
 // Procedural Eyelid is enabled 10th bit
+// Procedural PROCEDURAL_BLINK_FACE_MOVEMENT is enabled 11th bit
+// Procedural Collide with other avatars is enabled 12th bit
+// Procedural Has Hero Priority is enabled 13th bit
 
 const int KEY_STATE_START_BIT = 0; // 1st and 2nd bits
 const int HAND_STATE_START_BIT = 2; // 3rd and 4th bits
@@ -111,7 +114,7 @@ const int AUDIO_ENABLED_FACE_MOVEMENT = 8; // 9th bit
 const int PROCEDURAL_EYE_FACE_MOVEMENT = 9; // 10th bit
 const int PROCEDURAL_BLINK_FACE_MOVEMENT = 10; // 11th bit
 const int COLLIDE_WITH_OTHER_AVATARS = 11; // 12th bit
-
+const int HAS_HERO_PRIORITY = 12; // 13th bit  (be scared)
 
 const char HAND_STATE_NULL = 0;
 const char LEFT_HAND_POINTING_FLAG = 1;
@@ -1121,6 +1124,18 @@ public:
     int getAverageBytesReceivedPerSecond() const;
     int getReceiveRate() const;
 
+    // An Avatar can be set Priority from the AvatarMixer side.
+    bool getHasPriority() const { return _hasPriority; }
+    // regular setHasPriority does a check of state changed and if true reset 'additionalFlagsChanged' timestamp
+    void setHasPriority(bool hasPriority) {
+        if (_hasPriority != hasPriority) {
+            _additionalFlagsChanged = usecTimestampNow();
+            _hasPriority = hasPriority;
+        }
+    }
+    // In some cases, we want to assign the hasPRiority flag without reseting timestamp
+    void setHasPriorityWithoutTimestampReset(bool hasPriority) { _hasPriority = hasPriority; }
+
     const glm::vec3& getTargetVelocity() const { return _targetVelocity; }
 
     void clearRecordingBasis();
@@ -1498,6 +1513,7 @@ protected:
     bool _isNewAvatar { true };
     bool _isClientAvatar { false };
     bool _collideWithOtherAvatars { true };
+    bool _hasPriority{ false };
 
     // null unless MyAvatar or ScriptableAvatar sending traits data to mixer
     std::unique_ptr<ClientTraitsHandler, LaterDeleter> _clientTraitsHandler;

libraries/entities-renderer/src/EntityTreeRenderer.cpp

@@ -73,14 +73,14 @@ EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterf
     _currentHoverOverEntityID = UNKNOWN_ENTITY_ID;
     _currentClickingOnEntityID = UNKNOWN_ENTITY_ID;
 
-    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>();
+    auto entityScriptingInterface = DependencyManager::get<EntityScriptingInterface>().data();
     auto pointerManager = DependencyManager::get<PointerManager>();
-    connect(pointerManager.data(), &PointerManager::hoverBeginEntity, entityScriptingInterface.data(), &EntityScriptingInterface::hoverEnterEntity);
-    connect(pointerManager.data(), &PointerManager::hoverContinueEntity, entityScriptingInterface.data(), &EntityScriptingInterface::hoverOverEntity);
-    connect(pointerManager.data(), &PointerManager::hoverEndEntity, entityScriptingInterface.data(), &EntityScriptingInterface::hoverLeaveEntity);
-    connect(pointerManager.data(), &PointerManager::triggerBeginEntity, entityScriptingInterface.data(), &EntityScriptingInterface::mousePressOnEntity);
-    connect(pointerManager.data(), &PointerManager::triggerContinueEntity, entityScriptingInterface.data(), &EntityScriptingInterface::mouseMoveOnEntity);
-    connect(pointerManager.data(), &PointerManager::triggerEndEntity, entityScriptingInterface.data(), &EntityScriptingInterface::mouseReleaseOnEntity);
+    connect(pointerManager.data(), &PointerManager::hoverBeginEntity, entityScriptingInterface, &EntityScriptingInterface::hoverEnterEntity);
+    connect(pointerManager.data(), &PointerManager::hoverContinueEntity, entityScriptingInterface, &EntityScriptingInterface::hoverOverEntity);
+    connect(pointerManager.data(), &PointerManager::hoverEndEntity, entityScriptingInterface, &EntityScriptingInterface::hoverLeaveEntity);
+    connect(pointerManager.data(), &PointerManager::triggerBeginEntity, entityScriptingInterface, &EntityScriptingInterface::mousePressOnEntity);
+    connect(pointerManager.data(), &PointerManager::triggerContinueEntity, entityScriptingInterface, &EntityScriptingInterface::mouseMoveOnEntity);
+    connect(pointerManager.data(), &PointerManager::triggerEndEntity, entityScriptingInterface, &EntityScriptingInterface::mouseReleaseOnEntity);
 
     // Forward mouse events to web entities
     auto handlePointerEvent = [&](const QUuid& entityID, const PointerEvent& event) {
@@ -93,10 +93,10 @@ EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterf
             QMetaObject::invokeMethod(thisEntity.get(), "handlePointerEvent", Q_ARG(const PointerEvent&, event));
         }
     };
-    connect(entityScriptingInterface.data(), &EntityScriptingInterface::mousePressOnEntity, this, handlePointerEvent);
-    connect(entityScriptingInterface.data(), &EntityScriptingInterface::mouseMoveOnEntity, this, handlePointerEvent);
-    connect(entityScriptingInterface.data(), &EntityScriptingInterface::mouseReleaseOnEntity, this, handlePointerEvent);
-    connect(entityScriptingInterface.data(), &EntityScriptingInterface::hoverEnterEntity, this, [&](const QUuid& entityID, const PointerEvent& event) {
+    connect(entityScriptingInterface, &EntityScriptingInterface::mousePressOnEntity, this, handlePointerEvent);
+    connect(entityScriptingInterface, &EntityScriptingInterface::mouseMoveOnEntity, this, handlePointerEvent);
+    connect(entityScriptingInterface, &EntityScriptingInterface::mouseReleaseOnEntity, this, handlePointerEvent);
+    connect(entityScriptingInterface, &EntityScriptingInterface::hoverEnterEntity, this, [&](const QUuid& entityID, const PointerEvent& event) {
         std::shared_ptr<render::entities::WebEntityRenderer> thisEntity;
         auto entity = getEntity(entityID);
         if (entity && entity->isVisible() && entity->getType() == EntityTypes::Web) {
@@ -106,8 +106,8 @@ EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterf
             QMetaObject::invokeMethod(thisEntity.get(), "hoverEnterEntity", Q_ARG(const PointerEvent&, event));
         }
     });
-    connect(entityScriptingInterface.data(), &EntityScriptingInterface::hoverOverEntity, this, handlePointerEvent);
-    connect(entityScriptingInterface.data(), &EntityScriptingInterface::hoverLeaveEntity, this, [&](const QUuid& entityID, const PointerEvent& event) {
+    connect(entityScriptingInterface, &EntityScriptingInterface::hoverOverEntity, this, handlePointerEvent);
+    connect(entityScriptingInterface, &EntityScriptingInterface::hoverLeaveEntity, this, [&](const QUuid& entityID, const PointerEvent& event) {
         std::shared_ptr<render::entities::WebEntityRenderer> thisEntity;
         auto entity = getEntity(entityID);
         if (entity && entity->isVisible() && entity->getType() == EntityTypes::Web) {
@@ -196,8 +196,8 @@ void EntityTreeRenderer::resetEntitiesScriptEngine() {
     });
 }
 
-void EntityTreeRenderer::stopNonLocalEntityScripts() {
-    leaveNonLocalEntities();
+void EntityTreeRenderer::stopDomainAndNonOwnedEntities() {
+    leaveDomainAndNonOwnedEntities();
     // unload and stop the engine
     if (_entitiesScriptEngine) {
         QList<EntityItemID> entitiesWithEntityScripts = _entitiesScriptEngine->getListOfEntityScriptIDs();
@@ -206,7 +206,7 @@ void EntityTreeRenderer::stopNonLocalEntityScripts() {
             EntityItemPointer entityItem = getTree()->findEntityByEntityItemID(entityID);
 
             if (entityItem) {
-                if (!entityItem->isLocalEntity()) {
+                if (!(entityItem->isLocalEntity() || (entityItem->isAvatarEntity() && entityItem->getOwningAvatarID() == getTree()->getMyAvatarSessionUUID()))) {
                     _entitiesScriptEngine->unloadEntityScript(entityID, true);
                 }
             }
@@ -214,8 +214,8 @@ void EntityTreeRenderer::stopNonLocalEntityScripts() {
     }
 }
 
-void EntityTreeRenderer::clearNonLocalEntities() {
-    stopNonLocalEntityScripts();
+void EntityTreeRenderer::clearDomainAndNonOwnedEntities() {
+    stopDomainAndNonOwnedEntities();
 
     std::unordered_map<EntityItemID, EntityRendererPointer> savedEntities;
     // remove all entities from the scene
@@ -225,7 +225,7 @@ void EntityTreeRenderer::clearNonLocalEntities() {
         for (const auto& entry :  _entitiesInScene) {
             const auto& renderer = entry.second;
             const EntityItemPointer& entityItem = renderer->getEntity();
-            if (!entityItem->isLocalEntity()) {
+            if (!(entityItem->isLocalEntity() || (entityItem->isAvatarEntity() && entityItem->getOwningAvatarID() == getTree()->getMyAvatarSessionUUID()))) {
                 renderer->removeFromScene(scene, transaction);
             } else {
                 savedEntities[entry.first] = entry.second;
@@ -239,7 +239,7 @@ void EntityTreeRenderer::clearNonLocalEntities() {
 
     _layeredZones.clearNonLocalLayeredZones();
 
-    OctreeProcessor::clearNonLocalEntities();
+    OctreeProcessor::clearDomainAndNonOwnedEntities();
 }
 
 void EntityTreeRenderer::clear() {
@@ -655,22 +655,22 @@ bool EntityTreeRenderer::checkEnterLeaveEntities() {
     return didUpdate;
 }
 
-void EntityTreeRenderer::leaveNonLocalEntities() {
+void EntityTreeRenderer::leaveDomainAndNonOwnedEntities() {
     if (_tree && !_shuttingDown) {
-        QVector<EntityItemID> currentLocalEntitiesInside;
+        QVector<EntityItemID> currentEntitiesInsideToSave;
         foreach (const EntityItemID& entityID, _currentEntitiesInside) {
             EntityItemPointer entityItem = getTree()->findEntityByEntityItemID(entityID);
-            if (!entityItem->isLocalEntity()) {
+            if (!(entityItem->isLocalEntity() || (entityItem->isAvatarEntity() && entityItem->getOwningAvatarID() == getTree()->getMyAvatarSessionUUID()))) {
                 emit leaveEntity(entityID);
                 if (_entitiesScriptEngine) {
                     _entitiesScriptEngine->callEntityScriptMethod(entityID, "leaveEntity");
                 }
             } else {
-                currentLocalEntitiesInside.push_back(entityID);
+                currentEntitiesInsideToSave.push_back(entityID);
             }
         }
 
-        _currentEntitiesInside = currentLocalEntitiesInside;
+        _currentEntitiesInside = currentEntitiesInsideToSave;
         forceRecheckEntities();
     }
 }
@@ -792,11 +792,11 @@ static PointerEvent::Button toPointerButton(const QMouseEvent& event) {
     }
 }
 
-std::pair<float, QUuid> EntityTreeRenderer::mousePressEvent(QMouseEvent* event) {
+QUuid EntityTreeRenderer::mousePressEvent(QMouseEvent* event) {
     // If we don't have a tree, or we're in the process of shutting down, then don't
     // process these events.
     if (!_tree || _shuttingDown) {
-        return { FLT_MAX, UNKNOWN_ENTITY_ID };
+        return UNKNOWN_ENTITY_ID;
     }
 
     PerformanceTimer perfTimer("EntityTreeRenderer::mousePressEvent");
@@ -805,11 +805,13 @@ std::pair<float, QUuid> EntityTreeRenderer::mousePressEvent(QMouseEvent* event)
     RayToEntityIntersectionResult rayPickResult = _getPrevRayPickResultOperator(_mouseRayPickID);
     EntityItemPointer entity;
     if (rayPickResult.intersects && (entity = getTree()->findEntityByID(rayPickResult.entityID))) {
-        auto properties = entity->getProperties();
-        QString urlString = properties.getHref();
-        QUrl url = QUrl(urlString, QUrl::StrictMode);
-        if (url.isValid() && !url.isEmpty()){
-            DependencyManager::get<AddressManager>()->handleLookupString(urlString);
+        if (!EntityTree::areEntityClicksCaptured()) {
+            auto properties = entity->getProperties();
+            QString urlString = properties.getHref();
+            QUrl url = QUrl(urlString, QUrl::StrictMode);
+            if (url.isValid() && !url.isEmpty()) {
+                DependencyManager::get<AddressManager>()->handleLookupString(urlString);
+            }
         }
 
         glm::vec2 pos2D = projectOntoEntityXYPlane(entity, ray, rayPickResult);
@@ -827,10 +829,10 @@ std::pair<float, QUuid> EntityTreeRenderer::mousePressEvent(QMouseEvent* event)
         _lastPointerEvent = pointerEvent;
         _lastPointerEventValid = true;
 
-        return { rayPickResult.distance, rayPickResult.entityID };
+        return rayPickResult.entityID;
     }
     emit entityScriptingInterface->mousePressOffEntity();
-    return { FLT_MAX, UNKNOWN_ENTITY_ID };
+    return UNKNOWN_ENTITY_ID;
 }
 
 void EntityTreeRenderer::mouseDoublePressEvent(QMouseEvent* event) {

libraries/entities-renderer/src/EntityTreeRenderer.h

@@ -87,14 +87,14 @@ public:
     virtual void init() override;
 
     /// clears the tree
-    virtual void clearNonLocalEntities() override;
+    virtual void clearDomainAndNonOwnedEntities() override;
     virtual void clear() override;
 
     /// reloads the entity scripts, calling unload and preload
     void reloadEntityScripts();
 
     // event handles which may generate entity related events
-    std::pair<float, QUuid> mousePressEvent(QMouseEvent* event);
+    QUuid mousePressEvent(QMouseEvent* event);
     void mouseReleaseEvent(QMouseEvent* event);
     void mouseDoublePressEvent(QMouseEvent* event);
     void mouseMoveEvent(QMouseEvent* event);
@@ -170,7 +170,7 @@ private:
     bool findBestZoneAndMaybeContainingEntities(QVector<EntityItemID>* entitiesContainingAvatar = nullptr);
 
     bool applyLayeredZones();
-    void stopNonLocalEntityScripts();
+    void stopDomainAndNonOwnedEntities();
 
     void checkAndCallPreload(const EntityItemID& entityID, bool reload = false, bool unloadFirst = false);
 
@@ -179,7 +179,7 @@ private:
 
     QScriptValueList createEntityArgs(const EntityItemID& entityID);
     bool checkEnterLeaveEntities();
-    void leaveNonLocalEntities();
+    void leaveDomainAndNonOwnedEntities();
     void leaveAllEntities();
     void forceRecheckEntities();
 

libraries/entities-renderer/src/RenderableModelEntityItem.cpp

@@ -928,9 +928,9 @@ void RenderableModelEntityItem::setJointTranslationsSet(const QVector<bool>& tra
     _needsJointSimulation = true;
 }
 
-void RenderableModelEntityItem::locationChanged(bool tellPhysics) {
+void RenderableModelEntityItem::locationChanged(bool tellPhysics, bool tellChildren) {
     DETAILED_PERFORMANCE_TIMER("locationChanged");
-    EntityItem::locationChanged(tellPhysics);
+    EntityItem::locationChanged(tellPhysics, tellChildren);
     auto model = getModel();
     if (model && model->isLoaded()) {
         model->updateRenderItems();
@@ -1032,9 +1032,7 @@ void RenderableModelEntityItem::copyAnimationJointDataToModel() {
     });
 
     if (changed) {
-        forEachChild([&](SpatiallyNestablePointer object) {
-            object->locationChanged(false);
-        });
+        locationChanged(false, true);
     }
 }
 

libraries/entities-renderer/src/RenderableModelEntityItem.h

@@ -108,7 +108,7 @@ public:
     virtual void setJointTranslations(const QVector<glm::vec3>& translations) override;
     virtual void setJointTranslationsSet(const QVector<bool>& translationsSet) override;
 
-    virtual void locationChanged(bool tellPhysics = true) override;
+    virtual void locationChanged(bool tellPhysics = true, bool tellChildren = true) override;
 
     virtual int getJointIndex(const QString& name) const override;
     virtual QStringList getJointNames() const override;

libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp

@@ -19,6 +19,8 @@
 #include <PerfStat.h>
 #include <shaders/Shaders.h>
 
+#include <DisableDeferred.h>
+
 #include "paintStroke_Shared.slh"
 
 using namespace render;
@@ -29,13 +31,6 @@ gpu::PipelinePointer PolyLineEntityRenderer::_glowPipeline = nullptr;
 
 static const QUrl DEFAULT_POLYLINE_TEXTURE = PathUtils::resourcesUrl("images/paintStroke.png");
 
-#if defined(USE_GLES)
-static bool DISABLE_DEFERRED = true;
-#else
-static const QString RENDER_FORWARD{ "HIFI_RENDER_FORWARD" };
-static bool DISABLE_DEFERRED = QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD);
-#endif
-
 PolyLineEntityRenderer::PolyLineEntityRenderer(const EntityItemPointer& entity) : Parent(entity) {
     _texture = DependencyManager::get<TextureCache>()->getTexture(DEFAULT_POLYLINE_TEXTURE);
 

libraries/entities-renderer/src/RenderableShapeEntityItem.cpp

@@ -19,6 +19,8 @@
 
 #include "RenderPipelines.h"
 
+#include <DisableDeferred.h>
+
 //#define SHAPE_ENTITY_USE_FADE_EFFECT
 #ifdef SHAPE_ENTITY_USE_FADE_EFFECT
 #include <FadeEffect.h>
@@ -30,13 +32,6 @@ using namespace render::entities;
 // is a half unit sphere.  However, the geometry cache renders a UNIT sphere, so we need to scale down.
 static const float SPHERE_ENTITY_SCALE = 0.5f;
 
-#if defined(USE_GLES)
-static bool DISABLE_DEFERRED = true;
-#else
-static const QString RENDER_FORWARD{ "HIFI_RENDER_FORWARD" };
-static bool DISABLE_DEFERRED = QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD);
-#endif
-
 static_assert(shader::render_utils::program::simple != 0, "Validate simple program exists");
 static_assert(shader::render_utils::program::simple_transparent != 0, "Validate simple transparent program exists");
 

libraries/entities-renderer/src/RenderableTextEntityItem.cpp

@@ -19,6 +19,8 @@
 
 #include "GLMHelpers.h"
 
+#include <DisableDeferred.h>
+
 using namespace render;
 using namespace render::entities;
 
@@ -160,6 +162,7 @@ void TextEntityRenderer::doRender(RenderArgs* args) {
     glm::vec4 backgroundColor;
     Transform modelTransform;
     glm::vec3 dimensions;
+    bool forwardRendered;
     withReadLock([&] {
         modelTransform = _renderTransform;
         dimensions = _dimensions;
@@ -169,6 +172,7 @@ void TextEntityRenderer::doRender(RenderArgs* args) {
         textColor = EntityRenderer::calculatePulseColor(textColor, _pulseProperties, _created);
         backgroundColor = glm::vec4(_backgroundColor, fadeRatio * _backgroundAlpha);
         backgroundColor = EntityRenderer::calculatePulseColor(backgroundColor, _pulseProperties, _created);
+        forwardRendered = _renderLayer != RenderLayer::WORLD || DISABLE_DEFERRED;
     });
 
     // Render background
@@ -188,7 +192,7 @@ void TextEntityRenderer::doRender(RenderArgs* args) {
     if (backgroundColor.a > 0.0f) {
         batch.setModelTransform(transformToTopLeft);
         auto geometryCache = DependencyManager::get<GeometryCache>();
-        geometryCache->bindSimpleProgram(batch, false, backgroundColor.a < 1.0f, false, false, false);
+        geometryCache->bindSimpleProgram(batch, false, backgroundColor.a < 1.0f, false, false, false, true, forwardRendered);
         geometryCache->renderQuad(batch, minCorner, maxCorner, backgroundColor, _geometryID);
     }
 
@@ -199,7 +203,7 @@ void TextEntityRenderer::doRender(RenderArgs* args) {
         batch.setModelTransform(transformToTopLeft);
 
         glm::vec2 bounds = glm::vec2(dimensions.x - (_leftMargin + _rightMargin), dimensions.y - (_topMargin + _bottomMargin));
-        _textRenderer->draw(batch, _leftMargin / scale, -_topMargin / scale, _text, textColor, bounds / scale);
+        _textRenderer->draw(batch, _leftMargin / scale, -_topMargin / scale, _text, textColor, bounds / scale, forwardRendered);
     }
 }
 

libraries/entities-renderer/src/RenderableZoneEntityItem.h

@@ -150,7 +150,7 @@ public:
     virtual bool addToScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) override;
     virtual void removeFromScene(const EntityItemPointer& self, const render::ScenePointer& scene, render::Transaction& transaction) override;
 private:
-    virtual void locationChanged(bool tellPhysics = true) override { EntityItem::locationChanged(tellPhysics); notifyBoundChanged(); }
+    virtual void locationChanged(bool tellPhysics = true, bool tellChildren = true) override { EntityItem::locationChanged(tellPhysics, tellChildren); notifyBoundChanged(); }
     virtual void dimensionsChanged() override { EntityItem::dimensionsChanged(); notifyBoundChanged(); }
     void notifyBoundChanged();
     void notifyChangedRenderItem();

libraries/entities/src/EntityItem.cpp

@@ -41,6 +41,7 @@
 #include "EntitySimulation.h"
 #include "EntityDynamicFactoryInterface.h"
 
+//#define WANT_DEBUG
 
 Q_DECLARE_METATYPE(EntityItemPointer);
 int entityItemPointernMetaTypeId = qRegisterMetaType<EntityItemPointer>();
@@ -95,6 +96,8 @@ EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& param
     requestedProperties += PROP_LAST_EDITED_BY;
     requestedProperties += PROP_ENTITY_HOST_TYPE;
     requestedProperties += PROP_OWNING_AVATAR_ID;
+    requestedProperties += PROP_PARENT_ID;
+    requestedProperties += PROP_PARENT_JOINT_INDEX;
     requestedProperties += PROP_QUERY_AA_CUBE;
     requestedProperties += PROP_CAN_CAST_SHADOW;
     requestedProperties += PROP_VISIBLE_IN_SECONDARY_CAMERA;
@@ -144,6 +147,7 @@ EntityPropertyFlags EntityItem::getEntityProperties(EncodeBitstreamParams& param
     requestedProperties += PROP_EDITION_NUMBER;
     requestedProperties += PROP_ENTITY_INSTANCE_NUMBER;
     requestedProperties += PROP_CERTIFICATE_ID;
+    requestedProperties += PROP_CERTIFICATE_TYPE;
     requestedProperties += PROP_STATIC_CERTIFICATE_VERSION;
 
     return requestedProperties;
@@ -334,6 +338,7 @@ OctreeElement::AppendState EntityItem::appendEntityData(OctreePacketData* packet
         APPEND_ENTITY_PROPERTY(PROP_EDITION_NUMBER, getEditionNumber());
         APPEND_ENTITY_PROPERTY(PROP_ENTITY_INSTANCE_NUMBER, getEntityInstanceNumber());
         APPEND_ENTITY_PROPERTY(PROP_CERTIFICATE_ID, getCertificateID());
+        APPEND_ENTITY_PROPERTY(PROP_CERTIFICATE_TYPE, getCertificateType());
         APPEND_ENTITY_PROPERTY(PROP_STATIC_CERTIFICATE_VERSION, getStaticCertificateVersion());
 
         appendSubclassData(packetData, params, entityTreeElementExtraEncodeData,
@@ -502,6 +507,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
     }
 
     #ifdef WANT_DEBUG
+    {
         quint64 lastEdited = getLastEdited();
         float editedAgo = getEditedAgo();
         QString agoAsString = formatSecondsElapsed(editedAgo);
@@ -515,6 +521,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
         qCDebug(entities) << "    age=" << getAge() << "seconds - " << ageAsString;
         qCDebug(entities) << "    lastEdited =" << lastEdited;
         qCDebug(entities) << "    ago=" << editedAgo << "seconds - " << agoAsString;
+    }
     #endif
 
     quint64 lastEditedFromBuffer = 0;
@@ -937,6 +944,7 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
     READ_ENTITY_PROPERTY(PROP_EDITION_NUMBER, quint32, setEditionNumber);
     READ_ENTITY_PROPERTY(PROP_ENTITY_INSTANCE_NUMBER, quint32, setEntityInstanceNumber);
     READ_ENTITY_PROPERTY(PROP_CERTIFICATE_ID, QString, setCertificateID);
+    READ_ENTITY_PROPERTY(PROP_CERTIFICATE_TYPE, QString, setCertificateType);
     READ_ENTITY_PROPERTY(PROP_STATIC_CERTIFICATE_VERSION, quint32, setStaticCertificateVersion);
 
     bytesRead += readEntitySubclassDataFromBuffer(dataAt, (bytesLeftToRead - bytesRead), args,
@@ -1099,7 +1107,7 @@ void EntityItem::simulate(const quint64& now) {
         qCDebug(entities) << "    hasGravity=" << hasGravity();
         qCDebug(entities) << "    hasAcceleration=" << hasAcceleration();
         qCDebug(entities) << "    hasAngularVelocity=" << hasAngularVelocity();
-        qCDebug(entities) << "    getAngularVelocity=" << getAngularVelocity();
+        qCDebug(entities) << "    getAngularVelocity=" << getLocalAngularVelocity();
         qCDebug(entities) << "    isMortal=" << isMortal();
         qCDebug(entities) << "    getAge()=" << getAge();
         qCDebug(entities) << "    getLifetime()=" << getLifetime();
@@ -1111,12 +1119,12 @@ void EntityItem::simulate(const quint64& now) {
             qCDebug(entities) << "        hasGravity=" << hasGravity();
             qCDebug(entities) << "        hasAcceleration=" << hasAcceleration();
             qCDebug(entities) << "        hasAngularVelocity=" << hasAngularVelocity();
-            qCDebug(entities) << "        getAngularVelocity=" << getAngularVelocity();
+            qCDebug(entities) << "        getAngularVelocity=" << getLocalAngularVelocity();
         }
         if (hasAngularVelocity()) {
             qCDebug(entities) << "    CHANGING...=";
             qCDebug(entities) << "        hasAngularVelocity=" << hasAngularVelocity();
-            qCDebug(entities) << "        getAngularVelocity=" << getAngularVelocity();
+            qCDebug(entities) << "        getAngularVelocity=" << getLocalAngularVelocity();
         }
         if (isMortal()) {
             qCDebug(entities) << "    MORTAL...=";
@@ -1376,6 +1384,7 @@ EntityItemProperties EntityItem::getProperties(const EntityPropertyFlags& desire
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(editionNumber, getEditionNumber);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(entityInstanceNumber, getEntityInstanceNumber);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(certificateID, getCertificateID);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(certificateType, getCertificateType);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(staticCertificateVersion, getStaticCertificateVersion);
 
     // Script local data
@@ -1524,6 +1533,7 @@ bool EntityItem::setProperties(const EntityItemProperties& properties) {
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(editionNumber, setEditionNumber);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(entityInstanceNumber, setEntityInstanceNumber);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(certificateID, setCertificateID);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(certificateType, setCertificateType);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(staticCertificateVersion, setStaticCertificateVersion);
 
     if (updateQueryAACube()) {
@@ -1738,7 +1748,7 @@ bool EntityItem::contains(const glm::vec3& point) const {
         // the above cases not yet supported --> fall through to BOX case
         case SHAPE_TYPE_BOX: {
             localPoint = glm::abs(localPoint);
-            return glm::any(glm::lessThanEqual(localPoint, glm::vec3(NORMALIZED_HALF_SIDE)));
+            return glm::all(glm::lessThanEqual(localPoint, glm::vec3(NORMALIZED_HALF_SIDE)));
         }
         case SHAPE_TYPE_ELLIPSOID: {
             // since we've transformed into the normalized space this is just a sphere-point intersection test
@@ -1868,7 +1878,7 @@ void EntityItem::setParentID(const QUuid& value) {
 
 glm::vec3 EntityItem::getScaledDimensions() const {
     glm::vec3 scale = getSNScale();
-    return _unscaledDimensions * scale;
+    return getUnscaledDimensions() * scale;
 }
 
 void EntityItem::setScaledDimensions(const glm::vec3& value) {
@@ -2588,7 +2598,7 @@ QList<EntityDynamicPointer> EntityItem::getActionsOfType(EntityDynamicType typeT
     return result;
 }
 
-void EntityItem::locationChanged(bool tellPhysics) {
+void EntityItem::locationChanged(bool tellPhysics, bool tellChildren) {
     requiresRecalcBoxes();
     if (tellPhysics) {
         _flags |= Simulation::DIRTY_TRANSFORM;
@@ -2597,7 +2607,7 @@ void EntityItem::locationChanged(bool tellPhysics) {
             tree->entityChanged(getThisPointer());
         }
     }
-    SpatiallyNestable::locationChanged(tellPhysics); // tell all the children, also
+    SpatiallyNestable::locationChanged(tellPhysics, tellChildren);
     std::pair<int32_t, glm::vec4> data(_spaceIndex, glm::vec4(getWorldPosition(), _boundingRadius));
     emit spaceUpdate(data);
     somethingChangedNotification();
@@ -2652,13 +2662,23 @@ bool EntityItem::matchesJSONFilters(const QJsonObject& jsonFilters) const {
     // ALL entity properties. Some work will need to be done to the property system so that it can be more flexible
     // (to grab the value and default value of a property given the string representation of that property, for example)
 
-    // currently the only property filter we handle is '+' for serverScripts
+    // currently the only property filter we handle in EntityItem is '+' for serverScripts
     // which means that we only handle a filtered query asking for entities where the serverScripts property is non-default
 
     static const QString SERVER_SCRIPTS_PROPERTY = "serverScripts";
+    static const QString ENTITY_TYPE_PROPERTY = "type";
 
-    if (jsonFilters[SERVER_SCRIPTS_PROPERTY] == EntityQueryFilterSymbol::NonDefault) {
-        return _serverScripts != ENTITY_ITEM_DEFAULT_SERVER_SCRIPTS;
+    foreach(const auto& property, jsonFilters.keys()) {
+        if (property == SERVER_SCRIPTS_PROPERTY && jsonFilters[property] == EntityQueryFilterSymbol::NonDefault) {
+            // check if this entity has a non-default value for serverScripts
+            if (_serverScripts != ENTITY_ITEM_DEFAULT_SERVER_SCRIPTS) {
+                return true;
+            } else {
+                return false;
+            }
+        } else if (property == ENTITY_TYPE_PROPERTY) {
+            return (jsonFilters[property] == EntityTypes::getEntityTypeName(getType()) );
+        }
     }
 
     // the json filter syntax did not match what we expected, return a match
@@ -3135,6 +3155,7 @@ DEFINE_PROPERTY_ACCESSOR(QString, MarketplaceID, marketplaceID)
 DEFINE_PROPERTY_ACCESSOR(quint32, EditionNumber, editionNumber)
 DEFINE_PROPERTY_ACCESSOR(quint32, EntityInstanceNumber, entityInstanceNumber)
 DEFINE_PROPERTY_ACCESSOR(QString, CertificateID, certificateID)
+DEFINE_PROPERTY_ACCESSOR(QString, CertificateType, certificateType)
 DEFINE_PROPERTY_ACCESSOR(quint32, StaticCertificateVersion, staticCertificateVersion)
 
 uint32_t EntityItem::getDirtyFlags() const {