Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject

BUILD_OSX.md

@@ -13,13 +13,13 @@ We no longer require install of qt5 via our [homebrew formulas repository](https
 Assuming you've installed OpenSSL or Qt 5 using the homebrew instructions above, you'll need to set OPENSSL_ROOT_DIR and QT_CMAKE_PREFIX_PATH so CMake can find your installations.
 For OpenSSL installed via homebrew, set OPENSSL_ROOT_DIR:
 
-    export OPENSSL_ROOT_DIR=/usr/local/Cellar/openssl/1.0.2d_1
+    export OPENSSL_ROOT_DIR=/usr/local/Cellar/openssl/1.0.2h_1/
     
 For Qt 5.5.1 installed via homebrew, set QT_CMAKE_PREFIX_PATH as follows.
 
-    export QT_CMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.5.1_2/lib/cmake
+    export QT_CMAKE_PREFIX_PATH=/usr/local/Cellar/qt55/5.5.1/lib/cmake
 
-Not that these use the versions from homebrew formulae at the time of this writing, and the version in the path will likely change.
+Note that these use the versions from homebrew formulae at the time of this writing, and the version in the path will likely change.
 
 ###Xcode
 If Xcode is your editor of choice, you can ask CMake to generate Xcode project files instead of Unix Makefiles.

cmake/externals/neuron/CMakeLists.txt

@@ -4,8 +4,8 @@ set(EXTERNAL_NAME neuron)
 
 string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 
-set(NEURON_URL "https://s3.amazonaws.com/hifi-public/dependencies/neuron_datareader_b.12.zip")
-set(NEURON_URL_MD5 "0ab54ca04c9cc8094e0fa046c226e574")
+set(NEURON_URL "https://s3.amazonaws.com/hifi-public/dependencies/neuron_datareader_b.12.2.zip")
+set(NEURON_URL_MD5 "84273ad2200bf86a9279d1f412a822ca")
 
 ExternalProject_Add(${EXTERNAL_NAME}
                     URL ${NEURON_URL}

domain-server/src/DomainMetadata.cpp

@@ -63,12 +63,16 @@ const QString DomainMetadata::Descriptors::Hours::CLOSE = "close";
 DomainMetadata::DomainMetadata(QObject* domainServer) : QObject(domainServer) {
     // set up the structure necessary for casting during parsing (see parseHours, esp.)
     _metadata[USERS] = QVariantMap {};
-    _metadata[DESCRIPTORS] = QVariantMap {
-        { Descriptors::HOURS, QVariantMap {
-            { Descriptors::Hours::WEEKDAY, QVariantList { QVariantMap{} } },
-            { Descriptors::Hours::WEEKEND, QVariantList { QVariantMap{} } }
-        } }
-    };
+    _metadata[DESCRIPTORS] = QVariantMap { {
+        Descriptors::HOURS, QVariantMap {
+            { Descriptors::Hours::WEEKDAY, QVariantList {
+                QVariantList{ QVariant{}, QVariant{} } }
+            },
+            { Descriptors::Hours::WEEKEND, QVariantList {
+                QVariantList{ QVariant{}, QVariant{} } }
+            }
+        }
+    } };
 
     assert(dynamic_cast<DomainServer*>(domainServer));
     DomainServer* server = static_cast<DomainServer*>(domainServer);
@@ -96,33 +100,37 @@ QJsonObject DomainMetadata::get(const QString& group) {
     return QJsonObject::fromVariantMap(_metadata[group].toMap());
 }
 
+// merge delta into target
+// target should be of the form [ OpenTime, CloseTime ],
+// delta should be of the form [ { open: Time, close: Time } ]
 void parseHours(QVariant delta, QVariant& target) {
     using Hours = DomainMetadata::Descriptors::Hours;
 
-    // hours should be of the form [ { open: Time, close: Time } ]
     assert(target.canConvert<QVariantList>());
     auto& targetList = *static_cast<QVariantList*>(target.data());
 
     // if/when multiple ranges are allowed, this list will need to be iterated
-    assert(targetList[0].canConvert<QVariantMap>());
-    auto& targetMap = *static_cast<QVariantMap*>(targetList[0].data());
+    assert(targetList[0].canConvert<QVariantList>());
+    auto& hours = *static_cast<QVariantList*>(targetList[0].data());
 
-    auto deltaMap = delta.toList()[0].toMap();
-    if (deltaMap.isEmpty()) {
+    auto deltaHours = delta.toList()[0].toMap();
+    if (deltaHours.isEmpty()) {
         return;
     }
 
     // merge delta into base
-    auto open = deltaMap.find(Hours::OPEN);
-    if (open != deltaMap.end()) {
-        targetMap[Hours::OPEN] = open.value();
+    static const int OPEN_INDEX = 0;
+    static const int CLOSE_INDEX = 1;
+    auto open = deltaHours.find(Hours::OPEN);
+    if (open != deltaHours.end()) {
+        hours[OPEN_INDEX] = open.value();
     }
-    assert(targetMap[Hours::OPEN].canConvert<QString>());
-    auto close = deltaMap.find(Hours::CLOSE);
-    if (close != deltaMap.end()) {
-        targetMap[Hours::CLOSE] = close.value();
+    assert(hours[OPEN_INDEX].canConvert<QString>());
+    auto close = deltaHours.find(Hours::CLOSE);
+    if (close != deltaHours.end()) {
+        hours[CLOSE_INDEX] = close.value();
     }
-    assert(targetMap[Hours::CLOSE].canConvert<QString>());
+    assert(hours[CLOSE_INDEX].canConvert<QString>());
 }
 
 void DomainMetadata::descriptorsChanged() {

libraries/physics/src/EntityMotionState.cpp

@@ -135,7 +135,14 @@ void EntityMotionState::handleEasyChanges(uint32_t& flags) {
         _nextOwnershipBid = 0;
     }
     if ((flags & Simulation::DIRTY_PHYSICS_ACTIVATION) && !_body->isActive()) {
-        _body->activate();
+        if (_body->isKinematicObject()) {
+            // only force activate kinematic bodies (dynamic shouldn't need force and
+            // active static bodies are special (see PhysicsEngine::_activeStaticBodies))
+            _body->activate(true);
+            _lastKinematicStep = ObjectMotionState::getWorldSimulationStep();
+        } else {
+            _body->activate();
+        }
     }
 }
 

plugins/hifiSpacemouse/src/SpacemouseManager.cpp

@@ -18,7 +18,6 @@
 #include <UserActivityLogger.h>
 #include <PathUtils.h>
 
-#include <plugins/PluginContainer.h>
 #include <controllers/UserInputMapper.h>
 
 const QString SpacemouseManager::NAME { "Spacemouse" };