Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 19:03:07 +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
This commit is contained in:
Alezia Kurdis 2020-05-07 22:46:35 -04:00 committed by GitHub
parent 91d234589e
commit 95562f7e23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@
"tooltip": "The color of this entity." "tooltip": "The color of this entity."
}, },
"shapeAlpha": { "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": { "text": {
"tooltip": "The text to display on the entity." "tooltip": "The text to display on the entity."
@ -15,13 +15,13 @@
"tooltip": "The color of the text." "tooltip": "The color of the text."
}, },
"textAlpha": { "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": { "backgroundColor": {
"tooltip": "The color of the background." "tooltip": "The color of the background."
}, },
"backgroundAlpha": { "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": { "lineHeight": {
"tooltip": "The height of each line of text. This determines the size of the text." "tooltip": "The height of each line of text. This determines the size of the text."
@ -162,6 +162,9 @@
"avatarPriority": { "avatarPriority": {
"tooltip": "Alter Avatars' update priorities." "tooltip": "Alter Avatars' update priorities."
}, },
"screenshare": {
"tooltip": "Enable screen-sharing within this zone"
},
"modelURL": { "modelURL": {
"tooltip": "A mesh model from an FBX or OBJ file." "tooltip": "A mesh model from an FBX or OBJ file."
}, },
@ -212,7 +215,7 @@
"jsPropertyName": "color" "jsPropertyName": "color"
}, },
"imageAlpha": { "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": { "emissive": {
"tooltip": "If enabled, the image will display at full brightness." "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." "tooltip": "The spread in color that each particle is given, resulting in a variety of colors."
}, },
"particleAlphaTriple": { "particleAlphaTriple": {
"tooltip": "Set the opacity of 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" "jsPropertyName": "alpha"
}, },
"alpha": { "alpha": {
"tooltip": "Set the opacity of 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": { "alphaStart": {
"tooltip": "Set the initial opacity level of 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": { "alphaFinish": {
"tooltip": "Set the final opacity level of 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": { "alphaSpread": {
"tooltip": "The spread in opacity that each particle is given, resulting in a variety of opacity levels." "tooltip": "The spread in opacity that each particle is given, resulting in a variety of opacity levels."
@ -605,7 +608,7 @@
"tooltip": "The tint of the web entity." "tooltip": "The tint of the web entity."
}, },
"webAlpha": { "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": { "maxFPS": {
"tooltip": "The FPS at which to render the web entity. Higher values will have a performance impact." "tooltip": "The FPS at which to render the web entity. Higher values will have a performance impact."