Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles

cmake/macros/SetPackagingParameters.cmake

@@ -18,6 +18,13 @@ macro(SET_PACKAGING_PARAMETERS)
 
   set(RELEASE_TYPE $ENV{RELEASE_TYPE})
   set(RELEASE_NUMBER $ENV{RELEASE_NUMBER})
+  string(TOLOWER "$ENV{BRANCH}" BUILD_BRANCH)
+  set(BUILD_GLOBAL_SERVICES "DEVELOPMENT")
+  set(USE_STABLE_GLOBAL_SERVICES FALSE)
+
+  message(STATUS "The BUILD_BRANCH variable is: ${BUILD_BRANCH}")
+  message(STATUS "The BRANCH environment variable is: $ENV{BRANCH}")
+  message(STATUS "The RELEASE_TYPE variable is: ${RELEASE_TYPE}")
 
   if (RELEASE_TYPE STREQUAL "PRODUCTION")
     set(DEPLOY_PACKAGE TRUE)
@@ -31,6 +38,14 @@ macro(SET_PACKAGING_PARAMETERS)
     # add definition for this release type
     add_definitions(-DPRODUCTION_BUILD)
 
+    # if the build is a PRODUCTION_BUILD from the "stable" branch
+    # then use the STABLE gobal services
+    if (BUILD_BRANCH STREQUAL "stable")
+      message(STATUS "The RELEASE_TYPE is PRODUCTION and the BUILD_BRANCH is stable...")
+      set(BUILD_GLOBAL_SERVICES "STABLE")
+      set(USE_STABLE_GLOBAL_SERVICES TRUE)
+    endif()
+
   elseif (RELEASE_TYPE STREQUAL "PR")
     set(DEPLOY_PACKAGE TRUE)
     set(PR_BUILD 1)
@@ -132,6 +147,10 @@ macro(SET_PACKAGING_PARAMETERS)
   set(CLIENT_COMPONENT client)
   set(SERVER_COMPONENT server)
 
+  # print out some results for testing this new build feature
+  message(STATUS "The BUILD_GLOBAL_SERVICES variable is: ${BUILD_GLOBAL_SERVICES}")
+  message(STATUS "The USE_STABLE_GLOBAL_SERVICES variable is: ${USE_STABLE_GLOBAL_SERVICES}")
+
   # create a header file our targets can use to find out the application version
   file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/includes")
   configure_file("${HF_CMAKE_DIR}/templates/BuildInfo.h.in" "${CMAKE_BINARY_DIR}/includes/BuildInfo.h")

cmake/templates/BuildInfo.h.in

@@ -9,7 +9,12 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#define USE_STABLE_GLOBAL_SERVICES @USE_STABLE_GLOBAL_SERVICES@
+
 namespace BuildInfo {
     const QString MODIFIED_ORGANIZATION = "@BUILD_ORGANIZATION@";
     const QString VERSION = "@BUILD_VERSION@";
+    const QString BUILD_BRANCH = "@BUILD_BRANCH@";
+    const QString BUILD_GLOBAL_SERVICES = "@BUILD_GLOBAL_SERVICES@";
 }
+

cmake/templates/NSIS.template.in

@@ -600,6 +600,9 @@ Section "-Core installation"
   Delete "$INSTDIR\version"
   Delete "$INSTDIR\xinput1_3.dll"
 
+  ;Delete old Qt files
+  Delete "$INSTDIR\audio\qtaudio_windows.dll"
+
   ; Delete old desktop shortcuts before they were renamed during Sandbox rename
   Delete "$DESKTOP\@PRE_SANDBOX_INTERFACE_SHORTCUT_NAME@.lnk"
   Delete "$DESKTOP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk"

domain-server/src/DomainServer.cpp

@@ -46,7 +46,11 @@
 
 int const DomainServer::EXIT_CODE_REBOOT = 234923;
 
+#if USE_STABLE_GLOBAL_SERVICES
 const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.highfidelity.com";
+#else
+const QString ICE_SERVER_DEFAULT_HOSTNAME = "dev-ice.highfidelity.com";
+#endif
 
 DomainServer::DomainServer(int argc, char* argv[]) :
     QCoreApplication(argc, argv),
@@ -83,6 +87,14 @@ DomainServer::DomainServer(int argc, char* argv[]) :
 
     qDebug() << "Setting up domain-server";
 
+    qDebug() << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
+    qDebug() << "[VERSION] MODIFIED_ORGANIZATION:" << BuildInfo::MODIFIED_ORGANIZATION;
+    qDebug() << "[VERSION] VERSION:" << BuildInfo::VERSION;
+    qDebug() << "[VERSION] BUILD_BRANCH:" << BuildInfo::BUILD_BRANCH;
+    qDebug() << "[VERSION] BUILD_GLOBAL_SERVICES:" << BuildInfo::BUILD_GLOBAL_SERVICES;
+    qDebug() << "[VERSION] We will be using this default ICE server:" << ICE_SERVER_DEFAULT_HOSTNAME;
+
+
     // make sure we have a fresh AccountManager instance
     // (need this since domain-server can restart itself and maintain static variables)
     DependencyManager::set<AccountManager>();

interface/src/Application.cpp

@@ -562,6 +562,16 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     _deadlockWatchdogThread->start();
 
     qCDebug(interfaceapp) << "[VERSION] Build sequence:" << qPrintable(applicationVersion());
+    qCDebug(interfaceapp) << "[VERSION] MODIFIED_ORGANIZATION:" << BuildInfo::MODIFIED_ORGANIZATION;
+    qCDebug(interfaceapp) << "[VERSION] VERSION:" << BuildInfo::VERSION;
+    qCDebug(interfaceapp) << "[VERSION] BUILD_BRANCH:" << BuildInfo::BUILD_BRANCH;
+    qCDebug(interfaceapp) << "[VERSION] BUILD_GLOBAL_SERVICES:" << BuildInfo::BUILD_GLOBAL_SERVICES;
+#if USE_STABLE_GLOBAL_SERVICES
+    qCDebug(interfaceapp) << "[VERSION] We will use STABLE global services.";
+#else
+    qCDebug(interfaceapp) << "[VERSION] We will use DEVELOPMENT global services.";
+#endif
+
 
     _bookmarks = new Bookmarks();  // Before setting up the menu
 

scripts/system/controllers/handControllerGrab.js

@@ -1750,8 +1750,13 @@ function MyController(hand) {
         var newRadialVelocity = Vec3.dot(lastVelocity, delta);
 
         var VELOCITY_AVERAGING_TIME = 0.016;
-        this.grabRadialVelocity = (deltaObjectTime / VELOCITY_AVERAGING_TIME) * newRadialVelocity +
+        var blendFactor = deltaObjectTime / VELOCITY_AVERAGING_TIME;
-            (1.0 - (deltaObjectTime / VELOCITY_AVERAGING_TIME)) * this.grabRadialVelocity;
+        if (blendFactor < 0.0) {
+            blendFactor = 0.0;
+        } else if (blendFactor > 1.0) {
+            blendFactor = 1.0;
+        }
+        this.grabRadialVelocity = blendFactor * newRadialVelocity + (1.0 - blendFactor) * this.grabRadialVelocity;
 
         var RADIAL_GRAB_AMPLIFIER = 10.0;
         if (Math.abs(this.grabRadialVelocity) > 0.0) {