Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 13:09:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #15642 from huffman/feat/ignore-pick-intersection-in-create

Browse source 
BUGZ-403: Add ignorePickIntersection to Create
This commit is contained in:
Dante Ruiz 2019-05-29 10:53:44 -07:00 committed by GitHub
commit 022aae60cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/system/assets/data/createAppTooltips.json
View file

@ -492,6 +492,9 @@
"canCastShadow": { "canCastShadow": {
"tooltip": "If enabled, this geometry of this entity casts shadows when a shadow-casting light source shines on it." "tooltip": "If enabled, this geometry of this entity casts shadows when a shadow-casting light source shines on it."
}, },
"ignorePickIntersection": {
"tooltip": "If enabled, this entity will not be considered for ray picks, and will also not occlude other entities when picking."
},
"parentID": { "parentID": {
"tooltip": "The ID of the entity or avatar that this entity is parented to." "tooltip": "The ID of the entity or avatar that this entity is parented to."
}, },

7
scripts/system/html/js/entityProperties.js
View file

@ -1329,7 +1329,7 @@ const GROUPS = [
propertyID: "grab.grabFollowsController", propertyID: "grab.grabFollowsController",
}, },
{ {
label: "Cast shadows", label: "Cast Shadows",
type: "bool", type: "bool",
propertyID: "canCastShadow", propertyID: "canCastShadow",
}, },
@ -1339,6 +1339,11 @@ const GROUPS = [
propertyID: "href", propertyID: "href",
placeholder: "URL", placeholder: "URL",
}, },
{
label: "Ignore Pick Intersection",
type: "bool",
propertyID: "ignorePickIntersection",
},
{ {
label: "Script", label: "Script",
type: "string", type: "string",