Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-07 10:02:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged of "screenshare" and requested changes.

Browse source 
1- Update some tooltips (changed "Set the" for "The")
for Lines: 9, 18, 24, 215, 325, 329, 332, 335, 611

2- Include merge for conflict (not detected by Github) for "screenshare" attribute

3- Include tooltip for "renderWithZones" attribute (to avoid another rework on this file for PR#274) This includes some additional tooltip update done after PR215 for PR274 (no impact on functional)
This commit is contained in:
Alezia Kurdis 2020-05-07 22:44:35 -04:00 committed by GitHub
parent a94ed7f6c1
commit 67578a361e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scripts/system/create/assets/data/createAppTooltips.json
View file

@ -6,7 +6,7 @@
"tooltip": "The color of this entity."
},
"shapeAlpha": {
"tooltip": "Set the opacity of the entity between 0.0 fully transparent and 1.0 completely opaque."
"tooltip": "The opacity of the entity between 0.0 fully transparent and 1.0 completely opaque."
},
"text": {
"tooltip": "The text to display on the entity."
@ -15,13 +15,13 @@
"tooltip": "The color of the text."
},
"textAlpha": {
"tooltip": "Set the opacity of the text between 0.0 fully transparent and 1.0 completely opaque."
"tooltip": "The opacity of the text between 0.0 fully transparent and 1.0 completely opaque."
},
"backgroundColor": {
"tooltip": "The color of the background."
},
"backgroundAlpha": {
"tooltip": "Set the opacity of the background between 0.0 fully transparent and 1.0 completely opaque."
"tooltip": "The opacity of the background between 0.0 fully transparent and 1.0 completely opaque."
},
"lineHeight": {
"tooltip": "The height of each line of text. This determines the size of the text."
@ -162,6 +162,9 @@
"avatarPriority": {
"tooltip": "Alter Avatars' update priorities."
},
"screenshare": {
"tooltip": "Enable screen-sharing within this zone"
},
"modelURL": {
"tooltip": "A mesh model from an FBX or OBJ file."
},
@ -212,7 +215,7 @@
"jsPropertyName": "color"
},
"imageAlpha": {
"tooltip": "Set the opacity of the image between 0.0 fully transparent and 1.0 completely opaque."
"tooltip": "The opacity of the image between 0.0 fully transparent and 1.0 completely opaque."
},
"emissive": {
"tooltip": "If enabled, the image will display at full brightness."
@ -319,17 +322,17 @@
"tooltip": "The spread in color that each particle is given, resulting in a variety of colors."
},
"particleAlphaTriple": {
"tooltip": "Set the opacity of the each particle between 0.0 fully transparent and 1.0 completely opaque.",
"tooltip": "The opacity of each particle between 0.0 fully transparent and 1.0 completely opaque.",
"jsPropertyName": "alpha"
},
"alpha": {
"tooltip": "Set the opacity of the each particle between 0.0 fully transparent and 1.0 completely opaque."
"tooltip": "The opacity of each particle between 0.0 fully transparent and 1.0 completely opaque."
},
"alphaStart": {
"tooltip": "Set the initial opacity level of the each particle between 0.0 fully transparent and 1.0 completely opaque."
"tooltip": "The initial opacity level of each particle between 0.0 fully transparent and 1.0 completely opaque."
},
"alphaFinish": {
"tooltip": "Set the final opacity level of the each particle between 0.0 fully transparent and 1.0 completely opaque."
"tooltip": "The final opacity level of each particle between 0.0 fully transparent and 1.0 completely opaque."
},
"alphaSpread": {
"tooltip": "The spread in opacity that each particle is given, resulting in a variety of opacity levels."
@ -595,6 +598,9 @@
"primitiveMode": {
"tooltip": "The mode in which to draw an entity, either \"Solid\" or \"Wireframe\"."
},
"renderWithZones": {
"tooltip": "If set, this entity will only render when your avatar is inside of a zone in this list."
},
"groupCulled": {
"tooltip": "If false, individual pieces of the entity may be culled by the render engine. If true, either the entire entity will be culled, or it won't at all."
},
@ -602,7 +608,7 @@
"tooltip": "The tint of the web entity."
},
"webAlpha": {
"tooltip": "Set the opacity of the web entity between 0.0 fully transparent and 1.0 completely opaque."
"tooltip": "The opacity of the web entity between 0.0 fully transparent and 1.0 completely opaque."
},
"maxFPS": {
"tooltip": "The FPS at which to render the web entity. Higher values will have a performance impact."