From cba0b295e8f5ef8ca57e63dc30b8a611d24e66bc Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zmp@umich.edu>
Date: Mon, 23 Jan 2017 15:09:08 -0500
Subject: [PATCH 1/4] connect audio injector signal to scripting

---
 libraries/script-engine/src/ScriptAudioInjector.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/script-engine/src/ScriptAudioInjector.cpp b/libraries/script-engine/src/ScriptAudioInjector.cpp
index 2ec30ad4dd..c0ad2debd9 100644
--- a/libraries/script-engine/src/ScriptAudioInjector.cpp
+++ b/libraries/script-engine/src/ScriptAudioInjector.cpp
@@ -32,7 +32,7 @@ void injectorFromScriptValue(const QScriptValue& object, ScriptAudioInjector*& o
 ScriptAudioInjector::ScriptAudioInjector(AudioInjector* injector) :
     _injector(injector)
 {
-    
+    QObject::connect(injector, &AudioInjector::finished, this, &ScriptAudioInjector::finished);
 }
 
 ScriptAudioInjector::~ScriptAudioInjector() {

From d108fabd0b9ff64165bcc8d3823546ae9690c458 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 23 Jan 2017 13:56:48 -0800
Subject: [PATCH 2/4] Update the name of the collision shapes used in edit.js
 properties

Update the names to be consistent with what is shown on the add model
dialog.
---
 scripts/system/html/entityProperties.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/system/html/entityProperties.html b/scripts/system/html/entityProperties.html
index 1de59ad135..63131bb155 100644
--- a/scripts/system/html/entityProperties.html
+++ b/scripts/system/html/entityProperties.html
@@ -328,13 +328,13 @@
             <div class="model-group model-section zone-section property dropdown">
                 <label>Collision shape type</label>
                 <select name="SelectShapeType" id="property-shape-type">
-                    <option value="none">None</option>
+                    <option value="none">No Collision</option>
                     <option value="box">Box</option>
                     <option value="sphere">Sphere</option>
                     <option value="compound">Compound</option>
-                    <option value="simple-hull">One Hull</option>
-                    <option value="simple-compound">Hull Per Submesh</option>
-                    <option value="static-mesh">Static Mesh</option>
+                    <option value="simple-hull">Basic - Whole model</option>
+                    <option value="simple-compound">Good - Sub-meshes</option>
+                    <option value="static-mesh">Exact - All polygons (non-dynamic only)</option>
                 </select>
             </div>
             <div class="model-group model-section zone-section property url ">

From f6d5a59c8ae2b4a82259a846d7b15f3c537be53b Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 23 Jan 2017 14:18:56 -0800
Subject: [PATCH 3/4] Fix width of edit.js dropdown to accomodate collision
 options

---
 scripts/system/html/css/edit-style.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css
index 91138e41ec..251d0a2d75 100644
--- a/scripts/system/html/css/edit-style.css
+++ b/scripts/system/html/css/edit-style.css
@@ -593,7 +593,7 @@ hr {
 .dropdown dl {
     font-family: FiraSans-SemiBold;
     font-size: 15px;
-    width: 172px;
+    width: 292px;
     height: 28px;
     padding: 0 28px 0 12px;
     color: #afafaf;
@@ -645,7 +645,7 @@ hr {
 .dropdown li {
     list-style-type: none;
     padding: 3px 0 1px 12px;
-    width: 200px;
+    width: 320px;
     height: auto;
     font-family: FiraSans-SemiBold;
     font-size: 15px;

From a1962e274d2cb6b41dcd51002f897bbbbc3bd670 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 23 Jan 2017 14:35:16 -0800
Subject: [PATCH 4/4] Fix rescale for 0.x values

---
 scripts/system/edit.js                     | 2 +-
 scripts/system/html/js/entityProperties.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index ad04c8b139..91e43ebb9a 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -1556,7 +1556,7 @@ var PropertiesTool = function (opts) {
                     Camera.cameraEntity = selectionManager.selections[0];
                 }
             } else if (data.action === "rescaleDimensions") {
-                var multiplier = data.percentage / 100;
+                var multiplier = data.percentage / 100.0;
                 if (selectionManager.hasSelection()) {
                     selectionManager.saveProperties();
                     for (i = 0; i < selectionManager.selections.length; i++) {
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 4fe13196f3..3c155d83ea 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -1392,7 +1392,7 @@ function loaded() {
             EventBridge.emitWebEvent(JSON.stringify({
                 type: "action",
                 action: "rescaleDimensions",
-                percentage: parseInt(elRescaleDimensionsPct.value),
+                percentage: parseFloat(elRescaleDimensionsPct.value),
             }));
         });
         elReloadScriptButton.addEventListener("click", function() {