mirror of
https://github.com/JulianGro/overte.git
synced 2025-05-07 07:20:14 +02:00
quick re-organization of settings groups
This commit is contained in:
Stephen Birarda
parent
0ace92798d
commit
2f6b079d80
3 changed files with 122 additions and 118 deletions
|
|
@ -951,99 +951,6 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "asset_server",
|
|
||||||
"label": "Asset Server (ATP)",
|
|
||||||
"assignment-types": [ 3 ],
|
|
||||||
"settings": [
|
|
||||||
{
|
|
||||||
"name": "enabled",
|
|
||||||
"type": "checkbox",
|
|
||||||
"label": "Enabled",
|
|
||||||
"help": "Assigns an asset-server in your domain to serve files to clients via the ATP protocol (over UDP)",
|
|
||||||
"default": true,
|
|
||||||
"advanced": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "assets_path",
|
|
||||||
"type": "string",
|
|
||||||
"label": "Assets Path",
|
|
||||||
"help": "The path to the directory assets are stored in.<br/>If this path is relative, it will be relative to the application data directory.<br/>If you change this path you will need to manually copy any existing assets from the previous directory.",
|
|
||||||
"default": "",
|
|
||||||
"advanced": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "assets_filesize_limit",
|
|
||||||
"type": "int",
|
|
||||||
"label": "File Size Limit",
|
|
||||||
"help": "The file size limit of an asset that can be imported into the asset server in MBytes. 0 (default) means no limit on file size.",
|
|
||||||
"default": 0,
|
|
||||||
"advanced": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "entity_script_server",
|
|
||||||
"label": "Entity Script Server (ESS)",
|
|
||||||
"assignment-types": [ 5 ],
|
|
||||||
"settings": [
|
|
||||||
{
|
|
||||||
"name": "entity_pps_per_script",
|
|
||||||
"label": "Entity PPS per script",
|
|
||||||
"help": "The number of packets per second (PPS) that can be sent to the entity server for each server entity script. This contributes to a total overall amount.<br/>Example: 1000 PPS with 5 entites gives a total PPS of 5000 that is shared among the entity scripts. A single could use 4000 PPS, leaving 1000 for the rest, for example.",
|
|
||||||
"default": 900,
|
|
||||||
"type": "int",
|
|
||||||
"advanced": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "max_total_entity_pps",
|
|
||||||
"label": "Maximum Total Entity PPS",
|
|
||||||
"help": "The maximum total packets per seconds (PPS) that can be sent to the entity server.<br/>Example: 5 scripts @ 1000 PPS per script = 5000 total PPS. A maximum total PPS of 4000 would cap this 5000 total PPS to 4000.",
|
|
||||||
"default": 9000,
|
|
||||||
"type": "int",
|
|
||||||
"advanced": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "avatars",
|
|
||||||
"label": "Avatars",
|
|
||||||
"assignment-types": [ 1, 2 ],
|
|
||||||
"settings": [
|
|
||||||
{
|
|
||||||
"name": "min_avatar_height",
|
|
||||||
"type": "double",
|
|
||||||
"label": "Minimum Avatar Height (meters)",
|
|
||||||
"help": "Limits the height of avatars in your domain. Must be at least 0.009.",
|
|
||||||
"placeholder": 0.4,
|
|
||||||
"default": 0.4
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "max_avatar_height",
|
|
||||||
"type": "double",
|
|
||||||
"label": "Maximum Avatar Height (meters)",
|
|
||||||
"help": "Limits the scale of avatars in your domain. Cannot be greater than 1755.",
|
|
||||||
"placeholder": 5.2,
|
|
||||||
"default": 5.2
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "avatar_whitelist",
|
|
||||||
"label": "Avatars Allowed from:",
|
|
||||||
"help": "Comma separated list of URLs (with optional paths) that avatar .fst files are allowed from. If someone attempts to use an avatar with a different domain, it will be rejected and the replacement avatar will be used. If left blank, any domain is allowed.",
|
|
||||||
"placeholder": "",
|
|
||||||
"default": "",
|
|
||||||
"advanced": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "replacement_avatar",
|
|
||||||
"label": "Replacement Avatar for disallowed avatars",
|
|
||||||
"help": "A URL for an avatar .fst to be used when someone tries to use an avatar that is not allowed. If left blank, the generic default avatar is used.",
|
|
||||||
"placeholder": "",
|
|
||||||
"default": "",
|
|
||||||
"advanced": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "audio_threading",
|
"name": "audio_threading",
|
||||||
"label": "Audio Threading",
|
"label": "Audio Threading",
|
||||||
|
|
@ -1266,9 +1173,82 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "avatars",
|
||||||
|
"label": "Avatars",
|
||||||
|
"assignment-types": [ 1, 2 ],
|
||||||
|
"settings": [
|
||||||
|
{
|
||||||
|
"name": "min_avatar_height",
|
||||||
|
"type": "double",
|
||||||
|
"label": "Minimum Avatar Height (meters)",
|
||||||
|
"help": "Limits the height of avatars in your domain. Must be at least 0.009.",
|
||||||
|
"placeholder": 0.4,
|
||||||
|
"default": 0.4
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "max_avatar_height",
|
||||||
|
"type": "double",
|
||||||
|
"label": "Maximum Avatar Height (meters)",
|
||||||
|
"help": "Limits the scale of avatars in your domain. Cannot be greater than 1755.",
|
||||||
|
"placeholder": 5.2,
|
||||||
|
"default": 5.2
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "avatar_whitelist",
|
||||||
|
"label": "Avatars Allowed from:",
|
||||||
|
"help": "Comma separated list of URLs (with optional paths) that avatar .fst files are allowed from. If someone attempts to use an avatar with a different domain, it will be rejected and the replacement avatar will be used. If left blank, any domain is allowed.",
|
||||||
|
"placeholder": "",
|
||||||
|
"default": "",
|
||||||
|
"advanced": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "replacement_avatar",
|
||||||
|
"label": "Replacement Avatar for disallowed avatars",
|
||||||
|
"help": "A URL for an avatar .fst to be used when someone tries to use an avatar that is not allowed. If left blank, the generic default avatar is used.",
|
||||||
|
"placeholder": "",
|
||||||
|
"default": "",
|
||||||
|
"advanced": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "avatar_mixer",
|
||||||
|
"label": "Avatar Mixer",
|
||||||
|
"assignment-types": [
|
||||||
|
1
|
||||||
|
],
|
||||||
|
"settings": [
|
||||||
|
{
|
||||||
|
"name": "max_node_send_bandwidth",
|
||||||
|
"type": "double",
|
||||||
|
"label": "Per-Node Bandwidth",
|
||||||
|
"help": "Desired maximum send bandwidth (in Megabits per second) to each node",
|
||||||
|
"placeholder": 5.0,
|
||||||
|
"default": 5.0,
|
||||||
|
"advanced": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "auto_threads",
|
||||||
|
"label": "Automatically determine thread count",
|
||||||
|
"type": "checkbox",
|
||||||
|
"help": "Allow system to determine number of threads (recommended)",
|
||||||
|
"default": false,
|
||||||
|
"advanced": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "num_threads",
|
||||||
|
"label": "Number of Threads",
|
||||||
|
"help": "Threads to spin up for avatar mixing (if not automatically set)",
|
||||||
|
"placeholder": "1",
|
||||||
|
"default": "1",
|
||||||
|
"advanced": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "entity_server_settings",
|
"name": "entity_server_settings",
|
||||||
"label": "Entity Server",
|
"label": "Entities",
|
||||||
"assignment-types": [
|
"assignment-types": [
|
||||||
6
|
6
|
||||||
],
|
],
|
||||||
|
|
@ -1504,35 +1484,55 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "avatar_mixer",
|
"name": "asset_server",
|
||||||
"label": "Avatar Mixer",
|
"label": "Asset Server (ATP)",
|
||||||
"assignment-types": [
|
"assignment-types": [ 3 ],
|
||||||
1
|
|
||||||
],
|
|
||||||
"settings": [
|
"settings": [
|
||||||
{
|
{
|
||||||
"name": "max_node_send_bandwidth",
|
"name": "enabled",
|
||||||
"type": "double",
|
|
||||||
"label": "Per-Node Bandwidth",
|
|
||||||
"help": "Desired maximum send bandwidth (in Megabits per second) to each node",
|
|
||||||
"placeholder": 5.0,
|
|
||||||
"default": 5.0,
|
|
||||||
"advanced": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "auto_threads",
|
|
||||||
"label": "Automatically determine thread count",
|
|
||||||
"type": "checkbox",
|
"type": "checkbox",
|
||||||
"help": "Allow system to determine number of threads (recommended)",
|
"label": "Enabled",
|
||||||
"default": false,
|
"help": "Assigns an asset-server in your domain to serve files to clients via the ATP protocol (over UDP)",
|
||||||
|
"default": true,
|
||||||
"advanced": true
|
"advanced": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "num_threads",
|
"name": "assets_path",
|
||||||
"label": "Number of Threads",
|
"type": "string",
|
||||||
"help": "Threads to spin up for avatar mixing (if not automatically set)",
|
"label": "Assets Path",
|
||||||
"placeholder": "1",
|
"help": "The path to the directory assets are stored in.<br/>If this path is relative, it will be relative to the application data directory.<br/>If you change this path you will need to manually copy any existing assets from the previous directory.",
|
||||||
"default": "1",
|
"default": "",
|
||||||
|
"advanced": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "assets_filesize_limit",
|
||||||
|
"type": "int",
|
||||||
|
"label": "File Size Limit",
|
||||||
|
"help": "The file size limit of an asset that can be imported into the asset server in MBytes. 0 (default) means no limit on file size.",
|
||||||
|
"default": 0,
|
||||||
|
"advanced": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "entity_script_server",
|
||||||
|
"label": "Entity Script Server (ESS)",
|
||||||
|
"assignment-types": [ 5 ],
|
||||||
|
"settings": [
|
||||||
|
{
|
||||||
|
"name": "entity_pps_per_script",
|
||||||
|
"label": "Entity PPS per script",
|
||||||
|
"help": "The number of packets per second (PPS) that can be sent to the entity server for each server entity script. This contributes to a total overall amount.<br/>Example: 1000 PPS with 5 entites gives a total PPS of 5000 that is shared among the entity scripts. A single could use 4000 PPS, leaving 1000 for the rest, for example.",
|
||||||
|
"default": 900,
|
||||||
|
"type": "int",
|
||||||
|
"advanced": true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "max_total_entity_pps",
|
||||||
|
"label": "Maximum Total Entity PPS",
|
||||||
|
"help": "The maximum total packets per seconds (PPS) that can be sent to the entity server.<br/>Example: 5 scripts @ 1000 PPS per script = 5000 total PPS. A maximum total PPS of 4000 would cap this 5000 total PPS to 4000.",
|
||||||
|
"default": 9000,
|
||||||
|
"type": "int",
|
||||||
"advanced": true
|
"advanced": true
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,7 @@ $(document).ready(function(){
|
||||||
|
|
||||||
// for domain settings, we add a dummy "Places" group that we fill
|
// for domain settings, we add a dummy "Places" group that we fill
|
||||||
// via the API - add it to the dropdown menu in the right spot
|
// via the API - add it to the dropdown menu in the right spot
|
||||||
if (index == 1) {
|
if (index == 0) {
|
||||||
$settingsDropdown.append("<li role='separator' class='divider'></li>");
|
$settingsDropdown.append("<li role='separator' class='divider'></li>");
|
||||||
$settingsDropdown.append(makeGroupDropdownElement({ html_id: 'places', label: 'Places' }, "/settings/"));
|
$settingsDropdown.append(makeGroupDropdownElement({ html_id: 'places', label: 'Places' }, "/settings/"));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,7 @@
|
||||||
|
if (typeof Settings === "undefined") {
|
||||||
|
Settings = {};
|
||||||
|
}
|
||||||
|
|
||||||
Object.assign(Settings, {
|
Object.assign(Settings, {
|
||||||
DEPRECATED_CLASS: 'deprecated-setting',
|
DEPRECATED_CLASS: 'deprecated-setting',
|
||||||
TRIGGER_CHANGE_CLASS: 'trigger-change',
|
TRIGGER_CHANGE_CLASS: 'trigger-change',
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue