From eeceec35d6deca45fc78e348989fb9b87b05da4e Mon Sep 17 00:00:00 2001 From: David Rowe Date: Wed, 6 Nov 2019 12:22:45 +1300 Subject: [PATCH 1/4] Fix entities list "filter to frustum" button --- scripts/system/create/entityList/entityList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/create/entityList/entityList.js b/scripts/system/create/entityList/entityList.js index 06e100f457..4146d11522 100644 --- a/scripts/system/create/entityList/entityList.js +++ b/scripts/system/create/entityList/entityList.js @@ -177,7 +177,7 @@ EntityListTool = function(shouldUseEditTabletApp) { var cameraPosition = Camera.position; PROFILE("getMultipleProperties", function () { - var multipleProperties = Entities.getMultipleEntityProperties(ids, ['name', 'type', 'locked', + var multipleProperties = Entities.getMultipleEntityProperties(ids, ['position', 'name', 'type', 'locked', 'visible', 'renderInfo', 'modelURL', 'materialURL', 'imageURL', 'script', 'certificateID', 'skybox.url', 'ambientLight.url']); for (var i = 0; i < multipleProperties.length; i++) { From 4173cc46e273da0f65ce789f454521340016e540 Mon Sep 17 00:00:00 2001 From: Rebecca Stankus Date: Wed, 6 Nov 2019 14:11:17 -0800 Subject: [PATCH 2/4] Made web entities not grabbable by default --- scripts/system/create/edit.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js index c57f4bae50..a036cf384d 100644 --- a/scripts/system/create/edit.js +++ b/scripts/system/create/edit.js @@ -561,7 +561,8 @@ var toolBar = (function () { if (!properties.grab) { properties.grab = {}; if (Menu.isOptionChecked(MENU_CREATE_ENTITIES_GRABBABLE) && - !(properties.type === "Zone" || properties.type === "Light" || properties.type === "ParticleEffect")) { + !(properties.type === "Zone" || properties.type === "Light" + || properties.type === "ParticleEffect" || properties.type === "Web")) { properties.grab.grabbable = true; } else { properties.grab.grabbable = false; From fea65133b4031cbeec1312c8f2ce7bce3fa5b323 Mon Sep 17 00:00:00 2001 From: Nex-Pro Date: Fri, 8 Nov 2019 12:51:00 +0000 Subject: [PATCH 3/4] Update WindowScriptingInterface.h replace "model" with "modal" --- interface/src/scripting/WindowScriptingInterface.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h index 341b012c2d..f3e9dea45f 100644 --- a/interface/src/scripting/WindowScriptingInterface.h +++ b/interface/src/scripting/WindowScriptingInterface.h @@ -206,7 +206,7 @@ public slots: void browseAsync(const QString& title = "", const QString& directory = "", const QString& nameFilter = ""); /**jsdoc - * Prompts the user to specify the path and name of a file to save to. Displays a model dialog that navigates the directory + * Prompts the user to specify the path and name of a file to save to. Displays a modal dialog that navigates the directory * tree and allows the user to type in a file name. * @function Window.save * @param {string} [title=""] - The title to display at the top of the dialog. @@ -222,7 +222,7 @@ public slots: QScriptValue save(const QString& title = "", const QString& directory = "", const QString& nameFilter = ""); /**jsdoc - * Prompts the user to specify the path and name of a file to save to. Displays a non-model dialog that navigates the + * Prompts the user to specify the path and name of a file to save to. Displays a non-modal dialog that navigates the * directory tree and allows the user to type in a file name. A {@link Window.saveFileChanged|saveFileChanged} signal is * emitted when a file is specified; no signal is emitted if the user cancels the dialog. * @function Window.saveAsync From 1013497bcb58f848deaa3591b6e475a78afdd8a9 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Fri, 8 Nov 2019 16:38:07 +0100 Subject: [PATCH 4/4] Fixes the hand controllers in the latest Oculus Quest version --- android/apps/questInterface/src/main/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/android/apps/questInterface/src/main/AndroidManifest.xml b/android/apps/questInterface/src/main/AndroidManifest.xml index a5de47bdce..27cc18072b 100644 --- a/android/apps/questInterface/src/main/AndroidManifest.xml +++ b/android/apps/questInterface/src/main/AndroidManifest.xml @@ -15,6 +15,7 @@ +