Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:highfidelity/hifi into 20550-nitpickInstaller

Browse source
This commit is contained in:
NissimHadar 2019-01-24 16:23:08 -08:00
commit 684172bf6b
3 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/entities/src/EntityItemProperties.cpp
View file

@ -962,7 +962,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* parse the JSON string into a JavaScript object of name, URL pairs. <em>Read-only.</em>
*
* @property {ShapeType} shapeType="none" - The shape of the collision hull used if collisions are enabled.
* @property {string} compoundShapeURL="" - The OBJ file to use for the compound shape if <code>shapeType</code> is
* @property {string} compoundShapeURL="" - The model file to use for the compound shape if <code>shapeType</code> is
* <code>"compound"</code>.
*
* @property {Entities.AnimationProperties} animation - An animation to play on the model.
@ -1302,7 +1302,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
* @property {ShapeType} shapeType="box" - The shape of the volume in which the zone's lighting effects and avatar
* permissions have effect. Reverts to the default value if set to <code>"none"</code>, or set to <code>"compound"</code>
* and <code>compoundShapeURL</code> is <code>""</code>.
* @property {string} compoundShapeURL="" - The OBJ file to use for the compound shape if <code>shapeType</code> is
* @property {string} compoundShapeURL="" - The model file to use for the compound shape if <code>shapeType</code> is
* <code>"compound"</code>.
*
* @property {string} keyLightMode="inherit" - Configures the key light in the zone. Possible values:<br />

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

@ -39,6 +39,14 @@
"leftMargin": {
"tooltip": "The left margin, in meters."
},
"zoneShapeType": {
"tooltip": "The shape of the volume in which the zone's lighting effects and avatar permissions have effect.",
"jsPropertyName": "shapeType"
},
"zoneCompoundShapeURL": {
"tooltip": "The model file to use for the compound shape if Shape Type is \"Use Compound Shape URL\".",
"jsPropertyName": "compoundShapeURL"
},
"flyingAllowed": {
"tooltip": "If enabled, users can fly in the zone."
},
@ -133,7 +141,7 @@
"tooltip": "The shape of the collision hull used if collisions are enabled. This affects how an entity collides."
},
"compoundShapeURL": {
"tooltip": "The OBJ file to use for the compound shape if Collision Shape is \"compound\"."
"tooltip": "The model file to use for the compound shape if Collision Shape is \"Compound\"."
},
"animation.url": {
"tooltip": "An animation to play on the model."

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

@ -184,6 +184,20 @@ const GROUPS = [
id: "zone",
addToGroup: "base",
properties: [
{
label: "Shape Type",
type: "dropdown",
options: { "box": "Box", "sphere": "Sphere", "ellipsoid": "Ellipsoid",
"cylinder-y": "Cylinder", "compound": "Use Compound Shape URL" },
propertyID: "zoneShapeType",
propertyName: "shapeType", // actual entity property name
},
{
label: "Compound Shape URL",
type: "string",
propertyID: "zoneCompoundShapeURL",
propertyName: "compoundShapeURL", // actual entity property name
},
{
label: "Flying Allowed",
type: "bool",
@ -1345,24 +1359,6 @@ const GROUPS = [
},
]
},
{
id: "zone_shape",
label: "ZONE SHAPE",
properties: [
{
label: "Shape Type",
type: "dropdown",
options: { "box": "Box", "sphere": "Sphere", "ellipsoid": "Ellipsoid",
"cylinder-y": "Cylinder", "compound": "Use Compound Shape URL" },
propertyID: "shapeType",
},
{
label: "Compound Shape URL",
type: "string",
propertyID: "compoundShapeURL",
},
]
},
{
id: "physics",
label: "PHYSICS",
@ -1454,7 +1450,7 @@ const GROUPS_PER_TYPE = {
None: [ 'base', 'spatial', 'behavior', 'collision', 'physics' ],
Shape: [ 'base', 'shape', 'spatial', 'behavior', 'collision', 'physics' ],
Text: [ 'base', 'text', 'spatial', 'behavior', 'collision', 'physics' ],
Zone: [ 'base', 'zone', 'spatial', 'behavior', 'zone_shape', 'physics' ],
Zone: [ 'base', 'zone', 'spatial', 'behavior', 'physics' ],
Model: [ 'base', 'model', 'spatial', 'behavior', 'collision', 'physics' ],
Image: [ 'base', 'image', 'spatial', 'behavior', 'collision', 'physics' ],
Web: [ 'base', 'web', 'spatial', 'behavior', 'collision', 'physics' ],