Merge branch 'master' of https://github.com/highfidelity/hifi into temp0

2025-04-15 19:39:20 +02:00 · 2015-02-26 14:19:23 -08:00 · 2015-02-26 14:19:23 -08:00 · d8ebb0c5b9
commit d8ebb0c5b9
parent 65a3e3618a 375255f22e
174 changed files with 4671 additions and 3244 deletions
--- a/BUILD.md
+++ b/BUILD.md
@ -4,19 +4,30 @@
 * [Qt](http://qt-project.org/downloads) ~> 5.3.2
 * [OpenSSL](https://www.openssl.org/related/binaries.html) ~> 1.0.1g
  * IMPORTANT: OpenSSL 1.0.1g is critical to avoid a security vulnerability.
-* [Intel Threading Building Blocks](https://www.threadingbuildingblocks.org/) ~> 4.3
-* [Soxr](http://sourceforge.net/projects/soxr/) ~> 0.1.1
+* [VHACD](https://github.com/virneo/v-hacd)(clone this repository)(Optional)
+
+####CMake External Project Dependencies
+
 * [Bullet Physics Engine](https://code.google.com/p/bullet/downloads/list) ~> 2.82
-* [Gverb](https://github.com/highfidelity/gverb/archive/master.zip) (direct download to latest version)
-
-#### CMake External Project Dependencies
-
-The following dependencies will be downloaded, built, linked and included automatically by CMake where we require them. The CMakeLists files that handle grabbing each of the following external dependencies can be found in the [cmake/externals folder](cmake/externals). The resulting downloads, source files and binaries will be placed in the `build` directory in each of the subfolders for each external project. These are not placed in your normal build tree when doing an out of source build so that they do not need to be re-downloaded and re-compiled every time the CMake build folder is cleared.
-
+* [Intel Threading Building Blocks](https://www.threadingbuildingblocks.org/) ~> 4.3
 * [glm](http://glm.g-truc.net/0.9.5/index.html) ~> 0.9.5.4
 * [gverb](https://github.com/highfidelity/gverb)
+* [Soxr](http://sourceforge.net/projects/soxr/) ~> 0.1.1

-### OS Specific Build Guides
+The following external projects are optional dependencies. You can indicate to CMake that you would like to include them by passing -DGET_$NAME=1 when running a clean CMake build. For example, to get CMake to download and compile QXmpp you would pass -DGET_QXMPP=1.
+
+* [SDL2](https://www.libsdl.org/download-2.0.php) ~> 2.0.3
+  * Enables game controller support in Interface
+* [QXmpp](https://github.com/qxmpp-project/qxmpp) ~> 0.7.6
+  * Enables text chat support in Interface
+
+The above dependencies will be downloaded, built, linked and included automatically by CMake where we require them. The CMakeLists files that handle grabbing each of the following external dependencies can be found in the [cmake/externals folder](cmake/externals). The resulting downloads, source files and binaries will be placed in the `build-ext` directory in each of the subfolders for each external project. 
+
+These are not placed in your normal build tree when doing an out of source build so that they do not need to be re-downloaded and re-compiled every time the CMake build folder is cleared. Should you want to force a re-download and re-compile of a specific external, you can simply remove that directory from the appropriate subfolder in `build-ext`. Should you want to force a re-download and re-compile of all externals, just remove the `build-ext` folder.
+
+If you would like to use a specific install of a dependency instead of the version that would be grabbed as a CMake ExternalProject, you can pass -DGET_$NAME=0 (where $NAME is the name of the subfolder in [cmake/externals](cmake/externals)) when you run CMake to tell it not to get that dependency as an external project.
+
+###OS Specific Build Guides
 * [BUILD_OSX.md](BUILD_OSX.md) - additional instructions for OS X.
 * [BUILD_LINUX.md](BUILD_LINUX.md) - additional instructions for Linux.
 * [BUILD_WIN.md](BUILD_WIN.md) - additional instructions for Windows.
@ -51,6 +62,9 @@ For example, to pass the QT_CMAKE_PREFIX_PATH variable during build file generat
    cmake .. -DQT_CMAKE_PREFIX_PATH=/usr/local/qt/5.3.2/lib/cmake

 ####Finding Dependencies
+
+The following applies for dependencies we do not grab via CMake ExternalProject (OpenSSL is an example), or for dependencies you have opted not to grab as a CMake ExternalProject (via -DGET_$NAME=0). The list of dependencies we grab by default as external projects can be found in [the CMake External Project Dependencies section](#cmake-external-project-dependencies).
+
 You can point our [Cmake find modules](cmake/modules/) to the correct version of dependencies by setting one of the three following variables to the location of the correct version of the dependency.

 In the examples below the variable $NAME would be replaced by the name of the dependency in uppercase, and $name would be replaced by the name of the dependency in lowercase (ex: OPENSSL_ROOT_DIR, openssl).
@ -61,12 +75,6 @@ In the examples below the variable $NAME would be replaced by the name of the de

 ###Optional Components

-####QXmpp
-
-You can [find QXmpp here](https://github.com/qxmpp-project/qxmpp), 0.7.6 is the version you want. The inclusion of the QXmpp enables text chat in the Interface client.
-
-OS X users who tap our [homebrew formulas repository](https://github.com/highfidelity/homebrew-formulas) can install QXmpp via homebrew - `brew install highfidelity/formulas/qxmpp`.
-
 ####Devices

 You can support external input/output devices such as Oculus Rift, Leap Motion, Faceshift, PrioVR, MIDI, Razr Hydra and more by adding each individual SDK in the visible building path. Refer to the readme file available in each device folder in [interface/external/](interface/external) for the detailed explanation of the requirements to use the device.
--- a/BUILD_ANDROID.md
+++ b/BUILD_ANDROID.md
@ -72,38 +72,6 @@ This should generate libcrypto and libssl in the root of the OpenSSL directory.

 If you have been building other components it is possible that the OpenSSL compile will fail based on the values other cross-compilations (tbb, bullet) have set. Ensure that you are in a new terminal window to avoid compilation errors from previously set environment variables.

-####Intel Threading Building Blocks
-
-Download the [Intel Threading Building Blocks source](https://www.threadingbuildingblocks.org/download) and extract the tarball inside your `ANDROID_LIB_DIR`. Rename the extracted folder to `tbb`.
-
-NOTE: BEFORE YOU ATTEMPT TO CROSS-COMPILE TBB, DISCONNECT ANY DEVICES ADB WOULD DETECT. The tbb build process asks adb for a couple of strings, and if a device is plugged in extra characters get added that will cause ndk-build to fail with an error.
-
-From the tbb directory, execute the following commands. First, we build TBB using `ndk-build`. Then, the compiled libs are copied to a lib folder in the root of tbb directory.
-
-```
-cd jni
-ndk-build target=android tbb tbbmalloc arch=arm
-cd ../
-mkdir lib
-cp `find . -name "*.so"` lib/
-```
-
-####Soxr
-
-Download the [Soxr source](http://sourceforge.net/projects/soxr/) and extract the tarball inside your `ANDROID_LIB_DIR`. Rename the extracted folder to `soxr`.
-
-From the soxr directory, use cmake, along with the `android.toolchain.cmake` file (included in this repository under cmake/android) to cross-compile soxr for Android. Note that you will need ANDROID_NDK set in your environment before using the toolchain file.
-
-The full set of commands to build soxr for Android is shown below. It is a long command, make sure you copy the entire command (up to `-DBUILD_TESTS=0`).
-
-```
-cmake -DCMAKE_TOOLCHAIN_FILE=$FULL_PATH_TO_TOOLCHAIN -DCMAKE_INSTALL_PREFIX=. -DHAVE_WORDS_BIGENDIAN_EXITCODE=1 -DBUILD_TESTS=0
-make
-make install
-```
-
-This will create the `lib` and `include` folders inside `ANDROID_LIB_DIR/soxr` that FindSoxr will look for.
-
 ####Oculus Mobile SDK

 The Oculus Mobile SDK is optional, for Gear VR support. It is not required to compile gvr-interface.
@ -127,7 +95,6 @@ To put the Gear VR Service into developer mode you need an application with an O

 Once the application is on your device, go to `Settings->Application Manager->Gear VR Service->Manage Storage`. Tap on `VR Service Version` six times. It will scan your device to verify that you have an osig file in an application on your device, and then it will let you enable Developer mode.

-
 ###CMake

 We use CMake to generate the makefiles that compile and deploy the Android APKs to your device. In order to create Makefiles for the Android targets, CMake requires that some environment variables are set, and that other variables are passed to it when it is run.
--- a/BUILD_LINUX.md
+++ b/BUILD_LINUX.md
@ -1,11 +1,5 @@
 Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only Linux specific instructions are found in this file. 

-###Linux Specific Dependencies
-* [freeglut](http://freeglut.sourceforge.net/) ~> 2.8.0
-* [zLib](http://www.zlib.net/) ~> 1.2.8
-
-In general, as long as external dependencies are placed in OS standard locations, CMake will successfully find them during its run. When possible, you may choose to install depencies from your package manager of choice, or from source.
-
 ###Qt5 Dependencies
 Should you choose not to install Qt5 via a package manager that handles dependencies for you, you may be missing some Qt5 dependencies. On Ubuntu, for example, the following additional packages are required:

--- a/BUILD_OSX.md
+++ b/BUILD_OSX.md
@ -4,7 +4,7 @@ Please read the [general build guide](BUILD.md) for information on dependencies
 [Homebrew](http://brew.sh/) is an excellent package manager for OS X. It makes install of all hifi dependencies very simple.

    brew tap highfidelity/homebrew-formulas
-    brew install cmake openssl tbb libsoxr
+    brew install cmake openssl
    brew install highfidelity/formulas/qt5
    brew link qt5 --force

--- a/BUILD_WIN.md
+++ b/BUILD_WIN.md
@ -1,12 +1,6 @@
 Please read the [general build guide](BUILD.md) for information on dependencies required for all platforms. Only Windows specific instructions are found in this file.

-###Windows Specific Dependencies
-* [GLEW](http://glew.sourceforge.net/) ~> 1.10.0
-* [freeglut MSVC](http://www.transmissionzero.co.uk/software/freeglut-devel/) ~> 2.8.1
-* [zLib](http://www.zlib.net/) ~> 1.2.8
-* (remember that you need all other dependencies listed in [BUILD.md](BUILD.md))
-
-####Visual Studio 2013
+###Visual Studio 2013

 You can use the Community or Professional editions of Visual Studio 2013.

@ -16,10 +10,22 @@ Or you can start a regular command prompt and then run:

    "%VS120COMNTOOLS%\vsvars32.bat"

-#####Windows SDK 8.1
+####Windows SDK 8.1

 If using Visual Studio 2013 and building as a Visual Studio 2013 project you need the Windows 8 SDK which you should already have as part of installing Visual Studio 2013. You should be able to see it at `C:\Program Files (x86)\Windows Kits\8.1\Lib\winv6.3\um\x86`.

+####nmake & msbuild
+
+Some of the external projects may require nmake and msbuild to compile and install. If they are not installed at the locations listed below, please ensure that both are in your PATH so CMake can find them when required. 
+
+We expect nmake.exe to be located at the following path.
+
+    C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\bin
+
+We expect msbuild.exe to be located at the following path.
+
+    C:\Program Files (x86)\MSBUILD\12.0\Bin
+
 ###Qt
 You can use the online installer or the offline installer. If you use the offline installer, be sure to select the "OpenGL" version.

@ -32,9 +38,8 @@ NOTE: Qt does not support 64-bit builds on Windows 7, so you must use the 32-bit
 * [Download the offline installer](http://download.qt-project.org/official_releases/qt/5.3/5.3.2/qt-opensource-windows-x86-msvc2013_opengl-5.3.2.exe)

 Once Qt is installed, you need to manually configure the following:
-* Make sure the Qt runtime DLLs are loadable. You must do this before you attempt to build because some tools for the build depend on Qt. E.g., add to the PATH: `Qt\5.3.2\msvc2013_opengl\bin\`. 
-* Go to Control Panel > System > Advanced System Settings > Environment Variables > New ...
-* Set the QT_CMAKE_PREFIX_PATH environment variable to your `Qt\5.3.2\msvc2013_opengl` directory.
+* Set the QT_CMAKE_PREFIX_PATH environment variable to your `Qt\5.3.2\msvc2013_opengl\lib\cmake` directory.
+  * You can set an environment variable from Control Panel > System > Advanced System Settings > Environment Variables > New

 ###External Libraries

@ -42,37 +47,19 @@ As it stands, Hifi/Interface is a 32-bit application, so all libraries should al

 CMake will need to know where the headers and libraries for required external dependencies are. 

+We use CMake's `fixup_bundle` to find the DLLs all of our exectuable targets require, and then copy them beside the executable in a post-build step. If `fixup_bundle` is having problems finding a DLL, you can fix it manually on your end by adding the folder containing that DLL to your path. Let us know which DLL CMake had trouble finding, as it is possible a tweak to our CMake files is required.
+
 The recommended route for CMake to find the external dependencies is to place all of the dependencies in one folder and set one ENV variable - HIFI_LIB_DIR. That ENV variable should point to a directory with the following structure:

    root_lib_dir
-        -> bullet
-            -> include
-            -> lib
-        -> freeglut
-            -> bin
-            -> include
-            -> lib
-        -> glew
-            -> bin
-            -> include
-            -> lib
        -> openssl
            -> bin
            -> include
            -> lib
-        -> tbb
-            -> include
-            -> lib
-        -> zlib
-           -> include
-           -> lib
-           -> test

 For many of the external libraries where precompiled binaries are readily available you should be able to simply copy the extracted folder that you get from the download links provided at the top of the guide. Otherwise you may need to build from source and install the built product to this directory. The `root_lib_dir` in the above example can be wherever you choose on your system - as long as the environment variable HIFI_LIB_DIR is set to it. From here on, whenever you see %HIFI_LIB_DIR% you should substitute the directory that you chose.

-As with the Qt libraries, you will need to make sure that directories containing DLL'S are in your path. Where possible, you can use static builds of the external dependencies to avoid this requirement.
-
-###OpenSSL
+####OpenSSL

 Qt will use OpenSSL if it's available, but it doesn't install it, so you must install it separately.

@ -92,89 +79,25 @@ To prevent these problems, install OpenSSL yourself. Download the following bina

 Install OpenSSL into the Windows system directory, to make sure that Qt uses the version that you've just installed, and not some other version.

-###Intel Threading Building Blocks (TBB)
+###vhacd
+Download it directly from https://github.com/virneo/v-hacd

-Download the zip from the [TBB website](https://www.threadingbuildingblocks.org/). 
+To build it run the following commands
+	1. cd src\
+	2. mkdir build
+	3. cd build
+	4. cmake ..
+	
+Build using visual studio 2013. Build ALL_BUILD and INSTALL targets both in Release and Debug.

-We recommend you extract it to %HIFI_LIB_DIR%\tbb. This will help our FindTBB cmake module find what it needs. You can place it wherever you like on your machine if you specify TBB_ROOT_DIR as an environment variable or a variable passed when cmake is run.
+This will create an output folder with include and lib directory inside it.

-###Zlib
-
-Download the compiled DLL from the [zlib website](http://www.zlib.net/). Extract to %HIFI_LIB_DIR%\zlib.
-
-Add the following environment variables (remember to substitute your own directory for %HIFI_LIB_DIR%):
-
-    ZLIB_LIBRARY=%HIFI_LIB_DIR%\zlib\lib\zdll.lib
-    ZLIB_INCLUDE_DIR=%HIFI_LIB_DIR%\zlib\include
-
-Add to the PATH: `%HIFI_LIB_DIR%\zlib`
-
-(The PATH environment variable is where Windows looks for its DLL's and executables. There's a great tool for editing these variables with ease, [Rapid Environment Editor](http://www.rapidee.com/en/download))
-
-Important! This should be added at the beginning of the path, not the end (your 
-system likely has many copies of zlib1.dll, and you want High Fidelity to use the correct version). If High Fidelity picks up the wrong zlib1.dll then it might be unable to use it, and that would cause it to fail to start, showing only the cryptic error "The application was unable to start correctly: 0xc0000022".
-
-###freeglut
-
-Download the binary package: `freeglut-MSVC-2.8.1-1.mp.zip`. Extract to %HIFI_LIB_DIR%\freeglut.
-
-Add to the PATH: `%HIFI_LIB_DIR%\freeglut\bin`
-
-###GLEW
-
-Download the binary package: `glew-1.10.0-win32.zip`. Extract to %HIFI_LIB_DIR%\glew (you'll need to rename the default directory name).
-
-Add to the PATH: `%HIFI_LIB_DIR%\glew\bin\Release\Win32`
-
-###Bullet
-
-Bullet 2.82 source can be [downloaded here](https://code.google.com/p/bullet/downloads/detail?name=bullet-2.82-r2704.zip). Bullet does not come with prebuilt libraries, you need to make those yourself.
-
-* Download the zip file and extract into a temporary folder
-* Create a directory named cmakebuild. Bullet comes with a build\ directory by default, however, that directory is intended for use with premake, and considering premake doesn't support VS2013, we prefer to run the cmake build on its own directory.
-* Make the following modifications to Bullet's source:
-   1. In file: Extras\HACD\hacdICHull.cpp --- in line: 17 --- insert: #include &lt;algorithm&gt;
-   2. In file: src\MiniCL\cl_MiniCL_Defs.h --- comment lines 364 to 372
-   3. In file: CMakeLists.txt set to ON the option USE_MSVC_RUNTIME_LIBRARY_DLL in line 27
-
-Then create the Visual Studio solution and build the libraries - run the following commands from a Visual Studio 2013 command prompt, from within the cmakebuild directory created before:
-
-```shell
-cmake .. -G "Visual Studio 12"
-msbuild BULLET_PHYSICS.sln /p:Configuration=Debug
-```
-
-This will create Debug libraries in cmakebuild\lib\Debug. You can replace Debug with Release in the msbuild command and that will generate Release libraries in cmakebuild\lib\Release.
-
-You now have Bullet libraries compiled, now you need to put them in the right place for hifi to find them:
-
-* Create a directory named bullet\ inside your %HIFI_LIB_DIR%
-* Create two directores named lib\ and include\ inside bullet\
-* Copy all the contents inside src\ from the bullet unzip path into %HIFI_LIB_DIR%\bullet\include\
-* Copy all the contents inside cmakebuild\lib\ into %HIFI_LIB_DIR\bullet\lib
-
-_Note that the INSTALL target should handle the copying of files into an install directory automatically, however, without modifications to Cmake, the install target didn't work right for me, please update this instructions if you get that working right - Leo &lt;leo@highfidelity.io&gt;_
-
-###Soxr
-
-Download the zip from the [soxr sourceforge page](http://sourceforge.net/projects/soxr/). 
-
-We recommend you install it to %HIFI_LIB_DIR%\soxr. This will help our FindSoxr cmake module find what it needs. You can place it wherever you like on your machine if you specify SOXR_ROOT_DIR as an environment variable or a variable passed when cmake is run.
-
-Extract the soxr archive wherever you like. Then, inside the extracted folder, create a directory called `build`. From that build directory, the following commands will build and then install soxr to `%HIFI_LIB_DIR%`.
-
-(Make sure to run the following inside Visual Studio)
-
-```
-cmake .. -G "NMake Makefiles" -DCMAKE_INSTALL_PREFIX=%HIFI_LIB_DIR%/soxr
-nmake
-nmake install
-```
+Either copy the contents of output folder to ENV %HIFI_LIB_DIR%/vhacd or create an environment variable VHACD_ROOT_DIR to this output directory.

 ###Build High Fidelity using Visual Studio
 Follow the same build steps from the CMake section of [BUILD.md](BUILD.md), but pass a different generator to CMake.

-    cmake .. -DZLIB_LIBRARY=%ZLIB_LIBRARY% -DZLIB_INCLUDE_DIR=%ZLIB_INCLUDE_DIR% -G "Visual Studio 12"
+    cmake .. -G "Visual Studio 12"

 Open %HIFI_DIR%\build\hifi.sln and compile.

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -86,10 +86,33 @@ else ()
  endif ()
 endif ()

+# figure out where the qt dir is
+get_filename_component(QT_DIR "${QT_CMAKE_PREFIX_PATH}/../../" ABSOLUTE)
+
 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_CMAKE_PREFIX_PATH})

-# set our OS X deployment target to
-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8)
+if (APPLE)
+  # set our OS X deployment target
+  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.8)
+  
+  # find the 10.9 SDK path
+  find_path(
+    _OSX_DESIRED_SDK_PATH 
+    NAME MacOSX10.9.sdk 
+    HINTS ${OSX_SDK_PATH}
+    PATHS /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
+          /Applications/Xcode-beta.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
+  )
+  
+  if (NOT _OSX_DESIRED_SDK_PATH)
+    message(FATAL_ERROR "Could not find OS X 10.9 SDK. Please pass OSX_SDK_PATH to CMake to point us to your SDKs directory.")
+  else ()
+    message(STATUS "Found OS X 10.9 SDK at ${_OSX_DESIRED_SDK_PATH}/MacOSX10.9.sdk")
+  endif ()
+  
+  # set that as the SDK to use
+  set(CMAKE_OSX_SYSROOT ${_OSX_DESIRED_SDK_PATH}/MacOSX10.9.sdk)
+endif ()

 # Find includes in corresponding build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
@ -103,8 +126,15 @@ set(HIFI_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries")
 # setup for find modules
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")

-set(MACRO_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros")
-set(EXTERNAL_PROJECT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/externals")
+if (CMAKE_BUILD_TYPE)
+  string(TOUPPER ${CMAKE_BUILD_TYPE} UPPER_CMAKE_BUILD_TYPE)
+else ()
+  set(UPPER_CMAKE_BUILD_TYPE DEBUG)
+endif ()
+
+set(HIFI_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set(MACRO_DIR "${HIFI_CMAKE_DIR}/macros")
+set(EXTERNAL_PROJECT_DIR "${HIFI_CMAKE_DIR}/externals")

 file(GLOB HIFI_CUSTOM_MACROS "cmake/macros/*.cmake")
 foreach(CUSTOM_MACRO ${HIFI_CUSTOM_MACROS})
@ -118,6 +148,28 @@ if (ANDROID)
  endforeach()
 endif ()

+set(EXTERNAL_PROJECT_PREFIX "project")
+set_property(DIRECTORY PROPERTY EP_PREFIX ${EXTERNAL_PROJECT_PREFIX})
+setup_externals_binary_dir()
+
+# setup options to grab external project dependencies
+option(GET_BULLET "Get Bullet library automatically as external project" 1)
+option(GET_GLM "Get GLM library automatically as external project" 1)
+option(GET_GVERB "Get Gverb library automatically as external project" 1)
+option(GET_SOXR "Get Soxr library automatically as external project" 1)
+option(GET_TBB "Get Threading Building Blocks library automatically as external project" 1)
+
+if (WIN32)
+  option(GET_GLEW "Get GLEW library automatically as external project" 1)
+endif ()
+
+option(GET_SDL2 "Get SDL2 library automatically as external project" 0)
+option(GET_QXMPP "GET Qxmpp library automatically as external project" 0)
+
+if (WIN32)
+  add_paths_to_fixup_libs("${QT_DIR}/bin")
+endif ()
+
 # add subdirectories for all targets
 if (NOT ANDROID)
  add_subdirectory(assignment-client)
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@ -2,7 +2,7 @@ set(TARGET_NAME assignment-client)

 setup_hifi_project(Core Gui Network Script Widgets)

-add_dependency_external_project(glm)
+add_dependency_external_projects(glm)
 find_package(GLM REQUIRED)
 target_include_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS})

@ -17,4 +17,4 @@ if (UNIX)
  target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
 endif (UNIX)

-include_dependency_includes()
+copy_dlls_beside_windows_executable()
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@ -194,7 +194,7 @@ void Agent::run() {
    
    // setup an Avatar for the script to use
    ScriptableAvatar scriptedAvatar(&_scriptEngine);
-    scriptedAvatar.setForceFaceshiftConnected(true);
+    scriptedAvatar.setForceFaceTrackerConnected(true);

    // call model URL setters with empty URLs so our avatar, if user, will have the default models
    scriptedAvatar.setFaceModelURL(QUrl());
--- a/cmake/android/QtCreateAPK.cmake
+++ b/cmake/android/QtCreateAPK.cmake
@ -26,7 +26,7 @@ macro(qt_create_apk)
 		set(ANDROID_APK_THEME "")
 	endif()
  
-	if (CMAKE_BUILD_TYPE MATCHES RELEASE)
+	if (UPPER_CMAKE_BUILD_TYPE MATCHES RELEASE)
 		set(ANDROID_APK_DEBUGGABLE "false")
 		set(ANDROID_APK_RELEASE_LOCAL ${ANDROID_APK_RELEASE})
 	else ()
@ -39,9 +39,6 @@ macro(qt_create_apk)
  
  # create "strings.xml"
  configure_file("${ANDROID_THIS_DIRECTORY}/strings.xml.in" "${ANDROID_APK_BUILD_DIR}/res/values/strings.xml")
-
-  # figure out where the qt dir is
-  get_filename_component(QT_DIR "${QT_CMAKE_PREFIX_PATH}/../../" ABSOLUTE)
  
  # find androiddeployqt
  find_program(ANDROID_DEPLOY_QT androiddeployqt HINTS "${QT_DIR}/bin")
--- a/cmake/externals/bullet/CMakeLists.txt
+++ b/cmake/externals/bullet/CMakeLists.txt
@ -0,0 +1,93 @@
+set(EXTERNAL_NAME bullet)
+
+if (WIN32)
+  set(PLATFORM_CMAKE_ARGS "-DUSE_MSVC_RUNTIME_LIBRARY_DLL=1")
+else ()
+  set(PLATFORM_CMAKE_ARGS "-DBUILD_SHARED_LIBS=1")
+  
+  if (ANDROID)
+    list(APPEND PLATFORM_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19")
+  elseif (APPLE)
+    list(APPEND PLATFORM_CMAKE_ARGS "-DCMAKE_INSTALL_NAME_DIR=<INSTALL_DIR>/lib")
+  endif()
+endif ()
+
+include(ExternalProject)
+
+if (WIN32)
+  if (UPPER_CMAKE_BUILD_TYPE MATCHES DEBUG)
+    set(MSBUILD_CONFIGURATION Debug)
+  else ()
+    set(MSBUILD_CONFIGURATION Release)
+  endif ()
+  
+  find_program(MSBUILD_COMMAND msbuild PATHS "C:/Program Files (x86)/MSBUILD/12.0/Bin")
+  
+  ExternalProject_Add(
+    ${EXTERNAL_NAME}
+    URL https://bullet.googlecode.com/files/bullet-2.82-r2704.zip
+    URL_MD5 f5e8914fc9064ad32e0d62d19d33d977
+    CMAKE_ARGS ${PLATFORM_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DBUILD_EXTRAS=0 -DINSTALL_LIBS=1 -DBUILD_DEMOS=0 -DUSE_GLUT=0
+    BUILD_COMMAND ${MSBUILD_COMMAND} ALL_BUILD.vcxproj /p:Configuration=${MSBUILD_CONFIGURATION}
+    LOG_DOWNLOAD 1
+    LOG_CONFIGURE 1
+    LOG_BUILD 1
+    BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
+  )  
+else ()
+  ExternalProject_Add(
+    ${EXTERNAL_NAME}
+    URL http://bullet.googlecode.com/files/bullet-2.82-r2704.tgz
+    URL_MD5 70b3c8d202dee91a0854b4cbc88173e8
+    CMAKE_ARGS ${PLATFORM_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DBUILD_EXTRAS=0 -DINSTALL_LIBS=1 -DBUILD_DEMOS=0 -DUSE_GLUT=0
+    LOG_DOWNLOAD 1
+    LOG_CONFIGURE 1
+    LOG_BUILD 1
+    BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
+  )  
+endif ()
+
+ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
+
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+
+set(BULLET_LIB_DIR "${INSTALL_DIR}/lib")
+
+if (APPLE OR UNIX OR ANDROID)
+  if (APPLE)
+    set(BULLET_LIB_EXT "dylib")
+  else ()
+    set(BULLET_LIB_EXT "so")
+  endif ()
+  
+  set(LIB_PREFIX "lib")
+elseif (WIN32)
+  set(BULLET_LIB_EXT "lib")
+endif ()
+
+if (DEFINED BULLET_LIB_EXT)
+  if (NOT WIN32 OR UPPER_CMAKE_BUILD_TYPE MATCHES RELEASE)
+    set(_PRESENT_LIB_TYPE RELEASE)
+    set(_MISSING_LIB_TYPE DEBUG)
+  else ()
+    set(_PRESENT_LIB_TYPE DEBUG)
+    set(_MISSING_LIB_TYPE RELEASE)
+    set(_LIB_NAME_SUFFIX _Debug)
+  endif ()
+  
+  set(${EXTERNAL_NAME_UPPER}_DYNAMICS_LIBRARY_${_PRESENT_LIB_TYPE} ${BULLET_LIB_DIR}/${LIB_PREFIX}BulletDynamics${_LIB_NAME_SUFFIX}.${BULLET_LIB_EXT} CACHE FILEPATH "Bullet dynamics ${_PRESENT_LIB_TYPE} library location")
+  set(${EXTERNAL_NAME_UPPER}_DYNAMICS_LIBRARY_${_MISSING_LIB_TYPE} "" CACHE FILEPATH "Bullet dynamics ${_MISSING_LIB_TYPE} library location")
+
+  set(${EXTERNAL_NAME_UPPER}_COLLISION_LIBRARY_${_PRESENT_LIB_TYPE} ${BULLET_LIB_DIR}/${LIB_PREFIX}BulletCollision${_LIB_NAME_SUFFIX}.${BULLET_LIB_EXT} CACHE FILEPATH "Bullet collision ${_PRESENT_LIB_TYPE} library location")
+  set(${EXTERNAL_NAME_UPPER}_COLLISION_LIBRARY_${_MISSING_LIB_TYPE} "" CACHE FILEPATH "Bullet collision ${_MISSING_LIB_TYPE} library location")
+
+  set(${EXTERNAL_NAME_UPPER}_MATH_LIBRARY_${_PRESENT_LIB_TYPE} ${BULLET_LIB_DIR}/${LIB_PREFIX}LinearMath${_LIB_NAME_SUFFIX}.${BULLET_LIB_EXT} CACHE FILEPATH "Bullet math ${_PRESENT_LIB_TYPE} library location")
+  set(${EXTERNAL_NAME_UPPER}_MATH_LIBRARY_${_MISSING_LIB_TYPE} "" CACHE FILEPATH "Bullet math ${_MISSING_LIB_TYPE} library location")
+
+  set(${EXTERNAL_NAME_UPPER}_SOFTBODY_LIBRARY_${_PRESENT_LIB_TYPE} ${BULLET_LIB_DIR}/${LIB_PREFIX}BulletSoftBody${_LIB_NAME_SUFFIX}.${BULLET_LIB_EXT} CACHE FILEPATH "Bullet softbody ${_PRESENT_LIB_TYPE} library location")
+  set(${EXTERNAL_NAME_UPPER}_SOFTBODY_LIBRARY_${_MISSING_LIB_TYPE} "" CACHE FILEPATH "Bullet softbody ${_MISSING_LIB_TYPE} library location")
+endif ()
+
+if (DEFINED ${EXTERNAL_NAME_UPPER}_DYNAMICS_LIBRARY_${_PRESENT_LIB_TYPE})
+  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${INSTALL_DIR}/include/bullet CACHE PATH "Path to bullet include directory")
+endif ()
--- a/cmake/externals/glew/CMakeLists.txt
+++ b/cmake/externals/glew/CMakeLists.txt
@ -0,0 +1,26 @@
+if (WIN32)
+  set(EXTERNAL_NAME glew)
+
+  include(ExternalProject)
+  ExternalProject_Add(
+    ${EXTERNAL_NAME}
+    URL http://hifi-public.s3.amazonaws.com/dependencies/glew-1.10.0-win32.zip
+    URL_MD5 37514e4e595a3b3dc587eee8f7e8ec2f
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    LOG_DOWNLOAD 1
+  )
+
+  ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
+
+  string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE PATH "List of glew include directories")
+  
+  set(_LIB_DIR ${SOURCE_DIR}/lib/Release/Win32)
+  
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${_LIB_DIR}/glew32.lib CACHE FILEPATH "Location of GLEW release library")
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG "" CACHE FILEPATH "Location of GLEW debug library")
+  
+  set(${EXTERNAL_NAME_UPPER}_DLL_PATH ${SOURCE_DIR}/bin/Release/Win32 CACHE FILEPATH "Location of GLEW DLL")
+endif ()
--- a/cmake/externals/glm/CMakeLists.txt
+++ b/cmake/externals/glm/CMakeLists.txt
@ -3,13 +3,16 @@ set(EXTERNAL_NAME glm)
 include(ExternalProject)
 ExternalProject_Add(
  ${EXTERNAL_NAME}
-  PREFIX ${EXTERNAL_NAME}
  URL http://pkgs.fedoraproject.org/repo/pkgs/glm/glm-0.9.5.4.zip/fab76fc982b256b46208e5c750ed456a/glm-0.9.5.4.zip
+  URL_MD5 fab76fc982b256b46208e5c750ed456a
+  BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-  LOG_DOWNLOAD ON
+  LOG_DOWNLOAD 1
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
 )

 ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)

 string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE TYPE STRING)
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE PATH "List of glm include directories")
--- a/cmake/externals/gverb/CMakeLists.txt
+++ b/cmake/externals/gverb/CMakeLists.txt
@ -7,19 +7,22 @@ endif ()
 include(ExternalProject)
 ExternalProject_Add(
  ${EXTERNAL_NAME}
-  PREFIX ${EXTERNAL_NAME}
  URL http://hifi-public.s3.amazonaws.com/dependencies/gverb-master.zip
+  URL_MD5 8b16d586390a2102804e46b87820dfc6
  CMAKE_ARGS ${ANDROID_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-  LOG_DOWNLOAD ON
+  BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
+  LOG_DOWNLOAD 1
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
 )

 ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)

 string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
-set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE TYPE STRING)
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE FILEPATH "Path to gverb include directory")

 if (WIN32) 
-  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/gverb.lib CACHE TYPE STRING)
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/gverb.lib CACHE FILEPATH "List of gverb libraries")
 else ()
-  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libgverb.a CACHE TYPE STRING)
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libgverb.a CACHE FILEPATH "List of gverb libraries")
 endif ()
--- a/cmake/externals/qxmpp/CMakeLists.txt
+++ b/cmake/externals/qxmpp/CMakeLists.txt
@ -0,0 +1,74 @@
+set(EXTERNAL_NAME qxmpp)
+
+# we need to find qmake inside QT_DIR
+find_program(QMAKE_COMMAND NAME qmake PATHS ${QT_DIR}/bin NO_DEFAULT_PATH)
+
+if (NOT QMAKE_COMMAND)
+  message(FATAL_ERROR "Could not find qmake. Qxmpp cannot be compiled without qmake.")
+endif ()
+
+if (ANDROID)
+  set(ANDROID_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19")
+endif ()
+
+if (WIN32)
+  find_program(PLATFORM_BUILD_COMMAND nmake PATHS "C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/bin")
+  
+  if (NOT PLATFORM_BUILD_COMMAND)
+    message(FATAL_ERROR "You asked CMake to grap QXmpp and build it, but nmake was not found. Please make sure the folder containing nmake.exe is in your PATH.")
+  endif ()
+else ()
+  find_program(PLATFORM_BUILD_COMMAND make)
+endif ()
+
+include(ExternalProject)
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  URL http://qxmpp.googlecode.com/files/qxmpp-0.7.6.tar.gz
+  URL_MD5 ee45a97313306ded2ff0f6618a3ed1e1
+  BUILD_IN_SOURCE 1
+  PATCH_COMMAND patch -p2 -t -N --verbose < ${CMAKE_CURRENT_SOURCE_DIR}/qxmpp.patch
+  CONFIGURE_COMMAND ${QMAKE_COMMAND} PREFIX=<INSTALL_DIR>
+  BUILD_COMMAND ${PLATFORM_BUILD_COMMAND}
+  INSTALL_COMMAND ${PLATFORM_BUILD_COMMAND} install
+  LOG_DOWNLOAD 1
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+)
+
+ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
+
+if (CMAKE_GENERATOR STREQUAL Xcode)
+  find_program(DITTO_COMMAND ditto)
+  
+  ExternalProject_Add_Step(
+    ${EXTERNAL_NAME}
+    copy-from-xcode-install
+    COMMENT "Copying from /tmp/hifi.dst${INSTALL_DIR} to move install to proper location"
+    COMMAND ${DITTO_COMMAND} /tmp/hifi.dst${INSTALL_DIR} ${INSTALL_DIR}
+    DEPENDEES install
+    LOG 1
+  )
+endif ()
+
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE FILEPATH "Path to Qxmpp include directory")
+
+set(_LIB_DIR ${INSTALL_DIR}/lib)
+
+if (WIN32)
+  set(_LIB_EXT "0.lib")
+  
+  set(${EXTERNAL_NAME_UPPER}_DLL_PATH ${_LIB_DIR} CACHE PATH "Location of QXmpp DLL")
+else ()
+  if (APPLE)
+    set(_LIB_EXT ".dylib")
+  else ()
+    set(_LIB_EXT ".so")
+  endif ()
+  
+  set(_LIB_PREFIX "lib")
+endif ()
+
+set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${_LIB_DIR}/${_LIB_PREFIX}qxmpp${_LIB_EXT} CACHE FILEPATH "Path to QXmpp release library")
+set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG "" CACHE FILEPATH "Path to QXmpp debug library")
--- a/cmake/externals/qxmpp/qxmpp.patch
+++ b/cmake/externals/qxmpp/qxmpp.patch
@ -0,0 +1,13 @@
+diff --git a/qxmpp-0.7.6/src/src.pro b/qxmpp-0.7.6-patch/src/src.pro
+index 954738c..8404c8c 100644
+--- a/qxmpp-0.7.6/src/src.pro
+++ b/qxmpp-0.7.6-patch/src/src.pro
+@@ -4,7 +4,7 @@ QT -= gui
+ 
+ TEMPLATE = lib
+ 
+-CONFIG += $$QXMPP_LIBRARY_TYPE
+CONFIG += $$QXMPP_LIBRARY_TYPE c++11
+ DEFINES += QXMPP_BUILD
+ DEFINES += $$QXMPP_INTERNAL_DEFINES
+ INCLUDEPATH += $$QXMPP_INCLUDEPATH $$QXMPP_INTERNAL_INCLUDES
--- a/cmake/externals/sdl2/CMakeLists.txt
+++ b/cmake/externals/sdl2/CMakeLists.txt
@ -0,0 +1,68 @@
+set(EXTERNAL_NAME sdl2)
+
+include(ExternalProject)
+
+if (WIN32)
+  ExternalProject_Add(
+    ${EXTERNAL_NAME}
+    URL http://www.libsdl.org/release/SDL2-devel-2.0.3-VC.zip
+    URL_MD5 30a333bcbe94bc5016e8799c73e86233
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    LOG_DOWNLOAD 1
+  )
+elseif (APPLE)
+  ExternalProject_Add(
+    ${EXTERNAL_NAME}
+    URL http://hifi-public.s3.amazonaws.com/dependencies/SDL2-2.0.3-OSX.tar.gz
+    URL_MD5 64f888886268bdf1656ef1b4b7d7756d
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+    LOG_DOWNLOAD 1
+  )
+else ()
+  if (ANDROID)
+    set(ANDROID_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19")
+  endif ()
+  
+  ExternalProject_Add(
+    ${EXTERNAL_NAME}
+    URL http://www.libsdl.org/release/SDL2-2.0.3.tar.gz
+    URL_MD5 fe6c61d2e9df9ef570e7e80c6e822537
+    CMAKE_ARGS ${ANDROID_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+    LOG_DOWNLOAD 1
+    LOG_CONFIGURE 1
+    LOG_BUILD 1
+  )
+endif ()
+
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+
+if (APPLE)
+  ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
+  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${SOURCE_DIR}/SDL2.framework/Headers CACHE PATH "Location of SDL2 include directory")
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_TEMP ${SOURCE_DIR}/SDL2.framework/SDL2 CACHE STRING "Path to SDL2 library")
+else ()
+  if (WIN32)
+    ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
+    set(_ROOT_DIR ${SOURCE_DIR})
+    set(_INCLUDE_DIR ${_ROOT_DIR}/include)
+    set(_LIB_DIR "${SOURCE_DIR}/lib/x86")
+    set(_LIB_EXT "lib")
+  
+    set(${EXTERNAL_NAME_UPPER}_DLL_PATH ${_LIB_DIR} CACHE PATH "Location of SDL2 DLL")
+  else ()
+    ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
+    set(_ROOT_DIR ${INSTALL_DIR})
+    set(_INCLUDE_DIR ${_ROOT_DIR}/include/SDL2)
+  
+    set(_LIB_DIR ${INSTALL_DIR}/lib)
+    set(_LIB_EXT "so")
+    set(_LIB_PREFIX "lib")
+  endif ()
+
+  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIR ${_INCLUDE_DIR} CACHE PATH "Location of SDL2 include directory")
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_TEMP ${_LIB_DIR}/${_LIB_PREFIX}SDL2.${_LIB_EXT} CACHE FILEPATH "Path to SDL2 library")
+endif ()
--- a/cmake/externals/soxr/CMakeLists.txt
+++ b/cmake/externals/soxr/CMakeLists.txt
@ -0,0 +1,31 @@
+set(EXTERNAL_NAME soxr)
+
+if (ANDROID)
+  set(PLATFORM_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19" "-DHAVE_WORDS_BIGENDIAN_EXITCODE=1")
+endif ()
+
+include(ExternalProject)
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  URL http://hifi-public.s3.amazonaws.com/dependencies/soxr-0.1.1.zip
+  URL_MD5 349b5b2f323a7380bc12186d98c77d1d
+  CMAKE_ARGS ${PLATFORM_CMAKE_ARGS} -DBUILD_SHARED_LIBS=1 -DBUILD_TESTS=0 -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
+  LOG_DOWNLOAD 1
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
+)
+
+ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
+
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include CACHE PATH "List of soxr include directories")
+
+if (WIN32) 
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/soxr.lib CACHE FILEPATH "List of soxr libraries")
+  set(${EXTERNAL_NAME_UPPER}_DLL_PATH ${INSTALL_DIR}/bin CACHE PATH "Path to soxr dll")
+elseif (APPLE)
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libsoxr.dylib CACHE FILEPATH "List of soxr libraries")
+else ()
+  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libsoxr.so CACHE FILEPATH "List of soxr libraries")
+endif ()
--- a/cmake/externals/tbb/AndroidTBBLibCopy.cmake
+++ b/cmake/externals/tbb/AndroidTBBLibCopy.cmake
@ -0,0 +1,23 @@
+# 
+#  AndroidTBBLibCopy.cmake
+#  cmake/externals/tbb
+# 
+#  Copyright 2015 High Fidelity, Inc.
+#  Created by Stephen Birarda on February 18, 2014
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+#
+
+# first find the so files in the source dir
+file(GLOB_RECURSE _TBB_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/build/*.so")
+
+# raise an error if we found none
+if (NOT _TBB_LIBRARIES)
+  message(FATAL_ERROR "Did not find any compiled TBB libraries")
+endif ()
+
+# make the libs directory and copy the resulting files there
+file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/lib")
+message(STATUS "Copying TBB Android libs to ${CMAKE_CURRENT_SOURCE_DIR}/lib")
+file(COPY ${_TBB_LIBRARIES} DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/lib")
--- a/cmake/externals/tbb/CMakeLists.txt
+++ b/cmake/externals/tbb/CMakeLists.txt
@ -0,0 +1,105 @@
+set(EXTERNAL_NAME tbb)
+
+include(ExternalProject)
+
+if (ANDROID)
+  
+  find_program(NDK_BUILD_COMMAND NAMES ndk-build DOC "Path to the ndk-build command")
+      
+  ExternalProject_Add(
+    ${EXTERNAL_NAME}
+    URL http://hifi-public.s3.amazonaws.com/dependencies/tbb43_20150209oss_src.tgz
+    URL_MD5 f09c9abe8ec74e6558c1f89cebbe2893
+    BUILD_COMMAND ${NDK_BUILD_COMMAND} --directory=jni target=android tbb tbbmalloc arch=arm
+    BUILD_IN_SOURCE 1
+    CONFIGURE_COMMAND ""
+    INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/AndroidTBBLibCopy.cmake
+    LOG_DOWNLOAD 1
+    LOG_CONFIGURE 1
+    LOG_BUILD 1
+  )
+else ()
+  if (APPLE)
+    set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/tbb43_20150209oss_osx.tgz)
+    set(DOWNLOAD_MD5 3e683c19792582b61382e0d760ea5db2)
+  elseif (WIN32)
+    set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/tbb43_20150209oss_win.zip)
+    set(DOWNLOAD_MD5 e19c184f2bb0e944fc5f397f1e34ca84)
+  else () 
+    set(DOWNLOAD_URL http://s3.amazonaws.com/hifi-public/dependencies/tbb43_20150209oss_lin.tgz)
+    set(DOWNLOAD_MD5 d9c2a6f7807df364be44a8c3c05e8457)
+  endif ()
+  
+  ExternalProject_Add(
+    ${EXTERNAL_NAME}
+    URL ${DOWNLOAD_URL}
+    BUILD_COMMAND ""
+    CONFIGURE_COMMAND ""
+    INSTALL_COMMAND ""
+    LOG_DOWNLOAD ON
+  )
+endif ()
+
+ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
+
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+
+if (APPLE) 
+  set(_TBB_LIB_DIR "${SOURCE_DIR}/lib/libc++")
+  set(_LIB_PREFIX "lib")
+  set(_LIB_EXT "dylib")
+  
+  ExternalProject_Add_Step(
+    ${EXTERNAL_NAME}
+    change-install-name
+    COMMENT "Calling install_name_tool on TBB libraries to fix install name for dylib linking"
+    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/OSXTBBInstallNameChange.cmake
+    DEPENDEES install
+    WORKING_DIRECTORY <SOURCE_DIR>
+    LOG 1
+  )
+  
+elseif (WIN32)
+  set(_TBB_LIB_DIR "${SOURCE_DIR}/lib/ia32/vc12")
+  set(_LIB_EXT "lib")
+  set(${EXTERNAL_NAME_UPPER}_DLL_PATH "${SOURCE_DIR}/bin/ia32/vc12" CACHE PATH "Path to TBB DLLs")
+elseif (ANDROID)
+  set(_TBB_LIB_DIR "${SOURCE_DIR}/lib")
+  set(_LIB_PREFIX "lib")
+  set(_LIB_EXT "so")
+elseif (UNIX)
+  set(_LIB_PREFIX "lib")
+  set(_LIB_EXT "so")
+  
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(_TBB_ARCH_DIR "intel64")
+  else()
+    set(_TBB_ARCH_DIR "ia32")
+  endif()
+  
+  execute_process(
+    COMMAND ${CMAKE_C_COMPILER} -dumpversion
+    OUTPUT_VARIABLE GCC_VERSION
+  )
+  
+  if (GCC_VERSION VERSION_GREATER 4.4 OR GCC_VERSION VERSION_EQUAL 4.4)
+    set(_TBB_LIB_DIR "${SOURCE_DIR}/lib/${_TBB_ARCH_DIR}/gcc4.4")
+  elseif (GCC_VERSION VERSION_GREATER 4.1 OR GCC_VERSION VERSION_EQUAL 4.1)
+    set(_TBB_LIB_DIR "${SOURCE_DIR}/lib/${_TBB_ARCH_DIR}/gcc4.1")
+  else ()
+    message(STATUS "Could not find a compatible version of Threading Building Blocks library for your compiler.")
+  endif ()
+  
+  
+endif () 
+
+if (DEFINED _TBB_LIB_DIR)
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${_TBB_LIB_DIR}/${_LIB_PREFIX}tbb_debug.${_LIB_EXT} CACHE FILEPATH "TBB debug library location")
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${_TBB_LIB_DIR}/${_LIB_PREFIX}tbb.${_LIB_EXT} CACHE FILEPATH "TBB release library location")
+  set(${EXTERNAL_NAME_UPPER}_MALLOC_LIBRARY_DEBUG ${_TBB_LIB_DIR}/${_LIB_PREFIX}tbbmalloc_debug.${_LIB_EXT} CACHE FILEPATH "TBB malloc debug library location")
+  set(${EXTERNAL_NAME_UPPER}_MALLOC_LIBRARY_RELEASE ${_TBB_LIB_DIR}/${_LIB_PREFIX}tbbmalloc.${_LIB_EXT} CACHE FILEPATH "TBB malloc release library location")
+endif ()
+
+if (DEFINED ${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE)
+  set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${SOURCE_DIR}/include CACHE TYPE "List of tbb include directories")
+endif ()
--- a/cmake/externals/tbb/OSXTBBInstallNameChange.cmake
+++ b/cmake/externals/tbb/OSXTBBInstallNameChange.cmake
@ -0,0 +1,59 @@
+# 
+#  OSXTBBInstallNameChange.cmake
+#  cmake/externals/tbb
+# 
+#  Copyright 2015 High Fidelity, Inc.
+#  Created by Stephen Birarda on February 20, 2014
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+#
+
+# first find the so files in the source dir
+set(_TBB_LIBRARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/libc++)
+file(GLOB_RECURSE _TBB_LIBRARIES "${_TBB_LIBRARY_DIR}/*.dylib")
+
+# raise an error if we found none
+if (NOT _TBB_LIBRARIES)
+  message(FATAL_ERROR "Did not find any TBB libraries")
+endif ()
+
+# find the install_name_tool command
+find_program(INSTALL_NAME_TOOL_COMMAND NAMES install_name_tool DOC "Path to the install_name_tool command")
+
+# find the lipo command
+find_program(LIPO_COMMAND NAMES lipo DOC "Path to the lipo command")
+
+# enumerate the libraries
+foreach(_TBB_LIBRARY ${_TBB_LIBRARIES})
+  get_filename_component(_TBB_LIBRARY_FILENAME ${_TBB_LIBRARY} NAME)
+  
+  set(_LIPO_ARGS -remove i386 ${_TBB_LIBRARY_FILENAME} -output ${_TBB_LIBRARY_FILENAME})
+  message(STATUS "${LIPO_COMMAND} ${_LIPO_ARGS}")
+   
+  # first we use lipo to remove i386 from each dylib
+  execute_process(
+    COMMAND ${LIPO_COMMAND} ${_LIPO_ARGS}
+    WORKING_DIRECTORY ${_TBB_LIBRARY_DIR}
+    ERROR_VARIABLE _LIPO_ERROR
+  )
+  
+  if (_LIPO_ERROR)
+    message(FATAL_ERROR "There was an error removing i386 for ${_TBB_LIBRARY_FILENAME} - ${_LIPO_ERROR}")
+  endif ()
+  
+  set(_INSTALL_NAME_ARGS ${INSTALL_NAME_TOOL_COMMAND} -id ${_TBB_LIBRARY} ${_TBB_LIBRARY_FILENAME})
+  
+  message(STATUS "${INSTALL_NAME_COMMAND} ${_INSTALL_NAME_ARGS}")
+  
+  execute_process(
+    COMMAND ${INSTALL_NAME_COMMAND} ${_INSTALL_NAME_ARGS}
+    WORKING_DIRECTORY ${_TBB_LIBRARY_DIR}
+    ERROR_VARIABLE _INSTALL_NAME_ERROR
+  )
+  
+  if (_INSTALL_NAME_ERROR)
+    message(FATAL_ERROR "There was an error changing install name for ${_TBB_LIBRARY_FILENAME} - ${_INSTALL_NAME_ERROR}")
+  endif ()
+endforeach()
+
--- a/cmake/macros/AddDependencyExternalProject.cmake
+++ b/cmake/macros/AddDependencyExternalProject.cmake
@ -1,25 +0,0 @@
-# 
-#  SetupExternalProject.cmake
-#  cmake/macros
-# 
-#  Copyright 2015 High Fidelity, Inc.
-#  Created by Stephen Birarda on February 13, 2014
-#
-#  Distributed under the Apache License, Version 2.0.
-#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-# 
-
-macro(ADD_DEPENDENCY_EXTERNAL_PROJECT _PROJ_NAME)
-  
-  string(TOUPPER ${_PROJ_NAME} _PROJ_NAME_UPPER)
-  
-  if (NOT DEFINED GET_${_PROJ_NAME_UPPER} OR GET_${_PROJ_NAME_UPPER})
-    if (NOT TARGET ${_PROJ_NAME})    
-      add_subdirectory(${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME} ${CMAKE_BINARY_DIR}/externals/${_PROJ_NAME})
-    endif ()
-  
-    add_dependencies(${TARGET_NAME} ${_PROJ_NAME})
-    
-  endif ()
-  
-endmacro()
--- a/cmake/macros/AddDependencyExternalProjects.cmake
+++ b/cmake/macros/AddDependencyExternalProjects.cmake
@ -0,0 +1,46 @@
+# 
+#  AddDependencyExternalProjects.cmake
+#  cmake/macros
+# 
+#  Copyright 2015 High Fidelity, Inc.
+#  Created by Stephen Birarda on February 13, 2014
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+# 
+
+macro(ADD_DEPENDENCY_EXTERNAL_PROJECTS)
+  
+  foreach(_PROJ_NAME ${ARGN})
+    
+    string(TOUPPER ${_PROJ_NAME} _PROJ_NAME_UPPER)
+    
+    # has the user told us they specific don't want this as an external project?
+    if (GET_${_PROJ_NAME_UPPER})
+      # have we already detected we can't have this as external project on this OS?
+      if (NOT DEFINED ${_PROJ_NAME_UPPER}_EXTERNAL_PROJECT OR ${_PROJ_NAME_UPPER}_EXTERNAL_PROJECT)
+        # have we already setup the target?
+        if (NOT TARGET ${_PROJ_NAME})
+          add_subdirectory(${EXTERNAL_PROJECT_DIR}/${_PROJ_NAME} ${EXTERNALS_BINARY_DIR}/${_PROJ_NAME})
+          
+          # did we end up adding an external project target?
+          if (NOT TARGET ${_PROJ_NAME})
+            set(${_PROJ_NAME_UPPER}_EXTERNAL_PROJECT FALSE CACHE BOOL "Presence of ${_PROJ_NAME} as external target")
+            
+            message(STATUS "${_PROJ_NAME} was not added as an external project target for your OS."
+                    " Either your system should already have the external library or you will need to install it separately.")
+          else ()
+            set(${_PROJ_NAME_UPPER}_EXTERNAL_PROJECT TRUE CACHE BOOL "Presence of ${_PROJ_NAME} as external target")
+          endif ()
+        endif ()
+      
+        if (TARGET ${_PROJ_NAME})
+          add_dependencies(${TARGET_NAME} ${_PROJ_NAME})
+        endif ()
+        
+      endif ()
+    endif ()
+    
+  endforeach()
+
+endmacro()
--- a/cmake/macros/AddPathsToFixupLibs.cmake
+++ b/cmake/macros/AddPathsToFixupLibs.cmake
@ -0,0 +1,22 @@
+# 
+#  AddPathsToFixupLibs.cmake
+#  cmake/macros
+# 
+#  Copyright 2015 High Fidelity, Inc.
+#  Created by Stephen Birarda on February 17, 2014
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+# 
+
+macro(add_paths_to_fixup_libs)
+  foreach(_PATH ${ARGN})
+    set(_TEMP_LIB_PATHS ${FIXUP_LIBS})
+    
+    list(APPEND _TEMP_LIB_PATHS ${_PATH})
+    
+    list(REMOVE_DUPLICATES _TEMP_LIB_PATHS)
+    
+    set(FIXUP_LIBS ${_TEMP_LIB_PATHS} CACHE STRING "Paths for external libraries passed to fixup_bundle" FORCE)
+  endforeach()
+endmacro()
--- a/cmake/macros/CopyDllsBesideWindowsExecutable.cmake
+++ b/cmake/macros/CopyDllsBesideWindowsExecutable.cmake
@ -0,0 +1,43 @@
+# 
+#  CopyDllsBesideWindowsExecutable.cmake
+#  cmake/macros
+# 
+#  Copyright 2015 High Fidelity, Inc.
+#  Created by Stephen Birarda on February 17, 2014
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+# 
+
+macro(COPY_DLLS_BESIDE_WINDOWS_EXECUTABLE)
+  
+  if (WIN32)
+    configure_file(
+      ${HIFI_CMAKE_DIR}/templates/FixupBundlePostBuild.cmake.in  
+      ${CMAKE_CURRENT_BINARY_DIR}/FixupBundlePostBuild.cmake
+      @ONLY
+    )
+    
+    # add a post-build command to copy DLLs beside the executable
+    add_custom_command(
+      TARGET ${TARGET_NAME}
+      POST_BUILD
+      COMMAND ${CMAKE_COMMAND}
+        -DBUNDLE_EXECUTABLE=$<TARGET_FILE:${TARGET_NAME}>
+        -P ${CMAKE_CURRENT_BINARY_DIR}/FixupBundlePostBuild.cmake
+    )
+    
+    find_program(WINDEPLOYQT_COMMAND windeployqt PATHS ${QT_DIR}/bin NO_DEFAULT_PATH)
+    
+    if (NOT WINDEPLOYQT_COMMAND)
+      message(FATAL_ERROR "Could not find windeployqt at ${QT_DIR}/bin. windeployqt is required.")
+    endif ()
+  
+    # add a post-build command to call windeployqt to copy Qt plugins
+    add_custom_command(
+      TARGET ${TARGET_NAME}
+      POST_BUILD
+      COMMAND CMD /C "SET PATH=%PATH%;${QT_DIR}/bin && ${WINDEPLOYQT_COMMAND} --no-libraries $<TARGET_FILE:${TARGET_NAME}>"
+    )
+  endif ()
+endmacro()
--- a/cmake/macros/IncludeBullet.cmake
+++ b/cmake/macros/IncludeBullet.cmake
@ -1,16 +0,0 @@
-# 
-#  IncludeBullet.cmake
-# 
-#  Copyright 2014 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
-# 
-
-macro(INCLUDE_BULLET)
-    find_package(Bullet REQUIRED)
-    include_directories("${BULLET_INCLUDE_DIRS}")
-    if (APPLE OR UNIX)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${BULLET_INCLUDE_DIRS}")
-    endif()
-endmacro(INCLUDE_BULLET)
--- a/cmake/macros/IncludeDependencyIncludes.cmake
+++ b/cmake/macros/IncludeDependencyIncludes.cmake
@ -1,22 +0,0 @@
-# 
-#  IncludeDependencyIncludes.cmake
-#  cmake/macros
-# 
-#  Copyright 2014 High Fidelity, Inc.
-#  Created by Stephen Birarda on August 8, 2014
-# 
-#  Distributed under the Apache License, Version 2.0.
-#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-# 
-
-macro(INCLUDE_DEPENDENCY_INCLUDES)
-  if (${TARGET_NAME}_DEPENDENCY_INCLUDES)
-    list(REMOVE_DUPLICATES ${TARGET_NAME}_DEPENDENCY_INCLUDES)
-    
-    # include those in our own target
-    include_directories(SYSTEM ${${TARGET_NAME}_DEPENDENCY_INCLUDES})
-
-    # set the property on this target so it can be retreived by targets linking to us
-    set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_INCLUDES "${${TARGET_NAME}_DEPENDENCY_INCLUDES}")
-  endif()
-endmacro(INCLUDE_DEPENDENCY_INCLUDES)
--- a/cmake/macros/SetupExternalsBinaryDir.cmake
+++ b/cmake/macros/SetupExternalsBinaryDir.cmake
@ -0,0 +1,32 @@
+# 
+#  SetupExternalsBinaryDir.cmake
+#  cmake/macros
+# 
+#  Copyright 2015 High Fidelity, Inc.
+#  Created by Stephen Birarda on February 19, 2014
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+# 
+
+macro(SETUP_EXTERNALS_BINARY_DIR)
+
+  # get a short name for the generator to use in the path
+  STRING(REGEX REPLACE " " "-" CMAKE_GENERATOR_FOLDER_NAME ${CMAKE_GENERATOR})
+
+  if (MSVC12)
+    set(CMAKE_GENERATOR_FOLDER_NAME "vc12")
+  else ()
+    if (CMAKE_GENERATOR_FOLDER_NAME STREQUAL "Unix-Makefiles")
+      set(CMAKE_GENERATOR_FOLDER_NAME "makefiles")
+    endif ()
+  endif ()
+
+  set(EXTERNALS_BINARY_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build-ext")
+  if (ANDROID)
+    set(EXTERNALS_BINARY_DIR "${EXTERNALS_BINARY_ROOT_DIR}/android/${CMAKE_GENERATOR_FOLDER_NAME}")
+  else ()
+    set(EXTERNALS_BINARY_DIR "${EXTERNALS_BINARY_ROOT_DIR}/${CMAKE_GENERATOR_FOLDER_NAME}")
+  endif ()
+
+endmacro()
--- a/cmake/modules/FindBullet.cmake
+++ b/cmake/modules/FindBullet.cmake
@ -85,9 +85,7 @@ set(BULLET_INCLUDE_DIRS ${BULLET_INCLUDE_DIR})
 set(BULLET_LIBRARIES ${BULLET_DYNAMICS_LIBRARY} ${BULLET_COLLISION_LIBRARY} ${BULLET_MATH_LIBRARY} ${BULLET_SOFTBODY_LIBRARY})

 find_package_handle_standard_args(Bullet "Could NOT find Bullet, try to set the path to Bullet root folder in the system variable BULLET_ROOT_DIR"
-    BULLET_DYNAMICS_LIBRARY BULLET_COLLISION_LIBRARY BULLET_MATH_LIBRARY
    BULLET_INCLUDE_DIRS
+    BULLET_DYNAMICS_LIBRARY BULLET_COLLISION_LIBRARY BULLET_MATH_LIBRARY BULLET_SOFTBODY_LIBRARY
    BULLET_LIBRARIES
-)
-
-
+)
--- a/cmake/modules/FindGLEW.cmake
+++ b/cmake/modules/FindGLEW.cmake
@ -24,16 +24,19 @@ if (WIN32)
  
  find_path(GLEW_INCLUDE_DIRS GL/glew.h PATH_SUFFIXES include HINTS ${GLEW_SEARCH_DIRS})
  
-  find_library(GLEW_LIBRARY_RELEASE glew32s PATH_SUFFIXES "lib/Release/Win32" "lib" HINTS ${GLEW_SEARCH_DIRS})
-  find_library(GLEW_LIBRARY_DEBUG glew32sd PATH_SUFFIXES "lib/Debug/Win32" "lib" HINTS ${GLEW_SEARCH_DIRS})
+  find_library(GLEW_LIBRARY_RELEASE glew32 PATH_SUFFIXES "lib/Release/Win32" "lib" HINTS ${GLEW_SEARCH_DIRS})
+  find_library(GLEW_LIBRARY_DEBUG glew32d PATH_SUFFIXES "lib/Debug/Win32" "lib" HINTS ${GLEW_SEARCH_DIRS})
+  
+  find_path(GLEW_DLL_PATH glew32.dll PATH_SUFFIXES "bin/Release/Win32" HINTS ${GLEW_SEARCH_DIRS})
  
  include(SelectLibraryConfigurations)
  select_library_configurations(GLEW)
+  
+  set(GLEW_LIBRARIES ${GLEW_LIBRARY})
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(GLEW DEFAULT_MSG GLEW_INCLUDE_DIRS GLEW_LIBRARIES GLEW_DLL_PATH)
+  
+  add_paths_to_fixup_libs(${GLEW_DLL_PATH})
 endif ()

-set(GLEW_LIBRARIES ${GLEW_LIBRARY})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GLEW DEFAULT_MSG GLEW_INCLUDE_DIRS GLEW_LIBRARIES)
-
-mark_as_advanced(GLEW_INCLUDE_DIRS GLEW_LIBRARIES GLEW_SEARCH_DIRS)
--- a/cmake/modules/FindGverb.cmake
+++ b/cmake/modules/FindGverb.cmake
@ -22,4 +22,4 @@ find_path(GVERB_INCLUDE_DIRS gverb.h PATH_SUFFIXES include HINTS ${GVERB_SEARCH_
 find_library(GVERB_LIBRARIES gverb PATH_SUFFIXES lib HINTS ${GVERB_SEARCH_DIRS})

 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GVERB DEFAULT_MSG GVERB_INCLUDE_DIRS GVERB_LIBRARIES)
+find_package_handle_standard_args(Gverb DEFAULT_MSG GVERB_INCLUDE_DIRS GVERB_LIBRARIES)
--- a/cmake/modules/FindLeapMotion.cmake
+++ b/cmake/modules/FindLeapMotion.cmake
@ -20,6 +20,8 @@ find_path(LEAPMOTION_INCLUDE_DIRS Leap.h PATH_SUFFIXES include HINTS ${LEAPMOTIO
 if (WIN32)
  find_library(LEAPMOTION_LIBRARY_DEBUG Leapd PATH_SUFFIXES lib/x86 HINTS ${LEAPMOTION_SEARCH_DIRS})
  find_library(LEAPMOTION_LIBRARY_RELEASE Leap PATH_SUFFIXES lib/x86 HINTS ${LEAPMOTION_SEARCH_DIRS})
+  
+  find_path(LEAPMOTION_DLL_PATH Leap.dll PATH_SUFFIXES lib/x86 HINTS ${LEAPMOTION_SEARCH_DIRS})
 elseif (APPLE)
  find_library(LEAPMOTION_LIBRARY_RELEASE Leap PATH_SUFFIXES lib HINTS ${LEAPMOTION_SEARCH_DIRS})
 endif ()
@ -27,9 +29,18 @@ endif ()
 include(SelectLibraryConfigurations)
 select_library_configurations(LEAPMOTION)

-set(LEAPMOTION_LIBRARIES "${LEAPMOTION_LIBRARY}")
+set(LEAPMOTION_LIBRARIES ${LEAPMOTION_LIBRARY})
+
+set(LEAPMOTION_REQUIREMENTS LEAPMOTION_INCLUDE_DIRS LEAPMOTION_LIBRARIES)
+if (WIN32)
+  list(APPEND LEAPMOTION_REQUIREMENTS LEAPMOTION_DLL_PATH)
+endif ()

 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LeapMotion DEFAULT_MSG LEAPMOTION_INCLUDE_DIRS LEAPMOTION_LIBRARIES)
+find_package_handle_standard_args(LeapMotion DEFAULT_MSG ${LEAPMOTION_REQUIREMENTS})
+
+if (WIN32)
+  add_paths_to_fixup_libs(${LEAPMOTION_DLL_PATH})
+endif ()

 mark_as_advanced(LEAPMOTION_INCLUDE_DIRS LEAPMOTION_LIBRARIES LEAPMOTION_SEARCH_DIRS)
--- a/cmake/modules/FindOpenSSL.cmake
+++ b/cmake/modules/FindOpenSSL.cmake
@ -98,6 +98,9 @@ if (WIN32 AND NOT CYGWIN)
    select_library_configurations(SSL_EAY)

    set(OPENSSL_LIBRARIES ${SSL_EAY_LIBRARY} ${LIB_EAY_LIBRARY})
+    
+    find_path(OPENSSL_DLL_PATH NAMES ssleay32.dll PATH_SUFFIXES "bin" ${_OPENSSL_ROOT_HINTS_AND_PATHS})
+    
  elseif (MINGW)
    # same player, for MinGW
    set(LIB_EAY_NAMES libeay32)
@ -218,11 +221,15 @@ endif ()

 include(FindPackageHandleStandardArgs)

+set(OPENSSL_REQUIREMENTS OPENSSL_LIBRARIES OPENSSL_INCLUDE_DIR)
+if (WIN32)
+  list(APPEND OPENSSL_REQUIREMENTS OPENSSL_DLL_PATH)
+endif ()
+
 if (OPENSSL_VERSION)
  find_package_handle_standard_args(OpenSSL
    REQUIRED_VARS
-      OPENSSL_LIBRARIES
-      OPENSSL_INCLUDE_DIR
+      ${OPENSSL_REQUIREMENTS}
    VERSION_VAR
      OPENSSL_VERSION
    FAIL_MESSAGE
@ -230,9 +237,12 @@ if (OPENSSL_VERSION)
  )
 else ()
  find_package_handle_standard_args(OpenSSL "Could NOT find OpenSSL, try to set the path to OpenSSL root folder in the system variable OPENSSL_ROOT_DIR"
-    OPENSSL_LIBRARIES
-    OPENSSL_INCLUDE_DIR
+    ${OPENSSL_REQUIREMENTS}
  )
 endif ()

+if (WIN32)
+  add_paths_to_fixup_libs(${OPENSSL_DLL_PATH})
+endif ()
+
 mark_as_advanced(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES OPENSSL_SEARCH_DIRS)
--- a/cmake/modules/FindQxmpp.cmake
+++ b/cmake/modules/FindQxmpp.cmake
@ -21,11 +21,15 @@
 include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
 hifi_library_search_hints("qxmpp")

-find_path(QXMPP_INCLUDE_DIRS QXmppClient.h PATH_SUFFIXES include/qxmpp HINTS ${QXMPP_SEARCH_DIRS})
+find_path(QXMPP_INCLUDE_DIRS qxmpp/QXmppClient.h PATH_SUFFIXES include HINTS ${QXMPP_SEARCH_DIRS})

 find_library(QXMPP_LIBRARY_RELEASE NAMES qxmpp PATH_SUFFIXES lib HINTS ${QXMPP_SEARCH_DIRS})
 find_library(QXMPP_LIBRARY_DEBUG NAMES qxmpp_d PATH_SUFFIXES lib HINTS ${QXMPP_SEARCH_DIRS})

+if (WIN32)
+  find_path(QXMPP_DLL_PATH NAMES qxmpp.dll PATH_SUFFIXES lib HINTS ${QXMPP_SEARCH_DIRS})
+endif ()
+
 find_package(Qt5 COMPONENTS Xml REQUIRED)

 include(SelectLibraryConfigurations)
@ -36,4 +40,6 @@ set(QXMPP_LIBRARIES "${QXMPP_LIBRARY}" Qt5::Xml)
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(QXmpp DEFAULT_MSG QXMPP_INCLUDE_DIRS QXMPP_LIBRARIES QXMPP_LIBRARY)

-mark_as_advanced(QXMPP_INCLUDE_DIRS QXMPP_LIBRARIES QXMPP_SEARCH_DIRS)
+if (QXMPP_DLL_PATH)
+  add_paths_to_fixup_libs(${QXMPP_DLL_PATH})
+endif ()
--- a/cmake/modules/FindSDL2.cmake
+++ b/cmake/modules/FindSDL2.cmake
@ -138,6 +138,10 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
 		/opt/csw
 		/opt
 	)
+  
+  if (WIN32)
+    find_path(SDL2_DLL_PATH SDL2.dll PATH_SUFFIXES lib/x64 HINTS ${SDL2_SEARCH_DIRS})
+  endif ()
 # On 32bit build find the 32bit libs
 ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	FIND_LIBRARY(SDL2_LIBRARY_TEMP SDL2
@ -153,50 +157,12 @@ ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
 		/opt/csw
 		/opt
 	)
+  
+  if (WIN32)
+    find_path(SDL2_DLL_PATH SDL2.dll PATH_SUFFIXES lib/x86 HINTS ${SDL2_SEARCH_DIRS})
+  endif ()
 ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)

-IF(NOT SDL2_BUILDING_LIBRARY)
-	IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
-		# Non-OS X framework versions expect you to also dynamically link to
-		# SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
-		# seem to provide SDL2main for compatibility even though they don't
-		# necessarily need it.
-		# Lookup the 64 bit libs on x64
-		IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-			FIND_LIBRARY(SDL2MAIN_LIBRARY
-				NAMES SDL2main
-				HINTS
-				${SDL2_SEARCH_DIRS}
-				$ENV{SDL2}
-				PATH_SUFFIXES lib64 lib
-				lib/x64
-				x86_64-w64-mingw32/lib
-				PATHS
-				/sw
-				/opt/local
-				/opt/csw
-				/opt
-				)
-			# On 32bit build find the 32bit libs
-		ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
-			FIND_LIBRARY(SDL2MAIN_LIBRARY
-				NAMES SDL2main
-				HINTS
-				${SDL2_SEARCH_DIRS}
-				$ENV{SDL2}
-				PATH_SUFFIXES lib
-				lib/x86
-				i686-w64-mingw32/lib
-				PATHS
-				/sw
-				/opt/local
-				/opt/csw
-				/opt
-				)
-		ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-	ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
-ENDIF(NOT SDL2_BUILDING_LIBRARY)
-
 # SDL2 may require threads on your system.
 # The Apple build may not need an explicit flag because one of the
 # frameworks may already provide it.
@ -214,13 +180,6 @@ ENDIF(MINGW)

 SET(SDL2_FOUND "NO")
 	IF(SDL2_LIBRARY_TEMP)
-		# For SDL2main
-		IF(NOT SDL2_BUILDING_LIBRARY)
-			IF(SDL2MAIN_LIBRARY)
-				SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
-			ENDIF(SDL2MAIN_LIBRARY)
-		ENDIF(NOT SDL2_BUILDING_LIBRARY)
-
 		# For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
 		# CMake doesn't display the -framework Cocoa string in the UI even
 		# though it actually is there if I modify a pre-used variable.
@ -253,4 +212,13 @@ ENDIF(SDL2_LIBRARY_TEMP)

 INCLUDE(FindPackageHandleStandardArgs)

-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
+set(SDL2_REQUIREMENTS SDL2_LIBRARY SDL2_INCLUDE_DIR)
+if (WIN32)
+  list(APPEND SDL2_REQUIREMENTS SDL2_DLL_PATH)
+endif ()
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2 REQUIRED_VARS ${SDL2_REQUIREMENTS})
+
+if (WIN32)
+  add_paths_to_fixup_libs(${SDL2_DLL_PATH})
+endif ()
--- a/cmake/modules/FindSixense.cmake
+++ b/cmake/modules/FindSixense.cmake
@ -32,14 +32,27 @@ elseif (UNIX)
 elseif (WIN32)
  find_library(SIXENSE_LIBRARY_RELEASE lib/win32/release_dll/sixense.lib HINTS ${SIXENSE_SEARCH_DIRS})
  find_library(SIXENSE_LIBRARY_DEBUG lib/win32/debug_dll/sixensed.lib HINTS ${SIXENSE_SEARCH_DIRS})
+  
+  find_path(SIXENSE_DEBUG_DLL_PATH sixensed.dll PATH_SUFFIXES bin/win32/debug_dll HINTS ${SIXENSE_SEARCH_DIRS})
+  find_path(SIXENSE_RELEASE_DLL_PATH sixense.dll PATH_SUFFIXES bin/win32/release_dll HINTS ${SIXENSE_SEARCH_DIRS})
+  find_path(SIXENSE_DEVICE_DLL_PATH DeviceDLL.dll PATH_SUFFIXES samples/win32/sixense_simple3d HINTS ${SIXENSE_SEARCH_DIRS})
 endif ()

 include(SelectLibraryConfigurations)
 select_library_configurations(SIXENSE)

+set(SIXENSE_REQUIREMENTS SIXENSE_INCLUDE_DIRS SIXENSE_LIBRARIES)
+if (WIN32)
+  list(APPEND SIXENSE_REQUIREMENTS SIXENSE_DEBUG_DLL_PATH SIXENSE_RELEASE_DLL_PATH SIXENSE_DEVICE_DLL_PATH)
+endif ()
+
 set(SIXENSE_LIBRARIES "${SIXENSE_LIBRARY}")

 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Sixense DEFAULT_MSG SIXENSE_INCLUDE_DIRS SIXENSE_LIBRARIES)
+find_package_handle_standard_args(Sixense DEFAULT_MSG ${SIXENSE_REQUIREMENTS})
+
+if (WIN32)
+  add_paths_to_fixup_libs(${SIXENSE_DEBUG_DLL_PATH} ${SIXENSE_RELEASE_DLL_PATH} ${SIXENSE_DEVICE_DLL_PATH})
+endif ()

 mark_as_advanced(SIXENSE_LIBRARIES SIXENSE_INCLUDE_DIRS SIXENSE_SEARCH_DIRS)
--- a/cmake/modules/FindSoxr.cmake
+++ b/cmake/modules/FindSoxr.cmake
@ -24,7 +24,20 @@ hifi_library_search_hints("soxr")
 find_path(SOXR_INCLUDE_DIRS soxr.h PATH_SUFFIXES include HINTS ${SOXR_SEARCH_DIRS})
 find_library(SOXR_LIBRARIES NAMES soxr PATH_SUFFIXES lib HINTS ${SOXR_SEARCH_DIRS})

+if (WIN32)
+  find_path(SOXR_DLL_PATH soxr.dll PATH_SUFFIXES bin HINTS ${SOXR_SEARCH_DIRS}) 
+endif()
+
+set(SOXR_REQUIREMENTS SOXR_INCLUDE_DIRS SOXR_LIBRARIES)
+if (WIN32)
+  list(APPEND SOXR_REQUIREMENTS SOXR_DLL_PATH)
+endif ()
+
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SOXR DEFAULT_MSG SOXR_INCLUDE_DIRS SOXR_LIBRARIES)
+find_package_handle_standard_args(Soxr DEFAULT_MSG ${SOXR_REQUIREMENTS})
+
+if (WIN32)
+  add_paths_to_fixup_libs(${SOXR_DLL_PATH})
+endif ()

 mark_as_advanced(SOXR_INCLUDE_DIRS SOXR_LIBRARIES SOXR_SEARCH_DIRS)
--- a/cmake/modules/FindTBB.cmake
+++ b/cmake/modules/FindTBB.cmake
@ -56,6 +56,9 @@ elseif (WIN32)
  endif()
  
  set(_TBB_LIB_DIR "lib/${_TBB_ARCH_DIR}/vc12")
+  
+  find_path(TBB_DLL_PATH tbb_debug.dll PATH_SUFFIXES "bin/${_TBB_ARCH_DIR}/vc12" HINTS ${TBB_SEARCH_DIRS})
+  
 elseif (ANDROID)
  set(_TBB_DEFAULT_INSTALL_DIR "/tbb")
  set(_TBB_LIB_NAME "tbb")
@ -77,6 +80,15 @@ include(FindPackageHandleStandardArgs)
 select_library_configurations(TBB)
 select_library_configurations(TBB_MALLOC)

-find_package_handle_standard_args(TBB DEFAULT_MSG TBB_LIBRARY TBB_MALLOC_LIBRARY TBB_INCLUDE_DIRS)
+set(TBB_REQUIREMENTS TBB_LIBRARY TBB_MALLOC_LIBRARY TBB_INCLUDE_DIRS)
+if (WIN32)
+  list(APPEND TBB_REQUIREMENTS TBB_DLL_PATH)
+endif ()
+
+find_package_handle_standard_args(TBB DEFAULT_MSG ${TBB_REQUIREMENTS})
+
+if (WIN32)
+  add_paths_to_fixup_libs(${TBB_DLL_PATH})
+endif ()

 set(TBB_LIBRARIES ${TBB_LIBRARY} ${TBB_MALLOC_LIBRARY})
--- a/cmake/modules/FindVHACD.cmake
+++ b/cmake/modules/FindVHACD.cmake
@ -0,0 +1,59 @@
+#
+#  FindVHACD.cmake
+# 
+#  Try to find the V-HACD library that decomposes a 3D surface into a set of "near" convex parts.
+#
+#  Once done this will define
+#
+#  VHACD_FOUND - system found V-HACD 
+#  VHACD_INCLUDE_DIRS - the V-HACD include directory
+#  VHACD_LIBRARIES - link to this to use V-HACD
+#
+#  Created on 2/20/2015 by Virendra Singh
+#  Copyright 2015 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
+# 
+
+include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
+hifi_library_search_hints("vhacd")
+
+macro(_FIND_VHACD_LIBRARY _var)
+  set(_${_var}_NAMES ${ARGN})
+  find_library(${_var}_LIBRARY_RELEASE
+     NAMES ${_${_var}_NAMES}
+     HINTS
+        ${VHACD_SEARCH_DIRS}
+		$ENV{VHACD_ROOT_DIR}
+        PATH_SUFFIXES lib lib/Release
+  )
+    
+  find_library(${_var}_LIBRARY_DEBUG
+     NAMES ${_${_var}_NAMES}
+     HINTS
+        ${VHACD_SEARCH_DIRS}
+		$ENV{VHACD_ROOT_DIR}
+        PATH_SUFFIXES lib lib/Debug
+  )
+  
+  select_library_configurations(${_var})
+  
+  mark_as_advanced(${_var}_LIBRARY)
+  mark_as_advanced(${_var}_LIBRARY)
+endmacro()
+  
+
+find_path(VHACD_INCLUDE_DIRS VHACD.h PATH_SUFFIXES include HINTS ${VHACD_SEARCH_DIRS} $ENV{VHACD_ROOT_DIR})
+if(NOT WIN32)
+_FIND_VHACD_LIBRARY(VHACD libVHACD.a)
+else()
+_FIND_VHACD_LIBRARY(VHACD VHACD_LIB)
+endif()
+set(VHACD_LIBRARIES ${VHACD_LIBRARY})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(VHACD "Could NOT find VHACD, try to set the path to VHACD root folder in the system variable VHACD_ROOT_DIR or create a directory vhacd in HIFI_LIB_DIR and paste the necessary files there"
+ VHACD_INCLUDE_DIRS VHACD_LIBRARIES)
+
+mark_as_advanced(VHACD_INCLUDE_DIRS VHACD_LIBRARIES VHACD_SEARCH_DIRS)
--- a/cmake/templates/FixupBundlePostBuild.cmake.in
+++ b/cmake/templates/FixupBundlePostBuild.cmake.in
@ -0,0 +1,14 @@
+# 
+#  FixupBundlePostBuild.cmake.in
+#  cmake/templates
+# 
+#  Copyright 2015 High Fidelity, Inc.
+#  Created by Stephen Birarda on February 13, 2014
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+# 
+
+include(BundleUtilities)
+message(STATUS "FIXUP_LIBS for fixup_bundle called for bundle ${BUNDLE_EXECUTABLE} are @FIXUP_LIBS@")
+fixup_bundle("${BUNDLE_EXECUTABLE}" "" "@FIXUP_LIBS@")
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@ -52,4 +52,4 @@ include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
 # append OpenSSL to our list of libraries to link
 target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES})

-include_dependency_includes()
+copy_dlls_beside_windows_executable()
--- a/examples/controllers/hydra/toyball.js
+++ b/examples/controllers/hydra/toyball.js
@ -29,15 +29,21 @@ var RIGHT_BUTTON_FWD = 11;
 var RIGHT_BUTTON_3 = 9;

 var BALL_RADIUS = 0.08;
-var GRAVITY_STRENGTH = 1.0;
+var GRAVITY_STRENGTH = 3.0;

 var HELD_COLOR = { red: 240, green: 0, blue: 0 };
 var THROWN_COLOR = { red: 128, green: 0, blue: 0 };

+var averageLinearVelocity = [ { x: 0, y: 0, z : 0 }, { x: 0, y: 0, z : 0 } ];
+
+var LIFETIME_SECONDS = 600;
+
+var BALL_MODEL_URL = "https://hifi-public.s3.amazonaws.com/ryan/baseball4.fbx";
+
 var leftBallAlreadyInHand = false;
 var rightBallAlreadyInHand = false;
-var leftHandEntity;
-var rightHandEntity;
+var leftHandEntity = false;
+var rightHandEntity = false;

 var newSound = SoundCache.getSound("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/throw.raw");
 var catchSound = SoundCache.getSound("https://dl.dropboxusercontent.com/u/1864924/hifi-sounds/catch.raw");
@ -67,28 +73,51 @@ function checkControllerSide(whichSide) {
    var BUTTON_3;
    var TRIGGER;
    var palmPosition;
+    var palmRotation;
    var ballAlreadyInHand;
    var handMessage;
+    var linearVelocity;
+    var angularVelocity; 
+    var AVERAGE_FACTOR = 0.33;
    
    if (whichSide == LEFT_PALM) {
        BUTTON_FWD = LEFT_BUTTON_FWD;
        BUTTON_3 = LEFT_BUTTON_3;
        TRIGGER = 0;
        palmPosition = Controller.getSpatialControlPosition(LEFT_PALM);
+        palmRotation = Quat.multiply(MyAvatar.orientation, Controller.getSpatialControlRawRotation(LEFT_PALM));
        ballAlreadyInHand = leftBallAlreadyInHand;
        handMessage = "LEFT";
+        averageLinearVelocity[0] = Vec3.sum(Vec3.multiply(AVERAGE_FACTOR, Controller.getSpatialControlVelocity(LEFT_TIP)), 
+                                            Vec3.multiply(1.0 - AVERAGE_FACTOR, averageLinearVelocity[0]));
+        linearVelocity = averageLinearVelocity[0];
+        angularVelocity = Vec3.multiplyQbyV(MyAvatar.orientation, Controller.getSpatialControlRawAngularVelocity(LEFT_TIP));
+        angularVelocity = Vec3.multiply(180.0 / Math.PI, angularVelocity);
    } else {
        BUTTON_FWD = RIGHT_BUTTON_FWD;
        BUTTON_3 = RIGHT_BUTTON_3;
        TRIGGER = 1;
        palmPosition = Controller.getSpatialControlPosition(RIGHT_PALM);
+        palmRotation = Quat.multiply(MyAvatar.orientation, Controller.getSpatialControlRawRotation(RIGHT_PALM));
        ballAlreadyInHand = rightBallAlreadyInHand;
+        averageLinearVelocity[1] = Vec3.sum(Vec3.multiply(AVERAGE_FACTOR, Controller.getSpatialControlVelocity(RIGHT_TIP)), 
+                                            Vec3.multiply(1.0 - AVERAGE_FACTOR, averageLinearVelocity[1]));
+        linearVelocity = averageLinearVelocity[1];
+        angularVelocity = Vec3.multiplyQbyV(MyAvatar.orientation, Controller.getSpatialControlRawAngularVelocity(RIGHT_TIP));
+        angularVelocity = Vec3.multiply(180.0 / Math.PI, angularVelocity);
        handMessage = "RIGHT";
    }

    var grabButtonPressed = (Controller.isButtonPressed(BUTTON_FWD) || Controller.isButtonPressed(BUTTON_3) || (Controller.getTriggerValue(TRIGGER) > 0.5));

    // If I don't currently have a ball in my hand, then try to catch closest one
+    if (leftHandEntity && !leftHandEntity.isKnownID) {
+       leftHandEntity = Entities.identifyEntity(leftHandEntity);
+    }
+    if (rightHandEntity && !rightHandEntity.isKnownID) {
+       rightHandEntity = Entities.identifyEntity(rightHandEntity);
+    }
+
    if (!ballAlreadyInHand && grabButtonPressed) {
        var closestEntity = Entities.findClosestEntity(palmPosition, targetRadius);

@ -107,13 +136,14 @@ function checkControllerSide(whichSide) {
            var properties = { position: { x: ballPosition.x, 
                                           y: ballPosition.y, 
                                           z: ballPosition.z },
-                                           color: HELD_COLOR, 
+                                rotation: palmRotation,
+                                color: HELD_COLOR, 
                                velocity : { x: 0, y: 0, z: 0}, 
-                                lifetime : 600,
-                                inHand: true };
+                                gravity: { x: 0, y: 0, z: 0}
+                                };
            Entities.editEntity(closestEntity, properties);
            
-			      Audio.playSound(catchSound, { position: ballPosition });
+			Audio.playSound(catchSound, { position: ballPosition });
            
            return; // exit early
        }
@ -129,18 +159,20 @@ function checkControllerSide(whichSide) {
    if (grabButtonPressed && !ballAlreadyInHand) {
        var ballPosition = getBallHoldPosition(whichSide);
        var properties = { 
-                type: "Sphere",
+                type: "Model",
+                modelURL: BALL_MODEL_URL,
                position: { x: ballPosition.x, 
                            y: ballPosition.y, 
-                            z: ballPosition.z }, 
+                            z: ballPosition.z },
+                rotation: palmRotation, 
                velocity: { x: 0, y: 0, z: 0}, 
                gravity: { x: 0, y: 0, z: 0}, 
-                inHand: true,
                dimensions: { x: BALL_RADIUS * 2, y: BALL_RADIUS * 2, z: BALL_RADIUS * 2 },
                damping: 0.00001,
+                shapeType: "sphere",
+                collisionsWillMove: false,
                color: HELD_COLOR,
-
-                lifetime: 600 // 10 seconds - same as default, not needed but here as an example
+                lifetime: LIFETIME_SECONDS
            };

        newEntity = Entities.addEntity(properties);
@ -174,21 +206,20 @@ function checkControllerSide(whichSide) {
            var properties = { position: { x: ballPosition.x, 
                                           y: ballPosition.y, 
                                           z: ballPosition.z }, 
+                                rotation: palmRotation,
+                                velocity: { x: 0, y: 0, z: 0}, 
+                                gravity: { x: 0, y: 0, z: 0}, 
                };
            Entities.editEntity(handEntity, properties);
        } else {
            debugPrint(">>>>> " + handMessage + "-BALL IN HAND, not grabbing, THROW!!!");
            //  If toy ball just released, add velocity to it!
-            var tipVelocity = Controller.getSpatialControlVelocity(whichTip);
-            var THROWN_VELOCITY_SCALING = 1.5;
            var properties = { 
-                    velocity: { x: tipVelocity.x * THROWN_VELOCITY_SCALING, 
-                                y: tipVelocity.y * THROWN_VELOCITY_SCALING, 
-                                z: tipVelocity.z * THROWN_VELOCITY_SCALING } ,
+                    velocity: linearVelocity,
+                    rotation: palmRotation,
+                    angularVelocity: angularVelocity,
                    collisionsWillMove: true,
-                    inHand: false,
                    color: THROWN_COLOR,
-                    lifetime: 10,
                    gravity: { x: 0, y: -GRAVITY_STRENGTH, z: 0}, 
                };

@ -216,7 +247,7 @@ function checkController(deltaTime) {

    // this is expected for hydras
    if (!(numberOfButtons==12 && numberOfTriggers == 2 && controllersPerTrigger == 2)) {
-        debugPrint("no hydra connected?");
+        debugPrint("total buttons = " + numberOfButtons + ", Triggers = " + numberOfTriggers + ", controllers/trigger = " + controllersPerTrigger); 
        return; // bail if no hydra
    }

--- a/examples/dice.js
+++ b/examples/dice.js
@ -53,8 +53,10 @@ function shootDice(position, velocity) {
          position: position,  
          velocity: velocity, 
          rotation: Quat.fromPitchYawRollDegrees(Math.random() * 360, Math.random() * 360, Math.random() * 360),
+          angularVelocity: { x: Math.random() * 100, y: Math.random() * 100, z: Math.random() * 100 },
          lifetime: LIFETIME,
          gravity: {  x: 0, y: GRAVITY, z: 0 },
+          shapeType: "box",
          collisionsWillMove: true
      }));
      position = Vec3.sum(position, Vec3.multiply(DIE_SIZE, Vec3.normalize(Quat.getRight(Camera.getOrientation()))));
--- a/examples/editEntities.js
+++ b/examples/editEntities.js
@ -396,6 +396,10 @@ var toolBar = (function () {
        return handled;
    }

+    Window.domainChanged.connect(function() {
+        that.setActive(false);
+    });
+
    that.cleanup = function () {
        toolBar.cleanup();
    };
--- a/examples/example/games/billiards.js
+++ b/examples/example/games/billiards.js
@ -122,7 +122,7 @@ function makeBalls(pos) {
 	      	gravity: {  x: 0, y: GRAVITY, z: 0 },
 	        ignoreCollisions: false,
 	        damping: 0.50,
-            shapeType: 2,
+            shapeType: "sphere",
 	        collisionsWillMove: true }));
 	        ballPosition.z += (BALL_SIZE + BALL_GAP) * SCALE;
            ballNumber++;
@ -143,7 +143,7 @@ function makeBalls(pos) {
 	      	velocity: {x: 0, y: 0, z: 0 },
 	        ignoreCollisions: false,
 	        damping: 0.50,
-            shapeType: 2,
+            shapeType: "sphere",
 	        collisionsWillMove: true });
 	       
 }
--- a/examples/html/entityProperties.html
+++ b/examples/html/entityProperties.html
@ -406,7 +406,7 @@
            elModelAnimationFrame.addEventListener('change', createEmitNumberPropertyUpdateFunction('animationFrameIndex'));
            elModelAnimationSettings.addEventListener('change', createEmitTextPropertyUpdateFunction('animationSettings'));
            elModelTextures.addEventListener('change', createEmitTextPropertyUpdateFunction('textures'));
-            elModelShapeType.addEventListener('change', createEmitNumberPropertyUpdateFunction('shapeType'));
+            elModelShapeType.addEventListener('change', createEmitTextPropertyUpdateFunction('shapeType'));

            elTextText.addEventListener('change', createEmitTextPropertyUpdateFunction('text'));
            elTextLineHeight.addEventListener('change', createEmitNumberPropertyUpdateFunction('lineHeight'));
@ -671,9 +671,9 @@
            <div class="label">Shape Type</div>
            <div class="value">
                <select name="SelectShapeType" id="property-model-shape" name="SelectShapeType">
-                    <option value=0>None</option>
-                    <option value=1>Box</option>
-                    <option value=2>Sphere</option>
+                    <option value='none'>none</option>
+                    <option value='box'>box</option>
+                    <option value='sphere'>sphere</option>
                </select> 
            </div>
        </div>
--- a/examples/notifications.js
+++ b/examples/notifications.js
@ -38,11 +38,13 @@
 //  function onIncomingMessage(user, message) {
 //      //do stuff here;
 //      var text = "This is a notification";
-//      wordWrap(text);
+//      var wrappedText = wordWrap(text);
+//      createNotification(wrappedText, NotificationType.SNAPSHOT);
 //  }
 //
 //  This new function must call wordWrap(text) if the length of message is longer than 42 chars or unknown.
-//  wordWrap() will format the text to fit the notifications overlay and send it to createNotification(text).
+//  wordWrap() will format the text to fit the notifications overlay and return it
+//  after that we will send it to createNotification(text).
 //  If the message is 42 chars or less you should bypass wordWrap() and call createNotification() directly.


@ -50,12 +52,12 @@
 //
 //  1. Add a key to the keyPressEvent(key).
 //  2. Declare a text string.
-//  3. Call createNotifications(text) parsing the text.
+//  3. Call createNotifications(text, NotificationType) parsing the text.
 //  example:
 //    var welcome;
 //    if (key.text == "q") { //queries number of users online
 //        var welcome = "There are " + GlobalServices.onlineUsers.length + " users online now.";
-//        createNotification(welcome);
+//        createNotification(welcome, NotificationType.USERS_ONLINE);
 //    }
 Script.include("./libraries/globals.js");
 Script.include("./libraries/soundArray.js");
@ -83,6 +85,46 @@ var last_users = GlobalServices.onlineUsers;
 var users = [];
 var ctrlIsPressed = false;
 var ready = true;
+var MENU_NAME = 'Tools > Notifications';
+var PLAY_NOTIFICATION_SOUNDS_MENU_ITEM = "Play Notification Sounds";
+var NOTIFICATION_MENU_ITEM_POST = " Notifications";
+var PLAY_NOTIFICATION_SOUNDS_SETTING = "play_notification_sounds";
+var PLAY_NOTIFICATION_SOUNDS_TYPE_SETTING_PRE = "play_notification_sounds_type_";
+
+var NotificationType = {
+    UNKNOWN: 0,
+    USER_JOINS: 1,
+    USER_LEAVES: 2,
+    MUTE_TOGGLE: 3,
+    CHAT_MENTION: 4,
+    USERS_ONLINE: 5,
+    SNAPSHOT: 6,
+    WINDOW_RESIZE: 7,
+    properties: [
+        { text: "User Join" },
+        { text: "User Leave" },
+        { text: "Mute Toggle" },
+        { text: "Chat Mention" },
+        { text: "Users Online" },
+        { text: "Snapshot" },
+        { text: "Window Resize" }
+    ],
+    getTypeFromMenuItem: function(menuItemName) {
+        if (menuItemName.substr(menuItemName.length - NOTIFICATION_MENU_ITEM_POST.length) !== NOTIFICATION_MENU_ITEM_POST) {
+            return NotificationType.UNKNOWN;
+        }
+        var preMenuItemName = menuItemName.substr(0, menuItemName.length - NOTIFICATION_MENU_ITEM_POST.length);
+        for (type in this.properties) {
+            if (this.properties[type].text === preMenuItemName) {
+                return parseInt(type) + 1;
+            }
+        }
+        return NotificationType.UNKNOWN;
+    },
+    getMenuString: function(type) {
+        return this.properties[type - 1].text + NOTIFICATION_MENU_ITEM_POST;
+    }
+};

 var randomSounds = new SoundArray({ localOnly: true }, true);
 var numberOfSounds = 2;
@ -90,15 +132,6 @@ for (var i = 1; i <= numberOfSounds; i++) {
    randomSounds.addSound(HIFI_PUBLIC_BUCKET + "sounds/UI/notification-general" + i + ".raw");
 }

-//  When our script shuts down, we should clean up all of our overlays
-function scriptEnding() {
-    for (i = 0; i < notifications.length; i++) {
-        Overlays.deleteOverlay(notifications[i]);
-        Overlays.deleteOverlay(buttons[i]);
-    }
-}
-Script.scriptEnding.connect(scriptEnding);
-
 var notifications = [];
 var buttons = [];
 var times = [];
@ -211,8 +244,6 @@ function notify(notice, button, height) {
        positions,
        last;

-    randomSounds.playRandom();
-
    if (isOnHMD) {
        // Calculate 3D values from 2D overlay properties.

@ -257,7 +288,7 @@ function notify(notice, button, height) {
 }

 //  This function creates and sizes the overlays
-function createNotification(text) {
+function createNotification(text, notificationType) {
    var count = (text.match(/\n/g) || []).length,
        breakPoint = 43.0, // length when new line is added
        extraLine = 0,
@ -307,6 +338,12 @@ function createNotification(text) {
        alpha: backgroundAlpha
    };

+    if (Menu.isOptionChecked(PLAY_NOTIFICATION_SOUNDS_MENU_ITEM) &&
+        Menu.isOptionChecked(NotificationType.getMenuString(notificationType)))
+    {
+        randomSounds.playRandom();
+    }
+
    notify(noticeProperties, buttonProperties, height);
 }

@ -345,8 +382,7 @@ function stringDivider(str, slotWidth, spaceReplacer) {

 //  formats string to add newline every 43 chars
 function wordWrap(str) {
-    var result = stringDivider(str, 43.0, "\n");
-    createNotification(result);
+    return stringDivider(str, 43.0, "\n");
 }

 //  This fires a notification on window resize
@ -358,7 +394,7 @@ function checkSize() {
        windowDimensions = Controller.getViewportDimensions();
        overlayLocationX = (windowDimensions.x - (width + 60.0));
        buttonLocationX = overlayLocationX + (width - 35.0);
-        createNotification(windowResize);
+        createNotification(windowResize, NotificationType.WINDOW_RESIZE);
    }
 }

@ -442,10 +478,7 @@ var STARTUP_TIMEOUT = 500,  // ms

 //  This reports the number of users online at startup
 function reportUsers() {
-    var welcome;
-
-    welcome = "Welcome! There are " + GlobalServices.onlineUsers.length + " users online now.";
-    createNotification(welcome);
+    createNotification("Welcome! There are " + GlobalServices.onlineUsers.length + " users online now.", NotificationType.USERS_ONLINE);
 }

 function finishStartup() {
@ -472,13 +505,13 @@ function onOnlineUsersChanged(users) {
    if (!isStartingUp()) {  // Skip user notifications at startup.
        for (i = 0; i < users.length; i += 1) {
            if (last_users.indexOf(users[i]) === -1.0) {
-                createNotification(users[i] + " has joined");
+                createNotification(users[i] + " has joined", NotificationType.USER_JOINS);
            }
        }

        for (i = 0; i < last_users.length; i += 1) {
            if (users.indexOf(last_users[i]) === -1.0) {
-                createNotification(last_users[i] + " has left");
+                createNotification(last_users[i] + " has left", NotificationType.USER_LEAVES);
            }
        }
    }
@ -497,7 +530,7 @@ function onIncomingMessage(user, message) {
    thisAlert = user + ": " + myMessage;

    if (myMessage.indexOf(alertMe) > -1.0) {
-        wordWrap(thisAlert);
+        CreateNotification(wordWrap(thisAlert), NotificationType.CHAT_MENTION);
    }
 }

@ -506,9 +539,9 @@ function onMuteStateChanged() {
    var muteState,
        muteString;

-    muteState =  AudioDevice.getMuted() ?  "muted" :  "unmuted";
+    muteState = AudioDevice.getMuted() ? "muted" : "unmuted";
    muteString = "Microphone is now " + muteState;
-    createNotification(muteString);
+    createNotification(muteString, NotificationType.MUTE_TOGGLE);
 }

 //  handles mouse clicks on buttons
@ -551,25 +584,58 @@ function keyPressEvent(key) {
    if (key.text === "q") { //queries number of users online
        numUsers = GlobalServices.onlineUsers.length;
        welcome = "There are " + numUsers + " users online now.";
-        createNotification(welcome);
+        createNotification(welcome, NotificationType.USERS_ONLINE);
    }

    if (key.text === "s") {
        if (ctrlIsPressed === true) {
            noteString = "Snapshot taken.";
-            createNotification(noteString);
+            createNotification(noteString, NotificationType.SNAPSHOT);
        }
    }
 }

+function setup() {
+    Menu.addMenu(MENU_NAME);
+    var checked = Settings.getValue(PLAY_NOTIFICATION_SOUNDS_SETTING);
+    checked = checked === '' ? true : checked;
+    Menu.addMenuItem({
+        menuName: MENU_NAME,
+        menuItemName: PLAY_NOTIFICATION_SOUNDS_MENU_ITEM,
+        isCheckable: true,
+        isChecked: Settings.getValue(PLAY_NOTIFICATION_SOUNDS_SETTING)
+    });
+    Menu.addSeparator(MENU_NAME, "Play sounds for:");
+    for (type in NotificationType.properties) {
+        checked = Settings.getValue(PLAY_NOTIFICATION_SOUNDS_TYPE_SETTING_PRE + (parseInt(type) + 1));
+        checked = checked === '' ? true : checked;
+        Menu.addMenuItem({
+            menuName: MENU_NAME,
+            menuItemName: NotificationType.properties[type].text + NOTIFICATION_MENU_ITEM_POST,
+            isCheckable: true,
+            isChecked: checked
+        });
+    }
+}
+
 //  When our script shuts down, we should clean up all of our overlays
 function scriptEnding() {
-    var i;
-
-    for (i = 0; i < notifications.length; i += 1) {
+    for (var i = 0; i < notifications.length; i++) {
        Overlays.deleteOverlay(notifications[i]);
        Overlays.deleteOverlay(buttons[i]);
    }
+    Menu.removeMenu(MENU_NAME);
+}
+
+function menuItemEvent(menuItem) {
+    if (menuItem === PLAY_NOTIFICATION_SOUNDS_MENU_ITEM) {
+        Settings.setValue(PLAY_NOTIFICATION_SOUNDS_SETTING, Menu.isOptionChecked(PLAY_NOTIFICATION_SOUNDS_MENU_ITEM));
+        return;
+    }
+    var notificationType = NotificationType.getTypeFromMenuItem(menuItem);
+    if (notificationType !== notificationType.UNKNOWN) {
+        Settings.setValue(PLAY_NOTIFICATION_SOUNDS_TYPE_SETTING_PRE + notificationType, Menu.isOptionChecked(menuItem));
+    }
 }

 AudioDevice.muteToggled.connect(onMuteStateChanged);
@ -580,3 +646,6 @@ GlobalServices.incomingMessage.connect(onIncomingMessage);
 Controller.keyReleaseEvent.connect(keyReleaseEvent);
 Script.update.connect(update);
 Script.scriptEnding.connect(scriptEnding);
+Menu.menuItemEvent.connect(menuItemEvent);
+
+setup();
--- a/gvr-interface/CMakeLists.txt
+++ b/gvr-interface/CMakeLists.txt
@ -24,12 +24,11 @@ endif ()

 include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})

-add_dependency_external_project(glm)
+add_dependency_external_projects(glm)
 find_package(GLM REQUIRED)
 target_include_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS})

 link_hifi_libraries(shared networking audio-client avatars)
-include_dependency_includes()

 if (ANDROID)
  find_package(LibOVR)
@ -87,4 +86,6 @@ if (ANDROID)
  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/templates/hockeyapp.xml.in" "${ANDROID_APK_BUILD_DIR}/res/values/hockeyapp.xml")
  qt_create_apk()
  
-endif (ANDROID)
+endif (ANDROID)
+
+copy_dlls_beside_windows_executable()
--- a/ice-server/CMakeLists.txt
+++ b/ice-server/CMakeLists.txt
@ -6,4 +6,4 @@ setup_hifi_project(Network)
 # link the shared hifi libraries
 link_hifi_libraries(embedded-webserver networking shared)

-include_dependency_includes()
+copy_dlls_beside_windows_executable()
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@ -32,8 +32,6 @@ elseif (WIN32)
  set(GL_HEADERS "#include <windowshacks.h>\n#include <GL/glew.h>\n#include <GL/wglew.h>")
 endif ()

-include_bullet()
-
 # create the InterfaceConfig.h file based on GL_HEADERS above
 configure_file(InterfaceConfig.h.in "${PROJECT_BINARY_DIR}/includes/InterfaceConfig.h")
 configure_file(InterfaceVersion.h.in "${PROJECT_BINARY_DIR}/includes/InterfaceVersion.h")
@ -78,7 +76,7 @@ if (APPLE)
  set(MACOSX_BUNDLE_BUNDLE_NAME Interface)
  set(MACOSX_BUNDLE_GUI_IDENTIFIER io.highfidelity.Interface)
  
-  if (${CMAKE_BUILD_TYPE} MATCHES "RELEASE")
+  if (UPPER_CMAKE_BUILD_TYPE MATCHES RELEASE OR UPPER_CMAKE_BUILD_TYPE MATCHES RELWITHDEBINFO)
    set(ICON_FILENAME "interface.icns")
  else ()
    set(ICON_FILENAME "interface-beta.icns")
@ -108,17 +106,20 @@ endif()
 add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS} ${QM})

 # set up the external glm library
-add_dependency_external_project(glm)
+add_dependency_external_projects(glm bullet)
 find_package(GLM REQUIRED)
 target_include_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS})

+find_package(Bullet REQUIRED)
+target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${BULLET_INCLUDE_DIRS})
+target_link_libraries(${TARGET_NAME} ${BULLET_LIBRARIES})
+
 # link required hifi libraries
 link_hifi_libraries(shared octree environment gpu model fbx metavoxels networking entities avatars 
                    audio audio-client animation script-engine physics 
                    render-utils entities-renderer)

-# find any optional and required libraries
-find_package(ZLIB REQUIRED)
+add_dependency_external_projects(sdl2 qxmpp)

 # perform standard include and linking for found externals
 foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
@ -175,15 +176,20 @@ if (RTMIDI_FOUND AND NOT DISABLE_RTMIDI AND APPLE)
 endif ()

 if (QXMPP_FOUND AND NOT DISABLE_QXMPP AND WIN32)
-  # assume we're linking a static Qt on windows
-  add_definitions(-DQXMPP_STATIC) 
+  if (NOT QXMPP_DLL_PATH)
+    # if we have no QXmpp DLL path, assume we're linking a static QXmpp on windows
+    add_definitions(-DQXMPP_STATIC)
+  else ()
+    # otherwise assume we are linking a dynamic QXmpp
+    add_definitions(-DQXMPP_SHARED)
+  endif ()
 endif ()

 # include headers for interface and InterfaceConfig.
 include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/includes")

 target_link_libraries(
-  ${TARGET_NAME} ${ZLIB_LIBRARIES}
+  ${TARGET_NAME}
  Qt5::Gui Qt5::Network Qt5::Multimedia Qt5::OpenGL Qt5::Script Qt5::Svg Qt5::WebKitWidgets
 )

@ -220,13 +226,11 @@ else (APPLE)
  
  # link target to external libraries
  if (WIN32)
+    add_dependency_external_projects(glew)
    find_package(GLEW REQUIRED)
-    include_directories(${GLEW_INCLUDE_DIRS})
+    target_include_directories(${TARGET_NAME} PRIVATE ${GLEW_INCLUDE_DIRS})

-    # we're using static GLEW, so define GLEW_STATIC
-    add_definitions(-DGLEW_STATIC)
-
-    target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES} "${NSIGHT_LIBRARIES}" wsock32.lib opengl32.lib Winmm.lib)
+    target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES} ${NSIGHT_LIBRARIES} wsock32.lib opengl32.lib Winmm.lib)

    # try to find the Nsight package and add it to the build if we find it
    find_package(NSIGHT)
@ -239,5 +243,4 @@ else (APPLE)
  endif()
 endif (APPLE)

-# link any dependencies bubbled up from our linked dependencies
-include_dependency_includes()
+copy_dlls_beside_windows_executable()
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@ -215,7 +215,6 @@ bool setupEssentials(int& argc, char** argv) {
    DependencyManager::registerInheritance<AvatarHashMap, AvatarManager>();
    
    // Set dependencies
-    auto glCanvas = DependencyManager::set<GLCanvas>();
    auto addressManager = DependencyManager::set<AddressManager>();
    auto nodeList = DependencyManager::set<NodeList>(NodeType::Agent, listenPort);
    auto geometryCache = DependencyManager::set<GeometryCache>();
@ -307,7 +306,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
    
    Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us
    
-    auto glCanvas = DependencyManager::get<GLCanvas>();
    auto nodeList = DependencyManager::get<NodeList>();

    _myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
@ -447,16 +445,16 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :

    ResourceCache::setRequestLimit(3);

-    _window->setCentralWidget(glCanvas.data());
+    _window->setCentralWidget(_glWidget);

    _window->restoreGeometry();

    _window->setVisible(true);
-    glCanvas->setFocusPolicy(Qt::StrongFocus);
-    glCanvas->setFocus();
+    _glWidget->setFocusPolicy(Qt::StrongFocus);
+    _glWidget->setFocus();

    // enable mouse tracking; otherwise, we only get drag events
-    glCanvas->setMouseTracking(true);
+    _glWidget->setMouseTracking(true);

    _toolWindow = new ToolWindow();
    _toolWindow->setWindowFlags(_toolWindow->windowFlags() | Qt::WindowStaysOnTopHint);
@ -474,7 +472,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :

    checkVersion();

-    _overlays.init(glCanvas.data()); // do this before scripts load
+    _overlays.init(); // do this before scripts load

    _runningScriptsWidget->setRunningScripts(getRunningScripts());
    connect(_runningScriptsWidget, &RunningScriptsWidget::stopScriptName, this, &Application::stopScript);
@ -533,6 +531,10 @@ void Application::aboutToQuit() {
 }

 void Application::cleanupBeforeQuit() {
+    _datagramProcessor.shutdown(); // tell the datagram processor we're shutting down, so it can short circuit
+    _entities.shutdown(); // tell the entities system we're shutting down, so it will stop running scripts
+    ScriptEngine::stopAllScripts(this); // stop all currently running global scripts
+    
    // first stop all timers directly or by invokeMethod
    // depending on what thread they run in
    locationUpdateTimer->stop();
@ -580,8 +582,6 @@ Application::~Application() {
    _entities.getTree()->setSimulation(NULL);
    tree->unlock();

-    qInstallMessageHandler(NULL);
-
    // ask the datagram processing thread to quit and wait until it is done
    _nodeThread->quit();
    _nodeThread->wait();
@ -595,15 +595,13 @@ Application::~Application() {

    ModelEntityItem::cleanupLoadedAnimations() ;
    
-    DependencyManager::destroy<GLCanvas>();
-
-    qDebug() << "start destroying ResourceCaches Application::~Application() line:" << __LINE__;
    DependencyManager::destroy<AnimationCache>();
    DependencyManager::destroy<TextureCache>();
    DependencyManager::destroy<GeometryCache>();
    DependencyManager::destroy<ScriptCache>();
    DependencyManager::destroy<SoundCache>();
-    qDebug() << "done destroying ResourceCaches Application::~Application() line:" << __LINE__;
+
+    qInstallMessageHandler(NULL); // NOTE: Do this as late as possible so we continue to get our log messages
 }

 void Application::initializeGL() {
@ -688,7 +686,7 @@ void Application::paintGL() {
    if (OculusManager::isConnected()) {
        DependencyManager::get<TextureCache>()->setFrameBufferSize(OculusManager::getRenderTargetSize());
    } else {
-        QSize fbSize = DependencyManager::get<GLCanvas>()->getDeviceSize() * getRenderResolutionScale();
+        QSize fbSize = _glWidget->getDeviceSize() * getRenderResolutionScale();
        DependencyManager::get<TextureCache>()->setFrameBufferSize(fbSize);
    }

@ -1055,8 +1053,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
                if (isShifted) {
                    _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() - 0.1f);
                    if (TV3DManager::isConnected()) {
-                        auto glCanvas = DependencyManager::get<GLCanvas>();
-                        TV3DManager::configureCamera(_myCamera, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
+                        TV3DManager::configureCamera(_myCamera, _glWidget->getDeviceWidth(), _glWidget->getDeviceHeight());
                    }
                } else {
                    _myCamera.setEyeOffsetPosition(_myCamera.getEyeOffsetPosition() + glm::vec3(-0.001, 0, 0));
@ -1068,8 +1065,7 @@ void Application::keyPressEvent(QKeyEvent* event) {
                if (isShifted) {
                    _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() + 0.1f);
                    if (TV3DManager::isConnected()) {
-                        auto glCanvas = DependencyManager::get<GLCanvas>();
-                        TV3DManager::configureCamera(_myCamera, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
+                        TV3DManager::configureCamera(_myCamera, _glWidget->getDeviceWidth(), _glWidget->getDeviceHeight());
                    }

                } else {
@ -1469,6 +1465,10 @@ void Application::checkFPS() {

 void Application::idle() {
    PerformanceTimer perfTimer("idle");
+    
+    if (_aboutToQuit) {
+        return; // bail early, nothing to do here.
+    }

    // Normally we check PipelineWarnings, but since idle will often take more than 10ms we only show these idle timing
    // details if we're in ExtraDebugging mode. However, the ::update() and it's subcomponents will show their timing
@ -1494,7 +1494,7 @@ void Application::idle() {
        {
            PerformanceTimer perfTimer("updateGL");
            PerformanceWarning warn(showWarnings, "Application::idle()... updateGL()");
-            DependencyManager::get<GLCanvas>()->updateGL();
+            _glWidget->updateGL();
        }
        {
            PerformanceTimer perfTimer("rest");
@ -1535,8 +1535,7 @@ void Application::setFullscreen(bool fullscreen) {
 }

 void Application::setEnable3DTVMode(bool enable3DTVMode) {
-    auto glCanvas = DependencyManager::get<GLCanvas>();
-    resizeGL(glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
+    resizeGL(_glWidget->getDeviceWidth(), _glWidget->getDeviceHeight());
 }

 void Application::setEnableVRMode(bool enableVRMode) {
@ -1561,8 +1560,7 @@ void Application::setEnableVRMode(bool enableVRMode) {
        _myCamera.setHmdRotation(glm::quat());
    }
    
-    auto glCanvas = DependencyManager::get<GLCanvas>();
-    resizeGL(glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
+    resizeGL(_glWidget->getDeviceWidth(), _glWidget->getDeviceHeight());
    
    updateCursorVisibility();
 }
@ -1573,9 +1571,8 @@ void Application::setLowVelocityFilter(bool lowVelocityFilter) {

 bool Application::mouseOnScreen() const {
    if (OculusManager::isConnected()) {
-        auto glCanvas = DependencyManager::get<GLCanvas>();
-        return getMouseX() >= 0 && getMouseX() <= glCanvas->getDeviceWidth() &&
-               getMouseY() >= 0 && getMouseY() <= glCanvas->getDeviceHeight();
+        return getMouseX() >= 0 && getMouseX() <= _glWidget->getDeviceWidth() &&
+               getMouseY() >= 0 && getMouseY() <= _glWidget->getDeviceHeight();
    }
    return true;
 }
@ -1624,6 +1621,16 @@ FaceTracker* Application::getActiveFaceTracker() {
             (visage->isActive() ? static_cast<FaceTracker*>(visage.data()) : NULL)));
 }

+void Application::setActiveFaceTracker() {
+#ifdef HAVE_FACESHIFT
+    DependencyManager::get<Faceshift>()->setTCPEnabled(Menu::getInstance()->isOptionChecked(MenuOption::Faceshift));
+#endif 
+    DependencyManager::get<DdeFaceTracker>()->setEnabled(Menu::getInstance()->isOptionChecked(MenuOption::DDEFaceRegression));
+#ifdef HAVE_VISAGE
+    DependencyManager::get<Visage>()->updateEnabled();
+#endif
+}
+
 bool Application::exportEntities(const QString& filename, float x, float y, float z, float scale) {
    QVector<EntityItem*> entities;
    _entities.getTree()->findEntities(AACube(glm::vec3(x / (float)TREE_SCALE, 
@ -1741,6 +1748,7 @@ void Application::init() {

    // initialize our face trackers after loading the menu settings
    DependencyManager::get<Faceshift>()->init();
+    DependencyManager::get<DdeFaceTracker>()->init();
    DependencyManager::get<Visage>()->init();

    Leapmotion::init();
@ -1774,8 +1782,7 @@ void Application::init() {

    _metavoxels.init();

-    auto glCanvas = DependencyManager::get<GLCanvas>();
-    _rearMirrorTools = new RearMirrorTools(glCanvas.data(), _mirrorViewRect);
+    _rearMirrorTools = new RearMirrorTools(_glWidget, _mirrorViewRect);

    connect(_rearMirrorTools, SIGNAL(closeView()), SLOT(closeMirrorView()));
    connect(_rearMirrorTools, SIGNAL(restoreView()), SLOT(restoreMirrorView()));
@ -1783,10 +1790,10 @@ void Application::init() {
    connect(_rearMirrorTools, SIGNAL(resetView()), SLOT(resetSensors()));

    // make sure our texture cache knows about window size changes
-    DependencyManager::get<TextureCache>()->associateWithWidget(glCanvas.data());
+    DependencyManager::get<TextureCache>()->associateWithWidget(_glWidget);

    // initialize the GlowEffect with our widget
-    DependencyManager::get<GlowEffect>()->init(glCanvas.data(),
+    DependencyManager::get<GlowEffect>()->init(_glWidget,
                                               Menu::getInstance()->isOptionChecked(MenuOption::EnableGlowEffect));
 }

@ -2040,9 +2047,9 @@ void Application::updateCursor(float deltaTime) {

 void Application::updateCursorVisibility() {
    if (!_cursorVisible || Menu::getInstance()->isOptionChecked(MenuOption::EnableVRMode)) {
-        DependencyManager::get<GLCanvas>()->setCursor(Qt::BlankCursor);
+        _glWidget->setCursor(Qt::BlankCursor);
    } else {
-        DependencyManager::get<GLCanvas>()->unsetCursor();
+        _glWidget->unsetCursor();
    }
 }

@ -2636,8 +2643,7 @@ void Application::updateShadowMap() {
    
    fbo->release();
    
-    auto glCanvas = DependencyManager::get<GLCanvas>();
-    glViewport(0, 0, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
+    glViewport(0, 0, _glWidget->getDeviceWidth(), _glWidget->getDeviceHeight());
 }

 const GLfloat WORLD_AMBIENT_COLOR[] = { 0.525f, 0.525f, 0.6f };
@ -2687,7 +2693,7 @@ QImage Application::renderAvatarBillboard() {
    Glower glower;

    const int BILLBOARD_SIZE = 64;
-    renderRearViewMirror(QRect(0, DependencyManager::get<GLCanvas>()->getDeviceHeight() - BILLBOARD_SIZE,
+    renderRearViewMirror(QRect(0, _glWidget->getDeviceHeight() - BILLBOARD_SIZE,
                               BILLBOARD_SIZE, BILLBOARD_SIZE),
                         true);

@ -2979,9 +2985,8 @@ bool Application::getCascadeShadowsEnabled() {
 }

 glm::vec2 Application::getScaledScreenPoint(glm::vec2 projectedPoint) {
-    auto glCanvas = DependencyManager::get<GLCanvas>();
-    float horizontalScale = glCanvas->getDeviceWidth() / 2.0f;
-    float verticalScale   = glCanvas->getDeviceHeight() / 2.0f;
+    float horizontalScale = _glWidget->getDeviceWidth() / 2.0f;
+    float verticalScale   = _glWidget->getDeviceHeight() / 2.0f;

    // -1,-1 is 0,windowHeight
    // 1,1 is windowWidth,0
@ -3000,7 +3005,7 @@ glm::vec2 Application::getScaledScreenPoint(glm::vec2 projectedPoint) {
    // -1,-1                   1,-1

    glm::vec2 screenPoint((projectedPoint.x + 1.0) * horizontalScale,
-        ((projectedPoint.y + 1.0) * -verticalScale) + glCanvas->getDeviceHeight());
+        ((projectedPoint.y + 1.0) * -verticalScale) + _glWidget->getDeviceHeight());

    return screenPoint;
 }
@ -3136,7 +3141,7 @@ void Application::resetSensors() {
    QScreen* currentScreen = _window->windowHandle()->screen();
    QWindow* mainWindow = _window->windowHandle();
    QPoint windowCenter = mainWindow->geometry().center();
-    DependencyManager::get<GLCanvas>()->cursor().setPos(currentScreen, windowCenter);
+    _glWidget->cursor().setPos(currentScreen, windowCenter);
    
    _myAvatar->reset();

@ -3528,19 +3533,20 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
    scriptEngine->registerGlobalObject("MIDI", &MIDIManager::getInstance());
 #endif

+    // TODO: Consider moving some of this functionality into the ScriptEngine class instead. It seems wrong that this
+    // work is being done in the Application class when really these dependencies are more related to the ScriptEngine's
+    // implementation
    QThread* workerThread = new QThread(this);
-    workerThread->setObjectName("Script Engine Thread");
+    QString scriptEngineName = QString("Script Thread:") + scriptEngine->getFilename();
+    workerThread->setObjectName(scriptEngineName);

    // when the worker thread is started, call our engine's run..
    connect(workerThread, &QThread::started, scriptEngine, &ScriptEngine::run);

    // when the thread is terminated, add both scriptEngine and thread to the deleteLater queue
-    connect(scriptEngine, SIGNAL(finished(const QString&)), scriptEngine, SLOT(deleteLater()));
+    connect(scriptEngine, SIGNAL(doneRunning()), scriptEngine, SLOT(deleteLater()));
    connect(workerThread, SIGNAL(finished()), workerThread, SLOT(deleteLater()));

-    // when the application is about to quit, stop our script engine so it unwinds properly
-    connect(this, SIGNAL(aboutToQuit()), scriptEngine, SLOT(stop()));
-
    auto nodeList = DependencyManager::get<NodeList>();
    connect(nodeList.data(), &NodeList::nodeKilled, scriptEngine, &ScriptEngine::nodeKilled);

@ -3551,7 +3557,12 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
 }

 ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUserLoaded,
-    bool loadScriptFromEditor, bool activateMainWindow) {
+                                        bool loadScriptFromEditor, bool activateMainWindow) {
+
+    if (isAboutToQuit()) {
+        return NULL;
+    }
+                                        
    QUrl scriptUrl(scriptFilename);
    const QString& scriptURLString = scriptUrl.toString();
    if (_scriptEnginesHash.contains(scriptURLString) && loadScriptFromEditor
@ -3742,8 +3753,8 @@ void Application::domainSettingsReceived(const QJsonObject& domainSettingsObject
        voxelWalletUUID = QUuid(voxelObject[VOXEL_WALLET_UUID].toString());
    }
    
-    qDebug() << "Voxel costs are" << satoshisPerVoxel << "per voxel and" << satoshisPerMeterCubed << "per meter cubed";
-    qDebug() << "Destination wallet UUID for voxel payments is" << voxelWalletUUID;
+    qDebug() << "Octree edits costs are" << satoshisPerVoxel << "per octree cell and" << satoshisPerMeterCubed << "per meter cubed";
+    qDebug() << "Destination wallet UUID for edit payments is" << voxelWalletUUID;
 }

 QString Application::getPreviousScriptLocation() {
@ -3766,7 +3777,7 @@ void Application::setPreviousScriptLocation(const QString& previousScriptLocatio

 void Application::loadDialog() {

-    QString fileNameString = QFileDialog::getOpenFileName(DependencyManager::get<GLCanvas>().data(),
+    QString fileNameString = QFileDialog::getOpenFileName(_glWidget,
                                                          tr("Open Script"),
                                                          getPreviousScriptLocation(),
                                                          tr("JavaScript Files (*.js)"));
@ -3807,7 +3818,7 @@ void Application::setScriptsLocation(const QString& scriptsLocation) {

 void Application::toggleLogDialog() {
    if (! _logDialog) {
-        _logDialog = new LogDialog(DependencyManager::get<GLCanvas>().data(), getLogger());
+        _logDialog = new LogDialog(_glWidget, getLogger());
    }

    if (_logDialog->isVisible()) {
@ -3864,7 +3875,7 @@ void Application::parseVersionXml() {
    }

    if (!shouldSkipVersion(latestVersion) && applicationVersion() != latestVersion) {
-        new UpdateDialog(DependencyManager::get<GLCanvas>().data(), releaseNotes, latestVersion, downloadUrl);
+        new UpdateDialog(_glWidget, releaseNotes, latestVersion, downloadUrl);
    }
    sender->deleteLater();
 }
@ -3897,7 +3908,7 @@ void Application::takeSnapshot() {
    }

    if (!_snapshotShareDialog) {
-        _snapshotShareDialog = new SnapshotShareDialog(fileName, DependencyManager::get<GLCanvas>().data());
+        _snapshotShareDialog = new SnapshotShareDialog(fileName, _glWidget);
    }
    _snapshotShareDialog->show();
 }
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@ -171,7 +171,8 @@ public:
    bool event(QEvent* event);
    bool eventFilter(QObject* object, QEvent* event);

-    bool isThrottleRendering() const { return DependencyManager::get<GLCanvas>()->isThrottleRendering(); }
+    GLCanvas* getGLWidget() { return _glWidget; }
+    bool isThrottleRendering() const { return _glWidget->isThrottleRendering(); }

    Camera* getCamera() { return &_myCamera; }
    ViewFrustum* getViewFrustum() { return &_viewFrustum; }
@ -195,8 +196,8 @@ public:
    bool mouseOnScreen() const;
    int getMouseX() const;
    int getMouseY() const;
-    int getTrueMouseX() const { return DependencyManager::get<GLCanvas>()->mapFromGlobal(QCursor::pos()).x(); }
-    int getTrueMouseY() const { return DependencyManager::get<GLCanvas>()->mapFromGlobal(QCursor::pos()).y(); }
+    int getTrueMouseX() const { return _glWidget->mapFromGlobal(QCursor::pos()).x(); }
+    int getTrueMouseY() const { return _glWidget->mapFromGlobal(QCursor::pos()).y(); }
    int getMouseDragStartedX() const;
    int getMouseDragStartedY() const;
    int getTrueMouseDragStartedX() const { return _mouseDragStartedX; }
@ -270,8 +271,8 @@ public:

    FileLogger* getLogger() { return _logger; }

-    glm::vec2 getViewportDimensions() const { return glm::vec2(DependencyManager::get<GLCanvas>()->getDeviceWidth(),
-                                                               DependencyManager::get<GLCanvas>()->getDeviceHeight()); }
+    glm::vec2 getViewportDimensions() const { return glm::vec2(_glWidget->getDeviceWidth(),
+                                                               _glWidget->getDeviceHeight()); }
    NodeToJurisdictionMap& getEntityServerJurisdictions() { return _entityServerJurisdictions; }

    void skipVersion(QString latestVersion);
@ -366,6 +367,8 @@ public slots:

    void notifyPacketVersionMismatch();

+    void setActiveFaceTracker();
+
 private slots:
    void clearDomainOctreeDetails();
    void checkFPS();
@ -591,6 +594,8 @@ private:
    
    QThread _settingsThread;
    QTimer _settingsTimer;
+    
+    GLCanvas* _glWidget = new GLCanvas(); // our GLCanvas has a couple extra features
 };

 #endif // hifi_Application_h
--- a/interface/src/Camera.cpp
+++ b/interface/src/Camera.cpp
@ -122,7 +122,7 @@ void Camera::setFarClip(float f) {
 }

 PickRay Camera::computePickRay(float x, float y) {
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    return computeViewPickRay(x / glCanvas->width(), y / glCanvas->height());
 }

--- a/interface/src/DatagramProcessor.cpp
+++ b/interface/src/DatagramProcessor.cpp
@ -30,6 +30,10 @@ DatagramProcessor::DatagramProcessor(QObject* parent) :
 void DatagramProcessor::processDatagrams() {
    PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
                            "DatagramProcessor::processDatagrams()");
+
+    if (_isShuttingDown) {
+        return; // bail early... we're shutting down.
+    }
    
    HifiSockAddr senderSockAddr;
    
--- a/interface/src/DatagramProcessor.h
+++ b/interface/src/DatagramProcessor.h
@ -25,14 +25,17 @@ public:
    int getOutByteCount() const { return _outByteCount; }
    
    void resetCounters() { _inPacketCount = 0; _outPacketCount = 0; _inByteCount = 0; _outByteCount = 0; }
+
+    void shutdown() { _isShuttingDown = true; }
 public slots:
    void processDatagrams();
    
 private:
-    int _inPacketCount;
-    int _outPacketCount;
-    int _inByteCount;
-    int _outByteCount;
+    int _inPacketCount = 0;
+    int _outPacketCount = 0;
+    int _inByteCount = 0;
+    int _outByteCount = 0;
+    bool _isShuttingDown = false;
 };

 #endif // hifi_DatagramProcessor_h
--- a/interface/src/GLCanvas.h
+++ b/interface/src/GLCanvas.h
@ -16,14 +16,13 @@
 #include <QGLWidget>
 #include <QTimer>

-#include <DependencyManager.h>
-
 /// customized canvas that simply forwards requests/events to the singleton application
-class GLCanvas : public QGLWidget, public Dependency {
+class GLCanvas : public QGLWidget {
    Q_OBJECT
-    SINGLETON_DEPENDENCY
    
 public:
+    GLCanvas();
+
    bool isThrottleRendering() const;
    
    int getDeviceWidth() const;
@ -60,12 +59,8 @@ private slots:
    void activeChanged(Qt::ApplicationState state);
    void throttleRender();
    bool eventFilter(QObject*, QEvent* event);
-    
-private:
-    GLCanvas();
-    ~GLCanvas() {
-        qDebug() << "Deleting GLCanvas";
-    }
+   
 };

+
 #endif // hifi_GLCanvas_h
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@ -27,6 +27,7 @@
 #include "audio/AudioIOStatsRenderer.h"
 #include "audio/AudioScope.h"
 #include "avatar/AvatarManager.h"
+#include "devices/DdeFaceTracker.h"
 #include "devices/Faceshift.h"
 #include "devices/RealSense.h"
 #include "devices/SixenseManager.h"
@ -357,18 +358,35 @@ Menu::Menu() {
                                  dialogsManager.data(), SLOT(lodTools()));

    QMenu* avatarDebugMenu = developerMenu->addMenu("Avatar");
+
+    QMenu* faceTrackingMenu = avatarDebugMenu->addMenu("Face Tracking");
+    {
+        QActionGroup* faceTrackerGroup = new QActionGroup(avatarDebugMenu);
+
+        QAction* noFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::NoFaceTracking,
+            0, true,
+            qApp, SLOT(setActiveFaceTracker()));
+        faceTrackerGroup->addAction(noFaceTracker);
+
 #ifdef HAVE_FACESHIFT
-    addCheckableActionToQMenuAndActionHash(avatarDebugMenu,
-                                           MenuOption::Faceshift,
-                                           0,
-                                           true,
-                                           DependencyManager::get<Faceshift>().data(),
-                                           SLOT(setTCPEnabled(bool)));
+        QAction* faceshiftFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::Faceshift,
+            0, false,
+            qApp, SLOT(setActiveFaceTracker()));
+        faceTrackerGroup->addAction(faceshiftFaceTracker);
 #endif
+
+        QAction* ddeFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::DDEFaceRegression, 
+            0, false,
+            qApp, SLOT(setActiveFaceTracker()));
+        faceTrackerGroup->addAction(ddeFaceTracker);
+
 #ifdef HAVE_VISAGE
-    addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::Visage, 0, false,
-            DependencyManager::get<Visage>().data(), SLOT(updateEnabled()));
+        QAction* visageFaceTracker = addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::Visage, 
+            0, false,
+            qApp, SLOT(setActiveFaceTracker()));
+        faceTrackerGroup->addAction(visageFaceTracker);
 #endif
+    }

    addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderSkeletonCollisionShapes);
    addCheckableActionToQMenuAndActionHash(avatarDebugMenu, MenuOption::RenderHeadCollisionShapes);
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@ -133,13 +133,12 @@ namespace MenuOption {
    const QString CollideWithEnvironment = "Collide With World Boundaries";
    const QString Collisions = "Collisions";
    const QString Console = "Console...";
+    const QString ControlWithSpeech = "Control With Speech";
    const QString CopyAddress = "Copy Address to Clipboard";
    const QString CopyPath = "Copy Path to Clipboard";
-    const QString ControlWithSpeech = "Control With Speech";
-    const QString DeleteBookmark = "Delete Bookmark...";
-    const QString DontRenderEntitiesAsScene = "Don't Render Entities as Scene";
-    const QString DontDoPrecisionPicking = "Don't Do Precision Picking";
+    const QString DDEFaceRegression = "DDE Face Regression";
    const QString DecreaseAvatarSize = "Decrease Avatar Size";
+    const QString DeleteBookmark = "Delete Bookmark...";
    const QString DisableActivityLogger = "Disable Activity Logger";
    const QString DisableAutoAdjustLOD = "Disable Automatically Adjusting LOD";
    const QString DisableLightEntities = "Disable Light Entities";
@ -152,7 +151,9 @@ namespace MenuOption {
    const QString DisplayModelElementChildProxies = "Display Model Element Children";
    const QString DisplayModelElementProxy = "Display Model Element Bounds";
    const QString DisplayTimingDetails = "Display Timing Details";
+    const QString DontDoPrecisionPicking = "Don't Do Precision Picking";
    const QString DontFadeOnOctreeServerChanges = "Don't Fade In/Out on Octree Server Changes";
+    const QString DontRenderEntitiesAsScene = "Don't Render Entities as Scene";
    const QString EchoLocalAudio = "Echo Local Audio";
    const QString EchoServerAudio = "Echo Server Audio";
    const QString EditEntitiesHelp = "Edit Entities Help...";
@ -192,6 +193,7 @@ namespace MenuOption {
    const QString MuteEnvironment = "Mute Environment";
    const QString NetworkSimulator = "Network Simulator...";
    const QString NewVoxelCullingMode = "New Voxel Culling Mode";
+    const QString NoFaceTracking = "None";
    const QString ObeyEnvironmentalGravity = "Obey Environmental Gravity";
    const QString OctreeStats = "Voxel and Entity Statistics";
    const QString OffAxisProjection = "Off-Axis Projection";
--- a/interface/src/UIUtil.cpp
+++ b/interface/src/UIUtil.cpp
@ -12,6 +12,8 @@
 #include <QStyle>
 #include <QStyleOptionTitleBar>

+#include "GLCanvas.h"
+
 #include "UIUtil.h"

 int UIUtil::getWindowTitleBarHeight(const QWidget* window) {
@ -27,3 +29,47 @@ int UIUtil::getWindowTitleBarHeight(const QWidget* window) {

    return titleBarHeight;
 }
+
+// When setting the font size of a widget in points, the rendered text will be larger
+// on Windows and Linux than on Mac OSX.  This is because Windows and Linux use a DPI
+// of 96, while OSX uses 72.  In order to get consistent results across platforms, the
+// font sizes need to be scaled based on the system DPI.
+// This function will scale the font size of widget and all
+// of its children recursively.
+//
+// When creating widgets, if a font size isn't explicitly set Qt will choose a
+// reasonable, but often different font size across platforms.  This means
+// YOU SHOUD EXPLICITLY SET ALL FONT SIZES and call this function OR not use
+// this function at all.  If you mix both you will end up with inconsistent results
+// across platforms.
+void UIUtil::scaleWidgetFontSizes(QWidget* widget) {
+    // This is the base dpi that we are targetting.  This is based on Mac OSXs default DPI,
+    // and is the basis for all font sizes.
+    const float BASE_DPI = 72.0f;
+
+#ifdef Q_OS_MAC
+    const float NATIVE_DPI = 72.0f;
+#else
+    const float NATIVE_DPI = 96.0f;
+#endif
+
+    // Scale fonts based on the native dpi.  On Windows, where the native DPI is 96,
+    // the scale will be: 72.0 / 96.0 = 0.75
+    float fontScale = BASE_DPI / NATIVE_DPI;
+
+    internalScaleWidgetFontSizes(widget, fontScale);
+}
+
+// Depth-first traversal through widget hierarchy.  It is important to do a depth-first
+// traversal because modifying the font size of a parent node can affect children.
+void UIUtil::internalScaleWidgetFontSizes(QWidget* widget, float scale) {
+    for (auto child : widget->findChildren<QWidget*>()) {
+        if (child->parent() == widget) {
+            internalScaleWidgetFontSizes(child, scale);
+        }
+    }
+
+    QFont font = widget->font();
+    font.setPointSizeF(font.pointSizeF() * scale);
+    widget->setFont(font);
+}
--- a/interface/src/UIUtil.h
+++ b/interface/src/UIUtil.h
@ -18,7 +18,10 @@
 class UIUtil {
 public:
    static int getWindowTitleBarHeight(const QWidget* window);
+    static void scaleWidgetFontSizes(QWidget* widget);

+private:
+    static void internalScaleWidgetFontSizes(QWidget* widget, float scale);
 };

 #endif // hifi_UIUtil_h
--- a/interface/src/XmppClient.h
+++ b/interface/src/XmppClient.h
@ -15,8 +15,8 @@
 #include <QObject>

 #ifdef HAVE_QXMPP
-#include <QXmppClient.h>
-#include <QXmppMucManager.h>
+#include <qxmpp/QXmppClient.h>
+#include <qxmpp/QXmppMucManager.h>
 #endif

 /// Generalized threaded processor for handling received inbound packets. 
--- a/interface/src/audio/AudioScope.h
+++ b/interface/src/audio/AudioScope.h
@ -75,4 +75,4 @@ private:

 };

-#endif // hifi_AudioScope_h
+#endif // hifi_AudioScope_h
--- a/interface/src/audio/AudioToolBox.cpp
+++ b/interface/src/audio/AudioToolBox.cpp
@ -16,6 +16,7 @@
 #include <PathUtils.h>
 #include <GeometryCache.h>

+#include "Application.h"
 #include "AudioToolBox.h"

 // Mute icon configration
@ -37,7 +38,7 @@ bool AudioToolBox::mousePressEvent(int x, int y) {
 void AudioToolBox::render(int x, int y, bool boxed) {
    glEnable(GL_TEXTURE_2D);
    
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    if (_micTextureId == 0) {
        _micTextureId =  glCanvas->bindTexture(QImage(PathUtils::resourcesPath() + "images/mic.svg"));
    }
@ -105,8 +106,12 @@ void AudioToolBox::render(int x, int y, bool boxed) {
    glm::vec2 bottomRight(_iconBounds.right(), _iconBounds.bottom());
    glm::vec2 texCoordTopLeft(1,1);
    glm::vec2 texCoordBottomRight(0,0);
+    
+    if (_boxQuadID == GeometryCache::UNKNOWN_ID) {
+        _boxQuadID = DependencyManager::get<GeometryCache>()->allocateID();
+    }

-    DependencyManager::get<GeometryCache>()->renderQuad(topLeft, bottomRight, texCoordTopLeft, texCoordBottomRight, quadColor);
+    DependencyManager::get<GeometryCache>()->renderQuad(topLeft, bottomRight, texCoordTopLeft, texCoordBottomRight, quadColor, _boxQuadID);
    
    glDisable(GL_TEXTURE_2D);
 }
--- a/interface/src/audio/AudioToolBox.h
+++ b/interface/src/audio/AudioToolBox.h
@ -13,6 +13,7 @@
 #define hifi_AudioToolBox_h

 #include <DependencyManager.h>
+#include <GeometryCache.h>

 class AudioToolBox : public Dependency {
    SINGLETON_DEPENDENCY
@ -26,6 +27,7 @@ private:
    GLuint _micTextureId = 0;
    GLuint _muteTextureId = 0;
    GLuint _boxTextureId = 0;
+    int _boxQuadID = GeometryCache::UNKNOWN_ID;
    QRect _iconBounds;
    qint64 _iconPulseTimeReference = 0;
 };
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@ -539,18 +539,13 @@ void Avatar::renderBillboard() {
        return;
    }
    if (!_billboardTexture) {
-        QImage image = QImage::fromData(_billboard);
-        if (image.format() != QImage::Format_ARGB32) {
-            image = image.convertToFormat(QImage::Format_ARGB32);
-        }
-        _billboardTexture.reset(new Texture());
-        glBindTexture(GL_TEXTURE_2D, _billboardTexture->getID());
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image.width(), image.height(), 0,
-            GL_BGRA, GL_UNSIGNED_BYTE, image.constBits());
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    
-    } else {
-        glBindTexture(GL_TEXTURE_2D, _billboardTexture->getID());
+        // Using a unique URL ensures we don't get another avatar's texture from TextureCache
+        QUrl uniqueUrl = QUrl(QUuid::createUuid().toString());
+        _billboardTexture = DependencyManager::get<TextureCache>()->getTexture(
+            uniqueUrl, DEFAULT_TEXTURE, false, _billboard);
+    }
+    if (!_billboardTexture->isLoaded()) {
+        return;
    }
    
    glEnable(GL_ALPHA_TEST);
@ -558,6 +553,8 @@ void Avatar::renderBillboard() {
    
    glEnable(GL_TEXTURE_2D);
    glDisable(GL_LIGHTING);
+
+    glBindTexture(GL_TEXTURE_2D, _billboardTexture->getID());
    
    glPushMatrix();
    glTranslatef(_position.x, _position.y, _position.z);
--- a/interface/src/avatar/Avatar.h
+++ b/interface/src/avatar/Avatar.h
@ -234,7 +234,7 @@ protected:
 private:

    bool _initialized;
-    QScopedPointer<Texture> _billboardTexture;
+    NetworkTexturePointer _billboardTexture;
    bool _shouldRenderBillboard;
    bool _isLookAtTarget;

--- a/interface/src/avatar/Head.cpp
+++ b/interface/src/avatar/Head.cpp
@ -80,15 +80,10 @@ void Head::simulate(float deltaTime, bool isMine, bool billboard) {
        // Only use face trackers when not playing back a recording.
        if (!myAvatar->isPlaying()) {
            FaceTracker* faceTracker = Application::getInstance()->getActiveFaceTracker();
-            auto dde = DependencyManager::get<DdeFaceTracker>();
-            auto faceshift = DependencyManager::get<Faceshift>();
-            
-            if ((_isFaceshiftConnected = (faceshift == faceTracker))) {
+            _isFaceTrackerConnected = faceTracker != NULL;
+            if (_isFaceTrackerConnected) {
                _blendshapeCoefficients = faceTracker->getBlendshapeCoefficients();
-            } else if (dde->isActive()) {
-                faceTracker = dde.data();
-                _blendshapeCoefficients = faceTracker->getBlendshapeCoefficients();
-            }            
+            }
        }
        //  Twist the upper body to follow the rotation of the head, but only do this with my avatar,
        //  since everyone else will see the full joint rotations for other people.  
@ -109,7 +104,7 @@ void Head::simulate(float deltaTime, bool isMine, bool billboard) {
        _longTermAverageLoudness = glm::mix(_longTermAverageLoudness, _averageLoudness, glm::min(deltaTime / AUDIO_LONG_TERM_AVERAGING_SECS, 1.0f));
    }
    
-    if (!(_isFaceshiftConnected || billboard)) {
+    if (!(_isFaceTrackerConnected || billboard)) {
        // Update eye saccades
        const float AVERAGE_MICROSACCADE_INTERVAL = 0.50f;
        const float AVERAGE_SACCADE_INTERVAL = 4.0f;
--- a/interface/src/devices/DdeFaceTracker.cpp
+++ b/interface/src/devices/DdeFaceTracker.cpp
@ -44,58 +44,40 @@ struct Packet{
 };

 DdeFaceTracker::DdeFaceTracker() :
-_lastReceiveTimestamp(0),
-_reset(false),
-_leftBlinkIndex(0), // see http://support.faceshift.com/support/articles/35129-export-of-blendshapes
-_rightBlinkIndex(1),
-_leftEyeOpenIndex(8),
-_rightEyeOpenIndex(9),
-_browDownLeftIndex(14),
-_browDownRightIndex(15),
-_browUpCenterIndex(16),
-_browUpLeftIndex(17),
-_browUpRightIndex(18),
-_mouthSmileLeftIndex(28),
-_mouthSmileRightIndex(29),
-_jawOpenIndex(21)
+    DdeFaceTracker(QHostAddress::Any, DDE_FEATURE_POINT_SERVER_PORT)
+{
+
+}
+
+DdeFaceTracker::DdeFaceTracker(const QHostAddress& host, quint16 port) :
+    _lastReceiveTimestamp(0),
+    _reset(false),
+    _leftBlinkIndex(0), // see http://support.faceshift.com/support/articles/35129-export-of-blendshapes
+    _rightBlinkIndex(1),
+    _leftEyeOpenIndex(8),
+    _rightEyeOpenIndex(9),
+    _browDownLeftIndex(14),
+    _browDownRightIndex(15),
+    _browUpCenterIndex(16),
+    _browUpLeftIndex(17),
+    _browUpRightIndex(18),
+    _mouthSmileLeftIndex(28),
+    _mouthSmileRightIndex(29),
+    _jawOpenIndex(21),
+    _host(host),
+    _port(port)
 {
    _blendshapeCoefficients.resize(NUM_EXPRESSION);
    
    connect(&_udpSocket, SIGNAL(readyRead()), SLOT(readPendingDatagrams()));
    connect(&_udpSocket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(socketErrorOccurred(QAbstractSocket::SocketError)));
    connect(&_udpSocket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), SLOT(socketStateChanged(QAbstractSocket::SocketState)));
-    
-    bindTo(DDE_FEATURE_POINT_SERVER_PORT);
-}
-
-DdeFaceTracker::DdeFaceTracker(const QHostAddress& host, quint16 port) :
-_lastReceiveTimestamp(0),
-_reset(false),
-_leftBlinkIndex(0), // see http://support.faceshift.com/support/articles/35129-export-of-blendshapes
-_rightBlinkIndex(1),
-_leftEyeOpenIndex(8),
-_rightEyeOpenIndex(9),
-_browDownLeftIndex(14),
-_browDownRightIndex(15),
-_browUpCenterIndex(16),
-_browUpLeftIndex(17),
-_browUpRightIndex(18),
-_mouthSmileLeftIndex(28),
-_mouthSmileRightIndex(29),
-_jawOpenIndex(21)
-{
-    _blendshapeCoefficients.resize(NUM_EXPRESSION);
-    
-    connect(&_udpSocket, SIGNAL(readyRead()), SLOT(readPendingDatagrams()));
-    connect(&_udpSocket, SIGNAL(error(QAbstractSocket::SocketError)), SLOT(socketErrorOccurred(QAbstractSocket::SocketError)));
-    connect(&_udpSocket, SIGNAL(stateChanged(QAbstractSocket::SocketState)), SIGNAL(socketStateChanged(QAbstractSocket::SocketState)));
-    
-    bindTo(host, port);
 }

 DdeFaceTracker::~DdeFaceTracker() {
-    if(_udpSocket.isOpen())
+    if (_udpSocket.isOpen()) {
        _udpSocket.close();
+    }
 }

 void DdeFaceTracker::init() {
@ -110,15 +92,12 @@ void DdeFaceTracker::update() {
    
 }

-void DdeFaceTracker::bindTo(quint16 port) {
-    bindTo(QHostAddress::Any, port);
-}
-
-void DdeFaceTracker::bindTo(const QHostAddress& host, quint16 port) {
-    if(_udpSocket.isOpen()) {
-        _udpSocket.close();
+void DdeFaceTracker::setEnabled(bool enabled) {
+    // isOpen() does not work as one might expect on QUdpSocket; don't test isOpen() before closing socket.
+    _udpSocket.close();
+    if (enabled) {
+        _udpSocket.bind(_host, _port);
    }
-    _udpSocket.bind(host, port);
 }

 bool DdeFaceTracker::isActive() const {
@ -135,7 +114,7 @@ void DdeFaceTracker::socketStateChanged(QAbstractSocket::SocketState socketState
    QString state;
    switch(socketState) {
        case QAbstractSocket::BoundState:
-            state = "Bounded";
+            state = "Bound";
            break;
        case QAbstractSocket::ClosingState:
            state = "Closing";
@ -156,7 +135,7 @@ void DdeFaceTracker::socketStateChanged(QAbstractSocket::SocketState socketState
            state = "Unconnected";
            break;
    }
-    qDebug() << "[Info] DDE Face Tracker Socket: " << socketState;
+    qDebug() << "[Info] DDE Face Tracker Socket: " << state;
 }

 void DdeFaceTracker::readPendingDatagrams() {
--- a/interface/src/devices/DdeFaceTracker.h
+++ b/interface/src/devices/DdeFaceTracker.h
@ -28,9 +28,6 @@ public:
    void reset();
    void update();
    
-    //sockets
-    void bindTo(quint16 port);
-    void bindTo(const QHostAddress& host, quint16 port);
    bool isActive() const;
    
    float getLeftBlink() const { return getBlendshapeCoefficient(_leftBlinkIndex); }
@ -47,7 +44,10 @@ public:
    float getMouthSize() const { return getBlendshapeCoefficient(_jawOpenIndex); }
    float getMouthSmileLeft() const { return getBlendshapeCoefficient(_mouthSmileLeftIndex); }
    float getMouthSmileRight() const { return getBlendshapeCoefficient(_mouthSmileRightIndex); }
-    
+
+public slots:
+    void setEnabled(bool enabled);
+
 private slots:
    
    //sockets
@ -59,6 +59,9 @@ private:
    DdeFaceTracker();
    DdeFaceTracker(const QHostAddress& host, quint16 port);
    ~DdeFaceTracker();
+
+    QHostAddress _host;
+    quint16 _port;
    
    float getBlendshapeCoefficient(int index) const;
    void decodePacket(const QByteArray& buffer);
--- a/interface/src/devices/OculusManager.cpp
+++ b/interface/src/devices/OculusManager.cpp
@ -566,7 +566,7 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p
    }

    // restore our normal viewport
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    glViewport(0, 0, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());

    glMatrixMode(GL_PROJECTION);
@ -585,7 +585,7 @@ void OculusManager::display(const glm::quat &bodyOrientation, const glm::vec3 &p
 void OculusManager::renderDistortionMesh(ovrPosef eyeRenderPose[ovrEye_Count]) {

    glLoadIdentity();
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    glOrtho(0, glCanvas->getDeviceWidth(), 0, glCanvas->getDeviceHeight(), -1.0, 1.0);

    glDisable(GL_DEPTH_TEST);
--- a/interface/src/devices/PrioVR.cpp
+++ b/interface/src/devices/PrioVR.cpp
@ -216,7 +216,7 @@ void PrioVR::renderCalibrationCountdown() {
    static TextRenderer* textRenderer = TextRenderer::getInstance(MONO_FONT_FAMILY, 18, QFont::Bold,
        false, TextRenderer::OUTLINE_EFFECT, 2);
    QByteArray text = "Assume T-Pose in " + QByteArray::number(secondsRemaining) + "...";
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    textRenderer->draw((glCanvas->width() - textRenderer->computeExtent(text.constData()).x) / 2,
                       glCanvas->height() / 2,
                       text, glm::vec4(1,1,1,1));
--- a/interface/src/devices/SixenseManager.cpp
+++ b/interface/src/devices/SixenseManager.cpp
@ -260,6 +260,18 @@ void SixenseManager::update(float deltaTime) {
            float sign = (i == 0) ? -1.0f : 1.0f;
            rotation *= glm::angleAxis(sign * PI/4.0f, glm::vec3(0.0f, 0.0f, 1.0f));
            
+            //  Angular Velocity of Palm
+            glm::quat deltaRotation = rotation * glm::inverse(palm->getRawRotation());
+            glm::vec3 angularVelocity(0.0f);
+            float rotationAngle = glm::angle(deltaRotation);
+            if ((rotationAngle > EPSILON) && (deltaTime > 0.0f)) {
+                angularVelocity = glm::normalize(glm::axis(deltaRotation));
+                angularVelocity *= (rotationAngle / deltaTime);
+                palm->setRawAngularVelocity(angularVelocity);
+            } else {
+                palm->setRawAngularVelocity(glm::vec3(0.0f));
+            }
+            
            if (_lowVelocityFilter) {
                //  Use a velocity sensitive filter to damp small motions and preserve large ones with
                //  no latency.
@ -460,7 +472,7 @@ void SixenseManager::updateCalibration(const sixenseControllerData* controllers)
 //Injecting mouse movements and clicks
 void SixenseManager::emulateMouse(PalmData* palm, int index) {
    MyAvatar* avatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    QPoint pos;
    
    Qt::MouseButton bumperButton;
--- a/interface/src/devices/TV3DManager.cpp
+++ b/interface/src/devices/TV3DManager.cpp
@ -35,7 +35,7 @@ bool TV3DManager::isConnected() {
 }

 void TV3DManager::connect() {
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    int width = glCanvas->getDeviceWidth();
    int height = glCanvas->getDeviceHeight();
    Camera& camera = *Application::getInstance()->getCamera();
@ -93,7 +93,7 @@ void TV3DManager::display(Camera& whichCamera) {
    // left eye portal
    int portalX = 0;
    int portalY = 0;
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    QSize deviceSize = glCanvas->getDeviceSize() *
        Application::getInstance()->getRenderResolutionScale();
    int portalW = deviceSize.width() / 2;
--- a/interface/src/devices/Visage.cpp
+++ b/interface/src/devices/Visage.cpp
@ -174,7 +174,8 @@ void Visage::reset() {
 void Visage::updateEnabled() {
    setEnabled(Menu::getInstance()->isOptionChecked(MenuOption::Visage) &&
        !(Menu::getInstance()->isOptionChecked(MenuOption::Faceshift) &&
-            DependencyManager::get<Faceshift>()->isConnectedOrConnecting()));
+            DependencyManager::get<Faceshift>()->isConnectedOrConnecting()) &&
+        !Menu::getInstance()->isOptionChecked(MenuOption::DDEFaceRegression));
 }

 void Visage::setEnabled(bool enabled) {
--- a/interface/src/scripting/ControllerScriptingInterface.cpp
+++ b/interface/src/scripting/ControllerScriptingInterface.cpp
@ -15,6 +15,7 @@
 #include <HandData.h>
 #include <HFBackEvent.h>

+#include "Application.h"
 #include "devices/MotionTracker.h"
 #include "devices/SixenseManager.h"
 #include "ControllerScriptingInterface.h"
@ -208,6 +209,21 @@ glm::quat ControllerScriptingInterface::getSpatialControlRawRotation(int control
    }
    return glm::quat(); // bad index
 }
+    
+glm::vec3 ControllerScriptingInterface::getSpatialControlRawAngularVelocity(int controlIndex) const {
+    int palmIndex = controlIndex / NUMBER_OF_SPATIALCONTROLS_PER_PALM;
+    int controlOfPalm = controlIndex % NUMBER_OF_SPATIALCONTROLS_PER_PALM;
+    const PalmData* palmData = getActivePalm(palmIndex);
+    if (palmData) {
+        switch (controlOfPalm) {
+            case PALM_SPATIALCONTROL:
+                return palmData->getRawAngularVelocity();
+            case TIP_SPATIALCONTROL:
+                return palmData->getRawAngularVelocity();  //  Tip = palm angular velocity        
+        }
+    }
+    return glm::vec3(0); // bad index
+}

 glm::vec3 ControllerScriptingInterface::getSpatialControlNormal(int controlIndex) const {
    int palmIndex = controlIndex / NUMBER_OF_SPATIALCONTROLS_PER_PALM;
@ -270,7 +286,7 @@ void ControllerScriptingInterface::releaseJoystick(int joystickIndex) {
 }

 glm::vec2 ControllerScriptingInterface::getViewportDimensions() const {
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    return glm::vec2(glCanvas->width(), glCanvas->height());
 }

--- a/interface/src/scripting/ControllerScriptingInterface.h
+++ b/interface/src/scripting/ControllerScriptingInterface.h
@ -96,6 +96,7 @@ public slots:
    virtual glm::vec3 getSpatialControlVelocity(int controlIndex) const;
    virtual glm::vec3 getSpatialControlNormal(int controlIndex) const;
    virtual glm::quat getSpatialControlRawRotation(int controlIndex) const;
+    virtual glm::vec3 getSpatialControlRawAngularVelocity(int controlIndex) const;
    virtual void captureKeyEvents(const KeyEvent& event);
    virtual void releaseKeyEvents(const KeyEvent& event);

--- a/interface/src/scripting/GlobalServicesScriptingInterface.h
+++ b/interface/src/scripting/GlobalServicesScriptingInterface.h
@ -21,8 +21,8 @@

 #ifdef HAVE_QXMPP

-#include <QXmppClient.h>
-#include <QXmppMessage.h>
+#include <qxmpp/QXmppClient.h>
+#include <qxmpp/QXmppMessage.h>

 #endif // HAVE_QXMPP

--- a/interface/src/scripting/HMDScriptingInterface.cpp
+++ b/interface/src/scripting/HMDScriptingInterface.cpp
@ -48,7 +48,6 @@ QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* conte

 QScriptValue HMDScriptingInterface::getHUDLookAtPosition3D(QScriptContext* context, QScriptEngine* engine) {
    glm::vec3 result;
-    HMDScriptingInterface* hmdInterface = &HMDScriptingInterface::getInstance();
    if ((&HMDScriptingInterface::getInstance())->getHUDLookAtPosition3D(result)) {
        return qScriptValueFromValue<glm::vec3>(engine, result);
    }
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@ -18,6 +18,7 @@
 #include <QScrollArea>

 #include "Application.h"
+#include "DomainHandler.h"
 #include "MainWindow.h"
 #include "Menu.h"
 #include "ui/ModelsBrowser.h"
@ -34,6 +35,8 @@ WindowScriptingInterface::WindowScriptingInterface() :
    _nonBlockingFormActive(false),
    _formResult(QDialog::Rejected) 
 {
+    const DomainHandler& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler();
+    connect(&domainHandler, &DomainHandler::hostnameChanged, this, &WindowScriptingInterface::domainChanged);
 }

 WebWindowClass* WindowScriptingInterface::doCreateWebWindow(const QString& title, const QString& url, int width, int height) {
@ -41,7 +44,7 @@ WebWindowClass* WindowScriptingInterface::doCreateWebWindow(const QString& title
 }

 QScriptValue WindowScriptingInterface::hasFocus() {
-    return DependencyManager::get<GLCanvas>()->hasFocus();
+    return Application::getInstance()->getGLWidget()->hasFocus();
 }

 void WindowScriptingInterface::setFocus() {
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@ -57,6 +57,7 @@ public slots:
    QScriptValue peekNonBlockingFormResult(QScriptValue array);

 signals:
+    void domainChanged(const QString& domainHostname);
    void inlineButtonClicked(const QString& name);
    void nonBlockingFormClosed();

--- a/interface/src/ui/ApplicationOverlay.cpp
+++ b/interface/src/ui/ApplicationOverlay.cpp
@ -136,10 +136,10 @@ ApplicationOverlay::ApplicationOverlay() :
    _textureFov(glm::radians(DEFAULT_OCULUS_UI_ANGULAR_SIZE)),
    _textureAspectRatio(1.0f),
    _lastMouseMove(0),
+    _magnifier(true),
    _alpha(1.0f),
    _oculusUIRadius(1.0f),
    _crosshairTexture(0),
-    _magnifier(true),
    _previousBorderWidth(-1),
    _previousBorderHeight(-1),
    _previousMagnifierBottomLeft(),
@ -170,7 +170,7 @@ ApplicationOverlay::~ApplicationOverlay() {
 void ApplicationOverlay::renderOverlay(bool renderToTexture) {
    PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings), "ApplicationOverlay::displayOverlay()");
    Overlays& overlays = qApp->getOverlays();
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    
    _textureFov = glm::radians(_oculusUIAngularSize);
    _textureAspectRatio = (float)glCanvas->getDeviceWidth() / (float)glCanvas->getDeviceHeight();
@ -239,7 +239,7 @@ void ApplicationOverlay::displayOverlayTexture() {
    if (_alpha == 0.0f) {
        return;
    }
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();

    glEnable(GL_TEXTURE_2D);
    glActiveTexture(GL_TEXTURE0);
@ -401,7 +401,7 @@ void ApplicationOverlay::displayOverlayTexture3DTV(Camera& whichCamera, float as
                                                glm::vec2(1.0f, 0.0f), glm::vec2(0.0f, 0.0f),
                                                overlayColor);
    
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    if (_crosshairTexture == 0) {
        _crosshairTexture = glCanvas->bindTexture(QImage(PathUtils::resourcesPath() + "images/sixense-reticle.png"));
    }
@ -451,7 +451,7 @@ void ApplicationOverlay::computeOculusPickRay(float x, float y, glm::vec3& origi

 //Caculate the click location using one of the sixense controllers. Scale is not applied
 QPoint ApplicationOverlay::getPalmClickLocation(const PalmData *palm) const {
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();

    glm::vec3 tip = myAvatar->getLaserPointerTipPosition(palm);
@ -528,7 +528,7 @@ bool ApplicationOverlay::calculateRayUICollisionPoint(const glm::vec3& position,

 //Renders optional pointers
 void ApplicationOverlay::renderPointers() {
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();

    //lazily load crosshair texture
    if (_crosshairTexture == 0) {
@ -575,7 +575,7 @@ void ApplicationOverlay::renderPointers() {
 }

 void ApplicationOverlay::renderControllerPointers() {
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();

    //Static variables used for storing controller state
@ -722,7 +722,7 @@ void ApplicationOverlay::renderMagnifier(glm::vec2 magPos, float sizeMult, bool
    if (!_magnifier) {
        return;
    }
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    
    const int widgetWidth = glCanvas->width();
    const int widgetHeight = glCanvas->height();
@ -787,7 +787,7 @@ void ApplicationOverlay::renderMagnifier(glm::vec2 magPos, float sizeMult, bool
 }

 void ApplicationOverlay::renderAudioMeter() {
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    auto audio = DependencyManager::get<AudioClient>();

    //  Audio VU Meter and Mute Icon
@ -905,7 +905,7 @@ void ApplicationOverlay::renderStatsAndLogs() {
    Application* application = Application::getInstance();
    QSharedPointer<BandwidthRecorder> bandwidthRecorder = DependencyManager::get<BandwidthRecorder>();
    
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    const OctreePacketProcessor& octreePacketProcessor = application->getOctreePacketProcessor();
    NodeBounds& nodeBoundsDisplay = application->getNodeBoundsDisplay();

@ -943,7 +943,7 @@ void ApplicationOverlay::renderDomainConnectionStatusBorder() {
    auto nodeList = DependencyManager::get<NodeList>();

    if (nodeList && !nodeList->getDomainHandler().isConnected()) {
-        auto glCanvas = DependencyManager::get<GLCanvas>();
+        auto glCanvas = Application::getInstance()->getGLWidget();
        auto geometryCache = DependencyManager::get<GeometryCache>();
        int width = glCanvas->width();
        int height = glCanvas->height();
@ -1087,7 +1087,7 @@ void ApplicationOverlay::TexturedHemisphere::cleanupVBO() {
 }

 void ApplicationOverlay::TexturedHemisphere::buildFramebufferObject() {
-    QSize size = DependencyManager::get<GLCanvas>()->getDeviceSize();
+    QSize size = Application::getInstance()->getGLWidget()->getDeviceSize();
    if (_framebufferObject != NULL && size == _framebufferObject->size()) {
        // Already build
        return;
@ -1138,7 +1138,7 @@ void ApplicationOverlay::TexturedHemisphere::render() {


 glm::vec2 ApplicationOverlay::screenToSpherical(glm::vec2 screenPos) const {
-    QSize screenSize = DependencyManager::get<GLCanvas>()->getDeviceSize();
+    QSize screenSize = Application::getInstance()->getGLWidget()->getDeviceSize();
    float yaw = -(screenPos.x / screenSize.width() - 0.5f) * MOUSE_YAW_RANGE;
    float pitch = (screenPos.y / screenSize.height() - 0.5f) * MOUSE_PITCH_RANGE;
    
@ -1146,7 +1146,7 @@ glm::vec2 ApplicationOverlay::screenToSpherical(glm::vec2 screenPos) const {
 }

 glm::vec2 ApplicationOverlay::sphericalToScreen(glm::vec2 sphericalPos) const {
-    QSize screenSize = DependencyManager::get<GLCanvas>()->getDeviceSize();
+    QSize screenSize = Application::getInstance()->getGLWidget()->getDeviceSize();
    float x = (-sphericalPos.x / MOUSE_YAW_RANGE + 0.5f) * screenSize.width();
    float y = (sphericalPos.y / MOUSE_PITCH_RANGE + 0.5f) * screenSize.height();
    
@ -1154,7 +1154,7 @@ glm::vec2 ApplicationOverlay::sphericalToScreen(glm::vec2 sphericalPos) const {
 }

 glm::vec2 ApplicationOverlay::sphericalToOverlay(glm::vec2 sphericalPos) const {
-    QSize screenSize = DependencyManager::get<GLCanvas>()->getDeviceSize();
+    QSize screenSize = Application::getInstance()->getGLWidget()->getDeviceSize();
    float x = (-sphericalPos.x / (_textureFov * _textureAspectRatio) + 0.5f) * screenSize.width();
    float y = (sphericalPos.y / _textureFov + 0.5f) * screenSize.height();
    
@ -1162,7 +1162,7 @@ glm::vec2 ApplicationOverlay::sphericalToOverlay(glm::vec2 sphericalPos) const {
 }

 glm::vec2 ApplicationOverlay::overlayToSpherical(glm::vec2 overlayPos) const {
-    QSize screenSize = DependencyManager::get<GLCanvas>()->getDeviceSize();
+    QSize screenSize = Application::getInstance()->getGLWidget()->getDeviceSize();
    float yaw = -(overlayPos.x / screenSize.width() - 0.5f) * _textureFov * _textureAspectRatio;
    float pitch = (overlayPos.y / screenSize.height() - 0.5f) * _textureFov;
    
--- a/interface/src/ui/ChatWindow.h
+++ b/interface/src/ui/ChatWindow.h
@ -25,8 +25,8 @@

 #ifdef HAVE_QXMPP

-#include <QXmppClient.h>
-#include <QXmppMessage.h>
+#include <qxmpp/QXmppClient.h>
+#include <qxmpp/QXmppMessage.h>

 #endif

--- a/interface/src/ui/LoginDialog.cpp
+++ b/interface/src/ui/LoginDialog.cpp
@ -21,6 +21,7 @@
 #include "AccountManager.h"
 #include "ui_loginDialog.h"
 #include "LoginDialog.h"
+#include "UIUtil.h"

 const QString FORGOT_PASSWORD_URL = "https://metaverse.highfidelity.io/users/password/new";

@ -42,6 +43,8 @@ LoginDialog::LoginDialog(QWidget* parent) :
    connect(_ui->closeButton, &QPushButton::clicked,
            this, &LoginDialog::close);

+    UIUtil::scaleWidgetFontSizes(this);
+
    // Initialize toggle connection
    toggleQAction();
 };
--- a/interface/src/ui/MetavoxelEditor.cpp
+++ b/interface/src/ui/MetavoxelEditor.cpp
@ -140,7 +140,7 @@ MetavoxelEditor::MetavoxelEditor(QWidget* parent) :
    connect(Application::getInstance()->getMetavoxels(), &MetavoxelSystem::rendering,
        this, &MetavoxelEditor::renderPreview);
    
-    DependencyManager::get<GLCanvas>()->installEventFilter(this);
+    Application::getInstance()->getGLWidget()->installEventFilter(this);
    
    show();
    
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@ -10,6 +10,7 @@
 //

 #include <QFileDialog>
+#include <QFont>

 #include <AudioClient.h>
 #include <avatar/AvatarManager.h>
@ -23,6 +24,7 @@
 #include "PreferencesDialog.h"
 #include "Snapshot.h"
 #include "UserActivityLogger.h"
+#include "UIUtil.h"

 const int PREFERENCES_HEIGHT_PADDING = 20;

@ -46,6 +48,8 @@ PreferencesDialog::PreferencesDialog(QWidget* parent) :
    // move dialog to left side
    move(parentWidget()->geometry().topLeft());
    setFixedHeight(parentWidget()->size().height() - PREFERENCES_HEIGHT_PADDING);
+
+    UIUtil::scaleWidgetFontSizes(this);
 }

 void PreferencesDialog::accept() {
@ -231,7 +235,7 @@ void PreferencesDialog::savePreferences() {
    myAvatar->setLeanScale(ui.leanScaleSpin->value());
    myAvatar->setClampedTargetScale(ui.avatarScaleSpin->value());
    
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());

    DependencyManager::get<AvatarManager>()->getMyAvatar()->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value());
--- a/interface/src/ui/RunningScriptsWidget.cpp
+++ b/interface/src/ui/RunningScriptsWidget.cpp
@ -64,6 +64,8 @@ RunningScriptsWidget::RunningScriptsWidget(QWidget* parent) :
    connect(ui->loadScriptFromURLButton, &QPushButton::clicked,
            Application::getInstance(), &Application::loadScriptURLDialog);
    connect(&_signalMapper, SIGNAL(mapped(QString)), Application::getInstance(), SLOT(stopScript(const QString&)));
+
+    UIUtil::scaleWidgetFontSizes(this);
 }

 RunningScriptsWidget::~RunningScriptsWidget() {
@ -103,6 +105,7 @@ void RunningScriptsWidget::setRunningScripts(const QStringList& list) {
            hash.insert(list.at(i), 1);
        }
        QWidget* row = new QWidget(ui->scriptListWidget);
+        row->setFont(ui->scriptListWidget->font());
        row->setLayout(new QHBoxLayout(row));

        QUrl url = QUrl(list.at(i));
--- a/interface/src/ui/Snapshot.cpp
+++ b/interface/src/ui/Snapshot.cpp
@ -23,6 +23,7 @@
 #include <GLCanvas.h>
 #include <NodeList.h>

+#include "Application.h"
 #include "Snapshot.h"

 // filename format: hifi-snap-by-%username%-on-%date%_%time%_@-%location%.jpg
@ -93,7 +94,7 @@ QTemporaryFile* Snapshot::saveTempSnapshot() {
 }

 QFile* Snapshot::savedFileForSnapshot(bool isTemporary) {
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    QImage shot = glCanvas->grabFrameBuffer();
    
    Avatar* avatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
--- a/interface/src/ui/Stats.cpp
+++ b/interface/src/ui/Stats.cpp
@ -62,7 +62,7 @@ Stats::Stats():
        _metavoxelReceiveProgress(0),
        _metavoxelReceiveTotal(0)
 {
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    resetWidth(glCanvas->width(), 0);
 }

@ -73,7 +73,7 @@ void Stats::toggleExpanded() {
 // called on mouse click release
 // check for clicks over stats  in order to expand or contract them
 void Stats::checkClick(int mouseX, int mouseY, int mouseDragStartedX, int mouseDragStartedY, int horizontalOffset) {
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();

    if (0 != glm::compMax(glm::abs(glm::ivec2(mouseX - mouseDragStartedX, mouseY - mouseDragStartedY)))) {
        // not worried about dragging on stats
@ -128,7 +128,7 @@ void Stats::checkClick(int mouseX, int mouseY, int mouseDragStartedX, int mouseD
 }

 void Stats::resetWidth(int width, int horizontalOffset) {
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();
    int extraSpace = glCanvas->width() - horizontalOffset -2
                   - STATS_GENERAL_MIN_WIDTH
                   - (Menu::getInstance()->isOptionChecked(MenuOption::TestPing) ? STATS_PING_MIN_WIDTH -1 : 0)
@ -202,7 +202,7 @@ void Stats::display(
        int outKbitsPerSecond,
        int voxelPacketsToProcess) 
 {
-    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = Application::getInstance()->getGLWidget();

    unsigned int backgroundColor = 0x33333399;
    int verticalOffset = 0, lines = 0;
--- a/interface/src/ui/overlays/Base3DOverlay.cpp
+++ b/interface/src/ui/overlays/Base3DOverlay.cpp
@ -11,7 +11,6 @@
 // include this before QGLWidget, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"

-#include <QGLWidget>
 #include <SharedUtil.h>

 #include "Application.h"
--- a/interface/src/ui/overlays/BillboardOverlay.cpp
+++ b/interface/src/ui/overlays/BillboardOverlay.cpp
@ -10,6 +10,8 @@
 //

 #include "Application.h"
+#include "GeometryUtil.h"
+#include "PlaneShape.h"

 #include "BillboardOverlay.h"

@ -191,19 +193,25 @@ bool BillboardOverlay::findRayIntersection(const glm::vec3& origin, const glm::v
                                                        float& distance, BoxFace& face) {

    if (_texture) {
+        glm::quat rotation;
+        if (_isFacingAvatar) {
+            // rotate about vertical to face the camera
+            rotation = Application::getInstance()->getCamera()->getRotation();
+            rotation *= glm::angleAxis(glm::pi<float>(), glm::vec3(0.0f, 1.0f, 0.0f));
+        } else {
+            rotation = _rotation;
+        }
+
+        // Produce the dimensions of the billboard based on the image's aspect ratio and the overlay's scale.
        bool isNull = _fromImage.isNull();
        float width = isNull ? _texture->getWidth() : _fromImage.width();
        float height = isNull ? _texture->getHeight() : _fromImage.height();
-
        float maxSize = glm::max(width, height);
-        float x = width / (2.0f * maxSize);
-        float y = -height / (2.0f * maxSize);
-        float maxDimension = glm::max(x,y);
-        float scaledDimension = maxDimension * _scale;
-        glm::vec3 corner = getCenter() - glm::vec3(scaledDimension, scaledDimension, scaledDimension) ;
-        AACube myCube(corner, scaledDimension * 2.0f);
-        return myCube.findRayIntersection(origin, direction, distance, face);
+        glm::vec2 dimensions = _scale * glm::vec2(width / maxSize, height / maxSize);
+
+        return findRayRectangleIntersection(origin, direction, rotation, _position, dimensions, distance);
    }
+
    return false;
 }

--- a/interface/src/ui/overlays/Circle3DOverlay.cpp
+++ b/interface/src/ui/overlays/Circle3DOverlay.cpp
@ -11,7 +11,6 @@
 // include this before QGLWidget, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"

-#include <QGLWidget>
 #include <GeometryCache.h>
 #include <GlowEffect.h>
 #include <SharedUtil.h>
--- a/interface/src/ui/overlays/Cube3DOverlay.cpp
+++ b/interface/src/ui/overlays/Cube3DOverlay.cpp
@ -11,8 +11,6 @@
 // include this before QGLWidget, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"

-#include <QGLWidget>
-
 #include <DeferredLightingEffect.h>
 #include <GlowEffect.h>
 #include <SharedUtil.h>
--- a/interface/src/ui/overlays/Grid3DOverlay.h
+++ b/interface/src/ui/overlays/Grid3DOverlay.h
@ -17,8 +17,6 @@

 #include <glm/glm.hpp>

-#include <QGLWidget>
-
 #include <ProgramObject.h>
 #include <SharedUtil.h>

--- a/interface/src/ui/overlays/ImageOverlay.cpp
+++ b/interface/src/ui/overlays/ImageOverlay.cpp
@ -11,7 +11,6 @@
 // include this before QGLWidget, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"

-#include <QGLWidget>
 #include <QPainter>
 #include <QSvgRenderer>

--- a/interface/src/ui/overlays/ImageOverlay.h
+++ b/interface/src/ui/overlays/ImageOverlay.h
@ -14,7 +14,6 @@
 // include this before QGLWidget, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"

-#include <QGLWidget>
 #include <QImage>
 #include <QNetworkReply>
 #include <QRect>
--- a/interface/src/ui/overlays/Overlay.cpp
+++ b/interface/src/ui/overlays/Overlay.cpp
@ -11,16 +11,12 @@
 // include this before QGLWidget, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"

-#include <QSvgRenderer>
-#include <QPainter>
-#include <QGLWidget>
 #include <SharedUtil.h>

 #include "Overlay.h"


 Overlay::Overlay() :
-    _parent(NULL),
    _isLoaded(true),
    _alpha(DEFAULT_ALPHA),
    _glowLevel(0.0f),
@ -40,7 +36,6 @@ Overlay::Overlay() :
 }

 Overlay::Overlay(const Overlay* overlay) :
-    _parent(NULL),
    _isLoaded(overlay->_isLoaded),
    _alpha(overlay->_alpha),
    _glowLevel(overlay->_glowLevel),
@ -60,8 +55,7 @@ Overlay::Overlay(const Overlay* overlay) :
 {
 }

-void Overlay::init(QGLWidget* parent, QScriptEngine* scriptEngine) {
-    _parent = parent;
+void Overlay::init(QScriptEngine* scriptEngine) {
    _scriptEngine = scriptEngine;
 }

--- a/interface/src/ui/overlays/Overlay.h
+++ b/interface/src/ui/overlays/Overlay.h
@ -14,7 +14,6 @@
 // include this before QGLWidget, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"

-#include <QGLWidget>
 #include <QRect>
 #include <QScriptValue>
 #include <QString>
@ -38,7 +37,7 @@ public:
    Overlay();
    Overlay(const Overlay* overlay);
    ~Overlay();
-    void init(QGLWidget* parent, QScriptEngine* scriptEngine);
+    void init(QScriptEngine* scriptEngine);
    virtual void update(float deltatime) {}
    virtual void render(RenderArgs* args) = 0;

@ -85,7 +84,6 @@ public:
 protected:
    float updatePulse();

-    QGLWidget* _parent;
    bool _isLoaded;
    float _alpha;
    float _glowLevel;
--- a/interface/src/ui/overlays/Overlay2D.cpp
+++ b/interface/src/ui/overlays/Overlay2D.cpp
@ -11,9 +11,6 @@
 // include this before QGLWidget, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"

-#include <QSvgRenderer>
-#include <QPainter>
-#include <QGLWidget>
 #include <SharedUtil.h>

 #include "Overlay2D.h"
--- a/interface/src/ui/overlays/Overlay2D.h
+++ b/interface/src/ui/overlays/Overlay2D.h
@ -14,7 +14,6 @@
 // include this before QGLWidget, which includes an earlier version of OpenGL
 #include "InterfaceConfig.h"

-#include <QGLWidget>
 #include <QRect>
 #include <QScriptValue>
 #include <QString>
--- a/interface/src/ui/overlays/Overlays.cpp
+++ b/interface/src/ui/overlays/Overlays.cpp
@ -58,8 +58,7 @@ Overlays::~Overlays() {
    
 }

-void Overlays::init(QGLWidget* parent) {
-    _parent = parent;
+void Overlays::init() {
    _scriptEngine = new QScriptEngine();
 }

@ -202,7 +201,7 @@ unsigned int Overlays::addOverlay(const QString& type, const QScriptValue& prope
 }

 unsigned int Overlays::addOverlay(Overlay* overlay) {
-    overlay->init(_parent, _scriptEngine);
+    overlay->init(_scriptEngine);

    QWriteLocker lock(&_lock);
    unsigned int thisID = _nextOverlayID;
--- a/interface/src/ui/overlays/Overlays.h
+++ b/interface/src/ui/overlays/Overlays.h
@ -51,7 +51,7 @@ class Overlays : public QObject {
 public:
    Overlays();
    ~Overlays();
-    void init(QGLWidget* parent);
+    void init();
    void update(float deltatime);
    void renderWorld(bool drawFront, RenderArgs::RenderMode renderMode = RenderArgs::DEFAULT_RENDER_MODE,
                        RenderArgs::RenderSide renderSide = RenderArgs::MONO);
@ -95,7 +95,6 @@ private:
    QMap<unsigned int, Overlay*> _overlaysWorld;
    QList<Overlay*> _overlaysToDelete;
    unsigned int _nextOverlayID;
-    QGLWidget* _parent;
    QReadWriteLock _lock;
    QReadWriteLock _deleteLock;
    QScriptEngine* _scriptEngine;
--- a/Show more
+++ b/Show more