Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-08 23:12:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fix/anim-warning-spam

Browse source
This commit is contained in:
Kasen IO 2020-07-03 13:31:51 -04:00
commit 4c780a5997
22 changed files with 239 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
domain-server/resources/describe-settings.json
View file

@ -247,7 +247,7 @@
"name": "standard_permissions",
"type": "table",
"label": "Domain-Wide User Permissions",
"help": "Indicate which types of users can have which <a data-toggle='tooltip' data-html=true title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether a user can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether a user change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether a user can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether a user can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether a user can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether a user can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether a user can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Rez Certified</strong><br />Sets whether a user can create new certified entities.</li><li><strong>Can Get and Set Private User Data</strong><br>Sets whether a user can get and set the Private User Data entity property</li></ul><p>Note that permissions assigned to a specific user will supersede any parameter-level permissions that might otherwise apply to that user. Additionally, if more than one parameter is applicable to a given user, the permissions given to that user will be the sum of all applicable parameters. For example, let&rsquo;s say only localhost users can connect and only logged in users can lock and unlock entities. If a user is both logged in and on localhost then they will be able to both connect and lock/unlock entities.</p>'>domain-wide permissions</a>.",
"help": "Indicate which types of users can have which <a data-toggle='tooltip' data-html=true title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether a user can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether a user change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether a user can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether a user can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether a user can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether a user can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether a user can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Rez Certified</strong><br />Sets whether a user can create new certified entities.</li><li><strong>Get and Set Private User Data</strong><br>Sets whether a user can get and set the privateUserData entity property.</li></ul><p>Note that permissions assigned to a specific user will supersede any parameter-level permissions that might otherwise apply to that user. Additionally, if more than one parameter is applicable to a given user, the permissions given to that user will be the sum of all applicable parameters. For example, let&rsquo;s say only localhost users can connect and only logged in users can lock and unlock entities. If a user is both logged in and on localhost then they will be able to both connect and lock/unlock entities.</p>'>domain-wide permissions</a>.",
"caption": "Standard Permissions",
"can_add_new_rows": false,
"groups": [
@ -256,7 +256,7 @@
"span": 1
},
{
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether a user can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether a user change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether a user can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether a user can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether a user can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether a user can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether a user can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether a user can replace entire content sets by wiping existing domain content.</li><li><strong>Can Get and Set Private User Data</strong><br>Sets whether a user can get and set the Private User Data entity property</li></ul><p>Note that permissions assigned to a specific user will supersede any parameter-level permissions that might otherwise apply to that user. Additionally, if more than one parameter is applicable to a given user, the permissions given to that user will be the sum of all applicable parameters. For example, let&rsquo;s say only localhost users can connect and only logged in users can lock and unlock entities. If a user is both logged in and on localhost then they will be able to both connect and lock/unlock entities.</p>'>?</a>",
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether a user can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether a user change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether a user can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether a user can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether a user can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether a user can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether a user can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether a user can replace entire content sets by wiping existing domain content.</li><li><strong>Get and Set Private User Data</strong><br>Sets whether a user can get and set the privateUserData entity property.</li></ul><p>Note that permissions assigned to a specific user will supersede any parameter-level permissions that might otherwise apply to that user. Additionally, if more than one parameter is applicable to a given user, the permissions given to that user will be the sum of all applicable parameters. For example, let&rsquo;s say only localhost users can connect and only logged in users can lock and unlock entities. If a user is both logged in and on localhost then they will be able to both connect and lock/unlock entities.</p>'>?</a>",
"span": 11
}
],
@ -337,7 +337,7 @@
},
{
"name": "id_can_get_and_set_private_user_data",
"label": "Can Get and Set Private User Data",
"label": "Get and Set Private User Data",
"type": "checkbox",
"editable": true,
"default": false
@ -392,7 +392,7 @@
"span": 1
},
{
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users in specific groups can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users in specific groups can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users in specific groups can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users in specific groups can create new entities with a finite lifetime.</li><li><strong>Rez Temporary</strong><br />Sets whether users in specific groups can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether a users in specific groups can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether a user can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users in specific groups can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether user in specific groups can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether a user can replace entire content sets by wiping existing domain content.</li><li><strong>Can Get and Set Private User Data</strong><br>Sets whether a user can get and set the Private User Data entity property</li></ul><p>Permissions granted to a specific user will be a union of the permissions granted to the groups they are in, as well as permissions from the previous section. Group permissions are only granted if the user doesn&rsquo;t have their own row in the per-account section, below.</p>'>?</a>",
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users in specific groups can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users in specific groups can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users in specific groups can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users in specific groups can create new entities with a finite lifetime.</li><li><strong>Rez Temporary</strong><br />Sets whether users in specific groups can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether a users in specific groups can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether a user can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users in specific groups can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether user in specific groups can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether a user can replace entire content sets by wiping existing domain content.</li><li><strong>Get and Set Private User Data</strong><br>Sets whether a user can get and set the privateUserData entity property.</li></ul><p>Permissions granted to a specific user will be a union of the permissions granted to the groups they are in, as well as permissions from the previous section. Group permissions are only granted if the user doesn&rsquo;t have their own row in the per-account section, below.</p>'>?</a>",
"span": 11
}
],
@ -498,7 +498,7 @@
},
{
"name": "id_can_get_and_set_private_user_data",
"label": "Can Get and Set Private User Data",
"label": "Get and Set Private User Data",
"type": "checkbox",
"editable": true,
"default": false
@ -520,7 +520,7 @@
"span": 1
},
{
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users in specific groups can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users in specific groups can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users in specific groups can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users in specific groups can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether a users in specific groups can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether a user can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users in specific groups can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether user in specific groups can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether users in specific groups can replace entire content sets by wiping existing domain content.</li><li><strong>Can Get and Set Private User Data</strong><br>Sets whether a user can get and set the Private User Data entity property</li></ul><p>Permissions granted to a specific user will be a union of the permissions granted to the groups they are in. Group permissions are only granted if the user doesn&rsquo;t have their own row in the per-account section, below.</p>'>?</a>",
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users in specific groups can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users in specific groups can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users in specific groups can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users in specific groups can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether a users in specific groups can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether a user can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users in specific groups can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether user in specific groups can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether users in specific groups can replace entire content sets by wiping existing domain content.</li><li><strong>Get and Set Private User Data</strong><br>Sets whether a user can get and set the privateUserData entity property</li></ul><p>Permissions granted to a specific user will be a union of the permissions granted to the groups they are in. Group permissions are only granted if the user doesn&rsquo;t have their own row in the per-account section, below.</p>'>?</a>",
"span": 11
}
],
@ -623,7 +623,7 @@
},
{
"name": "id_can_get_and_set_private_user_data",
"label": "Can Get and Set Private User Data",
"label": "Get and Set Private User Data",
"type": "checkbox",
"editable": true,
"default": false
@ -641,7 +641,7 @@
"span": 1
},
{
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether a user can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether a user change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether a user can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether a user can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether a user can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether a user can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether a user can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether a user can replace entire content sets by wiping existing domain content.</li><li><strong>Can Get and Set Private User Data</strong><br>Sets whether a user can get and set the Private User Data entity property</li></ul><p>Note that permissions assigned to a specific user will supersede any parameter-level or group permissions that might otherwise apply to that user.</p>'>?</a>",
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide User Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether a user can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether a user change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether a user can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether a user can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether a user can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether a user can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether a user can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether a user can replace entire content sets by wiping existing domain content.</li><li><strong>Get and Set Private User Data</strong><br>Sets whether a user can get and set the privateUserData entity property.</li></ul><p>Note that permissions assigned to a specific user will supersede any parameter-level or group permissions that might otherwise apply to that user.</p>'>?</a>",
"span": 11
}
],
@ -722,7 +722,7 @@
},
{
"name": "id_can_get_and_set_private_user_data",
"label": "Can Get and Set Private User Data",
"label": "Get and Set Private User Data",
"type": "checkbox",
"editable": true,
"default": false
@ -740,7 +740,7 @@
"span": 1
},
{
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide IP Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users from specific IPs can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users from specific IPs can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users from specific IPs can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users from specific IPs can create new entities with a finite lifetime.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether users from specific IPs can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether users from specific IPs can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users from specific IPs can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether users from specific IPs can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether users from specific IPs can replace entire content sets by wiping existing domain content.</li><li><strong>Can Get and Set Private User Data</strong><br>Sets whether a user can get and set the Private User Data entity property</li></ul><p>Note that permissions assigned to a specific IP will supersede any parameter-level permissions that might otherwise apply to that user (from groups or standard permissions above). IP address permissions are overriden if the user has their own row in the users section.</p>'>?</a>",
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide IP Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users from specific IPs can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users from specific IPs can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users from specific IPs can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users from specific IPs can create new entities with a finite lifetime.</li><li><strong>Rez Temporary</strong><br />Sets whether a user can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether users from specific IPs can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether users from specific IPs can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users from specific IPs can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether users from specific IPs can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether users from specific IPs can replace entire content sets by wiping existing domain content.</li><li><strong>Get and Set Private User Data</strong><br>Sets whether a user can get and set the privateUserData entity property.</li></ul><p>Note that permissions assigned to a specific IP will supersede any parameter-level permissions that might otherwise apply to that user (from groups or standard permissions above). IP address permissions are overriden if the user has their own row in the users section.</p>'>?</a>",
"span": 11
}
],
@ -821,7 +821,7 @@
},
{
"name": "id_can_get_and_set_private_user_data",
"label": "Can Get and Set Private User Data",
"label": "Get and Set Private User Data",
"type": "checkbox",
"editable": true,
"default": false
@ -839,7 +839,7 @@
"span": 1
},
{
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide MAC Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users with specific MACs can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users from specific MACs can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users with specific MACs can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users with specific MACs can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether users with specific MACs can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether users with specific MACs can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users with specific MACs can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether users with specific MACs can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether users with specific MACs can replace entire content sets by wiping existing domain content.</li><li><strong>Can Get and Set Private User Data</strong><br>Sets whether a user can get and set the Private User Data entity property</li></ul><p>Note that permissions assigned to a specific MAC will supersede any parameter-level permissions that might otherwise apply to that user (from groups or standard permissions above). MAC address permissions are overriden if the user has their own row in the users section.</p>'>?</a>",
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide MAC Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users with specific MACs can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users from specific MACs can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users with specific MACs can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users with specific MACs can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether users with specific MACs can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether users with specific MACs can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users with specific MACs can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether users with specific MACs can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether users with specific MACs can replace entire content sets by wiping existing domain content.</li><li><strong>Get and Set Private User Data</strong><br>Sets whether a user can get and set the privateUserData entity property.</li></ul><p>Note that permissions assigned to a specific MAC will supersede any parameter-level permissions that might otherwise apply to that user (from groups or standard permissions above). MAC address permissions are overriden if the user has their own row in the users section.</p>'>?</a>",
"span": 11
}
],
@ -920,7 +920,7 @@
},
{
"name": "id_can_get_and_set_private_user_data",
"label": "Can Get and Set Private User Data",
"label": "Get and Set Private User Data",
"type": "checkbox",
"editable": true,
"default": false
@ -938,7 +938,7 @@
"span": 1
},
{
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide Machine Fingerprint Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users with specific Machine Fingerprints can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users from specific Machine Fingerprints can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users with specific Machine Fingerprints can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users with specific Machine Fingerprints can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether users with specific Machine Fingerprints can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether users with specific Machine Fingerprints can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users with specific Machine Fingerprints can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether users with specific Machine Fingerprints can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether users with specific Machine Fingerprints can replace entire content sets by wiping existing domain content.</li><li><strong>Can Get and Set Private User Data</strong><br>Sets whether a user can get and set the Private User Data entity property</li></ul><p>Note that permissions assigned to a specific Machine Fingerprint will supersede any parameter-level permissions that might otherwise apply to that user (from groups or standard permissions above). Machine Fingerprint address permissions are overriden if the user has their own row in the users section.</p>'>?</a>",
"label": "Permissions <a data-toggle='tooltip' data-html='true' title='<p><strong>Domain-Wide Machine Fingerprint Permissions</strong></p><ul><li><strong>Connect</strong><br />Sets whether users with specific Machine Fingerprints can connect to the domain.</li><li><strong>Lock / Unlock</strong><br />Sets whether users from specific Machine Fingerprints can change the &ldquo;locked&rdquo; property of an entity (either from on to off or off to on).</li><li><strong>Rez</strong><br />Sets whether users with specific Machine Fingerprints can create new entities.</li><li><strong>Rez Temporary</strong><br />Sets whether users with specific Machine Fingerprints can create new entities with a finite lifetime.</li><li><strong>Rez Certified</strong><br />Sets whether users with specific Machine Fingerprints can create new certified entities.</li><li><strong>Rez Temporary Certified</strong><br />Sets whether users with specific Machine Fingerprints can create new certified entities with a finite lifetime.</li><li><strong>Write Assets</strong><br />Sets whether users with specific Machine Fingerprints can make changes to the domain&rsquo;s asset-server assets.</li><li><strong>Ignore Max Capacity</strong><br />Sets whether users with specific Machine Fingerprints can connect even if the domain has reached or exceeded its maximum allowed agents.</li><li><strong>Replace Content</strong><br>Sets whether users with specific Machine Fingerprints can replace entire content sets by wiping existing domain content.</li><li><strong>Get and Set Private User Data</strong><br>Sets whether a user can get and set the privateUserData entity property.</li></ul><p>Note that permissions assigned to a specific Machine Fingerprint will supersede any parameter-level permissions that might otherwise apply to that user (from groups or standard permissions above). Machine Fingerprint address permissions are overriden if the user has their own row in the users section.</p>'>?</a>",
"span": 11
}
],
@ -1019,7 +1019,7 @@
},
{
"name": "id_can_get_and_set_private_user_data",
"label": "Can Get and Set Private User Data",
"label": "Get and Set Private User Data",
"type": "checkbox",
"editable": true,
"default": false

11
interface/src/Application.cpp
View file

@ -3857,6 +3857,11 @@ void Application::showHelp() {
//InfoView::show(INFO_HELP_PATH, false, queryString.toString());
}
void Application::gotoTutorial() {
const QString TUTORIAL_ADDRESS = "file:///~/serverless/tutorial.json";
DependencyManager::get<AddressManager>()->handleLookupString(TUTORIAL_ADDRESS);
}
void Application::resizeEvent(QResizeEvent* event) {
resizeGL();
}
@ -4065,7 +4070,7 @@ std::map<QString, QString> Application::prepareServerlessDomainContents(QUrl dom
bool success = tmpTree->readFromByteArray(domainURL.toString(), data);
if (success) {
tmpTree->reaverageOctreeElements();
tmpTree->sendEntities(&_entityEditSender, getEntities()->getTree(), 0, 0, 0);
tmpTree->sendEntities(&_entityEditSender, getEntities()->getTree(), "domain", 0, 0, 0);
}
std::map<QString, QString> namedPaths = tmpTree->getNamedPaths();
@ -5545,8 +5550,8 @@ bool Application::importEntities(const QString& urlOrFilename, const bool isObse
return success;
}
QVector<EntityItemID> Application::pasteEntities(float x, float y, float z) {
return _entityClipboard->sendEntities(&_entityEditSender, getEntities()->getTree(), x, y, z);
QVector<EntityItemID> Application::pasteEntities(const QString& entityHostType, float x, float y, float z) {
return _entityClipboard->sendEntities(&_entityEditSender, getEntities()->getTree(), entityHostType, x, y, z);
}
void Application::init() {

3
interface/src/Application.h
View file

@ -375,7 +375,7 @@ signals:
void awayStateWhenFocusLostInVRChanged(bool enabled);
public slots:
QVector<EntityItemID> pasteEntities(float x, float y, float z);
QVector<EntityItemID> pasteEntities(const QString& entityHostType, float x, float y, float z);
bool exportEntities(const QString& filename, const QVector<QUuid>& entityIDs, const glm::vec3* givenOffset = nullptr);
bool exportEntities(const QString& filename, float x, float y, float z, float scale);
bool importEntities(const QString& url, const bool isObservable = true, const qint64 callerId = -1);
@ -425,6 +425,7 @@ public slots:
#endif
static void showHelp();
static void gotoTutorial();
void cycleCamera();
void cameraModeChanged();

2
interface/src/Menu.cpp
View file

@ -816,6 +816,8 @@ Menu::Menu() {
addActionToQMenuAndActionHash(helpMenu, "Controls Reference", 0, qApp, SLOT(showHelp()));
addActionToQMenuAndActionHash(helpMenu, "Tutorial", 0, qApp, SLOT(gotoTutorial()));
helpMenu->addSeparator();
// Help > Release Notes

3
interface/src/scripting/ClipboardScriptingInterface.cpp
View file

@ -60,10 +60,11 @@ bool ClipboardScriptingInterface::importEntities(
return retVal;
}
QVector<EntityItemID> ClipboardScriptingInterface::pasteEntities(glm::vec3 position) {
QVector<EntityItemID> ClipboardScriptingInterface::pasteEntities(glm::vec3 position, const QString& entityHostType) {
QVector<EntityItemID> retVal;
BLOCKING_INVOKE_METHOD(qApp, "pasteEntities",
Q_RETURN_ARG(QVector<EntityItemID>, retVal),
Q_ARG(const QString&, entityHostType),
Q_ARG(float, position.x),
Q_ARG(float, position.y),
Q_ARG(float, position.z));

3
interface/src/scripting/ClipboardScriptingInterface.h
View file

@ -117,10 +117,11 @@ public:
* Pastes the contents of the clipboard into the domain.
* @function Clipboard.pasteEntities
* @param {Vec3} position - The position to paste the clipboard contents at.
* @param {Entities.EntityHostType} [entityHostType="domain"] - The type of entities to create.
* @returns {Uuid[]} The IDs of the new entities that were created as a result of the paste operation. If entities couldn't
* be created then an empty array is returned.
*/
Q_INVOKABLE QVector<EntityItemID> pasteEntities(glm::vec3 position);
Q_INVOKABLE QVector<EntityItemID> pasteEntities(glm::vec3 position, const QString& entityHostType = "domain");
};
#endif // hifi_ClipboardScriptingInterface_h

9
libraries/entities-renderer/src/RenderableParticleEffectEntityItem.cpp
View file

@ -199,7 +199,7 @@ float importanceSample3DDimension(float startDim) {
return dimension;
}
ParticleEffectEntityRenderer::CpuParticle ParticleEffectEntityRenderer::createParticle(uint64_t now, const Transform& baseTransform, const particle::Properties& particleProperties,
ParticleEffectEntityRenderer::CpuParticle ParticleEffectEntityRenderer::createParticle(const Transform& baseTransform, const particle::Properties& particleProperties,
const ShapeType& shapeType, const GeometryResource::Pointer& geometryResource,
const TriangleInfo& triangleInfo) {
CpuParticle particle;
@ -217,7 +217,7 @@ ParticleEffectEntityRenderer::CpuParticle ParticleEffectEntityRenderer::createPa
const auto& polarFinish = particleProperties.polar.finish;
particle.seed = randFloatInRange(-1.0f, 1.0f);
particle.expiration = now + (uint64_t)(particleProperties.lifespan * USECS_PER_SECOND);
particle.expiration = (uint64_t)(particleProperties.lifespan * USECS_PER_SECOND);
particle.relativePosition = glm::vec3(0.0f);
particle.basePosition = baseTransform.getTranslation();
@ -403,7 +403,7 @@ void ParticleEffectEntityRenderer::stepSimulation() {
computeTriangles(geometryResource->getHFMModel());
}
// emit particle
_cpuParticles.push_back(createParticle(now, modelTransform, particleProperties, shapeType, geometryResource, _triangleInfo));
_cpuParticles.push_back(createParticle(modelTransform, particleProperties, shapeType, geometryResource, _triangleInfo));
_timeUntilNextEmit = emitInterval;
if (emitInterval < timeRemaining) {
timeRemaining -= emitInterval;
@ -415,7 +415,7 @@ void ParticleEffectEntityRenderer::stepSimulation() {
}
// Kill any particles that have expired or are over the max size
while (_cpuParticles.size() > particleProperties.maxParticles || (!_cpuParticles.empty() && _cpuParticles.front().expiration <= now)) {
while (_cpuParticles.size() > particleProperties.maxParticles || (!_cpuParticles.empty() && _cpuParticles.front().expiration == 0)) {
_cpuParticles.pop_front();
}
@ -428,6 +428,7 @@ void ParticleEffectEntityRenderer::stepSimulation() {
}
particle.basePosition = modelTransform.getTranslation();
}
particle.expiration = particle.expiration >= interval ? particle.expiration - interval : 0;
particle.integrate(deltaTime);
}
_prevEmitterShouldTrail = particleProperties.emission.shouldTrail;

2
libraries/entities-renderer/src/RenderableParticleEffectEntityItem.h
View file

@ -88,7 +88,7 @@ private:
glm::mat4 transform;
} _triangleInfo;
static CpuParticle createParticle(uint64_t now, const Transform& baseTransform, const particle::Properties& particleProperties,
static CpuParticle createParticle(const Transform& baseTransform, const particle::Properties& particleProperties,
const ShapeType& shapeType, const GeometryResource::Pointer& geometryResource,
const TriangleInfo& triangleInfo);
void stepSimulation();

8
libraries/entities/src/EntityTree.cpp
View file

@ -2657,11 +2657,12 @@ QByteArray EntityTree::remapActionDataIDs(QByteArray actionData, QHash<EntityIte
}
QVector<EntityItemID> EntityTree::sendEntities(EntityEditPacketSender* packetSender, EntityTreePointer localTree,
float x, float y, float z) {
const QString& entityHostType, float x, float y, float z) {
SendEntitiesOperationArgs args;
args.ourTree = this;
args.otherTree = localTree;
args.root = glm::vec3(x, y, z);
args.entityHostType = entityHostType;
// If this is called repeatedly (e.g., multiple pastes with the same data), the new elements will clash unless we
// use new identifiers. We need to keep a map so that we can map parent identifiers correctly.
QHash<EntityItemID, EntityItemID> map;
@ -2751,6 +2752,11 @@ bool EntityTree::sendEntitiesOperation(const OctreeElementPointer& element, void
EntityItemID newID = getMapped(oldID);
EntityItemProperties properties = item->getProperties();
properties.setEntityHostTypeFromString(args->entityHostType);
if (properties.getEntityHostType() == entity::HostType::AVATAR) {
properties.setOwningAvatarID(AVATAR_SELF_ID);
}
EntityItemID oldParentID = properties.getParentID();
if (oldParentID.isInvalidID()) { // no parent
properties.setPosition(properties.getPosition() + args->root);

3
libraries/entities/src/EntityTree.h
View file

@ -40,6 +40,7 @@ public:
class SendEntitiesOperationArgs {
public:
glm::vec3 root;
QString entityHostType;
EntityTree* ourTree;
EntityTreePointer otherTree;
QHash<EntityItemID, EntityItemID>* map;
@ -177,7 +178,7 @@ public:
static QByteArray remapActionDataIDs(QByteArray actionData, QHash<EntityItemID, EntityItemID>& map);
QVector<EntityItemID> sendEntities(EntityEditPacketSender* packetSender, EntityTreePointer localTree,
float x, float y, float z);
const QString& entityHostType, float x, float y, float z);
void entityChanged(EntityItemPointer entity);

5
libraries/networking/src/AddressManager.h
View file

@ -249,8 +249,9 @@ public slots:
* Takes you to a specified metaverse address.
* @function location.handleLookupString
* @param {string} address - The address to go to: a <code>"hifi://"</code> address, an IP address (e.g.,
* <code>"127.0.0.1"</code> or <code>"localhost"</code>), a domain name, a named path on a domain (starts with
* <code>"/"</code>), a position or position and orientation, or a user (starts with <code>"@"</code>).
* <code>"127.0.0.1"</code> or <code>"localhost"</code>), a <code>file:///</code> address, a domain name, a named path
* on a domain (starts with <code>"/"</code>), a position or position and orientation, or a user (starts with
* <code>"@"</code>).
* @param {boolean} [fromSuggestions=false] - Set to <code>true</code> if the address is obtained from the "Goto" dialog.
* Helps ensure that user's location history is correctly maintained.
*/

4
libraries/shared/src/NumericalConstants.h
View file

@ -28,8 +28,8 @@ const float ARCSECONDS_PER_ARCMINUTE = 60.0f;
const float ARCSECONDS_PER_DEGREE = ARCMINUTES_PER_DEGREE * ARCSECONDS_PER_ARCMINUTE;
const float EPSILON = 0.000001f; //smallish positive number - used as margin of error for some computations
const float SQUARE_ROOT_OF_2 = (float)sqrt(2.0f);
const float SQUARE_ROOT_OF_3 = (float)sqrt(3.0f);
const float SQUARE_ROOT_OF_2 = 1.414214f;
const float SQUARE_ROOT_OF_3 = 1.732051f;
const float METERS_PER_DECIMETER = 0.1f;
const float METERS_PER_CENTIMETER = 0.01f;
const float METERS_PER_MILLIMETER = 0.001f;

87
scripts/communityModules/chat/FloofChat.html → scripts/communityScripts/chat/FloofChat.html
View file

@ -12,6 +12,7 @@
<link type="text/css" rel="stylesheet" href="css/FloofChat.css" media="screen,projection"/>
<link href="https://fonts.googleapis.com/css?family=Raleway:300,400,600,700" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400&display=swap" rel="stylesheet">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
</head>
@ -28,11 +29,19 @@
</span>
<div class="switch muteSwitch col s2">
<label>
<span style="font-size: 20px" id="muteText">Mute</span>
<span id="muteText">Hide Popups</span>
<input type="checkbox" id="muteInput" onclick="muteSwitchToggle()">
<span class="lever waves-light"></span>
</label>
</div>
<div class="switch muteSwitch col s2">
<label>
<span id="muteAudioText">Mute Sound</span>
<input type="checkbox" id="muteAudioInput" onclick="muteAudioSwitchToggle()">
<span class="lever waves-light"></span>
</label>
</div>
<span class="col s1">
</span>
@ -46,6 +55,7 @@
<script>
var muted = {"Local": false, "Domain": false, "Grid": false};
var mutedAudio = {"Local": false, "Domain": false, "Grid": false};
var instance;
var appUUID;
var messageData = {}; // The data that is sent along with the message.
@ -171,13 +181,23 @@
case ext == "JPG":
case ext == "GIF":
case ext == "JPEG":
elContent = elContent.replace(this, "<br/><img src='" + this + "'class=\"responsive z-depth-2\"><br/><a href=\"javascript:gotoClipboard('" + this + "');\" target='_blank'>" + this + "</a>");
elContent = elContent.replace(this, "<br/><img src='" + this
+ "'class=\"responsive z-depth-2\"><br/><a href=\"javascript:gotoClipboard('" + this + "');\" target='_blank'>" + this
+ "</a><a onclick=\"gotoExternalURL('" + this
+ "');return false;\"href=\"" + this
+ "\">&#x1F4F2;</a>");
break;
case ext == "iframe":
elContent = elContent.replace(this, "<br/><iframe class=\"z-depth-2\" src='" + this + "'width=\"440\" height=\"248\" frameborder=\"0\"></iframe>");
elContent = elContent.replace(this, "<br/><iframe class=\"z-depth-2\" src='" + this
+ "'width=\"440\" height=\"248\" frameborder=\"0\"></iframe>");
break;
case ext == "webm":
elContent = elContent.replace(this, "<br/><video controls class=\"z-depth-2 responsive\"><source src='" + this + "' type='video/" + ext + "'></video><br/><a href=\"javascript:gotoClipboard('" + this + "');\">" + this + "</a>");
elContent = elContent.replace(this, "<br/><video controls class=\"z-depth-2 responsive\"><source src='" + this
+ "' type='video/" + ext + "'></video><br/><a href=\"javascript:gotoClipboard('" + this
+ "');\">" + this
+ "</a><a onclick=\"gotoExternalURL('" + this
+ "');return false;\"href=\"" + this
+ "\">&#x1F4F2;</a>");
break;
case protocol === "HIFI":
case protocol === "hifi":
@ -186,13 +206,24 @@
case !!this.match(/(https?:\/\/)?(www\.)?(youtube\.com\/watch\?v=|youtu\.be\/)([^& \n<]+)(?:[^ \n<]+)?/g):
var youtubeMatch = this.match(/^.*(youtu.be\/|v\/|u\/\w\/|embed\/|watch\?v=|\&v=)([^#\&\?]*).*/);
if (youtubeMatch && youtubeMatch[2].length == 11) {
elContent = "<br/><iframe class=\"z-depth-2\" width='420' height='236' src='https://www.youtube.com/embed/" + youtubeMatch[2] + "' frameborder='0'></iframe><br/><a href=\"javascript:gotoURL('" + this + "');\">" + this + "</a>";
elContent = "<br/><iframe class=\"z-depth-2\" width='420' height='236' src='https://www.youtube.com/embed/" + youtubeMatch[2]
+ "' frameborder='0'></iframe><br/><a href=\"javascript:gotoURL('" + this
+ "');\">" + this
+ "</a><a onclick=\"gotoExternalURL('" + this
+ "');return false;\"href=\"" + this
+ "\">&#x1F4F2;</a>";
break;
}
// else fall through to default
default:
elContent = elContent.replace(this, "<br/><a href=\"javascript:gotoURL('" + this + "');\">" + this + "</a>");
elContent = elContent.replace(this, "<br/><a onclick=\"gotoURL('" + this
+ "');return false;\" href=\"" + this
+ "\">" + this
+ "</a><a onclick=\"gotoExternalURL('" + this
+ "');return false;\"href=\"" + this
+ "\">&#x1F4F2;</a>");
break;
}
});
@ -284,6 +315,10 @@
function gotoURL(url) {
emitWebEvent({type: "CMD", cmd: "URL", url: url});
}
function gotoExternalURL(url) {
emitWebEvent({ type: "CMD", cmd: "EXTERNALURL", url: url });
}
function gotoClipboard(url) {
M.toast({html: 'Copied URL to Clipboard', classes: 'rounded pink white-text'});
@ -322,7 +357,7 @@
location.reload();
}
function logMessage(userName, message, logScreen, colour) {
function logMessage(timestamp, userName, message, logScreen, colour) {
var LogScreen = $("#" + logScreen);
var $logLine =
$('<div/>')
@ -333,6 +368,10 @@
.addClass('z-depth-2')
.data('chat-message', message).css("color", rgbToHex(colour))
.appendTo(LogScreen);
$('<span/>')
.addClass('LogLogLineTimestamp')
.text(timestamp).css("color", rgbToHex(colour))
.appendTo($logLine);
$('<b/>')
.addClass('LogLogLineMessage')
.text(userName + ": ").css("color", rgbToHex(colour))
@ -350,18 +389,23 @@
function time() {
var d = new Date();
var month = (d.getMonth()).toString();
var day = (d.getDate()).toString();
var h = (d.getHours()).toString();
var m = (d.getMinutes()).toString();
var s = (d.getSeconds()).toString();
var h2 = ("0" + h).slice(-2);
var m2 = ("0" + m).slice(-2);
var s2 = ("0" + s).slice(-2);
s2 += (d.getMilliseconds() / 1000).toFixed(2).slice(1);
return h2 + ":" + m2 + ":" + s2;
// s2 += (d.getMilliseconds() / 1000).toFixed(2).slice(1);
return month + "/" + day + " - " + h2 + ":" + m2 + ":" + s2;
}
var muteInput;
var muteText;
var muteAudioInput;
var muteAudioText;
function muteSwitchToggle() {
muted[getCurrTab()] = muteInput.checked;
@ -369,18 +413,33 @@
muteText.classList.remove(!muteInput.checked ? "red-text" : "white-text");
emitWebEvent({type: "CMD", cmd: "MUTED", muted: muted});
}
function muteAudioSwitchToggle() {
mutedAudio[getCurrTab()] = muteAudioInput.checked;
muteAudioText.classList.add(muteAudioInput.checked ? "red-text" : "white-text");
muteAudioText.classList.remove(!muteAudioInput.checked ? "red-text" : "white-text");
emitWebEvent({ type: "CMD", cmd: "MUTEDAUDIO", muted: mutedAudio });
}
function main() {
muteInput = document.getElementById("muteInput");
muteText = document.getElementById("muteText");
muteAudioInput = document.getElementById("muteAudioInput");
muteAudioText = document.getElementById("muteAudioText");
instance = M.Tabs.init(document.getElementById("tabs"), {
"onShow": function (e) {
scrollChatLog(getCurrTab());
muteInput.checked = muted[getCurrTab()];
muteText.classList.add(muteInput.checked ? "red-text" : "white-text");
muteText.classList.remove(!muteInput.checked ? "red-text" : "white-text");
muteAudioInput.checked = mutedAudio[getCurrTab()];
muteAudioText.classList.add(muteAudioInput.checked ? "red-text" : "white-text");
muteAudioText.classList.remove(!muteAudioInput.checked ? "red-text" : "white-text");
}
});
instance.select("Local");
@ -430,11 +489,11 @@
var temp = cmd.data;
if (temp.length === 1) {
var temp2 = temp[0];
logMessage("[" + temp2[0] + "] " + temp2[2], temp2[1], temp2[4], temp2[3]);
logMessage("[" + temp2[0] + "] ", temp2[2], temp2[1], temp2[4], temp2[3]);
scrollChatLog(temp2[4]);
} else if (temp.length > 1) {
temp.forEach(function (msg) {
logMessage("[" + msg[0] + "] " + msg[2], msg[1], msg[4], msg[3]);
logMessage("[" + msg[0] + "] ", msg[2], msg[1], msg[4], msg[3]);
scrollChatLog(msg[4]);
});
}
@ -445,6 +504,12 @@
muteText.classList.add(muteInput.checked ? "red-text" : "white-text");
muteText.classList.remove(!muteInput.checked ? "red-text" : "white-text");
}
if (cmd.cmd === "MUTEDAUDIO") {
mutedAudio = cmd.muted;
muteAudioInput.checked = mutedAudio[getCurrTab()];
muteAudioText.classList.add(muteAudioInput.checked ? "red-text" : "white-text");
muteAudioText.classList.remove(!muteAudioInput.checked ? "red-text" : "white-text");
}
}
});
}, 100); // Delay to allow everything to settle

105
scripts/communityModules/chat/FloofChat.js → scripts/communityScripts/chat/FloofChat.js
View file

@ -23,6 +23,12 @@ var SHIFT_KEY = 33554432;
var FLOOF_CHAT_CHANNEL = "Chat";
var FLOOF_NOTIFICATION_CHANNEL = "Floof-Notif";
var MAIN_CHAT_WINDOW_HEIGHT = 450;
var MAIN_CHAT_WINDOW_WIDTH = 750;
var CHAT_BAR_HISTORY_LIMIT = 256;
var CHAT_HISTORY_LIMIT = 500;
Script.scriptEnding.connect(function () {
shutdown();
});
@ -41,8 +47,8 @@ var appUUID = Uuid.generate();
var chatBar;
var chatHistory;
var chatBarHistoryLimit = Settings.getValue(settingsRoot + "/chatBarHistoryLimit", 256);
var chatHistoryLimit = Settings.getValue(settingsRoot + "/chatHistoryLimit", 500);
var chatBarHistoryLimit = Settings.getValue(settingsRoot + "/chatBarHistoryLimit", CHAT_BAR_HISTORY_LIMIT);
var chatHistoryLimit = Settings.getValue(settingsRoot + "/chatHistoryLimit", CHAT_HISTORY_LIMIT);
var chatBarHistory = Settings.getValue(settingsRoot + "/chatBarHistory", ["Meow :3"]);
var historyLog = [];
@ -50,14 +56,16 @@ var visible = false;
var historyVisible = false;
var settingsRoot = "FloofChat";
var athenaGotoUrl = "https://metaverse.projectathena.io/interim/d-goto/app/goto.json";
var gotoJSONUrl = Settings.getValue(settingsRoot + "/gotoJSONUrl", athenaGotoUrl);
var vircadiaGotoUrl = "https://metaverse.vircadia.com/interim/d-goto/app/goto.json";
var gotoJSONUrl = Settings.getValue(settingsRoot + "/gotoJSONUrl", vircadiaGotoUrl);
var muted = Settings.getValue(settingsRoot + "/muted", {"Local": false, "Domain": false, "Grid": true});
var mutedAudio = Settings.getValue(settingsRoot + "/mutedAudio", {"Local": false, "Domain": false, "Grid": true});
var notificationSound = SoundCache.getSound(Script.resolvePath("resources/bubblepop.wav"));
var ws;
var wsReady = false;
var WEB_SOCKET_URL = "ws://chat.projectathena.io:8880"; // WebSocket for Grid chat.
var WEB_SOCKET_URL = "ws://chat.vircadia.com:8880"; // WebSocket for Grid chat.
var shutdownBool = false;
var defaultColour = {red: 255, green: 255, blue: 255};
@ -80,12 +88,12 @@ function init() {
setupHistoryWindow(false);
chatBar = new OverlayWindow({
source: Paths.defaultScripts + '/communityModules/chat/FloofChat.qml?' + Date.now(),
source: ROOT + "FloofChat.qml?" + Date.now(),
width: 360,
height: 180
});
button.clicked.connect(toggleChatHistory);
button.clicked.connect(toggleMainChatWindow);
chatBar.fromQml.connect(fromQml);
chatBar.sendToQml(JSON.stringify({visible: false, history: chatBarHistory}));
Controller.keyPressEvent.connect(keyPressEvent);
@ -106,6 +114,11 @@ function connectWebSocket(timeout) {
}
if (!cmd.FAILED) {
addToLog(cmd.message, cmd.displayName, cmd.colour, cmd.channel);
if (!mutedAudio["Grid"] && MyAvatar.sessionDisplayName !== cmd.displayName) {
playNotificationSound();
}
if (!muted["Grid"]) {
Messages.sendLocalMessage(FLOOF_NOTIFICATION_CHANNEL, JSON.stringify({
sender: "(G) " + cmd.displayName,
@ -166,13 +179,13 @@ function setupHistoryWindow() {
chatHistory = new OverlayWebWindow({
title: 'Chat',
source: ROOT + "FloofChat.html?appUUID=" + appUUID + "&" + Date.now(),
width: 900,
height: 700,
width: MAIN_CHAT_WINDOW_WIDTH,
height: MAIN_CHAT_WINDOW_HEIGHT,
visible: false
});
chatHistory.setPosition({x: 0, y: Window.innerHeight - 700});
chatHistory.setPosition({x: 0, y: Window.innerHeight - MAIN_CHAT_WINDOW_HEIGHT});
chatHistory.webEventReceived.connect(onWebEventReceived);
chatHistory.closed.connect(toggleChatHistory);
chatHistory.closed.connect(toggleMainChatWindow);
}
function emitScriptEvent(obj) {
@ -180,7 +193,7 @@ function emitScriptEvent(obj) {
tablet.emitScriptEvent(JSON.stringify(obj));
}
function toggleChatHistory() {
function toggleMainChatWindow() {
historyVisible = !historyVisible;
button.editProperties({isActive: historyVisible});
chatHistory.visible = historyVisible;
@ -282,18 +295,23 @@ function onWebEventReceived(event) {
if (event.type === "ready") {
chatHistory.emitScriptEvent(JSON.stringify({type: "MSG", data: historyLog}));
chatHistory.emitScriptEvent(JSON.stringify({type: "CMD", cmd: "MUTED", muted: muted}));
chatHistory.emitScriptEvent(JSON.stringify({type: "CMD", cmd: "MUTEDAUDIO", muted: mutedAudio}));
}
if (event.type === "CMD") {
if (event.cmd === "MUTED") {
muted = event.muted;
Settings.setValue(settingsRoot + "/muted", muted);
}
if (event.cmd === "MUTEDAUDIO") {
mutedAudio = event.muted;
Settings.setValue(settingsRoot + "/mutedAudio", mutedAudio);
}
if (event.cmd === "COLOUR") {
Settings.setValue(settingsRoot + "/" + event.colourType + "Colour", event.colour);
colours[event.colourType] = event.colour;
}
if (event.cmd === "REDOCK") {
chatHistory.setPosition({x: 0, y: Window.innerHeight - 700});
chatHistory.setPosition({x: 0, y: Window.innerHeight - MAIN_CHAT_WINDOW_HEIGHT});
}
if (event.cmd === "GOTO") {
gotoConfirm(event.url);
@ -307,12 +325,15 @@ function onWebEventReceived(event) {
visible: true
});
}
if (event.cmd === "EXTERNALURL") {
Window.openUrl(event.url);
}
if (event.cmd === "COPY") {
Window.copyToClipboard(event.url);
}
}
if (event.type === "WEBMSG") {
event.avatarName = MyAvatar.displayName;
event.avatarName = MyAvatar.sessionDisplayName;
event = processChat(event);
if (event.message === "") return;
sendWS({
@ -325,7 +346,7 @@ function onWebEventReceived(event) {
});
}
if (event.type === "MSG") {
event.avatarName = MyAvatar.displayName;
event.avatarName = MyAvatar.sessionDisplayName;
event = processChat(event);
if (event.message === "") return;
Messages.sendMessage("Chat", JSON.stringify({
@ -340,6 +361,17 @@ function onWebEventReceived(event) {
}
}
function playNotificationSound() {
if (notificationSound.downloaded) {
var injectorOptions = {
localOnly: true,
position: MyAvatar.position,
volume: 0.02
};
Audio.playSound(notificationSound, injectorOptions);
}
}
function replaceFormatting(text) {
var found = false;
if (text.indexOf("**") !== -1) {
@ -423,6 +455,11 @@ function messageReceived(channel, message) {
if (cmd.channel === "Local") {
if (Vec3.withinEpsilon(MyAvatar.position, cmd.position, 20)) {
addToLog(cmd.message, cmd.displayName, cmd.colour, cmd.channel);
if (!mutedAudio["Local"] && MyAvatar.sessionDisplayName !== cmd.displayName) {
playNotificationSound();
}
if (!muted["Local"]) {
Messages.sendLocalMessage(FLOOF_NOTIFICATION_CHANNEL, JSON.stringify({
sender: "(L) " + cmd.displayName,
@ -433,6 +470,11 @@ function messageReceived(channel, message) {
}
} else if (cmd.channel === "Domain") {
addToLog(cmd.message, cmd.displayName, cmd.colour, cmd.channel);
if (!mutedAudio["Domain"] && MyAvatar.sessionDisplayName !== cmd.displayName) {
playNotificationSound();
}
if (!muted["Domain"]) {
Messages.sendLocalMessage(FLOOF_NOTIFICATION_CHANNEL, JSON.stringify({
sender: "(D) " + cmd.displayName,
@ -442,6 +484,11 @@ function messageReceived(channel, message) {
}
} else if (cmd.channel === "Grid") {
addToLog(cmd.message, cmd.displayName, cmd.colour, cmd.channel);
if (!mutedAudio["Grid"] && MyAvatar.sessionDisplayName !== cmd.displayName) {
playNotificationSound();
}
if (!muted["Grid"]) {
Messages.sendLocalMessage(FLOOF_NOTIFICATION_CHANNEL, JSON.stringify({
sender: "(G) " + cmd.displayName,
@ -451,6 +498,11 @@ function messageReceived(channel, message) {
}
} else {
addToLog(cmd.message, cmd.displayName, cmd.colour, cmd.channel);
if (MyAvatar.sessionDisplayName !== cmd.displayName) {
playNotificationSound();
}
Messages.sendLocalMessage(FLOOF_NOTIFICATION_CHANNEL, JSON.stringify({
sender: cmd.displayName,
text: replaceFormatting(cmd.message),
@ -464,19 +516,22 @@ function messageReceived(channel, message) {
function time() {
var d = new Date();
var month = (d.getMonth()).toString();
var day = (d.getDate()).toString();
var h = (d.getHours()).toString();
var m = (d.getMinutes()).toString();
var s = (d.getSeconds()).toString();
var h2 = ("0" + h).slice(-2);
var m2 = ("0" + m).slice(-2);
var s2 = ("0" + s).slice(-2);
s2 += (d.getMilliseconds() / 1000).toFixed(2).slice(1);
return h2 + ":" + m2 + ":" + s2;
// s2 += (d.getMilliseconds() / 1000).toFixed(2).slice(1);
return month + "/" + day + " - " + h2 + ":" + m2 + ":" + s2;
}
function addToLog(msg, dp, colour, tab) {
historyLog.push([time(), msg, dp, colour, tab]);
chatHistory.emitScriptEvent(JSON.stringify({type: "MSG", data: [[time(), msg, dp, colour, tab]]}));
var currentTimestamp = time();
historyLog.push([currentTimestamp, msg, dp, colour, tab]);
chatHistory.emitScriptEvent(JSON.stringify({ type: "MSG", data: [[currentTimestamp, msg, dp, colour, tab]]}));
while (historyLog.length > chatHistoryLimit) {
historyLog.shift();
}
@ -503,7 +558,7 @@ function fromQml(message) {
if (cmd.message !== "") {
addToChatBarHistory(cmd.message);
if (cmd.event.modifiers === CONTROL_KEY) {
cmd.avatarName = MyAvatar.displayName;
cmd.avatarName = MyAvatar.sessionDisplayName;
cmd = processChat(cmd);
if (cmd.message === "") return;
Messages.sendMessage(FLOOF_CHAT_CHANNEL, JSON.stringify({
@ -512,7 +567,7 @@ function fromQml(message) {
displayName: cmd.avatarName
}));
} else if (cmd.event.modifiers === CONTROL_KEY + SHIFT_KEY) {
cmd.avatarName = MyAvatar.displayName;
cmd.avatarName = MyAvatar.sessionDisplayName;
cmd = processChat(cmd);
if (cmd.message === "") return;
sendWS({
@ -524,7 +579,7 @@ function fromQml(message) {
displayName: cmd.avatarName
});
} else {
cmd.avatarName = MyAvatar.displayName;
cmd.avatarName = MyAvatar.sessionDisplayName;
cmd = processChat(cmd);
if (cmd.message === "") return;
Messages.sendMessage(FLOOF_CHAT_CHANNEL, JSON.stringify({
@ -540,7 +595,7 @@ function fromQml(message) {
setVisible(false);
} else if (cmd.type === "CMD") {
if (cmd.cmd === "Clicked") {
toggleChatHistory()
toggleMainChatWindow()
}
}
}
@ -565,7 +620,7 @@ function setVisible(_visible) {
function keyPressEvent(event) {
if (event.key === H_KEY && !event.isAutoRepeat && event.isControl) {
toggleChatHistory()
toggleMainChatWindow()
}
if (event.key === ENTER_KEY && !event.isAutoRepeat && !visible) {
setVisible(true);
@ -588,4 +643,4 @@ function shutdown() {
}
chatBar.close();
chatHistory.close();
}
}

0
scripts/communityModules/chat/FloofChat.qml → scripts/communityScripts/chat/FloofChat.qml
View file

0
scripts/communityModules/chat/chat.png → scripts/communityScripts/chat/chat.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

40
scripts/communityModules/chat/css/FloofChat.css → scripts/communityScripts/chat/css/FloofChat.css
View file

@ -50,6 +50,12 @@ div.dockButton button.active {
border-top: none;
}
#tabs {
width: 250px !important;
}
body {
width: 100%;
height: 100%;
@ -69,9 +75,10 @@ body {
}
.ChatLog {
height: calc(100vh - 137px);
padding: 20px !important;
font-size: 20px;
height: calc(100vh - 127px);
padding: 10px !important;
font-size: 18px;
font-family: 'Roboto', sans-serif;
color: white;
background-color: black;
overflow-x: hidden;
@ -80,7 +87,7 @@ body {
}
.ChatLogLine {
margin-bottom: 15px;
margin-bottom: 7px;
}
.ChatLogLineDisplayName {
@ -91,25 +98,30 @@ body {
}
.LogLogLine {
margin-bottom: 15px;
padding: 10px !important;
margin-bottom: 7px;
padding: 6px !important;
}
.LogLogLineMessage {
/*font-style: italic;*/
}
.LogLogLineTimestamp {
font-weight: 300;
font-size: 16px;
}
.ChatInput {
color: #252525;
background: #252525;
height: 60px !important;
height: 45px !important;
}
.ChatInputText {
padding: 5px !important;
height: 50px !important;
padding: 5px 5px 5px 10px !important;
height: 35px !important;
width: calc(100vw - 20px) !important;
font-size: 20px !important;
font-size: 18px !important;
background-color: white !important;
border-style: solid !important;
border-color: #232323 !important;
@ -146,6 +158,14 @@ body {
background-color: #a62113 !important;
}
#muteText {
font-size: 16px;
}
#muteAudioText {
font-size: 16px;
}
img, a{
-moz-user-select: none;
-webkit-user-select: none;

0
scripts/communityModules/chat/css/materialize.css → scripts/communityScripts/chat/css/materialize.css vendored
View file

0
scripts/communityModules/chat/js/materialize.min.js → scripts/communityScripts/chat/js/materialize.min.js vendored
View file

BIN
scripts/communityScripts/chat/resources/bubblepop.wav Normal file
View file

Binary file not shown.

0
scripts/communityModules/notificationCore/notificationCore.js → scripts/communityScripts/notificationCore/notificationCore.js
View file

4
scripts/defaultScripts.js
View file

@ -38,11 +38,11 @@ var DEFAULT_SCRIPTS_COMBINED = [
];
var DEFAULT_SCRIPTS_SEPARATE = [
"system/controllers/controllerScripts.js",
"communityModules/notificationCore/notificationCore.js",
"communityScripts/notificationCore/notificationCore.js",
"simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js",
{"stable": "system/more/app-more.js", "beta": "https://cdn.vircadia.com/community-apps/more/app-more.js"},
{"stable": "communityScripts/explore/explore.js", "beta": "https://metaverse.vircadia.com/interim/d-goto/app/explore.js"},
{"stable": "communityModules/chat/FloofChat.js", "beta": "https://content.fluffy.ws/scripts/chat/FloofChat.js"}
{"stable": "communityScripts/chat/FloofChat.js", "beta": "https://content.fluffy.ws/scripts/chat/FloofChat.js"}
//"system/chat.js"
];