From e2dc86261ebdb6e9d43a30cb7e7e092f6eacb3f7 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Fri, 25 Jan 2019 05:16:04 +0100 Subject: [PATCH 1/3] add missing Material Entity tooltips --- scripts/system/assets/data/createAppTooltips.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/system/assets/data/createAppTooltips.json b/scripts/system/assets/data/createAppTooltips.json index bf3ff3f324..2de310e955 100644 --- a/scripts/system/assets/data/createAppTooltips.json +++ b/scripts/system/assets/data/createAppTooltips.json @@ -370,6 +370,9 @@ "priority": { "tooltip": "The priority of the material, where a larger number means higher priority. Original materials = 0." }, + "materialMappingMode": { + "tooltip": "How the material is mapped to the entity. If set to \"UV space\", then the material will be applied with the target entities their UV coordinates. If set to \"3D Projected\", then the 3D transform of the material entity will be used." + }, "materialMappingPos": { "tooltip": "The offset position of the bottom left of the material within the parent's UV space." }, @@ -379,6 +382,9 @@ "materialMappingRot": { "tooltip": "How much to rotate the material within the parent's UV-space, in degrees." }, + "materialRepeat": { + "tooltip": "If enabled, the material will repeat." + }, "followCamera": { "tooltip": "If enabled, the grid is always visible even as the camera moves to another position." }, From bfb93e67b7a396e9e4ac554d66c7025ed0be6c51 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Mon, 28 Jan 2019 16:46:35 +0100 Subject: [PATCH 2/3] materialRepeat will clamp when disabled. --- scripts/system/assets/data/createAppTooltips.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/assets/data/createAppTooltips.json b/scripts/system/assets/data/createAppTooltips.json index 2de310e955..35ef36ed58 100644 --- a/scripts/system/assets/data/createAppTooltips.json +++ b/scripts/system/assets/data/createAppTooltips.json @@ -383,7 +383,7 @@ "tooltip": "How much to rotate the material within the parent's UV-space, in degrees." }, "materialRepeat": { - "tooltip": "If enabled, the material will repeat." + "tooltip": "If enabled, the material will repeat, otherwise it will clamp." }, "followCamera": { "tooltip": "If enabled, the grid is always visible even as the camera moves to another position." From b75c4ae3b694110c0ba27d6149ced9fb6868abd6 Mon Sep 17 00:00:00 2001 From: Thijs Wenker Date: Mon, 28 Jan 2019 20:26:04 +0100 Subject: [PATCH 3/3] fix spelling --- scripts/system/assets/data/createAppTooltips.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/assets/data/createAppTooltips.json b/scripts/system/assets/data/createAppTooltips.json index 35ef36ed58..4c78da7306 100644 --- a/scripts/system/assets/data/createAppTooltips.json +++ b/scripts/system/assets/data/createAppTooltips.json @@ -371,7 +371,7 @@ "tooltip": "The priority of the material, where a larger number means higher priority. Original materials = 0." }, "materialMappingMode": { - "tooltip": "How the material is mapped to the entity. If set to \"UV space\", then the material will be applied with the target entities their UV coordinates. If set to \"3D Projected\", then the 3D transform of the material entity will be used." + "tooltip": "How the material is mapped to the entity. If set to \"UV space\", then the material will be applied with the target entity's UV coordinates. If set to \"3D Projected\", then the 3D transform of the material entity will be used." }, "materialMappingPos": { "tooltip": "The offset position of the bottom left of the material within the parent's UV space."