Merge branch 'master' into 'workload'

2025-03-27 23:52:03 +01:00 · 2018-05-30 16:04:13 -07:00 · 2018-05-30 16:04:13 -07:00 · 003e444246
commit 003e444246
parent d87b19522f 6095a3b319
130 changed files with 2292 additions and 1047 deletions
--- a/BUILD_WIN.md
+++ b/BUILD_WIN.md
@ -9,15 +9,17 @@ Note: The prerequisites will require about 10 GB of space on your drive. You wil

 If you don’t have Community or Professional edition of Visual Studio 2017, download [Visual Studio Community 2017](https://www.visualstudio.com/downloads/).

-When selecting components, check "Desktop development with C++." Also check "Windows 8.1 SDK and UCRT SDK" and "VC++ 2015.3 v140 toolset (x86,x64)" on the Summary toolbar on the right.
+When selecting components, check "Desktop development with C++." Also on the right on the Summary toolbar, check "Windows 8.1 SDK and UCRT SDK" and "VC++ 2015.3 v140 toolset (x86,x64)".

 ### Step 2. Installing CMake

-Download and install the latest version of CMake 3.9. Download the file named  win64-x64 Installer from the [CMake Website](https://cmake.org/download/). Make sure to check "Add CMake to system PATH for all users" when prompted during installation.
+Download and install the latest version of CMake 3.9. 
+
+Download the file named win64-x64 Installer from the [CMake Website](https://cmake.org/download/). You can access the installer on this [3.9 Version page](https://cmake.org/files/v3.9/). During installation, make sure to check "Add CMake to system PATH for all users" when prompted.

 ### Step 3. Installing Qt

-Download and install the [Qt Online Installer](https://www.qt.io/download-open-source/?hsCtaTracking=f977210e-de67-475f-a32b-65cec207fd03%7Cd62710cd-e1db-46aa-8d4d-2f1c1ffdacea). While installing, you only need to have the following components checked under Qt 5.10.1: "msvc2017 64-bit", "Qt WebEngine", and "Qt Script (Deprecated)".
+Download and install the [Qt Open Source Online Installer](https://www.qt.io/download-open-source/?hsCtaTracking=f977210e-de67-475f-a32b-65cec207fd03%7Cd62710cd-e1db-46aa-8d4d-2f1c1ffdacea). While installing, you only need to have the following components checked under Qt 5.10.1: "msvc2017 64-bit", "Qt WebEngine", and "Qt Script (Deprecated)".

 Note: Installing the Sources is optional but recommended if you have room for them (~2GB).

@ -56,9 +58,9 @@ Where `%HIFI_DIR%` is the directory for the highfidelity repository.

 Open `%HIFI_DIR%\build\hifi.sln` using Visual Studio.

-Change the Solution Configuration (next to the green play button) from "Debug" to "Release" for best performance.
+Change the Solution Configuration (menu ribbon under the menu bar, next to the green play button) from "Debug" to "Release" for best performance.

-Run `Build > Build Solution`.
+Run from the menu bar `Build > Build Solution`.

 ### Step 9. Testing Interface

@ -66,7 +68,7 @@ Create another environment variable (see Step #4)
 * Set "Variable name": `_NO_DEBUG_HEAP`
 * Set "Variable value": `1`

-In Visual Studio, right+click "interface" under the Apps folder in Solution Explorer and select "Set as Startup Project". Run `Debug > Start Debugging`.
+In Visual Studio, right+click "interface" under the Apps folder in Solution Explorer and select "Set as Startup Project". Run from the menu bar `Debug > Start Debugging`.

 Now, you should have a full build of High Fidelity and be able to run the Interface using Visual Studio. Please check our [Docs](https://wiki.highfidelity.com/wiki/Main_Page) for more information regarding the programming workflow.

--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -27,6 +27,14 @@ android {
                    '-DDISABLE_KTX_CACHE=OFF'
            }
        }
+        signingConfigs {
+            release {
+                storeFile project.hasProperty("HIFI_ANDROID_KEYSTORE") ? file(HIFI_ANDROID_KEYSTORE) : null
+                storePassword project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") ? HIFI_ANDROID_KEYSTORE_PASSWORD : ''
+                keyAlias project.hasProperty("HIFI_ANDROID_KEY_ALIAS") ? HIFI_ANDROID_KEY_ALIAS : ''
+                keyPassword project.hasProperty("HIFI_ANDROID_KEY_PASSWORD") ? HIFI_ANDROID_KEY_PASSWORD : ''
+            }
+        }
    }

    compileOptions {
@ -38,6 +46,10 @@ android {
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig project.hasProperty("HIFI_ANDROID_KEYSTORE") &&
+                    project.hasProperty("HIFI_ANDROID_KEYSTORE_PASSWORD") &&
+                    project.hasProperty("HIFI_ANDROID_KEY_ALIAS") &&
+                    project.hasProperty("HIFI_ANDROID_KEY_PASSWORD")? signingConfigs.release : null
        }
    }

--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -49,12 +49,6 @@
            android:label="@string/app_name"
            android:launchMode="singleTop"
            >
-
-            <intent-filter>
-                <category android:name="com.google.intent.category.DAYDREAM"/>
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-
            <meta-data android:name="android.app.lib_name" android:value="native-lib"/>
            <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
            <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
--- a/cmake/externals/serverless-content/CMakeLists.txt
+++ b/cmake/externals/serverless-content/CMakeLists.txt
@ -4,8 +4,8 @@ set(EXTERNAL_NAME serverless-content)

 ExternalProject_Add(
  ${EXTERNAL_NAME}
-  URL http://cdn.highfidelity.com/content-sets/serverless-tutorial-RC67-v4.zip
-  URL_MD5 ba32aed18bfeaac4ccaf5ebb8ea3e804
+  URL http://cdn.highfidelity.com/content-sets/serverless-tutorial-RC68.zip
+  URL_MD5 a068f74d4045e257cfa7926fe6e38ad5
  CONFIGURE_COMMAND ""
  BUILD_COMMAND ""
  INSTALL_COMMAND ""
--- a/cmake/macros/SetupHifiTestCase.cmake
+++ b/cmake/macros/SetupHifiTestCase.cmake
@ -61,16 +61,21 @@ macro(SETUP_HIFI_TESTCASE)
      endif()
    endforeach()

+
    # Find test classes to build into test executables.
    # Warn about any .cpp files that are *not* test classes (*Test[s].cpp), since those files will not be used.
    foreach (SRC_FILE ${TEST_PROJ_SRC_FILES})   
      string(REGEX MATCH ".+Tests?\\.cpp$"   TEST_CPP_FILE ${SRC_FILE})
      string(REGEX MATCH ".+\\.cpp$"     NON_TEST_CPP_FILE ${SRC_FILE}) 
+      string(REGEX MATCH ".+\\.qrc$"     QRC_FILE ${SRC_FILE}) 
      if (TEST_CPP_FILE)
        list(APPEND TEST_CASE_FILES ${TEST_CPP_FILE})
      elseif (NON_TEST_CPP_FILE)
        message(WARNING "ignoring .cpp file (not a test class -- this will not be linked or compiled!): " ${NON_TEST_CPP_FILE})
      endif ()
+      if (QRC_FILE)
+        list(APPEND EXTRA_FILES ${QRC_FILE}) 
+      endif()
    endforeach ()

    if (TEST_CASE_FILES)
@ -88,7 +93,7 @@ macro(SETUP_HIFI_TESTCASE)
        # grab the implemenation and header files
        set(TARGET_SRCS ${TEST_FILE})  # only one source / .cpp file (the test class)
      
-        add_executable(${TARGET_NAME} ${TEST_FILE})
+        add_executable(${TARGET_NAME} ${TEST_FILE} ${EXTRA_FILES})
        add_test(${TARGET_NAME}-test  ${TARGET_NAME})
        set_target_properties(${TARGET_NAME} PROPERTIES 
          EXCLUDE_FROM_DEFAULT_BUILD TRUE
--- a/domain-server/src/DomainGatekeeper.cpp
+++ b/domain-server/src/DomainGatekeeper.cpp
@ -479,7 +479,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
        limitedNodeList->killNodeWithUUID(existingNodeID);
    }

-    // add the connecting node (or re-use the matched one from eachNodeBreakable above)
+    // add the connecting node
    SharedNodePointer newNode = addVerifiedNodeFromConnectRequest(nodeConnection);

    // set the edit rights for this user
@ -508,26 +508,22 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
    return newNode;
 }

-SharedNodePointer DomainGatekeeper::addVerifiedNodeFromConnectRequest(const NodeConnectionData& nodeConnection,
-                                                                      QUuid nodeID) {
+SharedNodePointer DomainGatekeeper::addVerifiedNodeFromConnectRequest(const NodeConnectionData& nodeConnection) {
    HifiSockAddr discoveredSocket = nodeConnection.senderSockAddr;
    SharedNetworkPeer connectedPeer = _icePeers.value(nodeConnection.connectUUID);

-    if (connectedPeer) {
-        //  this user negotiated a connection with us via ICE, so re-use their ICE client ID
-        nodeID = nodeConnection.connectUUID;
-
-        if (connectedPeer->getActiveSocket()) {
-            // set their discovered socket to whatever the activated socket on the network peer object was
-            discoveredSocket = *connectedPeer->getActiveSocket();
-        }
-    } else {
-        // we got a connectUUID we didn't recognize, either use the hinted node ID or randomly generate a new one
-        if (nodeID.isNull()) {
-            nodeID = QUuid::createUuid();
-        }
+    if (connectedPeer && connectedPeer->getActiveSocket()) {
+        // set their discovered socket to whatever the activated socket on the network peer object was
+        discoveredSocket = *connectedPeer->getActiveSocket();
    }

+    // create a new node ID for the verified connecting node
+    auto nodeID = QUuid::createUuid();
+
+    // add a mapping from connection node ID to ICE peer ID
+    // so that we can remove the ICE peer once we see this node connect
+    _nodeToICEPeerIDs.insert(nodeID, nodeConnection.connectUUID);
+
    auto limitedNodeList = DependencyManager::get<LimitedNodeList>();

    Node::LocalID newLocalID = findOrCreateLocalID(nodeID);
@ -541,6 +537,15 @@ SharedNodePointer DomainGatekeeper::addVerifiedNodeFromConnectRequest(const Node
    return newNode;
 }

+void DomainGatekeeper::cleanupICEPeerForNode(const QUuid& nodeID) {
+    // remove this node ID from our node to ICE peer ID map
+    // and the associated ICE peer (if it still exists)
+    auto icePeerID = _nodeToICEPeerIDs.take(nodeID);
+    if (!icePeerID.isNull()) {
+        _icePeers.remove(icePeerID);
+    }
+}
+
 bool DomainGatekeeper::verifyUserSignature(const QString& username,
                                           const QByteArray& usernameSignature,
                                           const HifiSockAddr& senderSockAddr) {
--- a/domain-server/src/DomainGatekeeper.h
+++ b/domain-server/src/DomainGatekeeper.h
@ -39,8 +39,8 @@ public:
    void addPendingAssignedNode(const QUuid& nodeUUID, const QUuid& assignmentUUID,
                                const QUuid& walletUUID, const QString& nodeVersion);
    QUuid assignmentUUIDForPendingAssignment(const QUuid& tempUUID);
-    
-    void removeICEPeer(const QUuid& peerUUID) { _icePeers.remove(peerUUID); }
+
+    void cleanupICEPeerForNode(const QUuid& nodeID);

    Node::LocalID findOrCreateLocalID(const QUuid& uuid);

@ -77,8 +77,7 @@ private:
    SharedNodePointer processAgentConnectRequest(const NodeConnectionData& nodeConnection,
                                                 const QString& username,
                                                 const QByteArray& usernameSignature);
-    SharedNodePointer addVerifiedNodeFromConnectRequest(const NodeConnectionData& nodeConnection,
-                                                        QUuid nodeID = QUuid());
+    SharedNodePointer addVerifiedNodeFromConnectRequest(const NodeConnectionData& nodeConnection);
    
    bool verifyUserSignature(const QString& username, const QByteArray& usernameSignature,
                             const HifiSockAddr& senderSockAddr);
@ -101,6 +100,10 @@ private:
    std::unordered_map<QUuid, PendingAssignedNodeData> _pendingAssignedNodes;
    
    QHash<QUuid, SharedNetworkPeer> _icePeers;
+
+    using ConnectingNodeID = QUuid;
+    using ICEPeerID = QUuid;
+    QHash<ConnectingNodeID, ICEPeerID> _nodeToICEPeerIDs;
    
    QHash<QString, QUuid> _connectionTokenHash;

--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@ -1017,15 +1017,22 @@ void DomainServer::processListRequestPacket(QSharedPointer<ReceivedMessage> mess
    sendingNode->setPublicSocket(nodeRequestData.publicSockAddr);
    sendingNode->setLocalSocket(nodeRequestData.localSockAddr);

-    // update the NodeInterestSet in case there have been any changes
    DomainServerNodeData* nodeData = static_cast<DomainServerNodeData*>(sendingNode->getLinkedData());

+    if (!nodeData->hasCheckedIn()) {
+        nodeData->setHasCheckedIn(true);
+
+        // on first check in, make sure we've cleaned up any ICE peer for this node
+        _gatekeeper.cleanupICEPeerForNode(sendingNode->getUUID());
+    }
+
    // guard against patched agents asking to hear about other agents
    auto safeInterestSet = nodeRequestData.interestList.toSet();
    if (sendingNode->getType() == NodeType::Agent) {
        safeInterestSet.remove(NodeType::Agent);
    }

+    // update the NodeInterestSet in case there have been any changes
    nodeData->setNodeInterestSet(safeInterestSet);

    // update the connecting hostname in case it has changed
@ -2945,7 +2952,7 @@ void DomainServer::nodeAdded(SharedNodePointer node) {

 void DomainServer::nodeKilled(SharedNodePointer node) {
    // if this peer connected via ICE then remove them from our ICE peers hash
-    _gatekeeper.removeICEPeer(node->getUUID());
+    _gatekeeper.cleanupICEPeerForNode(node->getUUID());

    DomainServerNodeData* nodeData = static_cast<DomainServerNodeData*>(node->getLinkedData());

@ -2978,6 +2985,8 @@ void DomainServer::nodeKilled(SharedNodePointer node) {
            }
        }
    }
+
+    broadcastNodeDisconnect(node);
 }

 SharedAssignmentPointer DomainServer::dequeueMatchingAssignment(const QUuid& assignmentUUID, NodeType_t nodeType) {
@ -3163,18 +3172,23 @@ void DomainServer::handleKillNode(SharedNodePointer nodeToKill) {
    const QUuid& nodeUUID = nodeToKill->getUUID();

    limitedNodeList->killNodeWithUUID(nodeUUID);
+}

-    static auto removedNodePacket = NLPacket::create(PacketType::DomainServerRemovedNode, NUM_BYTES_RFC4122_UUID);
+void DomainServer::broadcastNodeDisconnect(const SharedNodePointer& disconnectedNode) {
+    auto limitedNodeList = DependencyManager::get<LimitedNodeList>();
+
+    static auto removedNodePacket = NLPacket::create(PacketType::DomainServerRemovedNode, NUM_BYTES_RFC4122_UUID, true);

    removedNodePacket->reset();
-    removedNodePacket->write(nodeUUID.toRfc4122());
+    removedNodePacket->write(disconnectedNode->getUUID().toRfc4122());

    // broadcast out the DomainServerRemovedNode message
-    limitedNodeList->eachMatchingNode([this, &nodeToKill](const SharedNodePointer& otherNode) -> bool {
+    limitedNodeList->eachMatchingNode([this, &disconnectedNode](const SharedNodePointer& otherNode) -> bool {
        // only send the removed node packet to nodes that care about the type of node this was
-        return isInInterestSet(otherNode, nodeToKill);
+        return isInInterestSet(otherNode, disconnectedNode);
    }, [&limitedNodeList](const SharedNodePointer& otherNode){
-        limitedNodeList->sendUnreliablePacket(*removedNodePacket, *otherNode);
+        auto removedNodePacketCopy = NLPacket::createCopy(*removedNodePacket);
+        limitedNodeList->sendPacket(std::move(removedNodePacketCopy), *otherNode);
    });
 }

--- a/domain-server/src/DomainServer.h
+++ b/domain-server/src/DomainServer.h
@ -165,6 +165,7 @@ private:
    unsigned int countConnectedUsers();

    void handleKillNode(SharedNodePointer nodeToKill);
+    void broadcastNodeDisconnect(const SharedNodePointer& disconnnectedNode);

    void sendDomainListToNode(const SharedNodePointer& node, const HifiSockAddr& senderSockAddr);

--- a/domain-server/src/DomainServerNodeData.h
+++ b/domain-server/src/DomainServerNodeData.h
@ -67,8 +67,11 @@ public:
    const QString& getPlaceName() { return _placeName; }
    void setPlaceName(const QString& placeName) { _placeName = placeName; }

-    bool wasAssigned() const { return _wasAssigned; };
+    bool wasAssigned() const { return _wasAssigned; }
    void setWasAssigned(bool wasAssigned) { _wasAssigned = wasAssigned; }
+
+    bool hasCheckedIn() const { return _hasCheckedIn; }
+    void setHasCheckedIn(bool hasCheckedIn) { _hasCheckedIn = hasCheckedIn; }
    
 private:
    QJsonObject overrideValuesIfNeeded(const QJsonObject& newStats);
@ -94,6 +97,8 @@ private:
    QString _placeName;

    bool _wasAssigned { false };
+
+    bool _hasCheckedIn { false };
 };

 #endif // hifi_DomainServerNodeData_h
--- a/interface/resources/qml/controls-uit/TextField.qml
+++ b/interface/resources/qml/controls-uit/TextField.qml
@ -163,10 +163,18 @@ TextField {
        text: textField.label
        colorScheme: textField.colorScheme
        anchors.left: parent.left
-        anchors.right: parent.right
+
+        Binding on anchors.right {
+            when: parent.right
+            value: parent.right
+        }
+        Binding on wrapMode {
+            when: parent.right
+            value: Text.WordWrap
+        }
+
        anchors.bottom: parent.top
        anchors.bottomMargin: 3
-        wrapMode: Text.WordWrap
        visible: label != ""
    }
 }
--- a/interface/resources/qml/dialogs/+android/FileDialog.qml
+++ b/interface/resources/qml/dialogs/+android/FileDialog.qml
@ -57,7 +57,7 @@ ModalWindow {
    property int iconSize: 40

    property bool selectDirectory: false;
-    property bool showHidden: false;
+    property bool showHidden: true;
    // FIXME implement
    property bool multiSelect: false;
    property bool saveDialog: false;
@ -324,8 +324,10 @@ ModalWindow {
            showDirsFirst: true
            showDotAndDotDot: false
            showFiles: !root.selectDirectory
+            showHidden: root.showHidden
            Component.onCompleted: {
                showFiles = !root.selectDirectory
+                showHidden = root.showHidden
            }

            onFolderChanged: {
--- a/interface/resources/qml/dialogs/FileDialog.qml
+++ b/interface/resources/qml/dialogs/FileDialog.qml
@ -58,7 +58,7 @@ ModalWindow {
    property int iconSize: 40

    property bool selectDirectory: false;
-    property bool showHidden: false;
+    property bool showHidden: true;
    // FIXME implement
    property bool multiSelect: false;
    property bool saveDialog: false;
@ -325,8 +325,10 @@ ModalWindow {
            showDirsFirst: true
            showDotAndDotDot: false
            showFiles: !root.selectDirectory
+            showHidden: root.showHidden
            Component.onCompleted: {
                showFiles = !root.selectDirectory
+                showHidden = root.showHidden
            }

            onFolderChanged: {
--- a/interface/resources/qml/dialogs/TabletFileDialog.qml
+++ b/interface/resources/qml/dialogs/TabletFileDialog.qml
@ -55,7 +55,7 @@ TabletModalWindow {
    property int iconSize: 40

    property bool selectDirectory: false;
-    property bool showHidden: false;
+    property bool showHidden: true;
    // FIXME implement
    property bool multiSelect: false;
    property bool saveDialog: false;
@ -288,8 +288,10 @@ TabletModalWindow {
            showDirsFirst: true
            showDotAndDotDot: false
            showFiles: !root.selectDirectory
+            showHidden: root.showHidden
            Component.onCompleted: {
                showFiles = !root.selectDirectory
+                showHidden = root.showHidden
            }

            onFolderChanged: {
--- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
@ -52,7 +52,7 @@ Rectangle {
    property int iconSize: 40

    property bool selectDirectory: false;
-    property bool showHidden: false;
+    property bool showHidden: true;
    // FIXME implement
    property bool multiSelect: false;
    property bool saveDialog: false;
@ -280,8 +280,10 @@ Rectangle {
            showDirsFirst: true
            showDotAndDotDot: false
            showFiles: !root.selectDirectory
+            showHidden: root.showHidden
            Component.onCompleted: {
                showFiles = !root.selectDirectory
+                showHidden = root.showHidden
            }

            onFolderChanged: {
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@ -717,7 +717,7 @@ private:
 *     <tr><td><code>NavigationFocused</code></td><td>number</td><td>number</td><td><em>Not used.</em></td></tr>
 *   </tbody>
 * </table>
- * @typedef Controller.Hardware-Application
+ * @typedef {object} Controller.Hardware-Application
 */

 static const QString STATE_IN_HMD = "InHMD";
@ -2492,6 +2492,7 @@ void Application::cleanupBeforeQuit() {
    }

    _window->saveGeometry();
+    _gpuContext->shutdown();

    // Destroy third party processes after scripts have finished using them.
 #ifdef HAVE_DDE
@ -3014,9 +3015,11 @@ void Application::onDesktopRootItemCreated(QQuickItem* rootItem) {
    auto surfaceContext = DependencyManager::get<OffscreenUi>()->getSurfaceContext();
    surfaceContext->setContextProperty("Stats", Stats::getInstance());

+#if !defined(Q_OS_ANDROID)
    auto offscreenUi = DependencyManager::get<OffscreenUi>();
    auto qml = PathUtils::qmlUrl("AvatarInputsBar.qml");
    offscreenUi->show(qml, "AvatarInputsBar");
+#endif
 }

 void Application::updateCamera(RenderArgs& renderArgs, float deltaTime) {
@ -4641,12 +4644,6 @@ void Application::idle() {

    _overlayConductor.update(secondsSinceLastUpdate);

-    auto myAvatar = getMyAvatar();
-    if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON || _myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
-        Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, myAvatar->getBoomLength() <= MyAvatar::ZOOM_MIN);
-        Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, !(myAvatar->getBoomLength() <= MyAvatar::ZOOM_MIN));
-        cameraMenuChanged();
-    }
    _gameLoopCounter.increment();
 }

@ -5196,6 +5193,21 @@ void Application::cameraModeChanged() {
    cameraMenuChanged();
 }

+void Application::changeViewAsNeeded(float boomLength) {
+    // Switch between first and third person views as needed
+    // This is called when the boom length has changed
+    bool boomLengthGreaterThanMinimum = (boomLength > MyAvatar::ZOOM_MIN);
+
+    if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON && boomLengthGreaterThanMinimum) {
+        Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, false);
+        Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, true);
+        cameraMenuChanged();
+    } else if (_myCamera.getMode() == CAMERA_MODE_THIRD_PERSON && !boomLengthGreaterThanMinimum) {
+        Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, true);
+        Menu::getInstance()->setIsOptionChecked(MenuOption::ThirdPerson, false);
+        cameraMenuChanged();
+    }
+}

 void Application::cameraMenuChanged() {
    auto menu = Menu::getInstance();
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@ -421,6 +421,8 @@ public slots:

    void updateVerboseLogging();

+    void changeViewAsNeeded(float boomLength);
+
 private slots:
    void onDesktopRootItemCreated(QQuickItem* qmlContext);
    void onDesktopRootContextCreated(QQmlContext* qmlContext);
--- a/interface/src/FancyCamera.h
+++ b/interface/src/FancyCamera.h
@ -25,7 +25,7 @@ class FancyCamera : public Camera {

     // FIXME: JSDoc 3.5.5 doesn't augment @property definitions. The following definition is repeated in Camera.h.
     /**jsdoc
-     * @property cameraEntity {Uuid} The ID of the entity that the camera position and orientation follow when the camera is in
+     * @property {Uuid} cameraEntity The ID of the entity that the camera position and orientation follow when the camera is in
     *     entity mode.
     */
    Q_PROPERTY(QUuid cameraEntity READ getCameraEntity WRITE setCameraEntity)
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@ -2245,9 +2245,15 @@ void MyAvatar::updateActionMotor(float deltaTime) {
        _actionMotorVelocity = getSensorToWorldScale() * (_walkSpeed.get() * _walkSpeedScalar)  * direction;
    }

+    float previousBoomLength = _boomLength;
    float boomChange = getDriveKey(ZOOM);
    _boomLength += 2.0f * _boomLength * boomChange + boomChange * boomChange;
    _boomLength = glm::clamp<float>(_boomLength, ZOOM_MIN, ZOOM_MAX);
+
+    // May need to change view if boom length has changed
+    if (previousBoomLength != _boomLength) {
+        qApp->changeViewAsNeeded(_boomLength);
+    }
 }

 void MyAvatar::updatePosition(float deltaTime) {
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@ -121,7 +121,7 @@ class MyAvatar : public Avatar {
     *     while flying.
     * @property {number} hmdRollControlDeadZone=8 - The amount of HMD roll, in degrees, required before your avatar turns if 
     *    <code>hmdRollControlEnabled</code> is enabled.
-     * @property hmdRollControlRate {number} If hmdRollControlEnabled is true, this value determines the maximum turn rate of
+     * @property {number} hmdRollControlRate If hmdRollControlEnabled is true, this value determines the maximum turn rate of
     *     your avatar when rolling your HMD in degrees per second.
     * @property {number} userHeight=1.75 - The height of the user in sensor space.
     * @property {number} userEyeHeight=1.65 - The estimated height of the user's eyes in sensor space. <em>Read-only.</em>
--- a/interface/src/raypick/PickScriptingInterface.h
+++ b/interface/src/raypick/PickScriptingInterface.h
@ -22,21 +22,22 @@
 * @hifi-interface
 * @hifi-client-entity
 *
- * @property PICK_NOTHING {number} A filter flag. Don't intersect with anything. <em>Read-only.</em>
- * @property PICK_ENTITIES {number} A filter flag. Include entities when intersecting. <em>Read-only.</em>
- * @property PICK_OVERLAYS {number} A filter flag. Include overlays when intersecting. <em>Read-only.</em>
- * @property PICK_AVATARS {number} A filter flag. Include avatars when intersecting. <em>Read-only.</em>
- * @property PICK_HUD {number} A filter flag. Include the HUD sphere when intersecting in HMD mode. <em>Read-only.</em>
- * @property PICK_COARSE {number} A filter flag. Pick against coarse meshes, instead of exact meshes. <em>Read-only.</em>
- * @property PICK_INCLUDE_INVISIBLE {number} A filter flag. Include invisible objects when intersecting. <em>Read-only.</em>
- * @property PICK_INCLUDE_NONCOLLIDABLE {number} A filter flag. Include non-collidable objects when intersecting. 
+ * @property {number} PICK_NOTHING A filter flag. Don't intersect with anything. <em>Read-only.</em>
+ * @property {number} PICK_ENTITIES A filter flag. Include entities when intersecting. <em>Read-only.</em>
+ * @property {number} PICK_OVERLAYS A filter flag. Include overlays when intersecting. <em>Read-only.</em>
+ * @property {number} PICK_AVATARS A filter flag. Include avatars when intersecting. <em>Read-only.</em>
+ * @property {number} PICK_HUD A filter flag. Include the HUD sphere when intersecting in HMD mode. <em>Read-only.</em>
+ * @property {number} PICK_COARSE A filter flag. Pick against coarse meshes, instead of exact meshes. <em>Read-only.</em>
+ * @property {number} PICK_INCLUDE_INVISIBLE A filter flag. Include invisible objects when intersecting. <em>Read-only.</em>
+ * @property {number} PICK_INCLUDE_NONCOLLIDABLE A filter flag. Include non-collidable objects when intersecting. 
 *     <em>Read-only.</em>
- * @property PICK_ALL_INTERSECTIONS {number}  <em>Read-only.</em>
- * @property INTERSECTED_NONE {number} An intersection type. Intersected nothing with the given filter flags. <em>Read-only.</em>
- * @property INTERSECTED_ENTITY {number} An intersection type. Intersected an entity. <em>Read-only.</em>
- * @property INTERSECTED_OVERLAY {number} An intersection type. Intersected an overlay. <em>Read-only.</em>
- * @property INTERSECTED_AVATAR {number} An intersection type. Intersected an avatar. <em>Read-only.</em>
- * @property INTERSECTED_HUD {number} An intersection type. Intersected the HUD sphere. <em>Read-only.</em>
+ * @property {number} PICK_ALL_INTERSECTIONS <em>Read-only.</em>
+ * @property {number} INTERSECTED_NONE An intersection type. Intersected nothing with the given filter flags. 
+ *     <em>Read-only.</em>
+ * @property {number} INTERSECTED_ENTITY An intersection type. Intersected an entity. <em>Read-only.</em>
+ * @property {number} INTERSECTED_OVERLAY An intersection type. Intersected an overlay. <em>Read-only.</em>
+ * @property {number} INTERSECTED_AVATAR An intersection type. Intersected an avatar. <em>Read-only.</em>
+ * @property {number} INTERSECTED_HUD An intersection type. Intersected the HUD sphere. <em>Read-only.</em>
 * @property {number} perFrameTimeBudget - The max number of usec to spend per frame updating Pick results. <em>Read-only.</em>
 */

@ -99,7 +100,7 @@ public:
    /**jsdoc
     * An intersection result for a Ray Pick.
     *
-     * @typedef {Object} RayPickResult
+     * @typedef {object} RayPickResult
     * @property {number} type The intersection type.
     * @property {boolean} intersects If there was a valid intersection (type != INTERSECTED_NONE)
     * @property {Uuid} objectID The ID of the intersected object.  Uuid.NULL for the HUD or invalid intersections.
@ -113,7 +114,7 @@ public:
    /**jsdoc
     * An intersection result for a Stylus Pick.
     *
-     * @typedef {Object} StylusPickResult
+     * @typedef {object} StylusPickResult
     * @property {number} type The intersection type.
     * @property {boolean} intersects If there was a valid intersection (type != INTERSECTED_NONE)
     * @property {Uuid} objectID The ID of the intersected object.  Uuid.NULL for the HUD or invalid intersections.
--- a/interface/src/raypick/PointerScriptingInterface.cpp
+++ b/interface/src/raypick/PointerScriptingInterface.cpp
@ -68,14 +68,14 @@ unsigned int PointerScriptingInterface::createStylus(const QVariant& properties)
 * A set of properties used to define the visual aspect of a Ray Pointer in the case that the Pointer is not intersecting something.  Same as a {@link Pointers.RayPointerRenderState},
 * but with an additional distance field.
 *
- * @typedef {Object} Pointers.DefaultRayPointerRenderState
+ * @typedef {object} Pointers.DefaultRayPointerRenderState
 * @augments Pointers.RayPointerRenderState
 * @property {number} distance The distance at which to render the end of this Ray Pointer, if one is defined.
 */
 /**jsdoc
 * A set of properties used to define the visual aspect of a Ray Pointer in the case that the Pointer is intersecting something.
 *
- * @typedef {Object} Pointers.RayPointerRenderState
+ * @typedef {object} Pointers.RayPointerRenderState
 * @property {string} name The name of this render state, used by {@link Pointers.setRenderState} and {@link Pointers.editRenderState}
 * @property {Overlays.OverlayProperties} [start] All of the properties you would normally pass to {@link Overlays.addOverlay}, plus the type (as a <code>type</code> field).
 * An overlay to represent the beginning of the Ray Pointer, if desired.
@ -87,7 +87,7 @@ unsigned int PointerScriptingInterface::createStylus(const QVariant& properties)
 /**jsdoc
 * A trigger mechanism for Ray Pointers.
 *
- * @typedef {Object} Pointers.Trigger
+ * @typedef {object} Pointers.Trigger
 * @property {Controller.Standard|Controller.Actions|function} action This can be a built-in Controller action, like Controller.Standard.LTClick, or a function that evaluates to >= 1.0 when you want to trigger <code>button</code>.
 * @property {string} button Which button to trigger.  "Primary", "Secondary", "Tertiary", and "Focus" are currently supported.  Only "Primary" will trigger clicks on web surfaces.  If "Focus" is triggered,
 * it will try to set the entity or overlay focus to the object at which the Pointer is aimed.  Buttons besides the first three will still trigger events, but event.button will be "None".
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@ -522,7 +522,7 @@ int WindowScriptingInterface::openMessageBox(QString title, QString text, int bu
 *     <tr> <td><strong>RestoreDefaults</strong></td> <td><code>0x8000000</code></td> <td>"Restore Defaults"</td> </tr>
 *   </tbody>
 * </table>
- * @typedef Window.MessageBoxButton
+ * @typedef {number} Window.MessageBoxButton
 */
 int WindowScriptingInterface::createMessageBox(QString title, QString text, int buttons, int defaultButton) {
    auto messageBox = DependencyManager::get<OffscreenUi>()->createMessageBox(OffscreenUi::ICON_INFORMATION, title, text,
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@ -470,7 +470,7 @@ public slots:
     *     </tr>
     *   </tbody>
     * </table>
-     * @typedef Window.DisplayTexture
+     * @typedef {string} Window.DisplayTexture
     */
    bool setDisplayTexture(const QString& name);

@ -523,16 +523,21 @@ public slots:
    int openMessageBox(QString title, QString text, int buttons, int defaultButton);

    /**jsdoc
-     * Open the given resource in the Interface window or in a web browser depending on the url scheme
+     * Open a URL in the Interface window or other application, depending on the URL's scheme. If the URL starts with 
+     * <code>hifi://</code> then that URL is navigated to in Interface, otherwise the URL is opened in the application the OS 
+     * associates with the URL's scheme (e.g., a Web browser for <code>http://</code>).
     * @function Window.openUrl
-     * @param {string} url - The resource to open
+     * @param {string} url - The URL to open.
     */
    void openUrl(const QUrl& url);

    /**jsdoc
-     * (Android only) Open the requested Activity and optionally back to the scene when the activity is done
+     * Open an Android activity and optionally return back to the scene when the activity is completed. <em>Android only.</em>
     * @function Window.openAndroidActivity
-     * @param {string} activityName - The name of the activity to open. One of "Home", "Login" or "Privacy Policy"
+     * @param {string} activityName - The name of the activity to open: one of <code>"Home"</code>, <code>"Login"</code>, or 
+     *     <code>"Privacy Policy"</code>.
+     * @param {boolean} backToScene - If <code>true</code>, the user is automatically returned back to the scene when the 
+     *     activity is completed.
     */
    void openAndroidActivity(const QString& activityName, const bool backToScene);

--- a/interface/src/ui/overlays/Billboard3DOverlay.cpp
+++ b/interface/src/ui/overlays/Billboard3DOverlay.cpp
@ -46,6 +46,13 @@ bool Billboard3DOverlay::applyTransformTo(Transform& transform, bool force) {
    return transformChanged;
 }

+void Billboard3DOverlay::update(float duration) {
+    if (isFacingAvatar()) {
+        _renderVariableDirty = true;
+    }
+    Parent::update(duration);
+}
+
 Transform Billboard3DOverlay::evalRenderTransform() {
    Transform transform = getTransform();
    bool transformChanged = applyTransformTo(transform, true);
--- a/interface/src/ui/overlays/Billboard3DOverlay.h
+++ b/interface/src/ui/overlays/Billboard3DOverlay.h
@ -18,6 +18,7 @@

 class Billboard3DOverlay : public Planar3DOverlay, public PanelAttachable, public Billboardable {
    Q_OBJECT
+    using Parent = Planar3DOverlay;

 public:
    Billboard3DOverlay() {}
@ -26,6 +27,8 @@ public:
    void setProperties(const QVariantMap& properties) override;
    QVariant getProperty(const QString& property) override;

+    void update(float duration) override;
+
 protected:
    virtual bool applyTransformTo(Transform& transform, bool force = false) override;

--- a/interface/src/ui/overlays/Image3DOverlay.cpp
+++ b/interface/src/ui/overlays/Image3DOverlay.cpp
@ -51,11 +51,6 @@ void Image3DOverlay::update(float deltatime) {
        _texture = DependencyManager::get<TextureCache>()->getTexture(_url);
        _textureIsLoaded = false;
    }
-    if (usecTimestampNow() > _transformExpiry) {
-        Transform transform = getTransform();
-        applyTransformTo(transform);
-        setTransform(transform);
-    }
    Parent::update(deltatime);
 }

--- a/interface/src/ui/overlays/Overlays.h
+++ b/interface/src/ui/overlays/Overlays.h
@ -53,7 +53,7 @@ const OverlayID UNKNOWN_OVERLAY_ID = OverlayID();
 * @property {number} distance - The distance from the {@link PickRay} origin to the intersection point.
 * @property {Vec3} surfaceNormal - The normal of the overlay surface at the intersection point.
 * @property {Vec3} intersection - The position of the intersection point.
- * @property {Object} extraInfo Additional intersection details, if available.
+ * @property {object} extraInfo Additional intersection details, if available.
 */
 class RayToOverlayIntersectionResult {
 public:
@ -482,7 +482,7 @@ public slots:

    /**jsdoc
     * Check if there is an overlay of a given ID.
-     * @function Overlays.isAddedOverly
+     * @function Overlays.isAddedOverlay
     * @param {Uuid} overlayID - The ID to check.
     * @returns {boolean} <code>true</code> if an overlay with the given ID exists, <code>false</code> otherwise.
     */
--- a/interface/src/ui/overlays/Text3DOverlay.cpp
+++ b/interface/src/ui/overlays/Text3DOverlay.cpp
@ -83,15 +83,6 @@ xColor Text3DOverlay::getBackgroundColor() {
    return result;
 }

-void Text3DOverlay::update(float deltatime) {
-    if (usecTimestampNow() > _transformExpiry) {
-        Transform transform = getTransform();
-        applyTransformTo(transform);
-        setTransform(transform);
-    }
-    Parent::update(deltatime);
-}
-
 void Text3DOverlay::render(RenderArgs* args) {
    if (!_renderVisible || !getParentVisible()) {
        return; // do nothing if we're not visible
@ -306,13 +297,4 @@ QSizeF Text3DOverlay::textSize(const QString& text) const {
    float pointToWorldScale = (maxHeight / FIXED_FONT_SCALING_RATIO) * _lineHeight;

    return QSizeF(extents.x, extents.y) * pointToWorldScale;
-}
-
-bool Text3DOverlay::findRayIntersection(const glm::vec3 &origin, const glm::vec3 &direction, float &distance,
-                                            BoxFace &face, glm::vec3& surfaceNormal) {
-    Transform transform = getTransform();
-    applyTransformTo(transform, true);
-    setTransform(transform);
-    return Billboard3DOverlay::findRayIntersection(origin, direction, distance, face, surfaceNormal);
-}
-
+}
--- a/interface/src/ui/overlays/Text3DOverlay.h
+++ b/interface/src/ui/overlays/Text3DOverlay.h
@ -30,8 +30,6 @@ public:
    ~Text3DOverlay();
    virtual void render(RenderArgs* args) override;

-    virtual void update(float deltatime) override;
-
    virtual const render::ShapeKey getShapeKey() override;

    // getters
@ -60,9 +58,6 @@ public:

    QSizeF textSize(const QString& test) const;  // Meters

-    virtual bool findRayIntersection(const glm::vec3& origin, const glm::vec3& direction, float& distance,
-                                        BoxFace& face, glm::vec3& surfaceNormal) override;
-
    virtual Text3DOverlay* createClone() const override;

 private:
--- a/interface/src/ui/overlays/Web3DOverlay.cpp
+++ b/interface/src/ui/overlays/Web3DOverlay.cpp
@ -260,7 +260,6 @@ void Web3DOverlay::setupQmlSurface() {
        _webSurface->getSurfaceContext()->setContextProperty("Web3DOverlay", this);
        _webSurface->getSurfaceContext()->setContextProperty("Window", DependencyManager::get<WindowScriptingInterface>().data());
        _webSurface->getSurfaceContext()->setContextProperty("Reticle", qApp->getApplicationCompositor().getReticleInterface());
-        _webSurface->getSurfaceContext()->setContextProperty("desktop", DependencyManager::get<OffscreenUi>()->getDesktop());
        _webSurface->getSurfaceContext()->setContextProperty("HiFiAbout", AboutUtil::getInstance());

        // Override min fps for tablet UI, for silky smooth scrolling
--- a/libraries/animation/src/AnimationCache.h
+++ b/libraries/animation/src/AnimationCache.h
@ -70,7 +70,7 @@ public:
     * @function AnimationCache.prefetch
     * @param {string} url - URL of the resource to prefetch.
     * @param {object} [extra=null]
-     * @returns {Resource}
+     * @returns {ResourceObject}
     */

    /**jsdoc
@ -79,7 +79,7 @@ public:
     * @param {string} url - URL of the resource to load.
     * @param {string} [fallback=""] - Fallback URL if load of the desired URL fails.
     * @param {} [extra=null]
-     * @returns {Resource}
+     * @returns {object}
     */


@ -87,7 +87,7 @@ public:
     * Returns animation resource for particular animation.
     * @function AnimationCache.getAnimation
     * @param {string} url - URL to load.
-     * @returns {Resource} animation
+     * @returns {AnimationObject} animation
     */
    Q_INVOKABLE AnimationPointer getAnimation(const QString& url) { return getAnimation(QUrl(url)); }
    Q_INVOKABLE AnimationPointer getAnimation(const QUrl& url);
@ -104,6 +104,17 @@ private:

 Q_DECLARE_METATYPE(AnimationPointer)

+/**jsdoc
+ * @class AnimationObject
+ *
+ * @hifi-interface
+ * @hifi-client-entity
+ * @hifi-server-entity
+ * @hifi-assignment-client
+ *
+ * @property {string[]} jointNames
+ * @property {FBXAnimationFrame[]} frames
+ */
 /// An animation loaded from the network.
 class Animation : public Resource {
    Q_OBJECT
@ -118,9 +129,16 @@ public:

    virtual bool isLoaded() const override;

-    
+    /**jsdoc
+     * @function AnimationObject.getJointNames
+     * @returns {string[]}
+     */
    Q_INVOKABLE QStringList getJointNames() const;
    
+    /**jsdoc
+     * @function AnimationObject.getFrames
+     * @returns {FBXAnimationFrame[]}
+     */
    Q_INVOKABLE QVector<FBXAnimationFrame> getFrames() const;

    const QVector<FBXAnimationFrame>& getFramesReference() const;
--- a/libraries/audio/src/Sound.h
+++ b/libraries/audio/src/Sound.h
@ -77,6 +77,17 @@ private:

 typedef QSharedPointer<Sound> SharedSoundPointer;

+/**jsdoc
+ * @class SoundObject
+ * 
+ * @hifi-interface
+ * @hifi-client-entity
+ * @hifi-server-entity
+ * @hifi-assignment-client
+ *
+ * @property {boolean} downloaded
+ * @property {number} duration
+ */
 class SoundScriptingInterface : public QObject {
    Q_OBJECT

@ -90,6 +101,10 @@ public:
    bool isReady() const { return _sound->isReady(); }
    float getDuration() { return _sound->getDuration(); }

+/**jsdoc
+ * @function SoundObject.ready
+ * @returns {Signal}
+ */
 signals:
    void ready();

--- a/libraries/audio/src/SoundCache.h
+++ b/libraries/audio/src/SoundCache.h
@ -64,7 +64,7 @@ public:
     * @function SoundCache.prefetch
     * @param {string} url - URL of the resource to prefetch.
     * @param {object} [extra=null]
-     * @returns {Resource}
+     * @returns {ResourceObject}
     */

    /**jsdoc
@ -73,14 +73,14 @@ public:
     * @param {string} url - URL of the resource to load.
     * @param {string} [fallback=""] - Fallback URL if load of the desired URL fails.
     * @param {} [extra=null]
-     * @returns {Resource}
+     * @returns {object}
     */


    /**jsdoc 
     * @function SoundCache.getSound
     * @param {string} url
-     * @returns {object}
+     * @returns {SoundObject}
     */
    Q_INVOKABLE SharedSoundPointer getSound(const QUrl& url);
 protected:
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.h
@ -292,7 +292,7 @@ public:
     */
    /**jsdoc
     * Information about a single joint in an Avatar's skeleton hierarchy.
-     * @typedef MyAvatar.SkeletonJoint
+     * @typedef {object} MyAvatar.SkeletonJoint
     * @property {string} name - Joint name.
     * @property {number} index - Joint index.
     * @property {number} parentIndex - Index of this joint's parent (-1 if no parent).
--- a/libraries/avatars/src/AvatarData.cpp
+++ b/libraries/avatars/src/AvatarData.cpp
@ -2363,7 +2363,7 @@ glm::vec3 AvatarData::getAbsoluteJointTranslationInObjectFrame(int index) const
 }

 /**jsdoc
- * @typedef AttachmentData
+ * @typedef {object} AttachmentData
 * @property {string} modelUrl
 * @property {string} jointName
 * @property {Vec3} translation
--- a/libraries/avatars/src/AvatarData.h
+++ b/libraries/avatars/src/AvatarData.h
@ -578,8 +578,7 @@ public:
     * @param {Quat} rotation - The rotation of the joint relative to its parent.
     * @param {Vec3} translation - The translation of the joint relative to its parent.
     * @example <caption>Set your avatar to it's default T-pose for a while.<br />
-     * <img alt="Avatar in T-pose" src="https://docs.highfidelity.com/user/pages/06.api-reference/25.myavatar/t-pose.png" />
-     * </caption>
+     * <img alt="Avatar in T-pose" src="https://docs.highfidelity.com/images/t-pose.png" /></caption>
     * // Set all joint translations and rotations to defaults.
     * var i, length, rotation, translation;
     * for (i = 0, length = MyAvatar.getJointNames().length; i < length; i++) {
@ -680,8 +679,7 @@ public:
     * @param {string} name - The name of the joint.
     * @param {Quat} rotation - The rotation of the joint relative to its parent.
     * @example <caption>Set your avatar to its default T-pose then rotate its right arm.<br />
-     * <img alt="Avatar in T-pose with arm rotated" 
-     * src="https://docs.highfidelity.com/user/pages/06.api-reference/25.myavatar/armpose.png" /></caption>
+     * <img alt="Avatar in T-pose with arm rotated" src="https://docs.highfidelity.com/images/armpose.png" /></caption>
     * // Set all joint translations and rotations to defaults.
     * var i, length, rotation, translation;
     * for (i = 0, length = MyAvatar.getJointNames().length; i < length; i++) {
@ -713,8 +711,7 @@ public:
     * @param {Vec3} translation - The translation of the joint relative to its parent.
     * @example <caption>Stretch your avatar's neck. Depending on the avatar you are using, you will either see a gap between 
     * the head and body or you will see the neck stretched.<br />
-     * <img alt="Avatar with neck stretched" 
-     * src="https://docs.highfidelity.com/user/pages/06.api-reference/25.myavatar/stretched-neck.png" /></caption>
+     * <img alt="Avatar with neck stretched" src="https://docs.highfidelity.com/images/stretched-neck.png" /></caption>
     * // Stretch your avatar's neck.
     * MyAvatar.setJointTranslation("Neck", { x: 0, y: 25, z: 0 });
     * 
@ -798,8 +795,7 @@ public:
     * @param {Quat[]} jointRotations - The rotations for all joints in the avatar. The values are in the same order as the 
     * array returned by {@link MyAvatar.getJointNames} or {@link Avatar.getJointNames}.
     * @example <caption>Set your avatar to its default T-pose then rotate its right arm.<br />
-     * <img alt="Avatar in T-pose" src="https://docs.highfidelity.com/user/pages/06.api-reference/25.myavatar/armpose.png" />
-     * </caption>
+     * <img alt="Avatar in T-pose" src="https://docs.highfidelity.com/images/armpose.png" /></caption>
     * // Set all joint translations and rotations to defaults.
     * var i, length, rotation, translation;
     * for (i = 0, length = MyAvatar.getJointNames().length; i < length; i++) {
--- a/libraries/controllers/src/controllers/Actions.cpp
+++ b/libraries/controllers/src/controllers/Actions.cpp
@ -307,7 +307,7 @@ namespace controller {
     *       action.</td></tr>
     *   </tbody>
     * </table>
-     * @typedef Controller.Actions
+     * @typedef {object} Controller.Actions
     */
    // Device functions
    Input::NamedVector ActionsDevice::getAvailableInputs() const {
--- a/libraries/controllers/src/controllers/InputDevice.h
+++ b/libraries/controllers/src/controllers/InputDevice.h
@ -79,7 +79,7 @@ enum Hand {
 *       {@link Controller.Hardware-Vive}.</td></tr>
 *   </tbody>
 * </table>
- * @typedef Controller.Hardware
+ * @typedef {object} Controller.Hardware
 * @example <caption>List all the currently available <code>Controller.Hardware</code> properties.</caption>
 * function printProperties(string, item) {
 *     print(string);
--- a/libraries/controllers/src/controllers/StandardController.cpp
+++ b/libraries/controllers/src/controllers/StandardController.cpp
@ -231,7 +231,7 @@ void StandardController::focusOutEvent() {
 *
 *   </tbody>
 * </table>
- * @typedef Controller.Standard
+ * @typedef {object} Controller.Standard
 */
 Input::NamedVector StandardController::getAvailableInputs() const {
    static Input::NamedVector availableInputs {
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@ -46,6 +46,8 @@

 const char* SRGB_TO_LINEAR_FRAG = R"SCRIBE(

+// OpenGLDisplayPlugin_present.frag
+
 uniform sampler2D colorMap;

 in vec2 varTexCoord0;
--- a/libraries/entities/src/AnimationPropertyGroup.cpp
+++ b/libraries/entities/src/AnimationPropertyGroup.cpp
@ -46,7 +46,7 @@ bool operator!=(const AnimationPropertyGroup& a, const AnimationPropertyGroup& b

 /**jsdoc
 * The AnimationProperties are used to configure an animation.
- * @typedef Entities.AnimationProperties
+ * @typedef {object} Entities.AnimationProperties
 * @property {string} url="" - The URL of the FBX file that has the animation.
 * @property {number} fps=30 - The speed in frames/s that the animation is played at.
 * @property {number} firstFrame=0 - The first frame to play in the animation.
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@ -486,7 +486,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
 * @property {boolean} locked=false - Whether or not the entity can be edited or deleted. If <code>true</code> then the 
 *     entity's properties other than <code>locked</code> cannot be changed, and the entity cannot be deleted.
 * @property {boolean} visible=true - Whether or not the entity is rendered. If <code>true</code> then the entity is rendered.
- * @property {boolean} canCastShadows=true - Whether or not the entity casts shadows. Currently applicable only to 
+ * @property {boolean} canCastShadow=true - Whether or not the entity can cast a shadow. Currently applicable only to 
 *     {@link Entities.EntityType|Model} and {@link Entities.EntityType|Shape} entities. Shadows are cast if inside a 
 *     {@link Entities.EntityType|Zone} entity with <code>castShadows</code> enabled in its 
 *     {@link Entities.EntityProperties-Zone|keyLight} property.
@ -1398,7 +1398,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool

    /**jsdoc
     * The axis-aligned bounding box of an entity.
-     * @typedef Entities.BoundingBox
+     * @typedef {object} Entities.BoundingBox
     * @property {Vec3} brn - The bottom right near (minimum axes values) corner of the AA box.
     * @property {Vec3} tfl - The top far left (maximum axes values) corner of the AA box.
     * @property {Vec3} center - The center of the AA box.
--- a/libraries/entities/src/KeyLightPropertyGroup.h
+++ b/libraries/entities/src/KeyLightPropertyGroup.h
@ -35,7 +35,7 @@ class ReadBitstreamToTreeParams;
 * @property {Vec3} direction=0,-1,0 - The direction the light is shining.
 * @property {boolean} castShadows=false - If <code>true</code> then shadows are cast. Shadows are cast by avatars, plus 
 *     {@link Entities.EntityType|Model} and {@link Entities.EntityType|Shape} entities that have their 
- *     <code>{@link Entities.EntityProperties|canCastShadows}</code> property set to <code>true</code>.
+ *     <code>{@link Entities.EntityProperties|canCastShadow}</code> property set to <code>true</code>.
 */
 class KeyLightPropertyGroup : public PropertyGroup {
 public:
--- a/libraries/fbx/src/FBX.h
+++ b/libraries/fbx/src/FBX.h
@ -258,6 +258,11 @@ public:
    QHash<QString, size_t> texcoordSetMap;
 };

+/**jsdoc
+ * @typedef {object} FBXAnimationFrame
+ * @property {Quat[]} rotations
+ * @property {Vec3[]} translations
+ */
 /// A single animation frame extracted from an FBX document.
 class FBXAnimationFrame {
 public:
--- a/libraries/fbx/src/GLTFReader.cpp
+++ b/libraries/fbx/src/GLTFReader.cpp
@ -1174,7 +1174,7 @@ bool GLTFReader::addArrayOfType(const QByteArray& bin, int byteOffset, int byteL
        break;
    }
    case GLTFAccessorComponentType::UNSIGNED_INT: {
-        readArray<quint8>(bin, byteOffset, byteLength, outarray, accessorType);
+        readArray<quint32>(bin, byteOffset, byteLength, outarray, accessorType);
        break;
    }
    case GLTFAccessorComponentType::UNSIGNED_SHORT: {
--- a/libraries/fbx/src/GLTFReader.h
+++ b/libraries/fbx/src/GLTFReader.h
@ -190,7 +190,7 @@ namespace GLTFBufferViewTarget {
 struct GLTFBufferView {
    int buffer; //required
    int byteLength; //required
-    int byteOffset;
+    int byteOffset { 0 };
    int target;
    QMap<QString, bool> defined;
    void dump() {
@ -470,7 +470,7 @@ namespace GLTFAccessorComponentType {
 }
 struct GLTFAccessor {
    int bufferView;
-    int byteOffset;
+    int byteOffset { 0 };
    int componentType; //required
    int count; //required
    int type; //required
--- a/libraries/gl/src/gl/GLShaders.cpp
+++ b/libraries/gl/src/gl/GLShaders.cpp
@ -2,15 +2,64 @@

 #include "GLLogging.h"

-namespace gl {
+#include <QtCore/QJsonDocument>
+#include <QtCore/QJsonValue>
+#include <QtCore/QJsonObject>
+#include <QtCore/QFileInfo>
+#include <QtCore/QCryptographicHash>

+#include <shared/FileUtils.h>
+
+using namespace gl;
+
+void Uniform::load(GLuint glprogram, int index) {
+    const GLint NAME_LENGTH = 256;
+    GLchar glname[NAME_LENGTH];
+    GLint length = 0;
+    glGetActiveUniform(glprogram, index, NAME_LENGTH, &length, &size, &type, glname);
+    name = std::string(glname, length);
+    location = glGetUniformLocation(glprogram, glname);
+}
+
+Uniforms gl::loadUniforms(GLuint glprogram) {
+    GLint uniformsCount = 0;
+    glGetProgramiv(glprogram, GL_ACTIVE_UNIFORMS, &uniformsCount);
+
+    Uniforms result;
+    result.resize(uniformsCount);
+    for (int i = 0; i < uniformsCount; i++) {
+        result[i].load(glprogram, i);
+    }
+    return result;
+}

 #ifdef SEPARATE_PROGRAM
-    bool compileShader(GLenum shaderDomain, const std::string& shaderSource, const std::string& defines, GLuint &shaderObject, GLuint &programObject, std::string& message) {
+bool gl::compileShader(GLenum shaderDomain,
+                   const std::string& shaderSource,
+                   GLuint& shaderObject,
+                   GLuint& programObject,
+                   std::string& message) {
+    return compileShader(shaderDomain, std::vector<std::string>{ shaderSource }, shaderObject, programObject, message);
+}
 #else
-    bool compileShader(GLenum shaderDomain, const std::string& shaderSource, const std::string& defines, GLuint &shaderObject, std::string& message) {
+bool gl::compileShader(GLenum shaderDomain, const std::string& shaderSource, GLuint& shaderObject, std::string& message) {
+    return compileShader(shaderDomain, std::vector<std::string>{ shaderSource }, shaderObject, message);
+}
 #endif
-    if (shaderSource.empty()) {
+
+#ifdef SEPARATE_PROGRAM
+bool gl::compileShader(GLenum shaderDomain,
+                   const std::string& shaderSource,
+                   GLuint& shaderObject,
+                   GLuint& programObject,
+                   std::string& message) {
+#else
+bool gl::compileShader(GLenum shaderDomain,
+                   const std::vector<std::string>& shaderSources,
+                   GLuint& shaderObject,
+                   std::string& message) {
+#endif
+    if (shaderSources.empty()) {
        qCDebug(glLogging) << "GLShader::compileShader - no GLSL shader source code ? so failed to create";
        return false;
    }
@ -23,9 +72,11 @@ namespace gl {
    }

    // Assign the source
-    const int NUM_SOURCE_STRINGS = 2;
-    const GLchar* srcstr[] = { defines.c_str(), shaderSource.c_str() };
-    glShaderSource(glshader, NUM_SOURCE_STRINGS, srcstr, NULL);
+    std::vector<const GLchar*> cstrs;
+    for (const auto& str : shaderSources) {
+        cstrs.push_back(str.c_str());
+    }
+    glShaderSource(glshader, static_cast<GLint>(cstrs.size()), cstrs.data(), NULL);

    // Compile !
    glCompileShader(glshader);
@ -66,7 +117,7 @@ namespace gl {

            qCCritical(glLogging) << "GLShader::compileShader - failed to compile the gl shader object:";
            int lineNumber = 0;
-            for (auto s : srcstr) {
+            for (const auto& s : cstrs) {
                QString str(s);
                QStringList lines = str.split("\n");
                for (auto& line : lines) {
@ -142,7 +193,7 @@ namespace gl {
    return true;
 }

-GLuint compileProgram(const std::vector<GLuint>& glshaders, std::string& message, std::vector<GLchar>& binary) {
+GLuint gl::compileProgram(const std::vector<GLuint>& glshaders, std::string& message, CachedShader& cachedShader) {
    // A brand new program:
    GLuint glprogram = glCreateProgram();
    if (!glprogram) {
@ -150,14 +201,21 @@ GLuint compileProgram(const std::vector<GLuint>& glshaders, std::string& message
        return 0;
    }

-    // glProgramParameteri(glprogram, GL_PROGRAM_, GL_TRUE);
-    // Create the program from the sub shaders
-    for (auto so : glshaders) {
-        glAttachShader(glprogram, so);
-    }
+    bool binaryLoaded = false;

-    // Link!
-    glLinkProgram(glprogram);
+    if (glshaders.empty() && cachedShader) {
+        glProgramBinary(glprogram, cachedShader.format, cachedShader.binary.data(), (GLsizei)cachedShader.binary.size());
+        binaryLoaded = true;
+    } else {
+        // glProgramParameteri(glprogram, GL_PROGRAM_, GL_TRUE);
+        // Create the program from the sub shaders
+        for (auto so : glshaders) {
+            glAttachShader(glprogram, so);
+        }
+
+        // Link!
+        glLinkProgram(glprogram);
+    }

    GLint linked = 0;
    glGetProgramiv(glprogram, GL_LINK_STATUS, &linked);
@ -205,25 +263,73 @@ GLuint compileProgram(const std::vector<GLuint>& glshaders, std::string& message
    }

    // If linked get the binaries
-    if (linked) {
+    if (linked && !binaryLoaded) {
        GLint binaryLength = 0;
        glGetProgramiv(glprogram, GL_PROGRAM_BINARY_LENGTH, &binaryLength);
-
        if (binaryLength > 0) {
-            GLint numBinFormats = 0;
-            glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &numBinFormats);
-            if (numBinFormats > 0) {
-                binary.resize(binaryLength);
-                std::vector<GLint> binFormats(numBinFormats);
-                glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, binFormats.data());
-
-                GLenum programBinFormat;
-                glGetProgramBinary(glprogram, binaryLength, NULL, &programBinFormat, binary.data());
-            }
+            cachedShader.binary.resize(binaryLength);
+            glGetProgramBinary(glprogram, binaryLength, NULL, &cachedShader.format, cachedShader.binary.data());
        }
    }

    return glprogram;
 }

+const QString& getShaderCacheFile() {
+    static const QString SHADER_CACHE_FOLDER{ "shaders" };
+    static const QString SHADER_CACHE_FILE_NAME{ "cache.json" };
+    static const QString SHADER_CACHE_FILE = FileUtils::standardPath(SHADER_CACHE_FOLDER) + SHADER_CACHE_FILE_NAME;
+    return SHADER_CACHE_FILE;
+}
+
+static const char* SHADER_JSON_TYPE_KEY = "type";
+static const char* SHADER_JSON_SOURCE_KEY = "source";
+static const char* SHADER_JSON_DATA_KEY = "data";
+
+void gl::loadShaderCache(ShaderCache& cache) {
+    QString shaderCacheFile = getShaderCacheFile();
+    if (QFileInfo(shaderCacheFile).exists()) {
+        QString json = FileUtils::readFile(shaderCacheFile);
+        auto root = QJsonDocument::fromJson(json.toUtf8()).object();
+        for (const auto& qhash : root.keys()) {
+            auto programObject = root[qhash].toObject();
+            QByteArray qbinary = QByteArray::fromBase64(programObject[SHADER_JSON_DATA_KEY].toString().toUtf8());
+            std::string hash = qhash.toStdString();
+            auto& cachedShader = cache[hash];
+            cachedShader.binary.resize(qbinary.size());
+            memcpy(cachedShader.binary.data(), qbinary.data(), qbinary.size());
+            cachedShader.format = (GLenum)programObject[SHADER_JSON_TYPE_KEY].toInt();
+            cachedShader.source = programObject[SHADER_JSON_SOURCE_KEY].toString().toStdString();
+        }
+    }
+}
+
+void gl::saveShaderCache(const ShaderCache& cache) {
+    QByteArray json;
+    {
+        QVariantMap variantMap;
+        for (const auto& entry : cache) {
+            const auto& key = entry.first;
+            const auto& type = entry.second.format;
+            const auto& binary = entry.second.binary;
+            QVariantMap qentry;
+            qentry[SHADER_JSON_TYPE_KEY] = QVariant(type);
+            qentry[SHADER_JSON_SOURCE_KEY] = QString(entry.second.source.c_str());
+            qentry[SHADER_JSON_DATA_KEY] = QByteArray{ binary.data(), (int)binary.size() }.toBase64();
+            variantMap[key.c_str()] = qentry;
+        }
+        json = QJsonDocument::fromVariant(variantMap).toJson(QJsonDocument::Indented);
+    }
+
+    if (!json.isEmpty()) {
+        QString shaderCacheFile = getShaderCacheFile();
+        QFile saveFile(shaderCacheFile);
+        saveFile.open(QFile::WriteOnly | QFile::Text | QFile::Truncate);
+        saveFile.write(json);
+        saveFile.close();
+    }
+}
+
+std::string gl::getShaderHash(const std::string& shaderSource) {
+    return QCryptographicHash::hash(QByteArray(shaderSource.c_str()), QCryptographicHash::Md5).toBase64().toStdString();
 }
--- a/libraries/gl/src/gl/GLShaders.h
+++ b/libraries/gl/src/gl/GLShaders.h
@ -14,15 +14,47 @@

 #include <vector>
 #include <string>
+#include <unordered_map>

 namespace gl {
+
+    struct Uniform {
+        std::string name;
+        GLint size{ -1 };
+        GLenum type{ GL_FLOAT };
+        GLint location{ -1 };
+        void load(GLuint glprogram, int index);
+    };
+
+    using Uniforms = std::vector<Uniform>;
+
+    Uniforms loadUniforms(GLuint glprogram);
+
+    struct CachedShader {
+        GLenum format{ 0 };
+        std::string source;
+        std::vector<char> binary;
+        inline operator bool() const {
+            return format != 0 && !binary.empty();
+        }
+    };
+
+    using ShaderCache = std::unordered_map<std::string, CachedShader>;
+
+    std::string getShaderHash(const std::string& shaderSource);
+    void loadShaderCache(ShaderCache& cache);
+    void saveShaderCache(const ShaderCache& cache);
+
+
 #ifdef SEPARATE_PROGRAM
-    bool compileShader(GLenum shaderDomain, const std::string& shaderSource, const std::string& defines, GLuint &shaderObject, GLuint &programObject, std::string& message);
+    bool compileShader(GLenum shaderDomain, const std::string& shaderSource, GLuint &shaderObject, GLuint &programObject, std::string& message);
+    bool compileShader(GLenum shaderDomain, const std::vector<std::string>& shaderSources, GLuint &shaderObject, GLuint &programObject, std::string& message);
 #else
-    bool compileShader(GLenum shaderDomain, const std::string& shaderSource, const std::string& defines, GLuint &shaderObject, std::string& message);
+    bool compileShader(GLenum shaderDomain, const std::string& shaderSource, GLuint &shaderObject, std::string& message);
+    bool compileShader(GLenum shaderDomain, const std::vector<std::string>& shaderSources, GLuint &shaderObject, std::string& message);
 #endif

-    GLuint compileProgram(const std::vector<GLuint>& glshaders, std::string& message, std::vector<GLchar>& binary);
+    GLuint compileProgram(const std::vector<GLuint>& glshaders, std::string& message, CachedShader& binary);

 }

--- a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
+++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.cpp
@ -124,13 +124,16 @@ void GLBackend::init() {
 GLBackend::GLBackend() {
    _pipeline._cameraCorrectionBuffer._buffer->flush();
    glGetIntegerv(GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT, &_uboAlignment);
+    initShaderBinaryCache();
 }

+GLBackend::~GLBackend() {}

-GLBackend::~GLBackend() {
+void GLBackend::shutdown() {
    killInput();
    killTransform();
    killTextureManagementStage();
+    killShaderBinaryCache();
 }

 void GLBackend::renderPassTransfer(const Batch& batch) {
--- a/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h
+++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackend.h
@ -23,6 +23,7 @@
 #include <QtCore/QLoggingCategory>

 #include <gl/Config.h>
+#include <gl/GLShaders.h>

 #include <gpu/Forward.h>
 #include <gpu/Context.h>
@ -71,6 +72,9 @@ public:

    virtual ~GLBackend();

+    // Shutdown rendering and persist any required resources
+    void shutdown() override;
+
    void setCameraCorrection(const Mat4& correction, const Mat4& prevRenderView, bool reset = false);
    void render(const Batch& batch) final override;

@ -455,6 +459,13 @@ protected:
    virtual GLShader* compileBackendProgram(const Shader& program, const Shader::CompilationHandler& handler);
    virtual GLShader* compileBackendShader(const Shader& shader, const Shader::CompilationHandler& handler);
    virtual std::string getBackendShaderHeader() const = 0;
+    // For a program, this will return a string containing all the source files (without any 
+    // backend headers or defines).  For a vertex, fragment or geometry shader, this will 
+    // return the fully customized shader with all the version and backend specific 
+    // preprocessor directives
+    // The program string returned can be used as a key for a cache of shader binaries
+    // The shader strings can be reliably sent to the low level `compileShader` functions
+    virtual std::string getShaderSource(const Shader& shader, int version) final;
    virtual void makeProgramBindings(ShaderObject& shaderObject);
    class ElementResource {
    public:
@ -465,12 +476,12 @@ protected:
    ElementResource getFormatFromGLUniform(GLenum gltype);
    static const GLint UNUSED_SLOT {-1};
    static bool isUnusedSlot(GLint binding) { return (binding == UNUSED_SLOT); }
-    virtual int makeUniformSlots(GLuint glprogram, const Shader::BindingSet& slotBindings,
+    virtual int makeUniformSlots(const ShaderObject& program, const Shader::BindingSet& slotBindings,
        Shader::SlotSet& uniforms, Shader::SlotSet& textures, Shader::SlotSet& samplers);
-    virtual int makeUniformBlockSlots(GLuint glprogram, const Shader::BindingSet& slotBindings, Shader::SlotSet& buffers);
-    virtual int makeResourceBufferSlots(GLuint glprogram, const Shader::BindingSet& slotBindings, Shader::SlotSet& resourceBuffers) = 0;
-    virtual int makeInputSlots(GLuint glprogram, const Shader::BindingSet& slotBindings, Shader::SlotSet& inputs);
-    virtual int makeOutputSlots(GLuint glprogram, const Shader::BindingSet& slotBindings, Shader::SlotSet& outputs);
+    virtual int makeUniformBlockSlots(const ShaderObject& program, const Shader::BindingSet& slotBindings, Shader::SlotSet& buffers);
+    virtual int makeResourceBufferSlots(const ShaderObject& program, const Shader::BindingSet& slotBindings, Shader::SlotSet& resourceBuffers) = 0;
+    virtual int makeInputSlots(const ShaderObject& program, const Shader::BindingSet& slotBindings, Shader::SlotSet& inputs);
+    virtual int makeOutputSlots(const ShaderObject& program, const Shader::BindingSet& slotBindings, Shader::SlotSet& outputs);


    // Synchronize the state cache of this Backend with the actual real state of the GL Context
@ -489,6 +500,19 @@ protected:

    void resetStages();

+    // Stores cached binary versions of the shaders for quicker startup on subsequent runs
+    // Note that shaders in the cache can still fail to load due to hardware or driver 
+    // changes that invalidate the cached binary, in which case we fall back on compiling 
+    // the source again
+    struct ShaderBinaryCache {
+        std::mutex _mutex;
+        std::vector<GLint> _formats;
+        std::unordered_map<std::string, ::gl::CachedShader> _binaries;
+    } _shaderBinaryCache;
+
+    virtual void initShaderBinaryCache();
+    virtual void killShaderBinaryCache();
+
    struct TextureManagementStageState {
        bool _sparseCapable { false };
        GLTextureTransferEnginePointer _transferEngine;
--- a/libraries/gpu-gl-common/src/gpu/gl/GLBackendShader.cpp
+++ b/libraries/gpu-gl-common/src/gpu/gl/GLBackendShader.cpp
@ -11,6 +11,8 @@

 using namespace gpu;
 using namespace gpu::gl;
+using CachedShader = ::gl::CachedShader;
+

 // Shader domain
 static const size_t NUM_SHADER_DOMAINS = 3;
@ -68,9 +70,45 @@ static const std::array<std::string, GLShader::NumVersions> VERSION_DEFINES { {
    stereoVersion
 } };

+static std::string getShaderTypeString(Shader::Type type) {
+    switch (type) {
+    case Shader::Type::VERTEX:
+        return "vertex";
+    case Shader::Type::PIXEL:
+        return "pixel";
+    case Shader::Type::GEOMETRY:
+        return "geometry";
+    case Shader::Type::PROGRAM:
+        return "program";
+    default:
+        qFatal("Unexpected shader type %d", type);
+        Q_UNREACHABLE();
+    }
+}
+
+std::string GLBackend::getShaderSource(const Shader& shader, int version) {
+    if (shader.isProgram()) {
+        std::string result;
+        result.append("// VERSION " + std::to_string(version));
+        for (const auto& subShader : shader.getShaders()) {
+            result.append("//-------- ");
+            result.append(getShaderTypeString(subShader->getType()));
+            result.append("\n");
+            result.append(subShader->getSource().getCode());
+        }
+        return result;
+    } 
+
+    std::string shaderDefines = getBackendShaderHeader() + "\n"
+        + (supportsBindless() ? textureTableVersion : "\n")
+        + DOMAIN_DEFINES[shader.getType()] + "\n"
+        + VERSION_DEFINES[version];
+
+    return shaderDefines + "\n" + shader.getSource().getCode();
+}
+
 GLShader* GLBackend::compileBackendShader(const Shader& shader, const Shader::CompilationHandler& handler) {
    // Any GLSLprogram ? normally yes...
-    const std::string& shaderSource = shader.getSource().getCode();
    GLenum shaderDomain = SHADER_DOMAINS[shader.getType()];
    GLShader::ShaderObjects shaderObjects;
    Shader::CompilationLogs compilationLogs(GLShader::NumVersions);
@ -78,11 +116,7 @@ GLShader* GLBackend::compileBackendShader(const Shader& shader, const Shader::Co

    for (int version = 0; version < GLShader::NumVersions; version++) {
        auto& shaderObject = shaderObjects[version];
-
-        std::string shaderDefines = getBackendShaderHeader() + "\n"
-            + (supportsBindless() ? textureTableVersion : "\n")
-            + DOMAIN_DEFINES[shader.getType()] + "\n"
-            + VERSION_DEFINES[version];
+        auto shaderSource = getShaderSource(shader, version);
        if (handler) {
            bool retest = true;
            std::string currentSrc = shaderSource;
@ -90,7 +124,7 @@ GLShader* GLBackend::compileBackendShader(const Shader& shader, const Shader::Co
            // The retest bool is set to false as soon as the compilation succeed to wexit the while loop.
            // The handler tells us if we should retry or not while returning a modified version of the source.
            while (retest) {
-                bool result = ::gl::compileShader(shaderDomain, currentSrc, shaderDefines, shaderObject.glshader, compilationLogs[version].message);
+                bool result = ::gl::compileShader(shaderDomain, currentSrc, shaderObject.glshader, compilationLogs[version].message);
                compilationLogs[version].compiled = result;
                if (!result) {
                    std::string newSrc;
@ -101,7 +135,7 @@ GLShader* GLBackend::compileBackendShader(const Shader& shader, const Shader::Co
                }
            }
        } else {
-            compilationLogs[version].compiled = ::gl::compileShader(shaderDomain, shaderSource, shaderDefines, shaderObject.glshader, compilationLogs[version].message);
+            compilationLogs[version].compiled = ::gl::compileShader(shaderDomain, shaderSource, shaderObject.glshader, compilationLogs[version].message);
        }

        if (!compilationLogs[version].compiled) {
@ -120,43 +154,80 @@ GLShader* GLBackend::compileBackendShader(const Shader& shader, const Shader::Co
    return object;
 }

+std::atomic<size_t> gpuBinaryShadersLoaded;
+
 GLShader* GLBackend::compileBackendProgram(const Shader& program, const Shader::CompilationHandler& handler) {
    if (!program.isProgram()) {
        return nullptr;
    }

    GLShader::ShaderObjects programObjects;
-
    program.incrementCompilationAttempt();
    Shader::CompilationLogs compilationLogs(GLShader::NumVersions);

    for (int version = 0; version < GLShader::NumVersions; version++) {
        auto& programObject = programObjects[version];
+        auto programSource = getShaderSource(program, version);
+        auto hash = ::gl::getShaderHash(programSource);

-        // Let's go through every shaders and make sure they are ready to go
-        std::vector< GLuint > shaderGLObjects;
-        for (auto subShader : program.getShaders()) {
-            auto object = GLShader::sync((*this), *subShader, handler);
-            if (object) {
-                shaderGLObjects.push_back(object->_shaderObjects[version].glshader);
-            } else {
-                qCWarning(gpugllogging) << "GLBackend::compileBackendProgram - One of the shaders of the program is not compiled?";
-                compilationLogs[version].compiled = false;
-                compilationLogs[version].message = std::string("Failed to compile, one of the shaders of the program is not compiled ?");
-                program.setCompilationLogs(compilationLogs);
-                return nullptr;
+        CachedShader cachedBinary;
+        {
+            Lock shaderCacheLock{ _shaderBinaryCache._mutex };
+            if (_shaderBinaryCache._binaries.count(hash) != 0) {
+                cachedBinary = _shaderBinaryCache._binaries[hash];
+            }
+        }
+
+
+        GLuint glprogram = 0;
+
+        // If we have a cached binary program, try to load it instead of compiling the individual shaders
+        if (cachedBinary) {
+            glprogram = ::gl::compileProgram({}, compilationLogs[version].message, cachedBinary);
+            if (0 != glprogram) {
+                ++gpuBinaryShadersLoaded;
+            }
+        }
+
+        // If we have no program, then either no cached binary, or the binary failed to load (perhaps a GPU driver update invalidated the cache)
+        if (0 == glprogram) {
+            cachedBinary = CachedShader();
+            {
+                std::unique_lock<std::mutex> shaderCacheLock{ _shaderBinaryCache._mutex };
+                _shaderBinaryCache._binaries.erase(hash);
+            }
+            // Let's go through every shaders and make sure they are ready to go
+            std::vector<GLuint> shaderGLObjects;
+            shaderGLObjects.reserve(program.getShaders().size());
+            for (auto subShader : program.getShaders()) {
+                auto object = GLShader::sync((*this), *subShader, handler);
+                if (object) {
+                    shaderGLObjects.push_back(object->_shaderObjects[version].glshader);
+                } else {
+                    qCWarning(gpugllogging) << "GLBackend::compileBackendProgram - One of the shaders of the program is not compiled?";
+                    compilationLogs[version].compiled = false;
+                    compilationLogs[version].message = std::string("Failed to compile, one of the shaders of the program is not compiled ?");
+                    program.setCompilationLogs(compilationLogs);
+                    return nullptr;
+                }
+            }
+
+            glprogram = ::gl::compileProgram(shaderGLObjects, compilationLogs[version].message, cachedBinary);
+            if (cachedBinary) {
+                cachedBinary.source = programSource;
+                std::unique_lock<std::mutex> shaderCacheLock{ _shaderBinaryCache._mutex };
+                _shaderBinaryCache._binaries[hash] = cachedBinary;
            }
        }

-        GLuint glprogram = ::gl::compileProgram(shaderGLObjects, compilationLogs[version].message, compilationLogs[version].binary);
        if (glprogram == 0) {
            qCWarning(gpugllogging) << "GLBackend::compileBackendProgram - Program didn't link:\n" << compilationLogs[version].message.c_str(); 
            program.setCompilationLogs(compilationLogs);
            return nullptr;
        }
+
        compilationLogs[version].compiled = true;
        programObject.glprogram = glprogram;
-
        makeProgramBindings(programObject);
    }
    // Compilation feedback
@ -338,20 +409,15 @@ GLBackend::ElementResource GLBackend::getFormatFromGLUniform(GLenum gltype) {

 };

-int GLBackend::makeUniformSlots(GLuint glprogram, const Shader::BindingSet& slotBindings,
+int GLBackend::makeUniformSlots(const ShaderObject& shaderProgram, const Shader::BindingSet& slotBindings,
    Shader::SlotSet& uniforms, Shader::SlotSet& textures, Shader::SlotSet& samplers) {
-    GLint uniformsCount = 0;
+    auto& glprogram = shaderProgram.glprogram;

-    glGetProgramiv(glprogram, GL_ACTIVE_UNIFORMS, &uniformsCount);
-
-    for (int i = 0; i < uniformsCount; i++) {
-        const GLint NAME_LENGTH = 256;
-        GLchar name[NAME_LENGTH];
-        GLint length = 0;
-        GLint size = 0;
-        GLenum type = 0;
-        glGetActiveUniform(glprogram, i, NAME_LENGTH, &length, &size, &type, name);
-        GLint location = glGetUniformLocation(glprogram, name);
+    for (const auto& uniform : shaderProgram.uniforms) {
+        const auto& type = uniform.type;
+        const auto& location = uniform.location;
+        const auto& size = uniform.size;
+        const auto& name = uniform.name;
        const GLint INVALID_UNIFORM_LOCATION = -1;

        // Try to make sense of the gltype
@ -359,8 +425,8 @@ int GLBackend::makeUniformSlots(GLuint glprogram, const Shader::BindingSet& slot

        // The uniform as a standard var type
        if (location != INVALID_UNIFORM_LOCATION) {
+            auto sname = uniform.name;
            // Let's make sure the name doesn't contains an array element
-            std::string sname(name);
            auto foundBracket = sname.find_first_of('[');
            if (foundBracket != std::string::npos) {
                //  std::string arrayname = sname.substr(0, foundBracket);
@ -397,10 +463,11 @@ int GLBackend::makeUniformSlots(GLuint glprogram, const Shader::BindingSet& slot
        }
    }

-    return uniformsCount;
+    return static_cast<uint32_t>(shaderProgram.uniforms.size());
 }

-int GLBackend::makeUniformBlockSlots(GLuint glprogram, const Shader::BindingSet& slotBindings, Shader::SlotSet& buffers) {
+int GLBackend::makeUniformBlockSlots(const ShaderObject& shaderProgram, const Shader::BindingSet& slotBindings, Shader::SlotSet& buffers) {
+    const auto& glprogram = shaderProgram.glprogram;
    GLint buffersCount = 0;

    glGetProgramiv(glprogram, GL_ACTIVE_UNIFORM_BLOCKS, &buffersCount);
@ -479,7 +546,8 @@ int GLBackend::makeUniformBlockSlots(GLuint glprogram, const Shader::BindingSet&
    return buffersCount;
 }

-int GLBackend::makeInputSlots(GLuint glprogram, const Shader::BindingSet& slotBindings, Shader::SlotSet& inputs) {
+int GLBackend::makeInputSlots(const ShaderObject& shaderProgram, const Shader::BindingSet& slotBindings, Shader::SlotSet& inputs) {
+    const auto& glprogram = shaderProgram.glprogram;
    GLint inputsCount = 0;

    glGetProgramiv(glprogram, GL_ACTIVE_ATTRIBUTES, &inputsCount);
@ -501,7 +569,7 @@ int GLBackend::makeInputSlots(GLuint glprogram, const Shader::BindingSet& slotBi
    return inputsCount;
 }

-int GLBackend::makeOutputSlots(GLuint glprogram, const Shader::BindingSet& slotBindings, Shader::SlotSet& outputs) {
+int GLBackend::makeOutputSlots(const ShaderObject& shaderProgram, const Shader::BindingSet& slotBindings, Shader::SlotSet& outputs) {
    /*   GLint outputsCount = 0;

    glGetProgramiv(glprogram, GL_ACTIVE_, &outputsCount);
@ -525,67 +593,19 @@ void GLBackend::makeProgramBindings(ShaderObject& shaderObject) {
    if (!shaderObject.glprogram) {
        return;
    }
-    GLuint glprogram = shaderObject.glprogram;
-    GLint loc = -1;
-
-    //Check for gpu specific attribute slotBindings
-    loc = glGetAttribLocation(glprogram, "inPosition");
-    if (loc >= 0 && loc != gpu::Stream::POSITION) {
-        glBindAttribLocation(glprogram, gpu::Stream::POSITION, "inPosition");
-    }
-
-    loc = glGetAttribLocation(glprogram, "inNormal");
-    if (loc >= 0 && loc != gpu::Stream::NORMAL) {
-        glBindAttribLocation(glprogram, gpu::Stream::NORMAL, "inNormal");
-    }
-
-    loc = glGetAttribLocation(glprogram, "inColor");
-    if (loc >= 0 && loc != gpu::Stream::COLOR) {
-        glBindAttribLocation(glprogram, gpu::Stream::COLOR, "inColor");
-    }
-
-    loc = glGetAttribLocation(glprogram, "inTexCoord0");
-    if (loc >= 0 && loc != gpu::Stream::TEXCOORD) {
-        glBindAttribLocation(glprogram, gpu::Stream::TEXCOORD, "inTexCoord0");
-    }
-
-    loc = glGetAttribLocation(glprogram, "inTangent");
-    if (loc >= 0 && loc != gpu::Stream::TANGENT) {
-        glBindAttribLocation(glprogram, gpu::Stream::TANGENT, "inTangent");
-    }
-
-    char attribName[] = "inTexCoordn";
-    for (auto i = 0; i < 4; i++) {
-        auto streamId = gpu::Stream::TEXCOORD1 + i;
-
-        attribName[strlen(attribName) - 1] = '1' + i;
-        loc = glGetAttribLocation(glprogram, attribName);
-        if (loc >= 0 && loc != streamId) {
-            glBindAttribLocation(glprogram, streamId, attribName);
-        }
-    }
-
-    loc = glGetAttribLocation(glprogram, "inSkinClusterIndex");
-    if (loc >= 0 && loc != gpu::Stream::SKIN_CLUSTER_INDEX) {
-        glBindAttribLocation(glprogram, gpu::Stream::SKIN_CLUSTER_INDEX, "inSkinClusterIndex");
-    }
-
-    loc = glGetAttribLocation(glprogram, "inSkinClusterWeight");
-    if (loc >= 0 && loc != gpu::Stream::SKIN_CLUSTER_WEIGHT) {
-        glBindAttribLocation(glprogram, gpu::Stream::SKIN_CLUSTER_WEIGHT, "inSkinClusterWeight");
-    }
-
-    loc = glGetAttribLocation(glprogram, "_drawCallInfo");
-    if (loc >= 0 && loc != gpu::Stream::DRAW_CALL_INFO) {
-        glBindAttribLocation(glprogram, gpu::Stream::DRAW_CALL_INFO, "_drawCallInfo");
-    }
-
-    // Link again to take into account the assigned attrib location
-    glLinkProgram(glprogram);
-
-    GLint linked = 0;
-    glGetProgramiv(glprogram, GL_LINK_STATUS, &linked);
-    if (!linked) {
-        qCWarning(gpugllogging) << "GLShader::makeBindings - failed to link after assigning slotBindings?";
-    }
+}
+
+
+void GLBackend::initShaderBinaryCache() {
+    GLint numBinFormats = 0;
+    glGetIntegerv(GL_NUM_PROGRAM_BINARY_FORMATS, &numBinFormats);
+    if (numBinFormats > 0) {
+        _shaderBinaryCache._formats.resize(numBinFormats);
+        glGetIntegerv(GL_PROGRAM_BINARY_FORMATS, _shaderBinaryCache._formats.data());
+    }
+    ::gl::loadShaderCache(_shaderBinaryCache._binaries);
+}
+
+void GLBackend::killShaderBinaryCache() {
+    ::gl::saveShaderCache(_shaderBinaryCache._binaries);
 }
--- a/libraries/gpu-gl-common/src/gpu/gl/GLShader.cpp
+++ b/libraries/gpu-gl-common/src/gpu/gl/GLShader.cpp
@ -68,22 +68,23 @@ bool GLShader::makeProgram(GLBackend& backend, Shader& shader, const Shader::Bin
    for (int version = 0; version < GLShader::NumVersions; version++) {
        auto& shaderObject = object->_shaderObjects[version];
        if (shaderObject.glprogram) {
+            shaderObject.uniforms = ::gl::loadUniforms(shaderObject.glprogram);
            Shader::SlotSet buffers;
-            backend.makeUniformBlockSlots(shaderObject.glprogram, slotBindings, buffers);
+            backend.makeUniformBlockSlots(shaderObject, slotBindings, buffers);

            Shader::SlotSet uniforms;
            Shader::SlotSet textures;
            Shader::SlotSet samplers;
-            backend.makeUniformSlots(shaderObject.glprogram, slotBindings, uniforms, textures, samplers);
+            backend.makeUniformSlots(shaderObject, slotBindings, uniforms, textures, samplers);

            Shader::SlotSet resourceBuffers;
-            backend.makeResourceBufferSlots(shaderObject.glprogram, slotBindings, resourceBuffers);
+            backend.makeResourceBufferSlots(shaderObject, slotBindings, resourceBuffers);

            Shader::SlotSet inputs;
-            backend.makeInputSlots(shaderObject.glprogram, slotBindings, inputs);
+            backend.makeInputSlots(shaderObject, slotBindings, inputs);

            Shader::SlotSet outputs;
-            backend.makeOutputSlots(shaderObject.glprogram, slotBindings, outputs);
+            backend.makeOutputSlots(shaderObject, slotBindings, outputs);

            // Define the public slots only from the default version
            if (version == 0) {
--- a/libraries/gpu-gl-common/src/gpu/gl/GLShader.h
+++ b/libraries/gpu-gl-common/src/gpu/gl/GLShader.h
@ -9,14 +9,17 @@
 #define hifi_gpu_gl_GLShader_h

 #include "GLShared.h"
+#include <gl/GLShaders.h>

 namespace gpu { namespace gl {

 struct ShaderObject {
+    using Uniforms = ::gl::Uniforms;
    GLuint glshader { 0 };
    GLuint glprogram { 0 };
    GLint transformCameraSlot { -1 };
    GLint transformObjectSlot { -1 };
+    Uniforms uniforms;
 };

 class GLShader : public GPUObject {
--- a/libraries/gpu-gl/src/gpu/gl41/GL41Backend.h
+++ b/libraries/gpu-gl/src/gpu/gl41/GL41Backend.h
@ -173,7 +173,7 @@ protected:

    std::string getBackendShaderHeader() const override;
    void makeProgramBindings(ShaderObject& shaderObject) override;
-    int makeResourceBufferSlots(GLuint glprogram, const Shader::BindingSet& slotBindings,Shader::SlotSet& resourceBuffers) override;
+    int makeResourceBufferSlots(const ShaderObject& shaderProgram, const Shader::BindingSet& slotBindings,Shader::SlotSet& resourceBuffers) override;

 };

--- a/libraries/gpu-gl/src/gpu/gl41/GL41BackendShader.cpp
+++ b/libraries/gpu-gl/src/gpu/gl41/GL41BackendShader.cpp
@ -22,20 +22,13 @@ std::string GL41Backend::getBackendShaderHeader() const {
    return header;
 }

-int GL41Backend::makeResourceBufferSlots(GLuint glprogram, const Shader::BindingSet& slotBindings,Shader::SlotSet& resourceBuffers) {
+int GL41Backend::makeResourceBufferSlots(const ShaderObject& shaderProgram, const Shader::BindingSet& slotBindings,Shader::SlotSet& resourceBuffers) {
    GLint ssboCount = 0;
-       GLint uniformsCount = 0;
-
-    glGetProgramiv(glprogram, GL_ACTIVE_UNIFORMS, &uniformsCount);
-
-    for (int i = 0; i < uniformsCount; i++) {
-        const GLint NAME_LENGTH = 256;
-        GLchar name[NAME_LENGTH];
-        GLint length = 0;
-        GLint size = 0;
-        GLenum type = 0;
-        glGetActiveUniform(glprogram, i, NAME_LENGTH, &length, &size, &type, name);
-        GLint location = glGetUniformLocation(glprogram, name);
+    const auto& glprogram = shaderProgram.glprogram;
+    for (const auto& uniform : shaderProgram.uniforms) {
+        const auto& name = uniform.name;
+        const auto& type = uniform.type;
+        const auto& location = uniform.location;
        const GLint INVALID_UNIFORM_LOCATION = -1;

        // Try to make sense of the gltype
--- a/libraries/gpu-gl/src/gpu/gl45/GL45Backend.h
+++ b/libraries/gpu-gl/src/gpu/gl45/GL45Backend.h
@ -274,7 +274,7 @@ protected:
    // Shader Stage
    std::string getBackendShaderHeader() const override;
    void makeProgramBindings(ShaderObject& shaderObject) override;
-    int makeResourceBufferSlots(GLuint glprogram, const Shader::BindingSet& slotBindings,Shader::SlotSet& resourceBuffers) override;
+    int makeResourceBufferSlots(const ShaderObject& shaderProgram, const Shader::BindingSet& slotBindings,Shader::SlotSet& resourceBuffers) override;

    // Texture Management Stage
    void initTextureManagementStage() override;
--- a/libraries/gpu-gl/src/gpu/gl45/GL45BackendShader.cpp
+++ b/libraries/gpu-gl/src/gpu/gl45/GL45BackendShader.cpp
@ -27,7 +27,8 @@ std::string GL45Backend::getBackendShaderHeader() const {
    return header;
 }

-int GL45Backend::makeResourceBufferSlots(GLuint glprogram, const Shader::BindingSet& slotBindings,Shader::SlotSet& resourceBuffers) {
+int GL45Backend::makeResourceBufferSlots(const ShaderObject& shaderProgram, const Shader::BindingSet& slotBindings,Shader::SlotSet& resourceBuffers) {
+    const auto& glprogram = shaderProgram.glprogram;
    GLint buffersCount = 0;
    glGetProgramInterfaceiv(glprogram, GL_SHADER_STORAGE_BLOCK, GL_ACTIVE_RESOURCES, &buffersCount);

--- a/libraries/gpu-gles/src/gpu/gles/GLESBackend.h
+++ b/libraries/gpu-gles/src/gpu/gles/GLESBackend.h
@ -164,7 +164,7 @@ protected:
    
    std::string getBackendShaderHeader() const override;
    void makeProgramBindings(ShaderObject& shaderObject) override;
-    int makeResourceBufferSlots(GLuint glprogram, const Shader::BindingSet& slotBindings,Shader::SlotSet& resourceBuffers) override;
+    int makeResourceBufferSlots(const ShaderObject& shaderObject, const Shader::BindingSet& slotBindings,Shader::SlotSet& resourceBuffers) override;

 };

--- a/libraries/gpu-gles/src/gpu/gles/GLESBackendShader.cpp
+++ b/libraries/gpu-gles/src/gpu/gles/GLESBackendShader.cpp
@ -25,20 +25,15 @@ std::string GLESBackend::getBackendShaderHeader() const {
    return header;
 }

-int GLESBackend::makeResourceBufferSlots(GLuint glprogram, const Shader::BindingSet& slotBindings,Shader::SlotSet& resourceBuffers) {
+int GLESBackend::makeResourceBufferSlots(const ShaderObject& shaderObject, const Shader::BindingSet& slotBindings,Shader::SlotSet& resourceBuffers) {
    GLint ssboCount = 0;
-       GLint uniformsCount = 0;
+    GLint uniformsCount = 0;
+    const auto& glprogram = shaderObject.glprogram;

-    glGetProgramiv(glprogram, GL_ACTIVE_UNIFORMS, &uniformsCount);
-
-    for (int i = 0; i < uniformsCount; i++) {
-        const GLint NAME_LENGTH = 256;
-        GLchar name[NAME_LENGTH];
-        GLint length = 0;
-        GLint size = 0;
-        GLenum type = 0;
-        glGetActiveUniform(glprogram, i, NAME_LENGTH, &length, &size, &type, name);
-        GLint location = glGetUniformLocation(glprogram, name);
+    for (const auto& uniform : shaderObject.uniforms) {
+        const auto& type = uniform.type;
+        const auto& location = uniform.location;
+        const auto& name = uniform.name;
        const GLint INVALID_UNIFORM_LOCATION = -1;

        // Try to make sense of the gltype
--- a/libraries/gpu/src/gpu/Context.cpp
+++ b/libraries/gpu/src/gpu/Context.cpp
@ -53,6 +53,13 @@ Context::~Context() {
    _batchPool.clear();
 }

+void Context::shutdown() {
+    if (_backend) {
+        _backend->shutdown();
+        _backend.reset();
+    }
+}
+
 const std::string& Context::getBackendVersion() const {
    return _backend->getVersion();
 }
--- a/libraries/gpu/src/gpu/Context.h
+++ b/libraries/gpu/src/gpu/Context.h
@ -54,6 +54,7 @@ class Backend {
 public:
    virtual ~Backend(){};

+    virtual void shutdown() {}
    virtual const std::string& getVersion() const = 0;

    void setStereoState(const StereoState& stereo) { _stereo = stereo; }
@ -154,6 +155,7 @@ public:
    Context();
    ~Context();

+    void shutdown();
    const std::string& getBackendVersion() const;

    void beginFrame(const glm::mat4& renderView = glm::mat4(), const glm::mat4& renderPose = glm::mat4());
--- a/libraries/gpu/src/gpu/Shader.h
+++ b/libraries/gpu/src/gpu/Shader.h
@ -54,13 +54,11 @@ public:

    struct CompilationLog {
        std::string message;
-        std::vector<char> binary;
        bool compiled{ false };

        CompilationLog() {}
        CompilationLog(const CompilationLog& src) :
            message(src.message),
-            binary(src.binary),
            compiled(src.compiled) {}
    };
    using CompilationLogs = std::vector<CompilationLog>;
--- a/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
+++ b/libraries/input-plugins/src/input-plugins/KeyboardMouseDevice.cpp
@ -279,7 +279,7 @@ controller::Input KeyboardMouseDevice::InputDevice::makeInput(KeyboardMouseDevic
 *       moved down. The data value is how far the average position of all touch points moved.</td></tr>
  *   </tbody>
 * </table>
- * @typedef Controller.Hardware-Keyboard
+ * @typedef {object} Controller.Hardware-Keyboard
 * @todo <em>Currently, the mouse wheel in an ordinary mouse generates left/right wheel events instead of up/down.</em>
 */
 controller::Input::NamedVector KeyboardMouseDevice::InputDevice::getAvailableInputs() const {
--- a/libraries/model-networking/src/model-networking/ModelCache.h
+++ b/libraries/model-networking/src/model-networking/ModelCache.h
@ -179,7 +179,7 @@ public:
     * @function ModelCache.prefetch
     * @param {string} url - URL of the resource to prefetch.
     * @param {object} [extra=null]
-     * @returns {Resource}
+     * @returns {ResourceObject}
     */

    /**jsdoc
@ -188,7 +188,7 @@ public:
     * @param {string} url - URL of the resource to load.
     * @param {string} [fallback=""] - Fallback URL if load of the desired URL fails.
     * @param {} [extra=null]
-     * @returns {Resource}
+     * @returns {object}
     */


--- a/libraries/model-networking/src/model-networking/TextureCache.h
+++ b/libraries/model-networking/src/model-networking/TextureCache.h
@ -195,7 +195,7 @@ public:
     * @function TextureCache.prefetch
     * @param {string} url - URL of the resource to prefetch.
     * @param {object} [extra=null]
-     * @returns {Resource}
+     * @returns {ResourceObject}
     */

    /**jsdoc
@ -204,7 +204,7 @@ public:
     * @param {string} url - URL of the resource to load.
     * @param {string} [fallback=""] - Fallback URL if load of the desired URL fails.
     * @param {} [extra=null]
-     * @returns {Resource}
+     * @returns {object}
     */


@ -261,7 +261,7 @@ protected:
     * @param {string} url
     * @param {number} type
     * @param {number} [maxNumPixels=67108864]
-     * @returns {Resource}
+     * @returns {ResourceObject}
     */
    // Overload ResourceCache::prefetch to allow specifying texture type for loads
    Q_INVOKABLE ScriptableResource* prefetch(const QUrl& url, int type, int maxNumPixels = ABSOLUTE_MAX_TEXTURE_NUM_PIXELS);
--- a/libraries/networking/src/AddressManager.h
+++ b/libraries/networking/src/AddressManager.h
@ -138,7 +138,7 @@ public:
     *     </tr>
     *   </tbody>
     * </table>
-     * @typedef location.LookupTrigger
+     * @typedef {number} location.LookupTrigger
     */
    enum LookupTrigger {
        UserInput,
@ -184,7 +184,7 @@ public slots:
    /**jsdoc
     * Go to a specified metaverse address.
     * @function location.handleLookupString
-     * @param {string} address - The address to go to: a <code>"hifi:/"<code> address, an IP address (e.g., 
+     * @param {string} address - The address to go to: a <code>"hifi://"<code> address, an IP address (e.g., 
     * <code>"127.0.0.1"</code> or <code>"localhost"</code>), a domain name, a named path on a domain (starts with 
     * <code>"/"</code>), a position or position and orientation, or a user (starts with <code>"@"</code>).
     * @param {boolean} fromSuggestions=false - Set to <code>true</code> if the address is obtained from the "Goto" dialog.
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@ -137,7 +137,7 @@ public:
     *     </tr>
     *   </tbody>
     * </table>
-     * @typedef Window.ConnectionRefusedReason
+     * @typedef {number} Window.ConnectionRefusedReason
     */
    enum class ConnectionRefusedReason : uint8_t {
        Unknown,
--- a/libraries/networking/src/ResourceCache.cpp
+++ b/libraries/networking/src/ResourceCache.cpp
@ -218,8 +218,8 @@ ScriptableResource* ResourceCache::prefetch(const QUrl& url, void* extra) {
 }

 ResourceCache::ResourceCache(QObject* parent) : QObject(parent) {
-    auto nodeList = DependencyManager::get<NodeList>();
-    if (nodeList) {
+    if (DependencyManager::isSet<NodeList>()) {
+        auto nodeList = DependencyManager::get<NodeList>();
        auto& domainHandler = nodeList->getDomainHandler();
        connect(&domainHandler, &DomainHandler::disconnectedFromDomain,
            this, &ResourceCache::clearATPAssets, Qt::DirectConnection);
--- a/libraries/networking/src/ResourceCache.h
+++ b/libraries/networking/src/ResourceCache.h
@ -87,7 +87,7 @@ private:
 class ScriptableResource : public QObject {

    /**jsdoc
-     * @constructor Resource
+     * @class ResourceObject
     *
     * @hifi-interface
     * @hifi-client-entity
@ -97,11 +97,6 @@ class ScriptableResource : public QObject {
     * @property {string} url - URL of this resource.
     * @property {Resource.State} state - Current loading state.
     */
-    /**jsdoc
-     * @namespace Resource
-     * @variation 0
-     * @property {Resource.State} State
-     */
    Q_OBJECT
    Q_PROPERTY(QUrl url READ getURL)
    Q_PROPERTY(int state READ getState NOTIFY stateChanged)
@ -109,8 +104,7 @@ class ScriptableResource : public QObject {
 public:

    /**jsdoc
-     * @name Resource.State
-     * @static
+     * @typedef {object} Resource.State
     * @property {number} QUEUED - The resource is queued up, waiting to be loaded.
     * @property {number} LOADING - The resource is downloading.
     * @property {number} LOADED - The resource has finished downloaded by is not complete.
@ -131,7 +125,7 @@ public:

    /**jsdoc
     * Release this resource.
-     * @function Resource#release
+     * @function ResourceObject#release
     */
    Q_INVOKABLE void release();

@ -146,7 +140,7 @@ signals:

    /**jsdoc
     * Triggered when download progress for this resource has changed.
-     * @function Resource#progressChanged
+     * @function ResourceObject#progressChanged
     * @param {number} bytesReceived - Byytes downloaded so far.
     * @param {number} bytesTotal - Total number of bytes in the resource.
     * @returns {Signal}
@ -155,7 +149,7 @@ signals:

    /**jsdoc
     * Triggered when resource loading state has changed.
-     * @function Resource#stateChanged
+     * @function ResourceObject#stateChanged
     * @param {Resource.State} state - New state.
     * @returns {Signal}
     */
@ -262,7 +256,7 @@ protected slots:
     * @function ResourceCache.prefetch
     * @param {string} url - URL of the resource to prefetch.
     * @param {object} [extra=null]
-     * @returns {Resource}
+     * @returns {ResourceObject}
     */
    // Prefetches a resource to be held by the QScriptEngine.
    // Left as a protected member so subclasses can overload prefetch
@ -275,8 +269,9 @@ protected slots:
     * @param {string} url - URL of the resource to load.
     * @param {string} [fallback=""] - Fallback URL if load of the desired URL fails.
     * @param {} [extra=null]
-     * @returns {Resource}
+     * @returns {object}
     */
+    // FIXME: The return type is not recognized by JavaScript.
    /// Loads a resource from the specified URL and returns it.
    /// If the caller is on a different thread than the ResourceCache,
    /// returns an empty smart pointer and loads its asynchronously.
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@ -242,11 +242,9 @@ void EntityMotionState::getWorldTransform(btTransform& worldTrans) const {

        uint32_t thisStep = ObjectMotionState::getWorldSimulationStep();
        float dt = (thisStep - _lastKinematicStep) * PHYSICS_ENGINE_FIXED_SUBSTEP;
+        _lastKinematicStep = thisStep;
        _entity->stepKinematicMotion(dt);

-        // bypass const-ness so we can remember the step
-        const_cast<EntityMotionState*>(this)->_lastKinematicStep = thisStep;
-
        // and set the acceleration-matches-gravity count high so that if we send an update
        // it will use the correct acceleration for remote simulations
        _accelerationNearlyGravityCount = (uint8_t)(-1);
--- a/libraries/physics/src/ObjectMotionState.h
+++ b/libraries/physics/src/ObjectMotionState.h
@ -184,7 +184,7 @@ protected:
    btRigidBody* _body { nullptr };
    float _density { 1.0f };

-    uint32_t _lastKinematicStep;
+    mutable uint32_t _lastKinematicStep;
    bool _hasInternalKinematicChanges { false };
 };

--- a/libraries/physics/src/PhysicsEngine.cpp
+++ b/libraries/physics/src/PhysicsEngine.cpp
@ -71,8 +71,8 @@ void PhysicsEngine::init() {
    }
 }

-uint32_t PhysicsEngine::getNumSubsteps() {
-    return _numSubsteps;
+uint32_t PhysicsEngine::getNumSubsteps() const {
+    return _dynamicsWorld->getNumSubsteps();
 }

 // private
@ -331,13 +331,9 @@ void PhysicsEngine::stepSimulation() {
                                                                        PHYSICS_ENGINE_FIXED_SUBSTEP, onSubStep);
    if (numSubsteps > 0) {
        BT_PROFILE("postSimulation");
-        _numSubsteps += (uint32_t)numSubsteps;
-        ObjectMotionState::setWorldSimulationStep(_numSubsteps);
-
        if (_myAvatarController) {
            _myAvatarController->postSimulation();
        }
-
        _hasOutgoingChanges = true;
    }

--- a/libraries/physics/src/PhysicsEngine.h
+++ b/libraries/physics/src/PhysicsEngine.h
@ -52,7 +52,7 @@ public:
    ~PhysicsEngine();
    void init();

-    uint32_t getNumSubsteps();
+    uint32_t getNumSubsteps() const;

    void removeObjects(const VectorOfMotionStates& objects);
    void removeSetOfObjects(const SetOfMotionStates& objects); // only called during teardown
@ -135,7 +135,6 @@ private:
    CharacterController* _myAvatarController;

    uint32_t _numContactFrames = 0;
-    uint32_t _numSubsteps;

    bool _dumpNextStats { false };
    bool _saveNextStats { false };
--- a/libraries/physics/src/ThreadSafeDynamicsWorld.cpp
+++ b/libraries/physics/src/ThreadSafeDynamicsWorld.cpp
@ -59,14 +59,11 @@ int ThreadSafeDynamicsWorld::stepSimulationWithSubstepCallback(btScalar timeStep
        }
    }

-    /*//process some debugging flags
-    if (getDebugDrawer()) {
-        btIDebugDraw* debugDrawer = getDebugDrawer();
-        gDisableDeactivation = (debugDrawer->getDebugMode() & btIDebugDraw::DBG_NoDeactivation) != 0;
-    }*/
    if (subSteps) {
        //clamp the number of substeps, to prevent simulation grinding spiralling down to a halt
        int clampedSimulationSteps = (subSteps > maxSubSteps)? maxSubSteps : subSteps;
+        _numSubsteps += clampedSimulationSteps;
+        ObjectMotionState::setWorldSimulationStep(_numSubsteps);

        saveKinematicState(fixedTimeStep*clampedSimulationSteps);

@ -98,28 +95,24 @@ int ThreadSafeDynamicsWorld::stepSimulationWithSubstepCallback(btScalar timeStep
 // call this instead of non-virtual btDiscreteDynamicsWorld::synchronizeSingleMotionState()
 void ThreadSafeDynamicsWorld::synchronizeMotionState(btRigidBody* body) {
    btAssert(body);
-    if (body->getMotionState() && !body->isStaticObject()) {
-        //we need to call the update at least once, even for sleeping objects
-        //otherwise the 'graphics' transform never updates properly
-        ///@todo: add 'dirty' flag
-        //if (body->getActivationState() != ISLAND_SLEEPING)
-        {
-            if (body->isKinematicObject()) {
-                ObjectMotionState* objectMotionState = static_cast<ObjectMotionState*>(body->getMotionState());
-                if (objectMotionState->hasInternalKinematicChanges()) {
-                    objectMotionState->clearInternalKinematicChanges();
-                    body->getMotionState()->setWorldTransform(body->getWorldTransform());
-                }
-                return;
-            }
-            btTransform interpolatedTransform;
-            btTransformUtil::integrateTransform(body->getInterpolationWorldTransform(),
-                body->getInterpolationLinearVelocity(),body->getInterpolationAngularVelocity(),
-                (m_latencyMotionStateInterpolation && m_fixedTimeStep) ? m_localTime - m_fixedTimeStep : m_localTime*body->getHitFraction(),
-                interpolatedTransform);
-            body->getMotionState()->setWorldTransform(interpolatedTransform);
+    btAssert(body->getMotionState());
+
+    if (body->isKinematicObject()) {
+        ObjectMotionState* objectMotionState = static_cast<ObjectMotionState*>(body->getMotionState());
+        if (objectMotionState->hasInternalKinematicChanges()) {
+            // this is a special case where the kinematic motion has been updated by an Action
+            // so we supply the body's current transform to the MotionState
+            objectMotionState->clearInternalKinematicChanges();
+            body->getMotionState()->setWorldTransform(body->getWorldTransform());
        }
+        return;
    }
+    btTransform interpolatedTransform;
+    btTransformUtil::integrateTransform(body->getInterpolationWorldTransform(),
+        body->getInterpolationLinearVelocity(),body->getInterpolationAngularVelocity(),
+        (m_latencyMotionStateInterpolation && m_fixedTimeStep) ? m_localTime - m_fixedTimeStep : m_localTime*body->getHitFraction(),
+        interpolatedTransform);
+    body->getMotionState()->setWorldTransform(interpolatedTransform);
 }

 void ThreadSafeDynamicsWorld::synchronizeMotionStates() {
@ -164,24 +157,12 @@ void ThreadSafeDynamicsWorld::synchronizeMotionStates() {
 }

 void ThreadSafeDynamicsWorld::saveKinematicState(btScalar timeStep) {
-///would like to iterate over m_nonStaticRigidBodies, but unfortunately old API allows
-///to switch status _after_ adding kinematic objects to the world
-///fix it for Bullet 3.x release
    DETAILED_PROFILE_RANGE(simulation_physics, "saveKinematicState");
    BT_PROFILE("saveKinematicState");
-    for (int i=0;i<m_collisionObjects.size();i++)
-    {
-        btCollisionObject* colObj = m_collisionObjects[i];
-        btRigidBody* body = btRigidBody::upcast(colObj);
-        if (body && body->getActivationState() != ISLAND_SLEEPING)
-        {
-            if (body->isKinematicObject())
-            {
-                //to calculate velocities next frame
-                body->saveKinematicState(timeStep);
-            }
+    for (int i=0;i<m_nonStaticRigidBodies.size();i++) {
+        btRigidBody* body = m_nonStaticRigidBodies[i];
+        if (body && body->isKinematicObject() && body->getActivationState() != ISLAND_SLEEPING) {
+            body->saveKinematicState(timeStep);
        }
    }
 }
-
-
--- a/libraries/physics/src/ThreadSafeDynamicsWorld.h
+++ b/libraries/physics/src/ThreadSafeDynamicsWorld.h
@ -37,6 +37,7 @@ public:
            btConstraintSolver* constraintSolver,
            btCollisionConfiguration* collisionConfiguration);

+    int getNumSubsteps() const { return _numSubsteps; }
    int stepSimulationWithSubstepCallback(btScalar timeStep, int maxSubSteps = 1,
                                          btScalar fixedTimeStep = btScalar(1.)/btScalar(60.),
                                          SubStepCallback onSubStep = []() { });
@ -61,6 +62,7 @@ private:
    VectorOfMotionStates _deactivatedStates;
    SetOfMotionStates _activeStates;
    SetOfMotionStates _lastActiveStates;
+    int _numSubsteps { 0 };
 };

 #endif // hifi_ThreadSafeDynamicsWorld_h
--- a/libraries/script-engine/src/AssetScriptingInterface.h
+++ b/libraries/script-engine/src/AssetScriptingInterface.h
@ -121,7 +121,7 @@ public:

    /**jsdoc
     * A set of properties that can be passed to {@link Assets.getAsset}.
-     * @typedef {Object} Assets.GetOptions
+     * @typedef {object} Assets.GetOptions
     * @property {string} [url] an "atp:" style URL, hash, or relative mapped path to fetch
     * @property {string} [responseType=text] the desired reponse type (text | arraybuffer | json)
     * @property {boolean} [decompress=false] whether to attempt gunzip decompression on the fetched data
@ -137,7 +137,7 @@ public:

    /**jsdoc
     * Result value returned by {@link Assets.getAsset}.
-     * @typedef {Object} Assets~getAssetResult
+     * @typedef {object} Assets~getAssetResult
     * @property {string} [url] the resolved "atp:" style URL for the fetched asset
     * @property {string} [hash] the resolved hash for the fetched asset
     * @property {string|ArrayBuffer|Object} [response] response data (possibly converted per .responseType value)
@ -159,7 +159,7 @@ public:

    /**jsdoc
     * A set of properties that can be passed to {@link Assets.putAsset}.
-     * @typedef {Object} Assets.PutOptions
+     * @typedef {object} Assets.PutOptions
     * @property {ArrayBuffer|string} [data] byte buffer or string value representing the new asset's content
     * @property {string} [path=null] ATP path mapping to automatically create (upon successful upload to hash)
     * @property {boolean} [compress=false] whether to gzip compress data before uploading
@ -174,7 +174,7 @@ public:

    /**jsdoc
     * Result value returned by {@link Assets.putAsset}.
-     * @typedef {Object} Assets~putAssetResult
+     * @typedef {object} Assets~putAssetResult
     * @property {string} [url] the resolved "atp:" style URL for the uploaded asset (based on .path if specified, otherwise on the resulting ATP hash)
     * @property {string} [path] the uploaded asset's resulting ATP path (or undefined if no path mapping was assigned)
     * @property {string} [hash] the uploaded asset's resulting ATP hash
--- a/libraries/script-engine/src/Quat.h
+++ b/libraries/script-engine/src/Quat.h
@ -43,7 +43,7 @@
 * @hifi-server-entity
 * @hifi-assignment-client
 *
- * @property IDENTITY {Quat} <code>{ x: 0, y: 0, z: 0, w: 1 }</code> : The identity rotation, i.e., no rotation.
+ * @property {Quat} IDENTITY - <code>{ x: 0, y: 0, z: 0, w: 1 }</code> : The identity rotation, i.e., no rotation.
 *     <em>Read-only.</em>
 * @example <caption>Print the <code>IDENTITY</code> value.</caption>
 * print(JSON.stringify(Quat.IDENTITY)); // { x: 0, y: 0, z: 0, w: 1 }
--- a/libraries/script-engine/src/SceneScriptingInterface.h
+++ b/libraries/script-engine/src/SceneScriptingInterface.h
@ -21,7 +21,7 @@
 namespace SceneScripting {
    
    /**jsdoc
-     * @typedef Scene.Stage.Location
+     * @typedef {object} Scene.Stage.Location
     * @property {number} longitude
     * @property {number} latitude
     * @property {number} altitude
@ -49,7 +49,7 @@ namespace SceneScripting {
    using LocationPointer = std::unique_ptr<Location>;
    
    /**jsdoc
-     * @typedef Scene.Stage.Time
+     * @typedef {object} Scene.Stage.Time
     * @property {number} hour
     * @property {number} day
     */
@ -73,7 +73,7 @@ namespace SceneScripting {
    using TimePointer = std::unique_ptr<Time>;

    /**jsdoc
-     * @typedef Scene.Stage.KeyLight
+     * @typedef {object} Scene.Stage.KeyLight
     * @property {Vec3} color
     * @property {number} intensity
     * @property {number} ambientIntensity
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@ -237,6 +237,14 @@ QString ScriptEngine::getContext() const {
    return "unknown";
 }

+bool ScriptEngine::isDebugMode() const { 
+#if defined(DEBUG)
+    return true;
+#else
+    return false;
+#endif
+}
+
 ScriptEngine::~ScriptEngine() {
    auto scriptEngines = DependencyManager::get<ScriptEngines>();
    if (scriptEngines) {
@ -558,6 +566,16 @@ static void scriptableResourceFromScriptValue(const QScriptValue& value, Scripta
    resource = static_cast<ScriptableResourceRawPtr>(value.toQObject());
 }

+/**jsdoc
+ * @namespace Resource
+ *
+ * @hifi-interface
+ * @hifi-client-entity
+ * @hifi-server-entity
+ * @hifi-assignment-client
+ *
+ * @property {Resource.State} State
+ */
 static QScriptValue createScriptableResourcePrototype(ScriptEnginePointer engine) {
    auto prototype = engine->newObject();

--- a/libraries/script-engine/src/ScriptEngine.h
+++ b/libraries/script-engine/src/ScriptEngine.h
@ -232,6 +232,12 @@ public:
     */
    Q_INVOKABLE bool isClientScript() const { return _context == CLIENT_SCRIPT; }

+    /**jsdoc
+     * @function Script.isDebugMode
+     * @returns {boolean}
+     */
+    Q_INVOKABLE bool isDebugMode() const;
+
    /**jsdoc
     * @function Script.isEntityClientScript
     * @returns {boolean}
--- a/libraries/script-engine/src/ScriptUUID.h
+++ b/libraries/script-engine/src/ScriptUUID.h
@ -30,7 +30,7 @@
 * @hifi-server-entity
 * @hifi-assignment-client
 *
- * @property NULL {Uuid} The null UUID, <code>{00000000-0000-0000-0000-000000000000}</code>.
+ * @property {Uuid} NULL - The null UUID, <code>{00000000-0000-0000-0000-000000000000}</code>.
 */

 /// Scriptable interface for a UUID helper class object. Used exclusively in the JavaScript API
--- a/libraries/script-engine/src/Vec3.h
+++ b/libraries/script-engine/src/Vec3.h
@ -42,8 +42,7 @@
 /**jsdoc
 * The Vec3 API facilities for generating and manipulating 3-dimensional vectors. High Fidelity uses a right-handed 
 * Cartesian coordinate system where the y-axis is the "up" and the negative z-axis is the "front" direction.
- * <img alt="High Fidelity coordinate system" 
- * src="https://docs.highfidelity.com/user/pages/06.api-reference/43.vec3/opengl-coord-system.jpg" />
+ * <img alt="High Fidelity coordinate system" src="https://docs.highfidelity.com/images/opengl-coord-system.jpg" />
 *
 * @namespace Vec3
 * @variation 0
--- a/libraries/shared/src/SharedUtil.h
+++ b/libraries/shared/src/SharedUtil.h
@ -25,6 +25,7 @@
 #include <QtCore/QCoreApplication>
 #include <QUuid>

+#include "NumericalConstants.h"
 // When writing out avatarEntities to a QByteArray, if the parentID is the ID of MyAvatar, use this ID instead.  This allows
 // the value to be reset when the sessionID changes.
 const QUuid AVATAR_SELF_ID = QUuid("{00000000-0000-0000-0000-000000000001}");
@ -122,6 +123,27 @@ const QByteArray HIGH_FIDELITY_USER_AGENT = "Mozilla/5.0 (HighFidelityInterface)
 quint64 usecTimestampNow(bool wantDebug = false);
 void usecTimestampNowForceClockSkew(qint64 clockSkew);

+inline bool afterUsecs(quint64& startUsecs, quint64 maxIntervalUecs) {
+    auto now = usecTimestampNow();
+    auto interval = now - startUsecs;
+    if (interval > maxIntervalUecs) {
+        startUsecs = now;
+        return true;
+    }
+    return false;
+}
+
+inline bool afterSecs(quint64& startUsecs, quint64 maxIntervalSecs) {
+    return afterUsecs(startUsecs, maxIntervalSecs * USECS_PER_SECOND);
+}
+
+template <typename F>
+void doEvery(quint64& lastReportUsecs, quint64 secs, F lamdba) {
+    if (afterSecs(lastReportUsecs, secs)) {
+        lamdba();
+    }
+}
+
 // Number of seconds expressed since the first call to this function, expressed as a float
 // Maximum accuracy in msecs
 float secTimestampNow();
--- a/libraries/shared/src/shared/Camera.h
+++ b/libraries/shared/src/shared/Camera.h
@ -44,13 +44,14 @@ class Camera : public QObject {
     * @hifi-interface
     * @hifi-client-entity
     *
-     * @property position {Vec3} The position of the camera. You can set this value only when the camera is in independent mode.
-     * @property orientation {Quat} The orientation of the camera. You can set this value only when the camera is in independent
+     * @property {Vec3} position - The position of the camera. You can set this value only when the camera is in independent 
     *     mode.
-     * @property mode {Camera.Mode} The camera mode.
-     * @property frustum {ViewFrustum} The camera frustum.
-     * @property cameraEntity {Uuid} The ID of the entity that is used for the camera position and orientation when the camera
-     *     is in entity mode.
+     * @property {Quat} orientation - The orientation of the camera. You can set this value only when the camera is in 
+     *     independent mode.
+     * @property {Camera.Mode} mode - The camera mode.
+     * @property {ViewFrustum} frustum - The camera frustum.
+     * @property {Uuid} cameraEntity - The ID of the entity that is used for the camera position and orientation when the 
+     *     camera is in entity mode.
     */
    // FIXME: The cameraEntity property definition is copied from FancyCamera.h.
    Q_PROPERTY(glm::vec3 position READ getPosition WRITE setPosition)
--- a/libraries/test-utils/CMakeLists.txt
+++ b/libraries/test-utils/CMakeLists.txt
@ -1,3 +1,3 @@
 set(TARGET_NAME test-utils)
 setup_hifi_library(Network Gui)
-
+link_hifi_libraries(shared)
--- a/libraries/test-utils/src/test-utils/GLMTestUtils.h
+++ b/libraries/test-utils/src/test-utils/GLMTestUtils.h
--- a/libraries/test-utils/src/test-utils/QTestExtensions.h
+++ b/libraries/test-utils/src/test-utils/QTestExtensions.h
@ -313,27 +313,6 @@ inline QString getTestResource(const QString& relativePath) {
    return QDir::cleanPath(dir.absoluteFilePath(relativePath));
 }

-inline bool afterUsecs(quint64& startUsecs, quint64 maxIntervalUecs) {
-    auto now = usecTimestampNow();
-    auto interval = now - startUsecs;
-    if (interval > maxIntervalUecs) {
-        startUsecs = now;
-        return true;
-    }
-    return false;
-}
-
-inline bool afterSecs(quint64& startUsecs, quint64 maxIntervalSecs) {
-    return afterUsecs(startUsecs, maxIntervalSecs * USECS_PER_SECOND);
-}
-
-template <typename F>
-void doEvery(quint64& lastReportUsecs, quint64 secs, F lamdba) {
-    if (afterSecs(lastReportUsecs, secs)) {
-        lamdba();
-    }
-}
-
 inline void failAfter(quint64 startUsecs, quint64 secs, const char* message) {
    if (afterSecs(startUsecs, secs)) {
        QFAIL(message);
--- a/libraries/ui/src/QmlFragmentClass.h
+++ b/libraries/ui/src/QmlFragmentClass.h
@ -20,7 +20,7 @@ public:
    /**jsdoc
     * Creates a new button, adds it to this and returns it.
     * @function QmlFragmentClass#addButton
-     * @param properties {Object} button properties 
+     * @param properties {object} button properties 
     * @returns {TabletButtonProxy}
     */
    Q_INVOKABLE QObject* addButton(const QVariant& properties);
--- a/libraries/ui/src/ui/TabletScriptingInterface.h
+++ b/libraries/ui/src/ui/TabletScriptingInterface.h
@ -493,7 +493,7 @@ protected:
    int _stableOrder;

    /**jsdoc
-     * @typedef TabletButtonProxy.ButtonProperties
+     * @typedef {object} TabletButtonProxy.ButtonProperties
     * @property {string} icon - URL to button icon. (50 x 50)
     * @property {string} hoverIcon - URL to button icon, displayed during mouse hover. (50 x 50)
     * @property {string} activeHoverIcon - URL to button icon used when button is active, and during mouse hover. (50 x 50)
--- a/plugins/oculus/src/OculusControllerManager.cpp
+++ b/plugins/oculus/src/OculusControllerManager.cpp
@ -442,7 +442,7 @@ void OculusControllerManager::TouchDevice::stopHapticPulse(bool leftHand) {
 *     <tr><td><code>RightHand</code></td><td>number</td><td>{@link Pose}</td><td>right hand pose.</td></tr>
 *   </tbody>
 * </table>
- * @typedef Controller.Hardware-OculusTouch
+ * @typedef {object} Controller.Hardware-OculusTouch
 */
 controller::Input::NamedVector OculusControllerManager::TouchDevice::getAvailableInputs() const {
    using namespace controller;
--- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
@ -198,9 +198,9 @@ public:
            std::string fsSource = HMD_REPROJECTION_FRAG;
            GLuint vertexShader { 0 }, fragmentShader { 0 };
            std::string error;
-            std::vector<char> binary;
-            ::gl::compileShader(GL_VERTEX_SHADER, vsSource, "", vertexShader, error);
-            ::gl::compileShader(GL_FRAGMENT_SHADER, fsSource, "", fragmentShader, error);
+            ::gl::CachedShader binary;
+            ::gl::compileShader(GL_VERTEX_SHADER, vsSource, vertexShader, error);
+            ::gl::compileShader(GL_FRAGMENT_SHADER, fsSource, fragmentShader, error);
            _program = ::gl::compileProgram({ { vertexShader, fragmentShader } }, error, binary);
            glDeleteShader(vertexShader);
            glDeleteShader(fragmentShader);
--- a/plugins/openvr/src/ViveControllerManager.cpp
+++ b/plugins/openvr/src/ViveControllerManager.cpp
@ -1297,7 +1297,7 @@ void ViveControllerManager::InputDevice::setConfigFromString(const QString& valu
 *     <tr><td><code>TrackedObject15</code></td><td>number</td><td>{@link Pose}</td><td>Tracker 15 pose.</td></tr>
 *   </tbody>
 * </table>
- * @typedef Controller.Hardware-Vive
+ * @typedef {object} Controller.Hardware-Vive
 */
 controller::Input::NamedVector ViveControllerManager::InputDevice::getAvailableInputs() const {
    using namespace controller;
--- a/scripts/+android/defaultScripts.js
+++ b/scripts/+android/defaultScripts.js
@ -16,8 +16,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
    "system/+android/touchscreenvirtualpad.js",
    "system/+android/actionbar.js",
    "system/+android/audio.js" ,
-    "system/+android/modes.js",
-    "system/+android/stats.js"/*,
+    "system/+android/modes.js"/*,
    "system/away.js",
    "system/controllers/controllerDisplayManager.js",
    "system/controllers/handControllerGrabAndroid.js",
@ -33,6 +32,10 @@ var DEFAULT_SCRIPTS_COMBINED = [
    "developer/debugging/debugAndroidMouse.js"*/
 ];

+var DEBUG_SCRIPTS = [
+    "system/+android/stats.js"
+];
+
 var DEFAULT_SCRIPTS_SEPARATE = [ ];

 // add a menu item for debugging
@ -70,6 +73,11 @@ function runDefaultsTogether() {
    for (var i in DEFAULT_SCRIPTS_COMBINED) {
        Script.include(DEFAULT_SCRIPTS_COMBINED[i]);
    }
+    if (Script.isDebugMode()) {
+        for (var i in DEBUG_SCRIPTS) {
+            Script.include(DEBUG_SCRIPTS[i]);
+        }
+    }
    loadSeparateDefaults();
 }

@ -77,6 +85,11 @@ function runDefaultsSeparately() {
    for (var i in DEFAULT_SCRIPTS_COMBINED) {
        Script.load(DEFAULT_SCRIPTS_COMBINED[i]);
    }
+    if (Script.isDebugMode()) {
+        for (var i in DEBUG_SCRIPTS) {
+            Script.load(DEBUG_SCRIPTS[i]);
+        }
+    }
    loadSeparateDefaults();
 }

--- a/scripts/system/+android/stats.js
+++ b/scripts/system/+android/stats.js
@ -30,7 +30,7 @@ function init() {
        text: "STATS"
    });
    statsButton.clicked.connect(function() {
-        Menu.triggerOption("Stats");
+        Menu.triggerOption("Show Statistics");
    });
 }

--- a/scripts/system/controllers/toggleAdvancedMovementForHandControllers.js
+++ b/scripts/system/controllers/toggleAdvancedMovementForHandControllers.js
@ -171,4 +171,25 @@
    Messages.subscribe(HIFI_ADVANCED_MOVEMENT_DISABLER_CHANNEL);
    Messages.messageReceived.connect(handleMessage);

+    function initializeControls() {
+        if(HMD.active) {
+            if (Controller.Hardware.Vive !== undefined || Controller.Hardware.OculusTouch !== undefined) {
+                if (MyAvatar.useAdvancedMovementControls) {
+                    Controller.disableMapping(DRIVING_MAPPING_NAME);
+                } else {
+                    Controller.enableMapping(DRIVING_MAPPING_NAME);
+                }
+
+                if (MyAvatar.getFlyingEnabled()) {
+                    Controller.disableMapping(FLYING_MAPPING_NAME);
+                } else {
+                    Controller.enableMapping(FLYING_MAPPING_NAME);
+                }
+			});
+
+		}
+	}
+
+	initializeControls();
+
 }()); // END LOCAL_SCOPE
--- a/tests-manual/shaders/src/main.cpp
+++ b/tests-manual/shaders/src/main.cpp
@ -134,12 +134,12 @@ const std::string PIXEL_SHADER_DEFINES{ R"GLSL(

 void testShaderBuild(const std::string& vs_src, const std::string& fs_src) {
    std::string error;
-    std::vector<char> binary;
    GLuint vs, fs;
-    if (!gl::compileShader(GL_VERTEX_SHADER, vs_src, VERTEX_SHADER_DEFINES, vs, error) || 
-        !gl::compileShader(GL_FRAGMENT_SHADER, fs_src, PIXEL_SHADER_DEFINES, fs, error)) {
+    if (!gl::compileShader(GL_VERTEX_SHADER, VERTEX_SHADER_DEFINES + vs_src, vs, error) ||
+        !gl::compileShader(GL_FRAGMENT_SHADER, PIXEL_SHADER_DEFINES + fs_src, fs, error)) {
        throw std::runtime_error("Failed to compile shader");
    }
+    gl::CachedShader binary;
    auto pr = gl::compileProgram({ vs, fs }, error, binary);
    if (!pr) {
        throw std::runtime_error("Failed to link shader");
--- a/tests/animation/CMakeLists.txt
+++ b/tests/animation/CMakeLists.txt
@ -1,7 +1,7 @@
 # Declare dependencies
 macro (setup_testcase_dependencies)
  # link in the shared libraries
-  link_hifi_libraries(shared animation gpu fbx graphics networking)
+  link_hifi_libraries(shared animation gpu fbx graphics networking test-utils)

  package_libraries_for_deployment()
 endmacro ()
--- a/tests/animation/src/AnimInverseKinematicsTests.cpp
+++ b/tests/animation/src/AnimInverseKinematicsTests.cpp
@ -16,7 +16,7 @@
 #include <AnimationLogging.h>
 #include <NumericalConstants.h>

-#include "../QTestExtensions.h"
+#include <test-utils/QTestExtensions.h>

 QTEST_MAIN(AnimInverseKinematicsTests)

--- a/tests/animation/src/AnimTests.cpp
+++ b/tests/animation/src/AnimTests.cpp
@ -20,7 +20,7 @@
 #include <AccountManager.h>
 #include <ResourceManager.h>
 #include <StatTracker.h>
-#include <../QTestExtensions.h>
+#include <test-utils/QTestExtensions.h>

 QTEST_MAIN(AnimTests)

--- a/Show more
+++ b/Show more