Merge branch 'master' of git://github.com/highfidelity/hifi into shadow

.eslintrc.js

@@ -68,7 +68,7 @@ module.exports = {
         "eqeqeq": ["error", "always"],
         "indent": ["error", 4, { "SwitchCase": 1 }],
         "keyword-spacing": ["error", { "before": true, "after": true }],
-        "max-len": ["error", 192, 4],
+        "max-len": ["error", 128, 4],
         "new-cap": ["error"],
         "no-floating-decimal": ["error"],
         //"no-magic-numbers": ["error", { "ignore": [0, 1], "ignoreArrayIndexes": true }],

domain-server/resources/web/css/style.css

@@ -307,7 +307,6 @@ table .headers + .headers td {
   margin-right: 20px;
 }
 
-#visit-domain-link,
 .blue-link {
   font-size: 14px;
   text-decoration-line: underline;

domain-server/resources/web/header.html

@@ -39,7 +39,7 @@
             <li><a href="/settings/">Settings</a></li>
           </ul>
           <ul class="nav navbar-right navbar-nav">
-            <li><a id="visit-domain-link" target="_blank" style="display: none;">Visit domain in VR</a></li>
+            <li><a id="visit-domain-link" class="blue-link" target="_blank" style="display: none;">Visit domain in VR</a></li>
             <li><a href="#" id="restart-server"><span class="glyphicon glyphicon-refresh"></span> Restart</a></li>
           </ul>
         </div>

domain-server/resources/web/wizard/css/style.css

@@ -31,6 +31,12 @@ label {
   color: #373A3C;
 }
 
+.wizard-link {
+  font-size: 16px;
+  font-weight: normal;
+  color: #2F80ED;
+}
+
 #admin-row {
   margin-top: 20px;
   margin-bottom: 20px;
@@ -84,6 +90,14 @@ label {
   height: 169px;
 }
 
-#visit-domain-row {
-  margin-bottom: 68px;
+#congratulation-text {
+  margin-bottom: 59px;
+}
+
+#visit-domain-checkbox {
+  margin-bottom: 23px;
+}
+
+#visit-domain-checkbox label {
+  margin: 0 0;
 }

domain-server/resources/web/wizard/index.shtml

@@ -60,8 +60,7 @@
   </div>
   <div id="admin-row" class="row">
     <p class="col-md-6">
-      <span id="admin-description" class="step-info"><b>Add your High Fidelity username</b> and any other usernames to grant administrator privileges.</span>
-      <span class='glyphicon glyphicon-info-sign' data-toggle="tooltip" title="Users who will have all the permissions for this domain."></span>
+      <span class="step-info"><span id="admin-description"><b>Add your High Fidelity username</b> and any other usernames</span> to grant <span class='wizard-link' data-toggle="tooltip" title="Users who will have all the permissions for this domain.">administrator privileges</span></span>
     </p>
     <div class="col-md-6">
       <input id="admin-usernames" type="text" class="form-control">
@@ -78,7 +77,7 @@
   <div class="row">
     <div class="col-md-12">
       <p id="connect-question" class="step-info">
-        Who can connect to your domain?
+        Who can <a href='#' class='wizard-link  perms-link'>connect</a> to your domain?
         <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='You can set this to allow a user to connect to this domain.'></span>
       </p>
     </div>
@@ -87,25 +86,21 @@
     <p class="col-md-2">
       <label>
         <input id="connect-none" name="connect-radio" type="radio" value="none" checked> None
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Only the admins of this domain'></span>
       </label>
     </p>
     <p class="col-md-3">
       <label>
         <input id="connect-friends" name="connect-radio" type="radio" value="friends"> Friends
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Users who are your Friends in High Fidelity'></span>
       </label>
     </p>
     <p class="col-md-5">
       <label>
-        <input id="connect-logged-in" name="connect-radio" type="radio" value="logged-in"> Users logged in to High Fidelity
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Users who are currently logged into High Fidelity'></span>
+        <input id="connect-logged-in" name="connect-radio" type="radio" value="logged-in"> Users logged into High Fidelity
       </label>
     </p>
     <p class="col-md-2">
       <label>
         <input id="connect-everyone" name="connect-radio" type="radio" value="everyone"> Everyone
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title="Users who aren't logged into High Fidelity"></span>
       </label>
     </p>
   </div>
@@ -113,7 +108,7 @@
   <div class="row">
     <div class="col-md-12">
       <p class="step-info">
-        Who can rez items in your domain?
+        Who can <a href='#' class='wizard-link perms-link'>rez items</a> in your domain?
         <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='You can set this to allow a user to create entities in this domain.'></span>
       </p>
     </div>
@@ -122,33 +117,32 @@
     <p class="col-md-2">
       <label>
         <input id="rez-none" name="rez-radio" type="radio" value="none" checked> None
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Only the admins of this domain'></span>
       </label>
     </p>
     <p class="col-md-3">
       <label>
-        <input id="rez-friends" name="rez-radio" type="radio" value="friends"> Friends
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Users who are your Friends in High Fidelity'></span>
+        <input id="rez-friends" name="rez-radio" type="radio" value="friends" disabled> Friends
       </label>
     </p>
     <p class="col-md-5">
       <label>
-        <input id="rez-logged-in" name="rez-radio" type="radio" value="logged-in"> Users logged in to High Fidelity
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title='Users who are currently logged into High Fidelity'></span>
+        <input id="rez-logged-in" name="rez-radio" type="radio" value="logged-in" disabled> Users logged into High Fidelity
       </label>
     </p>
     <p class="col-md-2">
       <label>
-        <input id="rez-everyone" name="rez-radio" type="radio" value="everyone"> Everyone
-        <span class='glyphicon glyphicon-info-sign' data-toggle='tooltip' title="Users who aren't logged into High Fidelity"></span>
+        <input id="rez-everyone" name="rez-radio" type="radio" value="everyone" disabled> Everyone
       </label>
     </p>
   </div>
 
   <div class="row">
-    <div class="col-md-3 col-md-offset-9">
+    <dd class="col-md-3">
+      <button type="button" class="btn btn-md btn-block btn-default back-button">Back</button>
+    </dd>
+    <dd class="col-md-3 col-md-offset-6">
       <button id="save-permissions" type="button" class="btn btn-md btn-block btn-primary">Next</button>
-    </div>
+    </dd>
   </div>
 </div>
 
@@ -188,35 +182,37 @@
   </dl>
 
   <dl class="row">
-    <dd class="col-md-3 col-md-offset-9">
+    <dd class="col-md-3">
+      <button type="button" class="btn btn-md btn-block btn-default back-button">Back</button>
+    </dd>
+    <dd class="col-md-3 col-md-offset-6">
       <button id="save-username-password" type="button" class="btn btn-md btn-block btn-primary">Finish</button>
     </dd>
   </dl>
 </div>
 
-<div class="wizard-step cloud-only col-md-7 col-centered" style="display: none;">
+<div class="wizard-step cloud-only col-xs-12 col-sm-12 col-md-9 col-lg-7 col-centered" style="display: none;">
   <div class="row">
-    <div class="col-xs-4 col-centered">
+    <div class="col-xs-12" align="center">
       <img id="checkmark-image" src="../images/checkmark.svg">
     </div>
   </div>
 
-  <div class="row">
-    <div class="col-md-12">
+  <div id="congratulation-text" class="row">
+    <div class="col-xs-12">
       <p class="step-info">Congratulations! You have successfully setup and configured your cloud hosted domain.</p>
     </div>
   </div>
 
-  <div id="visit-domain-row" class="row">
-    <div class="col-md-12">
-      <label><input id="go-to-domain" class="form-check-input" type="checkbox"> Visit domain in VR now</label>
-    </div>
-  </div>
-
   <dl class="row">
-    <dd class="col-md-5 col-md-offset-7">
-      <button id="explore-settings" type="button" class="btn btn-md btn-block btn-primary">Explore all domain server settings</button>
-    </dd>
+    <div class="col-xs-12">
+      <div class="pull-right">
+        <div id="visit-domain-checkbox">
+          <label><input id="go-to-domain" class="form-check-input" type="checkbox"> Visit domain in VR now</label>
+        </div>
+        <button id="explore-settings" type="button" class="btn btn-md btn-primary">Explore all domain server settings</button>
+      </div>
+    </div>
   </dl>
 </div>
 

domain-server/resources/web/wizard/js/wizard.js

@@ -2,6 +2,8 @@ var Metaverse = {
   accessToken: null
 }
 
+var currentStepNumber;
+
 $(document).ready(function(){
   Strings.ADD_PLACE_NOT_CONNECTED_MESSAGE = "You must have an access token to query your High Fidelity places.<br><br>" +
     "Please go back and connect your account.";
@@ -9,6 +11,22 @@ $(document).ready(function(){
   $('#connect-account-btn').attr('href', URLs.METAVERSE_URL + "/user/tokens/new?for_domain_server=true");
 
   $('[data-toggle="tooltip"]').tooltip();
+  
+  $('.perms-link').on('click', function() {
+    var modal_body = '<div>';
+    modal_body += '<b>None</b> - No one will have permissions. Only you and the users your have given administrator privileges to will have permissions.</br></br>';
+    modal_body += '<b>Friends</b> - Users who are your Friends in High Fidelity.</br></br>';
+    modal_body += '<b>Users logged into High Fidelity</b> - Users who are currently logged into High Fidelity.</br></br>';
+    modal_body += '<b>Everyone</b> - Anyone who uses High Fidelity.';
+    modal_body += '</div>';
+
+    dialog = bootbox.dialog({
+      title: "User definition",
+      message: modal_body,
+      closeButton: true
+    });
+    return false;
+  });
 
   $('body').on('click', '.next-button', function() {
     goToNextStep();
@@ -56,6 +74,36 @@ $(document).ready(function(){
     exploreSettings();
   });
 
+  $('input[type=radio][name=connect-radio]').change(function() {
+    var inputs = $('input[type=radio][name=rez-radio]');
+    var disabled = [];
+
+    switch (this.value) {
+      case 'none':
+        disabled = inputs.splice(1);
+        break;
+      case 'friends':
+        disabled = inputs.splice(2);
+        break;
+      case 'logged-in':
+        disabled = inputs.splice(3);
+        break;
+      case 'everyone':
+        disabled = inputs.splice(4);
+        break;
+    }
+
+    $.each(inputs, function() {
+      $(this).prop('disabled', false);
+    });
+    $.each(disabled, function() {
+      if ($(this).prop('checked')) {
+        $(inputs.last()).prop('checked', true);
+      }
+      $(this).prop('disabled', true);
+    });
+  });
+
   reloadSettings(function(success) {
     if (success) {
       getDomainFromAPI();
@@ -73,12 +121,12 @@ $(document).ready(function(){
 });
 
 function setupWizardSteps() {
-  var stepsCompleted = Settings.data.values.wizard.steps_completed;
+  currentStepNumber = Settings.data.values.wizard.steps_completed;
   var steps = null;
 
   if (Settings.data.values.wizard.cloud_domain) {
     $('.desktop-only').remove();
-    $('.wizard-step').find('.back-button').hide();
+    $('.wizard-step:first').find('.back-button').hide();
 
     steps = $('.wizard-step');
     $(steps).each(function(i) {
@@ -86,7 +134,7 @@ function setupWizardSteps() {
     });
 
     $('#permissions-description').html('You <span id="username-display"></span>have been assigned administrator privileges to this domain.');
-    $('#admin-description').html('Add more High Fidelity usernames to grant administrator privileges.');
+    $('#admin-description').html('Add more High Fidelity usernames');
   } else {
     $('.cloud-only').remove();
     $('#save-permissions').text("Finish");
@@ -96,12 +144,12 @@ function setupWizardSteps() {
       $(this).children(".step-title").text("Step " + (i + 1) + " of " + steps.length);
     });
 
-    if (stepsCompleted == 0) {
+    if (currentStepNumber == 0) {
       $('#skip-wizard-button').show();
     }
   }
 
-  var currentStep = steps[stepsCompleted];
+  var currentStep = steps[currentStepNumber];
   $(currentStep).show();
 }
 
@@ -204,7 +252,7 @@ function goToNextStep() {
     currentStep.hide();
     nextStep.show();
 
-    var currentStepNumber = parseInt(Settings.data.values.wizard.steps_completed) + 1;
+    currentStepNumber += 1;
 
     postSettings({
       "wizard": {
@@ -233,7 +281,7 @@ function goToPreviousStep() {
     currentStep.hide();
     previousStep.show();
 
-    var currentStepNumber = parseInt(Settings.data.values.wizard.steps_completed) - 1;
+    currentStepNumber -= 1;
 
     postSettings({
       "wizard": {
@@ -439,7 +487,7 @@ function saveUsernamePassword() {
     return;
   }
 
-  var currentStepNumber = parseInt(Settings.data.values.wizard.steps_completed) + 1;
+  currentStepNumber += 1;
 
   var formJSON = {
     "security": {

interface/resources/qml/controls-uit/Key.qml

@@ -5,10 +5,16 @@ Item {
     id: keyItem
     width: 45
     height: 50
+
+    property int contentPadding: 4
     property string glyph: "a"
     property bool toggle: false   // does this button have the toggle behaivor?
     property bool toggled: false  // is this button currently toggled?
     property alias mouseArea: mouseArea1
+    property alias fontFamily: letter.font.family;
+    property alias fontPixelSize: letter.font.pixelSize
+    property alias verticalAlignment: letter.verticalAlignment
+    property alias letterAnchors: letter.anchors
 
     function resetToggledMode(mode) {
         toggled = mode;
@@ -105,14 +111,8 @@ Item {
         color: "#121212"
         radius: 2
         border.color: "#00000000"
-        anchors.right: parent.right
-        anchors.rightMargin: 4
-        anchors.left: parent.left
-        anchors.leftMargin: 4
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 4
-        anchors.top: parent.top
-        anchors.topMargin: 4
+        anchors.fill: parent
+        anchors.margins: contentPadding
     }
 
     Text {

interface/resources/qml/controls-uit/Keyboard.qml

@@ -8,7 +8,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-import QtQuick 2.0
+import QtQuick 2.7
+import QtGraphicalEffects 1.0
 import "."
 
 Rectangle {
@@ -55,6 +56,8 @@ Rectangle {
             return ">";
         } else if (str === "/") {
             return "?";
+        } else if (str === "-") {
+            return "_";
         } else {
             return str.toUpperCase(str);
         }
@@ -67,6 +70,8 @@ Rectangle {
             return ".";
         } else if (str === "?") {
             return "/";
+        } else if (str === "_") {
+            return "-";
         } else {
             return str.toLowerCase(str);
         }
@@ -85,7 +90,7 @@ Rectangle {
 
     onShiftModeChanged: {
         forEachKey(function (key) {
-            if (/[a-z]/i.test(key.glyph)) {
+            if (/[a-z-_]/i.test(key.glyph)) {
                 if (shiftMode) {
                     key.glyph = keyboardBase.toUpper(key.glyph);
                 } else {
@@ -112,8 +117,6 @@ Rectangle {
     }
 
     Rectangle {
-        y: 0
-        x: 0
         height: showMirrorText ? mirrorTextHeight : 0
         width: keyboardWidth
         color: "#252525"
@@ -122,13 +125,18 @@ Rectangle {
         TextInput {
             id: mirrorText
             visible: showMirrorText
-            FontLoader { id: ralewaySemiBold; source: "../../fonts/Raleway-SemiBold.ttf"; }
-            font.family: ralewaySemiBold.name
-            font.pointSize: 13.5
+            FontLoader { id: font; source: "../../fonts/FiraSans-Regular.ttf"; }
+            font.family: font.name
+            font.pixelSize: 20
             verticalAlignment: Text.AlignVCenter
             horizontalAlignment: Text.AlignHCenter
-            color: "#FFFFFF";
-            anchors.fill: parent
+            color: "#00B4EF";
+            anchors.left: parent.left
+            anchors.leftMargin: 10
+            anchors.right: parent.right
+            anchors.top: parent.top
+            anchors.bottom: parent.bottom
+
             wrapMode: Text.WordWrap
             readOnly: false // we need this to allow control to accept QKeyEvent
             selectByMouse: false
@@ -140,16 +148,15 @@ Rectangle {
                     event.accepted = true;
                 }
             }
-        }
 
-        MouseArea { // ... and we need this mouse area to prevent mirrorText from getting mouse events to ensure it will never get focus
-            anchors.fill: parent
+            MouseArea { // ... and we need this mouse area to prevent mirrorText from getting mouse events to ensure it will never get focus
+                anchors.fill: parent
+            }
         }
     }
 
     Rectangle {
         id: keyboardRect
-        x: 0
         y: showMirrorText ? mirrorTextHeight : 0
         width: keyboardWidth
         height: raisedHeight
@@ -158,6 +165,8 @@ Rectangle {
         anchors.bottom: parent.bottom
         anchors.bottomMargin: 0
 
+        FontLoader { id: hiFiGlyphs; source: pathToFonts + "fonts/hifi-glyphs.ttf"; }
+
         Column {
             id: columnAlpha
             width: keyboardWidth
@@ -221,7 +230,7 @@ Rectangle {
                 Key { width: 43; glyph: "b"; }
                 Key { width: 43; glyph: "n"; }
                 Key { width: 43; glyph: "m"; }
-                Key { width: 43; glyph: "_"; }
+                Key { width: 43; glyph: "-"; }
                 Key { width: 43; glyph: "/"; }
                 Key { width: 43; glyph: "?"; }
             }
@@ -240,8 +249,13 @@ Rectangle {
                 Key { width: 231; glyph: " "; }
                 Key { width: 43; glyph: ","; }
                 Key { width: 43; glyph: "."; }
-                Key { width: 43; glyph: "\u276C"; }
-                Key { width: 43; glyph: "\u276D"; }
+                Key {
+                    fontFamily: hiFiGlyphs.name;
+                    fontPixelSize: 48;
+                    letterAnchors.topMargin: -4;
+                    verticalAlignment: Text.AlignVCenter;
+                    width: 86; glyph: "\ue02b";
+                }
             }
         }
 
@@ -328,8 +342,13 @@ Rectangle {
                 Key { width: 231; glyph: " "; }
                 Key { width: 43; glyph: ","; }
                 Key { width: 43; glyph: "."; }
-                Key { width: 43; glyph: "\u276C"; }
-                Key { width: 43; glyph: "\u276D"; }
+                Key {
+                    fontFamily: hiFiGlyphs.name;
+                    fontPixelSize: 48;
+                    letterAnchors.topMargin: -4;
+                    verticalAlignment: Text.AlignVCenter;
+                    width: 86; glyph: "\ue02b";
+                }
             }
         }
     }

interface/resources/qml/controls/FlickableWebViewCore.qml

@@ -27,6 +27,12 @@ Item {
         id: hifi
     }
 
+    function unfocus() {
+        webViewCore.runJavaScript("if (document.activeElement) document.activeElement.blur();", function(result) {
+            console.log('unfocus completed: ', result);
+        });
+    }
+
     function onLoadingChanged(loadRequest) {
         if (WebEngineView.LoadStartedStatus === loadRequest.status) {
 

interface/resources/qml/controls/TabletWebScreen.qml

@@ -10,6 +10,11 @@ Item {
     property alias urlTag: webroot.urlTag
     property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
     property bool keyboardRaised: false
+    onKeyboardRaisedChanged: {
+        if(!keyboardRaised) {
+            webroot.unfocus();
+        }
+    }
     property bool punctuationMode: false
 
     // FIXME - Keyboard HMD only: Make Interface either set keyboardRaised property directly in OffscreenQmlSurface

interface/resources/qml/controls/TabletWebView.qml

@@ -15,6 +15,11 @@ Item {
     property string scriptURL
     property bool keyboardEnabled: false
     property bool keyboardRaised: false
+    onKeyboardRaisedChanged: {
+        if(!keyboardRaised) {
+            webroot.unfocus();
+        }
+    }
     property bool punctuationMode: false
     property bool passwordField: false
     property bool isDesktop: false

interface/resources/qml/controls/WebView.qml

@@ -12,6 +12,11 @@ Item {
     property alias urlTag: webroot.urlTag
     property bool keyboardEnabled: true  // FIXME - Keyboard HMD only: Default to false
     property bool keyboardRaised: false
+    onKeyboardRaisedChanged: {
+        if(!keyboardRaised) {
+            webroot.unfocus();
+        }
+    }
     property bool punctuationMode: false
     property bool passwordField: false
     property alias flickable: webroot.interactive

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

@@ -476,9 +476,7 @@ Rectangle {
                             commerce.buy(itemId, itemPrice, true);
                         }
                     } else {
-                        if (urlHandler.canHandleUrl(itemHref)) {
-                            urlHandler.handleUrl(itemHref);
-                        }
+                        sendToScript({method: 'checkout_rezClicked', itemHref: root.itemHref, isWearable: root.isWearable});
                     }
                 }
             }

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

@@ -113,21 +113,6 @@ Rectangle {
         }
     }
 
-    onVisibleChanged: {
-        if (!visible) {
-            titleBarText.text = "Certificate";
-            popText.text = "PROOF OF PURCHASE";
-            root.certificateId = "";
-            root.itemName = "--";
-            root.itemOwner = "--";
-            root.itemEdition = "--";
-            root.dateOfPurchase = "--";
-            root.marketplaceUrl = "";
-            root.isMyCert = false;
-            errorText.text = "";
-        }
-    }
-
     // This object is always used in a popup.
     // This MouseArea is used to prevent a user from being
     //     able to click on a button/mouseArea underneath the popup.
@@ -420,6 +405,18 @@ Rectangle {
             case 'inspectionCertificate_setCertificateId':
                 root.certificateId = message.certificateId;
             break;
+            case 'inspectionCertificate_resetCert':
+                titleBarText.text = "Certificate";
+                popText.text = "PROOF OF PURCHASE";
+                root.certificateId = "";
+                root.itemName = "--";
+                root.itemOwner = "--";
+                root.itemEdition = "--";
+                root.dateOfPurchase = "--";
+                root.marketplaceUrl = "";
+                root.isMyCert = false;
+                errorText.text = "";
+            break;
             default:
                 console.log('Unrecognized message from marketplaces.js:', JSON.stringify(message));
         }

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

@@ -346,9 +346,7 @@ Item {
             enabled: (root.canRezCertifiedItems || root.isWearable) && root.purchaseStatus !== "invalidated";
             
             onClicked: {
-                if (urlHandler.canHandleUrl(root.itemHref)) {
-                    urlHandler.handleUrl(root.itemHref);
-                }
+                sendToPurchases({method: 'purchases_rezClicked', itemHref: root.itemHref, isWearable: root.isWearable});
                 rezzedNotifContainer.visible = true;
                 rezzedNotifContainerTimer.start();
             }

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

@@ -442,6 +442,8 @@ Rectangle {
                     onSendToPurchases: {
                         if (msg.method === 'purchases_itemInfoClicked') {
                             sendToScript({method: 'purchases_itemInfoClicked', itemId: itemId});
+                        } else if (msg.method === "purchases_rezClicked") {
+                            sendToScript({method: 'purchases_rezClicked', itemHref: itemHref, isWearable: isWearable});
                         } else if (msg.method === 'purchases_itemCertificateClicked') {
                             inspectionCertificate.visible = true;
                             inspectionCertificate.isLightbox = true;

interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml

@@ -32,6 +32,8 @@ Rectangle {
 
     color: hifi.colors.baseGray
 
+    property bool keyboardEnabled: HMD.active
+    property bool keyboardRaised: false
 
     LetterboxMessage {
         id: letterBoxMessage
@@ -380,7 +382,7 @@ Rectangle {
                     Component.onCompleted: scriptsModel.filterRegExp = new RegExp("^.*$", "i")
                     onActiveFocusChanged: {
                         // raise the keyboard
-                        keyboard.raised = activeFocus;
+                        root.keyboardRaised = activeFocus;
 
                         // scroll to the bottom of the content area.
                         if (activeFocus) {
@@ -481,7 +483,7 @@ Rectangle {
 
     HifiControls.Keyboard {
         id: keyboard
-        raised: false
+        raised: parent.keyboardEnabled && parent.keyboardRaised
         numeric: false
         anchors {
             bottom: parent.bottom

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

@@ -366,7 +366,7 @@ StackView {
 
         HifiControls.Keyboard {
             id: keyboard
-            raised: parent.keyboardEnabled
+            raised: parent.keyboardEnabled && parent.keyboardRaised
             numeric: parent.punctuationMode
             anchors {
                 bottom: parent.bottom

interface/src/Application.cpp

@@ -4441,7 +4441,7 @@ void Application::cameraModeChanged() {
 void Application::cameraMenuChanged() {
     auto menu = Menu::getInstance();
     if (menu->isOptionChecked(MenuOption::FullscreenMirror)) {
-        if (_myCamera.getMode() != CAMERA_MODE_MIRROR) {
+        if (!isHMDMode() && _myCamera.getMode() != CAMERA_MODE_MIRROR) {
             _myCamera.setMode(CAMERA_MODE_MIRROR);
             getMyAvatar()->reset(false, false, false); // to reset any active MyAvatar::FollowHelpers
         }
@@ -7271,6 +7271,10 @@ void Application::updateDisplayMode() {
         menu->setIsOptionChecked(MenuOption::FirstPerson, true);
         cameraMenuChanged();
     }
+    
+    // Remove the mirror camera option from menu if in HMD mode
+    auto mirrorAction = menu->getActionForOption(MenuOption::FullscreenMirror);
+    mirrorAction->setVisible(!isHmd);
 
     Q_ASSERT_X(_displayPlugin, "Application::updateDisplayMode", "could not find an activated display plugin");
 }

libraries/model/src/model/Haze.cpp

@@ -8,8 +8,8 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-#include <memory>
 
+#include <memory>
 #include "Haze.h"
 
 using namespace model;

libraries/render-utils/src/RenderDeferredTask.cpp

@@ -449,6 +449,11 @@ void CompositeHUD::run(const RenderContextPointer& renderContext) {
     assert(renderContext->args);
     assert(renderContext->args->_context);
 
+    // We do not want to render HUD elements in secondary camera
+    if (renderContext->args->_renderMode == RenderArgs::RenderMode::SECONDARY_CAMERA_RENDER_MODE) {
+        return;
+    }
+
     // Grab the HUD texture
     gpu::doInBatch(renderContext->args->_context, [&](gpu::Batch& batch) {
         if (renderContext->args->_hudOperator) {

libraries/ui/src/OffscreenUi.cpp

@@ -720,7 +720,7 @@ QString OffscreenUi::fileDialog(const QVariantMap& properties) {
         return QString();
     }
     qCDebug(uiLogging) << result.toString();
-    return result.toUrl().toLocalFile();
+    return result.toString();
 }
 
 ModalDialogListener* OffscreenUi::fileDialogAsync(const QVariantMap& properties) {

libraries/ui/src/ui/OffscreenQmlSurface.cpp

@@ -1038,6 +1038,7 @@ static const uint8_t BACKSPACE_SYMBOL[] = { 0xE2, 0x86, 0x90, 0x00 };
 static const uint8_t LEFT_ARROW[] = { 0xE2, 0x9D, 0xAC, 0x00 };
 static const uint8_t RIGHT_ARROW[] = { 0xE2, 0x9D, 0xAD, 0x00 };
 static const uint8_t RETURN_SYMBOL[] = { 0xE2, 0x8F, 0x8E, 0x00 };
+static const uint8_t COLLAPSE_KEYBOARD[] = { 0xEE, 0x80, 0xAB, 0x00 };
 static const char PUNCTUATION_STRING[] = "123";
 static const char ALPHABET_STRING[] = "abc";
 
@@ -1061,6 +1062,9 @@ void OffscreenQmlSurface::synthesizeKeyPress(QString key, QObject* targetOverrid
         if (equals(utf8Key, SHIFT_ARROW) || equals(utf8Key, NUMERIC_SHIFT_ARROW) ||
             equals(utf8Key, (uint8_t*)PUNCTUATION_STRING) || equals(utf8Key, (uint8_t*)ALPHABET_STRING)) {
             return;  // ignore
+        } else if (equals(utf8Key, COLLAPSE_KEYBOARD)) {
+            lowerKeyboard();
+            return;
         } else if (equals(utf8Key, BACKSPACE_SYMBOL)) {
             scanCode = Qt::Key_Backspace;
             keyString = "\x08";
@@ -1082,7 +1086,19 @@ void OffscreenQmlSurface::synthesizeKeyPress(QString key, QObject* targetOverrid
     }
 }
 
+void OffscreenQmlSurface::lowerKeyboard() {
+
+    QSignalBlocker blocker(_quickWindow);
+
+    if (_currentFocusItem) {
+        _currentFocusItem->setFocus(false);
+        setKeyboardRaised(_currentFocusItem, false);
+    }
+}
+
 void OffscreenQmlSurface::setKeyboardRaised(QObject* object, bool raised, bool numeric, bool passwordField) {
+    qCDebug(uiLogging) << "setKeyboardRaised: " << object << ", raised: " << raised << ", numeric: " << numeric << ", password: " << passwordField;
+
 #if Q_OS_ANDROID
     return;
 #endif
@@ -1117,6 +1133,10 @@ void OffscreenQmlSurface::setKeyboardRaised(QObject* object, bool raised, bool n
                     item->setProperty("passwordField", QVariant(passwordField));
                 }
 
+                if (raised) {
+                    item->setProperty("keyboardRaised", QVariant(!raised));
+                }
+
                 item->setProperty("keyboardRaised", QVariant(raised));
                 return;
             }

libraries/ui/src/ui/OffscreenQmlSurface.h

@@ -84,6 +84,7 @@ public:
 
     void setKeyboardRaised(QObject* object, bool raised, bool numeric = false, bool passwordField = false);
     Q_INVOKABLE void synthesizeKeyPress(QString key, QObject* targetOverride = nullptr);
+    Q_INVOKABLE void lowerKeyboard();
 
     using TextureAndFence = std::pair<uint32_t, void*>;
     // Checks to see if a new texture is available.  If one is, the function returns true and 

scripts/system/html/entityProperties.html

@@ -623,7 +623,7 @@
                         </div>
                     </div>
                 </fieldset>
-                <div class="zone-group zone-section haze-section property checkbox">
+                <!--div class="zone-group zone-section haze-section property checkbox">
                     <input type="checkbox" id="property-zone-haze-attenuate-keylight">
                     <label for="property-zone-haze-attenuate-keylight">Attenuate Keylight</label>
                 </div>
@@ -634,7 +634,7 @@
                         <div><label>Altitude<span class="unit">m</span></label><input type="number" id="property-zone-haze-keylight-altitude" 
                         min="-1000" max="50000" step="10"></div>
                     </div>
-                </fieldset>
+                </fieldset-->
            </fieldset>
             <fieldset class="minor">
                 <legend class="sub-section-header zone-group zone-section stage-section">

scripts/system/html/js/entityProperties.js

@@ -1069,9 +1069,9 @@ function loaded() {
 
                             elZoneHazeBackgroundBlend.value = properties.haze.hazeBackgroundBlend.toFixed(2);
 
-                            elZoneHazeAttenuateKeyLight.checked = properties.haze.hazeAttenuateKeyLight;
-                            elZoneHazeKeyLightRange.value = properties.haze.hazeKeyLightRange.toFixed(0);
-                            elZoneHazeKeyLightAltitude.value = properties.haze.hazeKeyLightAltitude.toFixed(0);
+//                            elZoneHazeAttenuateKeyLight.checked = properties.haze.hazeAttenuateKeyLight;
+//                            elZoneHazeKeyLightRange.value = properties.haze.hazeKeyLightRange.toFixed(0);
+//                            elZoneHazeKeyLightAltitude.value = properties.haze.hazeKeyLightAltitude.toFixed(0);
 
                             elZoneStageLatitude.value = properties.stage.latitude.toFixed(2);
                             elZoneStageLongitude.value = properties.stage.longitude.toFixed(2);
@@ -1533,9 +1533,9 @@ function loaded() {
 
         elZoneHazeBackgroundBlend.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeBackgroundBlend'));
 
-        elZoneHazeAttenuateKeyLight.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('haze', 'hazeAttenuateKeyLight'));
-        elZoneHazeKeyLightRange.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeKeyLightRange'));
-        elZoneHazeKeyLightAltitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeKeyLightAltitude'));
+//        elZoneHazeAttenuateKeyLight.addEventListener('change', createEmitGroupCheckedPropertyUpdateFunction('haze', 'hazeAttenuateKeyLight'));
+//        elZoneHazeKeyLightRange.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeKeyLightRange'));
+//        elZoneHazeKeyLightAltitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('haze', 'hazeKeyLightAltitude'));
 
         elZoneStageLatitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage', 'latitude'));
         elZoneStageLongitude.addEventListener('change', createEmitGroupNumberPropertyUpdateFunction('stage', 'longitude'));

scripts/system/marketplaces/marketplaces.js

@@ -128,6 +128,12 @@
         } else {
             ContextOverlay.isInMarketplaceInspectionMode = false;
         }
+
+        if (!onCommerceScreen) {
+            tablet.sendToQml({
+                method: 'inspectionCertificate_resetCert'
+            });
+        }
     }
 
     function openWallet() {
@@ -162,6 +168,106 @@
         }));
     }
 
+    var HALF_TREE_SCALE = 16384;
+    function getPositionToCreateEntity(extra) {
+        var CREATE_DISTANCE = 2;
+        var position;
+        var delta = extra !== undefined ? extra : 0;
+        if (Camera.mode === "entity" || Camera.mode === "independent") {
+            position = Vec3.sum(Camera.position, Vec3.multiply(Quat.getForward(Camera.orientation), CREATE_DISTANCE + delta));
+        } else {
+            position = Vec3.sum(MyAvatar.position, Vec3.multiply(Quat.getForward(MyAvatar.orientation), CREATE_DISTANCE + delta));
+            position.y += 0.5;
+        }
+
+        if (position.x > HALF_TREE_SCALE || position.y > HALF_TREE_SCALE || position.z > HALF_TREE_SCALE) {
+            return null;
+        }
+        return position;
+    }
+
+    function rezEntity(itemHref, isWearable) {
+        var success = Clipboard.importEntities(itemHref);
+
+        if (success) {
+            var VERY_LARGE = 10000;
+            var isLargeImport = Clipboard.getClipboardContentsLargestDimension() >= VERY_LARGE;
+            var position = Vec3.ZERO;
+            if (!isLargeImport) {
+                position = getPositionToCreateEntity(Clipboard.getClipboardContentsLargestDimension() / 2);
+            }
+            if (position !== null && position !== undefined) {
+                var pastedEntityIDs = Clipboard.pasteEntities(position);
+                if (!isLargeImport) {
+                    // The first entity in Clipboard gets the specified position with the rest being relative to it. Therefore, move
+                    // entities after they're imported so that they're all the correct distance in front of and with geometric mean
+                    // centered on the avatar/camera direction.
+                    var deltaPosition = Vec3.ZERO;
+                    var entityPositions = [];
+                    var entityParentIDs = [];
+
+                    var propType = Entities.getEntityProperties(pastedEntityIDs[0], ["type"]).type;
+                    var NO_ADJUST_ENTITY_TYPES = ["Zone", "Light", "ParticleEffect"];
+                    if (NO_ADJUST_ENTITY_TYPES.indexOf(propType) === -1) {
+                        var targetDirection;
+                        if (Camera.mode === "entity" || Camera.mode === "independent") {
+                            targetDirection = Camera.orientation;
+                        } else {
+                            targetDirection = MyAvatar.orientation;
+                        }
+                        targetDirection = Vec3.multiplyQbyV(targetDirection, Vec3.UNIT_Z);
+
+                        var targetPosition = getPositionToCreateEntity();
+                        var deltaParallel = HALF_TREE_SCALE;  // Distance to move entities parallel to targetDirection.
+                        var deltaPerpendicular = Vec3.ZERO;  // Distance to move entities perpendicular to targetDirection.
+                        for (var i = 0, length = pastedEntityIDs.length; i < length; i++) {
+                            var curLoopEntityProps = Entities.getEntityProperties(pastedEntityIDs[i], ["position", "dimensions",
+                                "registrationPoint", "rotation", "parentID"]);
+                            var adjustedPosition = adjustPositionPerBoundingBox(targetPosition, targetDirection,
+                                curLoopEntityProps.registrationPoint, curLoopEntityProps.dimensions, curLoopEntityProps.rotation);
+                            var delta = Vec3.subtract(adjustedPosition, curLoopEntityProps.position);
+                            var distance = Vec3.dot(delta, targetDirection);
+                            deltaParallel = Math.min(distance, deltaParallel);
+                            deltaPerpendicular = Vec3.sum(Vec3.subtract(delta, Vec3.multiply(distance, targetDirection)),
+                                deltaPerpendicular);
+                            entityPositions[i] = curLoopEntityProps.position;
+                            entityParentIDs[i] = curLoopEntityProps.parentID;
+                        }
+                        deltaPerpendicular = Vec3.multiply(1 / pastedEntityIDs.length, deltaPerpendicular);
+                        deltaPosition = Vec3.sum(Vec3.multiply(deltaParallel, targetDirection), deltaPerpendicular);
+                    }
+
+                    if (grid.getSnapToGrid()) {
+                        var firstEntityProps = Entities.getEntityProperties(pastedEntityIDs[0], ["position", "dimensions",
+                            "registrationPoint"]);
+                        var positionPreSnap = Vec3.sum(deltaPosition, firstEntityProps.position);
+                        position = grid.snapToSurface(grid.snapToGrid(positionPreSnap, false, firstEntityProps.dimensions,
+                                firstEntityProps.registrationPoint), firstEntityProps.dimensions, firstEntityProps.registrationPoint);
+                        deltaPosition = Vec3.subtract(position, firstEntityProps.position);
+                    }
+
+                    if (!Vec3.equal(deltaPosition, Vec3.ZERO)) {
+                        for (var editEntityIndex = 0, numEntities = pastedEntityIDs.length; editEntityIndex < numEntities; editEntityIndex++) {
+                            if (Uuid.isNull(entityParentIDs[editEntityIndex])) {
+                                Entities.editEntity(pastedEntityIDs[editEntityIndex], {
+                                    position: Vec3.sum(deltaPosition, entityPositions[editEntityIndex])
+                                });
+                            }
+                        }
+                    }
+                }
+
+                if (isActive) {
+                    selectionManager.setSelections(pastedEntityIDs);
+                }
+            } else {
+                Window.notifyEditError("Can't import entities: entities would be out of bounds.");
+            }
+        } else {
+            Window.notifyEditError("There was an error importing the entity file.");
+        }
+    }
+
     marketplaceButton.clicked.connect(onClick);
     tablet.screenChanged.connect(onScreenChanged);
     Entities.canWriteAssetsChanged.connect(onCanWriteAssetsChanged);
@@ -324,6 +430,10 @@
                     tablet.gotoWebScreen(MARKETPLACE_URL + '/items/' + itemId, MARKETPLACES_INJECT_SCRIPT_URL);
                 }
                 break;
+            case 'checkout_rezClicked':
+            case 'purchases_rezClicked':
+                rezEntity(message.itemHref, message.isWearable);
+                break;
             case 'header_marketplaceImageClicked':
             case 'purchases_backClicked':
                 tablet.gotoWebScreen(message.referrerURL, MARKETPLACES_INJECT_SCRIPT_URL);