Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 09:14:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87497 commits 71 branches 56 tags 1.2 GiB
Commit graph

801 commits

Author SHA1 Message Date
Stephen Birarda
8598360f2e allow string values to be graphable in DS stats 2016-02-10 11:50:23 -08:00
Stephen Birarda
90b78feb1e force models file to end in .json.gz 2016-02-02 15:37:34 -08:00
Stephen Birarda
ff239a7c6a add helper text for extension to persistFilePath 2016-02-02 15:17:45 -08:00
Stephen Birarda
13d58003be migrate persistFilename to persistFilePath in DS settings 2016-02-02 15:02:12 -08:00
Stephen Birarda
cfff765731 allow for absolute path handling at entity-server 2016-02-02 14:21:34 -08:00
Stephen Birarda
15c922f4a5 always respond with default index path 2016-01-21 18:24:16 -08:00
Leonardo Murillo
098b7a4ff3 Merge pull request #6870 from birarda/console 
Your Stack Manager is now a Server Console
 2016-01-21 14:31:34 -06:00
Stephen Birarda
f12e0b5fd0 simplify callback for domain API get 2016-01-21 11:15:50 -08:00
Atlante45
fb60a048a5 Default dynamic jitter buffer to true on AM 2016-01-20 14:04:14 -08:00
Stephen Birarda
0bf5526d97 fix default persist path from DS for new location 2016-01-20 09:48:00 -08:00
Stephen Birarda
fdeb00d4c2 change default for models path to new directory 2016-01-20 09:28:47 -08:00
Stephen Birarda
4e94817959 hookup share when passed action on settings page 2016-01-15 15:41:34 -08:00
Thijs Wenker
6808e25fdf zone ranges to min and max variables, this way it is more oversee-able with the new negative positioning system 2016-01-13 01:26:32 +01:00
Brad Hefta-Gaub
456da661ff implement support to download the persist file from entity server status page 2015-11-18 17:30:07 -08:00
Andrew Meadows
4ff05e8c2a fix lin endings of some JS files 2015-10-20 13:26:19 -07:00
Seth Alves
9a9e5b962e make edit logging terse vs not a domain-server setting 2015-10-14 09:45:35 -07:00
Stephen Birarda
60f5a06308 turn on the asset-server by default 2015-10-12 16:44:51 -07:00
Stephen Birarda
dc1f726283 don't assign the asset-server in domain by default 2015-08-26 12:36:48 -07:00
Stephen Birarda
17befac262 use fixed width for stats tables 2015-08-24 18:10:21 -07:00
Stephen Birarda
b8ac9aa5eb update jquery and bootstrap in DS 2015-08-24 18:02:26 -07:00
Stephen Birarda
b386a95d08 fix sort for node uptime 2015-08-19 18:31:42 -07:00
Stephen Birarda
2738f65c10 have domain-server report non-skewed uptime 2015-08-19 18:23:11 -07:00
Stephen Birarda
42a7262707 Merge pull request #5565 from murillodigital/node-version 
DO NOT MERGE - Node versioning
 2015-08-19 13:32:48 -07:00
Seth Alves
4a456488a1 remove the option to persist entities as anything other than json.gz files 2015-08-17 14:01:25 -07:00
Leonardo Murillo
b345d75e4d More cleanup and showing version in ds web gui 2015-08-13 16:44:28 -06:00
Seth Alves
adcd91e3ff Added an option to domain-server settings to persist entities as gzipped json. With this setting enabled, persist files take much less space on disk than with the other two options. 2015-08-04 07:23:24 -07:00
Howard Stearns
a736d0d901 Initial value false for domain-server wantEditLogging (used by assignment clients). 2015-06-29 11:33:55 -07:00
Stephen Birarda
857552ae0b don't hold back link event for account connect 2015-05-26 15:16:23 -07:00
Stephen Birarda
33545a0c3f fix for domain-server settings account disconnect 2015-05-21 13:45:50 -07:00
Stephen Birarda
6306b69ec8 add a version and handle remapping for restricted access 2015-05-20 16:27:53 -07:00
Stephen Birarda
ac954e1c43 fix for lowercase help text in settings 2015-05-20 15:00:11 -07:00
Stephen Birarda
19b669867e cleanup entity checkboxes for new format 2015-05-20 14:58:09 -07:00
Stephen Birarda
e295f52c0a handle change event for new checkboxes 2015-05-20 14:52:31 -07:00
Stephen Birarda
ab52df7254 change checkboxes to prettier bootstrap switches 2015-05-20 14:30:50 -07:00
Stephen Birarda
227bdff07a fix width of re-order column 2015-05-20 11:31:32 -07:00
Stephen Birarda
8fb5c53142 handle initial values for hash tables 2015-05-20 11:21:19 -07:00
Stephen Birarda
dff021ea15 fix for table creation on settings.js 2015-05-18 12:45:24 -07:00
Stephen Birarda
1a1b304319 update METAVERSE_URL to correct url 2015-05-18 10:24:10 -07:00
Stephen Birarda
6c5626da43 save input on enter or act on table 2015-05-18 10:19:11 -07:00
Stephen Birarda
bc0cb6105d fix sidebar badging for grouped values 2015-05-15 17:28:37 -07:00
Stephen Birarda
23378a79ab enable full auto networking for temporary name 2015-05-15 17:25:18 -07:00
Stephen Birarda
9024f15d25 show description for existing domain selection 2015-05-15 17:19:22 -07:00
Stephen Birarda
b8b5ff4aca fixes for temporary domain creation 2015-05-15 17:14:51 -07:00
Stephen Birarda
edf9042ed5 add hifi link to table, make table icons anchors 2015-05-15 17:12:19 -07:00
Stephen Birarda
60a8dc1eb3 add initial version of places table in domain-server 2015-05-15 16:33:12 -07:00
Stephen Birarda
7caaa757fd change paths label to places/paths 2015-05-15 14:51:53 -07:00
Stephen Birarda
bfa069a26b handle domain ID removal and account disconnection 2015-05-15 13:15:09 -07:00
Stephen Birarda
a675b0a891 fix locked link button in settings 2015-05-15 13:10:32 -07:00
Stephen Birarda
82cb55e602 handle case where account is locked 2015-05-15 11:26:06 -07:00
Stephen Birarda
78fa82515a use constant IDs for domain buttons 2015-05-15 11:19:44 -07:00
Stephen Birarda
c0473adec9 add button to create new domain ID in settings 2015-05-15 11:18:12 -07:00
Stephen Birarda
bb936657ae handle domain creation during account connect flow 2015-05-15 11:09:00 -07:00
Stephen Birarda
c4f926b25f hide domain ID + auto network options without account 2015-05-14 16:15:28 -07:00
Stephen Birarda
20940b55ba handle access token storage via sweet-alert 2015-05-14 15:47:20 -07:00
Stephen Birarda
5645fdc8b9 send user to token creation page 2015-05-14 15:21:33 -07:00
Stephen Birarda
a668ea7a4c remove a blank line 2015-05-14 12:53:23 -07:00
Stephen Birarda
4de006f9b9 handle OAuth access token retrieval 2015-05-14 12:22:23 -07:00
Stephen Birarda
fabe19a92c ask for OAuth token directly 2015-05-14 11:19:07 -07:00
Stephen Birarda
aff83be768 handle account disconnection from DS settings 2015-05-14 11:03:41 -07:00
Stephen Birarda
033007cce6 use viewHelpers to create HF account button 2015-05-14 10:45:26 -07:00
Stephen Birarda
62c0aff16a handle falsy values returned from valueForKeyPath 2015-05-13 17:52:46 -07:00
Stephen Birarda
69fb6c73ac remove gui only feature in domain-server 2015-05-13 17:33:44 -07:00
Stephen Birarda
93973eecd1 resolve conflicts on merge with upstream/master 2015-05-13 17:13:33 -07:00
Stephen Birarda
edadaea604 add help text for domain-server paths 2015-05-12 15:30:25 -07:00
Stephen Birarda
c66bd9b1aa complete addition of paths to DS settings 2015-05-12 11:58:55 -07:00
Stephen Birarda
f0aeaa1af8 handle sidebar badging for new root values 2015-05-11 18:07:33 -07:00
Stephen Birarda
542ce944ef add paths, handling for non-grouped values 2015-05-11 17:44:35 -07:00
Stephen Birarda
c390dcb4dd change button to disconnect if account connected 2015-05-11 14:10:44 -07:00
Stephen Birarda
5afb0792dc don't return gui only values from DS settings json 2015-05-11 13:44:35 -07:00
Stephen Birarda
27f06e2d37 add button handling for describe settings 2015-05-11 13:32:09 -07:00
Stephen Birarda
e7433adc96 re-affix the DS settings sidebar 2015-05-11 11:29:32 -07:00
Stephen Birarda
979f33ade5 show an advanced toggle button in when xs 2015-05-11 11:26:45 -07:00
Stephen Birarda
e225443986 fix for table overflow in DS settings 2015-05-11 11:18:26 -07:00
Stephen Birarda
7b4522e950 nullify the current Highchart when modal closed 2015-05-01 16:21:05 -07:00
Stephen Birarda
5936073425 get avatar-mixer settings from domain-server 2015-04-30 14:55:53 -07:00
Stephen Birarda
b50545f414 use symlink for DS resources, add AM bandwidth 2015-04-30 13:53:44 -07:00
Stephen Birarda
73da4828b1 fix the shift and width of stat highchart 2015-04-30 08:33:08 -07:00
Stephen Birarda
17c5d1e32a complete highchart dynamic graph for numerical values 2015-04-29 20:07:00 -07:00
Stephen Birarda
781f45e488 pull the keypath for clicked value in stats javascript 2015-04-29 17:55:10 -07:00
Stephen Birarda
a39ee91233 add a keypath data attribute on stat values 2015-04-29 17:53:29 -07:00
Stephen Birarda
eda18318d8 add highcharts for graphing of numerical stat values 2015-04-29 17:35:03 -07:00
Stephen Birarda
40dfbada5d cleanup styling in json.human.css 2015-04-29 16:38:12 -07:00
Stephen Birarda
cca13d6c96 add back stale state for stats 2015-04-29 16:35:07 -07:00
Stephen Birarda
ab4a140806 re-enable dynamic stat updates, styling fix 2015-04-29 16:25:40 -07:00
Stephen Birarda
cb588debfe handle display of more complex json stats in domain-server 2015-04-29 16:21:35 -07:00
Seth Alves
4e83301c65 add a bool value to Node which indicates if it is allowed to rez new entities 2015-03-31 18:27:46 -07:00
Leonardo Murillo
d1d183e190 More .com changes 2015-03-25 13:05:10 -06:00
Seth Alves
405eceeda6 Merge branch 'master' of github.com:highfidelity/hifi into maximum-capacity 2015-03-18 13:26:46 -07:00
Seth Alves
4bae19015c add (thus far unused) domain-server setting for maximum user capacity 2015-03-17 15:52:23 -07:00
Seth Alves
b431ce289c missed a comma 2015-03-12 10:11:46 -07:00
Seth Alves
3bc85c2531 instead of a json checkbox, a dropdown to chose the file type 2015-03-12 09:34:01 -07:00
Seth Alves
2a06816f71 added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting 2015-03-11 23:09:15 -07:00
ZappoMan
bc5a1477e6 added logging of edit commands in the server 2015-02-13 14:59:57 -08:00
Stephen Birarda
fe79d8902e replace data with metaverse for highfidelity urls 2015-02-10 10:05:38 -08:00
Seth Alves
9539292c22 clarify settings explaination, coding standard 2015-02-06 10:44:35 -08:00
Seth Alves
d19ab4c36f formatting 2015-02-05 15:46:40 -08:00
Seth Alves
ccc8662732 formatting 2015-02-05 15:46:23 -08:00
Seth Alves
810e7549d1 formatting 2015-02-05 15:41:04 -08:00
Seth Alves
afea5f3534 added allowed_editors to settings json 2015-02-04 16:31:36 -08:00
Stephen Birarda
2c1d4c8a64 fix settings url to check domains 2015-01-15 17:44:15 -08:00
Stephen Birarda
891cb42eff use new place names in domain-server settings 2015-01-15 17:41:59 -08:00
ZappoMan
6eb35bf98c tweaks to descriptions 2015-01-13 16:13:18 -08:00
ZappoMan
60aec8ac00 add support for multiple backup rules 2015-01-13 13:41:32 -08:00
Stephen Birarda
2103e0150f fix for row removal in domain array settings 2015-01-06 15:42:01 -08:00
Stephen Birarda
51c175d160 put input default back after row add 2015-01-06 15:30:38 -08:00
ZappoMan
5cef7d0e9d more voxelEctomy 2014-12-30 20:24:27 -08:00
Atlante45
e6123ec4a7 Typo 2014-12-18 16:31:19 -08:00
Atlante45
47d8b0b062 Replace Game Of Life with intructions 2014-12-18 16:24:26 -08:00
Stephen Birarda
77bc00e410 a simple model for persistent scripts in domain-server 2014-12-16 18:34:39 -08:00
Philip Rosedale
2e6330e3c4 Merge pull request #3810 from Atlante45/new_reverb_settings_description 
New text for reverb settings
 2014-11-17 11:50:19 -08:00
Atlante45
18faa78aa3 New text for reverb settings 2014-11-17 11:22:32 -08:00
ZappoMan
bdfe02bbd0 Merge branch 'master' of https://github.com/highfidelity/hifi into persistThreadImprovements 
Conflicts:
	assignment-client/src/octree/OctreeServer.cpp
	libraries/octree/src/OctreePersistThread.cpp
	libraries/octree/src/OctreePersistThread.h
 2014-11-17 11:22:00 -08:00
ZappoMan
f44513ebe7 added support for rolling version numbers in backups 2014-11-15 22:55:12 -08:00
ZappoMan
4adb4787cd added debugging of usecTimestampNow() in octree server to better understand flight times 2014-11-15 21:50:42 -08:00
ZappoMan
6ee4e611ac add persist settings to domain settings, make default backup interval 30 minutes 2014-11-14 11:31:06 -08:00
Philip Rosedale
17d0f247d6 Switch muting threshold to 0.003 to be a bit less aggressive 2014-11-11 14:10:44 -08:00
Philip Rosedale
12eb67c734 fix bug with audio mixer muting too often 2014-11-07 14:18:57 -08:00
AndrewMeadows
843aaf4e95 Merge pull request #3747 from PhilipRosedale/master 
First pass audio mixer muting, improved tour guide, hair, injector loudness in JS
 2014-11-06 10:36:46 -08:00
ZappoMan
bcec14b0f4 adjust the sentAt times in packets by the receiving side's clockskew so that it can calculate proper flight times 2014-11-05 19:37:08 -08:00
Philip Rosedale
688bd0f34f first pass audio mixer automatic muting of noisy streams, tour guide improvements, new lightExample.js, hair hangs over cone 'body' 2014-11-05 16:58:58 -08:00
ZappoMan
e9a332de4d make entity and voxel servers support domain based configuration 2014-11-05 12:12:17 -08:00
Stephen Birarda
9364c3b342 fix for delete of last row in array table 2014-10-23 11:54:30 -07:00
Atlante45
7c54da033c Changed reverb time label 2014-10-20 16:29:19 -07:00
Atlante45
86b87770c2 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 16:50:19 -07:00
Stephen Birarda
1e4eaed7fd don't show domain ID selection button if in master config 2014-10-17 12:25:23 -07:00
Stephen Birarda
0d99beb344 add styling to locked table 2014-10-17 11:33:29 -07:00
Stephen Birarda
796b519fe0 remove change buttons for a locked table 2014-10-17 11:24:51 -07:00
Stephen Birarda
7c24186baa don't allow the creation of new table rows if table locked 2014-10-17 11:23:39 -07:00
Stephen Birarda
5b0ccd7091 fix for for clickable labels and locked table 2014-10-17 11:22:42 -07:00
Atlante45
c86f3965e8 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 11:01:42 -07:00
Stephen Birarda
9a842e2202 flip domain-server local connect conditional 2014-10-17 10:52:36 -07:00
Atlante45
ea7c2e2fa3 Added reverb settings to DS settings 2014-10-16 15:28:24 -07:00
Atlante45
9019ae4f89 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/web/js/settings.js
 2014-10-16 10:55:46 -07:00
AndrewMeadows
4fbc589606 Merge pull request #3598 from birarda/domain-tunnel 
initial pass at using keypairs for username verification for basic domain-server ACL
 2014-10-16 10:49:03 -07:00
Atlante45
0ae4392d0a missing 's' 2014-10-15 17:11:24 -07:00
Atlante45
3f67f6fae7 hide panels if only advanced settings 2014-10-15 17:09:10 -07:00
Atlante45
ad48009ecd Switch buffers back to advanced 2014-10-15 17:08:45 -07:00
Atlante45
0cf4483c5a factor text-align and font-size 2014-10-15 15:52:59 -07:00
Atlante45
0688379b74 changed buttons class names 2014-10-15 15:15:19 -07:00
Atlante45
2edc2eed6d Changed arrows style 2014-10-14 12:31:17 -07:00
Atlante45
02b4b220b9 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-14 12:16:20 -07:00
Atlante45
edea8da18f Move array rows 2014-10-14 12:13:34 -07:00
Stephen Birarda
7e116346cb fix the security link in domain-server page 2014-10-14 11:53:07 -07:00
Atlante45
6d03590c00 If no advanced settings, don't show button 2014-10-13 11:10:37 -07:00
Atlante45
8fab184ed1 Remove audio settings from advanced 2014-10-13 11:10:11 -07:00
Stephen Birarda
21114d5f56 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-10 14:30:43 -07:00
Atlante45
fb751aec7c Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/web/js/settings.js
 2014-10-10 10:24:28 -07:00
Stephen Birarda
64b3d461fe fix for delete of object table row 2014-10-10 10:00:35 -07:00
Stephen Birarda
3aca910e17 remove some extra console logs 2014-10-10 09:27:15 -07:00
Stephen Birarda
d2c7bf4334 fix for delete of object table row 2014-10-10 09:26:41 -07:00
Stephen Birarda
e40aff4864 remove a missed console log 2014-10-09 16:54:08 -07:00
Stephen Birarda
31df339565 pipe username signature requirement through to DomainHandler 2014-10-09 16:53:22 -07:00
Stephen Birarda
c342e1b2e8 cleanup help text for allowed users for domain 2014-10-09 16:19:16 -07:00
Stephen Birarda
d70bf7fc50 add allowed users to describe, remove +/- from table header 2014-10-09 16:15:59 -07:00
Stephen Birarda
d741b860f8 fix for delete of object table row 2014-10-09 15:58:26 -07:00
Atlante45
fb520bf47f Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-09 15:34:24 -07:00
Atlante45
f2bbb88405 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/describe-settings.json
	domain-server/resources/web/js/settings.js
 2014-10-09 15:34:17 -07:00
Stephen Birarda
95bca3f33e fix an error in describe json 2014-10-09 15:29:15 -07:00
Stephen Birarda
90a79fc6f5 remove allowed users from describe until ready for primetime 2014-10-09 15:27:51 -07:00
Stephen Birarda
7eae64a26b constantize the delete row button classes 2014-10-09 15:24:12 -07:00
Stephen Birarda
c748ecb967 constantize the new row class 2014-10-09 15:22:20 -07:00
Stephen Birarda
e80cf6fc76 highlight new rows by making them green 2014-10-09 15:21:38 -07:00
Stephen Birarda
4d13718d87 constantize the trigger change class for input changes 2014-10-09 15:19:56 -07:00
Stephen Birarda
712a81c950 more constantization and removal of extra line 2014-10-09 15:17:45 -07:00
Stephen Birarda
ee36b6b91a jump to input for next row after enter on previous row 2014-10-09 15:12:42 -07:00
Stephen Birarda
a6c5f4308a handle the enter button in domain server forms 2014-10-09 15:10:17 -07:00
Stephen Birarda
ad48592a69 start to constantize some classes in settings.js 2014-10-09 15:02:14 -07:00
Atlante45
b19956b0ca Changed panel names 2014-10-09 14:46:13 -07:00
Stephen Birarda
9dc0bf52b8 constantize the advanced settings class 2014-10-09 14:44:24 -07:00
Stephen Birarda
2472dc0c11 handle transition from input to row for array of objects 2014-10-09 14:42:21 -07:00
Stephen Birarda
323eaa0ac9 remove an extra space 2014-10-09 14:36:33 -07:00
Stephen Birarda
98925e4adb handle removal of last row and removal of hidden input for empty array 2014-10-09 14:34:05 -07:00
Stephen Birarda
e1b64275c9 fix population of multi-column array from values in settings 2014-10-09 14:26:39 -07:00
Atlante45
06007863d2 Fixed placeholder 2014-10-09 12:39:00 -07:00
Atlante45
72e4785db2 Reorganized settings 2014-10-09 12:38:46 -07:00
Atlante45
e7ecf1cd6f Optional labels 2014-10-09 12:38:07 -07:00
Stephen Birarda
6d01724568 rename in changedInput in badge sidebar in settings.js 2014-10-09 11:57:11 -07:00
Stephen Birarda
84fa1c7f5f remove an extra space 2014-10-09 11:54:53 -07:00
Stephen Birarda
806e73d321 don't set data-changed when a row is added and deleted in same session 2014-10-09 11:54:37 -07:00
Stephen Birarda
bfaf96dbf5 remove the allowed_users setting that isn't ready for primetime 2014-10-09 11:31:30 -07:00
Stephen Birarda
68dffabd5e handle data-changed setting for all array values 2014-10-09 11:31:00 -07:00
Stephen Birarda
a175c22724 handle addition and removal on same page session 2014-10-09 10:56:54 -07:00
Stephen Birarda
f39120519d fix removal icons, handle row removal for hash 2014-10-09 10:50:05 -07:00
Stephen Birarda
a416f67751 handle add and delete for badged sidebar 2014-10-09 10:33:20 -07:00
Stephen Birarda
90c73dc9e1 post an empty array to remove an array from settings 2014-10-09 09:47:53 -07:00
Stephen Birarda
188320a7b7 badge sidebar for table removal 2014-10-09 09:37:24 -07:00
Stephen Birarda
ed6b62cea4 clear a row value after it is added to the table 2014-10-08 17:07:31 -07:00
Stephen Birarda
1fa0d8df72 change the add and remove style for glyphs in settings 2014-10-08 16:56:41 -07:00
Stephen Birarda
01e6acda39 changes to allow an array setting via table 2014-10-08 16:52:04 -07:00
Stephen Birarda
e6dee30a6a handle drawing a table for array values 2014-10-08 16:01:43 -07:00
Stephen Birarda
1136c1bf13 remove custom font and large X for errors 2014-10-08 15:49:08 -07:00
Stephen Birarda
4daa379b03 use sweet alert for nice error messages in domain-settings 2014-10-08 15:32:56 -07:00
Stephen Birarda
51afd52ffb vertically center the glyphicon for table button 2014-10-08 14:56:09 -07:00
Stephen Birarda
f4eddbc93b change number to numbered for domain-server settings 2014-10-08 14:54:41 -07:00
Stephen Birarda
fb8c5c3bf0 initial styling changes to domain table 2014-10-08 14:52:53 -07:00
Atlante45
19d103c343 Indentation 2014-10-08 13:54:53 -07:00
Atlante45
9a87e764e2 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/web/js/settings.js
	domain-server/src/DomainServerSettingsManager.cpp
 2014-10-08 11:46:07 -07:00
Atlante45
cd67c9d456 Removed console logs 2014-10-08 11:40:43 -07:00
Atlante45
11b38d554f reindentation 2014-10-08 11:24:01 -07:00
Atlante45
e2d3ca53e6 Changed data to row-data 2014-10-08 11:14:39 -07:00
Atlante45
dd90ea01bd Removed setting-input 2014-10-08 10:25:01 -07:00
Stephen Birarda
7773a94df7 resolve conflicts on merge with upstream master 2014-10-08 09:27:16 -07:00
Atlante45
9c2e688477 indentation 2014-10-07 21:03:02 -07:00
Atlante45
c9e4c12ce2 Removed line number 2014-10-07 21:00:53 -07:00
Atlante45
4e0e9d1dba Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-07 20:52:27 -07:00
Atlante45
91727232f8 Indentation 2014-10-07 20:52:06 -07:00
Atlante45
ec8fcb6b59 removed debug and name in posted object 
:
 2014-10-07 20:43:41 -07:00
Atlante45
2a5292732c DomainServerSettings handles any types of objects 2014-10-07 18:01:32 -07:00
Stephen Birarda
67fdfbb7f1 fix for user domains path in domain settings 2014-10-07 14:19:15 -07:00
Stephen Birarda
ea4c5a8900 repairs for new user scoped paths 2014-10-07 14:18:05 -07:00
Atlante45
8be5c18412 Get table data over to DS 2014-10-06 17:52:41 -07:00
Stephen Birarda
78920234bb handle changed domain-server port on start 2014-10-06 14:49:15 -07:00
Stephen Birarda
14cd044359 handle custom local UDP port for domain-server from webpage 2014-10-06 14:41:16 -07:00
Atlante45
ace8b98064 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 2014-10-06 14:12:57 -07:00
Atlante45
011e848c04 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/describe-settings.json
 2014-10-03 17:52:40 -07:00
Sam Gateau
bd5c6517a5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 
Conflicts:
	interface/src/ui/MetavoxelEditor.cpp
	interface/src/ui/overlays/Sphere3DOverlay.cpp
 2014-10-03 17:31:05 -07:00
Sam Gateau
738369e21f Replacing glutSolidSphere by a cached Geometry 
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)

- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using  fOuterRadius
 2014-10-03 16:55:58 -07:00
Philip Rosedale
f38ddb0f6e Merge pull request #3537 from Atlante45/move_att_setting 
Moved attenuation setting to non advanced
 2014-10-03 15:30:58 -07:00
Atlante45
1d37545511 Moved attenuation setting to non advanced 2014-10-03 15:25:03 -07:00
Atlante45
1aab86884d Move table view code + wire row delete 2014-10-03 14:25:36 -07:00
Stephen Birarda
5be067cf11 disable automatic networking by default 2014-10-03 09:31:17 -07:00
Atlante45
a5108375b8 Table JSON data 2014-10-02 15:39:02 -07:00
Atlante45
61e38f545e new table type 2014-10-02 15:38:36 -07:00
Stephen Birarda
e88b3311ad Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-02 09:20:08 -07:00
Brad Hefta-Gaub
5d67739ab7 Merge pull request #3521 from birarda/domain-wizard 
handle select inputs in domain server settings creation
 2014-10-02 08:36:10 -07:00
Stephen Birarda
d6572c3e2e handle automatic networking changes with data-server 2014-10-01 16:38:44 -07:00
Stephen Birarda
15156519b3 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-01 16:19:16 -07:00
Stephen Birarda
2eec6c1401 changes to settings.js to allow for select inputs 2014-10-01 12:00:10 -07:00
Stephen Birarda
a4b4fc52b6 handle select inputs in domain server settings creation 2014-10-01 11:57:44 -07:00
Stephen Birarda
d3cef7e592 add select for automatic networking to describe settings 2014-10-01 11:57:24 -07:00
Stephen Birarda
0174a985ee add a domain-server scripts folder that is ignored for clean symlink 2014-10-01 09:56:13 -07:00
Stephen Birarda
f1de2ac937 rename jquery for easier updating in domain-server 2014-10-01 09:00:24 -07:00
Stephen Birarda
4ef2863b79 fix setting posting for checkbox values 2014-09-30 15:01:37 -07:00
Stephen Birarda
909a6e89a8 resolve conflicts on merge with upstream master 2014-09-30 13:50:04 -07:00
Atlante45
b571fb86ae Changed attenuation setting help 2014-09-30 12:53:33 -07:00
Atlante45
4e7bf0487b Add attenuation setting on DS page 2014-09-30 12:50:50 -07:00
Stephen Birarda
df5ab50703 clear up domain ID selection on domain settings page 2014-09-30 11:34:03 -07:00
Stephen Birarda
26c2aece7a fix target blank link from domain-server settings 2014-09-30 11:21:35 -07:00
Stephen Birarda
f566b42d18 make My Tokens link open in a new tab 2014-09-30 11:17:55 -07:00
Stephen Birarda
541c3c6da8 handle style of button while domains are loading 2014-09-30 11:02:47 -07:00
Stephen Birarda
5b03a445a8 allow user to choose domain ID from High Fidelity domains 2014-09-30 10:47:52 -07:00
Stephen Birarda
68a70cc914 don't use dashes in settings JSON keys 2014-09-30 09:40:54 -07:00
Stephen Birarda
f07a8fd672 add a message for domain query with missing access token 2014-09-30 09:37:41 -07:00
Stephen Birarda
85aa0c34fb stub of domain-server choose domain handler 2014-09-30 09:31:04 -07:00
Stephen Birarda
c84aac9d2e remove an extra console log 2014-09-30 09:12:53 -07:00
Stephen Birarda
46258ae78f add a tooltip to say why locked settings cannot be changed 2014-09-29 10:02:01 -07:00
Stephen Birarda
58b03c7ef2 disable form inputs for values set by master config 2014-09-29 09:53:27 -07:00
Stephen Birarda
42d40d5a13 some help text cleanup for audio settings 2014-09-26 15:11:12 -07:00
Stephen Birarda
6bc81e6ff4 use panels on main domain-server page 2014-09-26 14:45:32 -07:00
Stephen Birarda
e8c3fa3cf1 use ID from new domain settings, don't disable save button 2014-09-26 14:39:50 -07:00
Stephen Birarda
cccacf4e6a disable the save button if no settings are changed 2014-09-26 14:31:44 -07:00
Stephen Birarda
bbf111a9a0 disable the save button when nothing has changed 2014-09-26 14:27:29 -07:00
Stephen Birarda
05b80e3fb4 remove scrollspy while sections are not large enough 2014-09-26 14:21:49 -07:00
Stephen Birarda
401eb7df4f remove the offset from scrollspy 2014-09-26 14:19:56 -07:00
Stephen Birarda
2a7626159c stop the refresh countdown once we hit zero 2014-09-26 14:15:56 -07:00
Stephen Birarda
80f1594a17 add a restart modal to settings page 2014-09-26 14:12:30 -07:00
Stephen Birarda
0f41ca65a9 add a save button on domain settings when viewport small 2014-09-26 13:53:12 -07:00
Stephen Birarda
33856be29e add period to help text for http password 2014-09-26 13:16:08 -07:00
Stephen Birarda
96627a8f97 allow authenticated access to full domain-server settings 2014-09-26 12:56:35 -07:00
Stephen Birarda
954fbc2017 use DomainServerSettingsManager to handle simulation settings and config 2014-09-26 11:06:05 -07:00
Stephen Birarda
2c8d8decb8 remove focus from advanced toggle when clicked 2014-09-26 09:46:55 -07:00
Stephen Birarda
507621ca3a add toggle for advanced settings 2014-09-26 09:27:33 -07:00
Stephen Birarda
7d14408adc badge the list-group-item when settings have changed 2014-09-26 09:15:48 -07:00
Stephen Birarda
f47cc176b5 resolve conflicts on merge with upstream master 2014-09-26 08:33:34 -07:00
Stephen Birarda
ba929626c2 fix for undefined placeholder values 2014-09-25 18:25:16 -07:00
Stephen Birarda
697ae900dc handle basic vs advanced settings 2014-09-25 18:14:18 -07:00
Stephen Birarda
9a56e72079 fix for values grabbed from settings 2014-09-25 18:08:22 -07:00
Stephen Birarda
ecb14d261b distinguish advanced and standard settings, cleanup checkboxes 2014-09-25 18:04:25 -07:00
Stephen Birarda
606a25694d setup scrollspy for nav links on settings page 2014-09-25 17:18:10 -07:00
Stephen Birarda
623e9e625b update to jQuery 2.1.1 2014-09-25 16:42:39 -07:00
Stephen Birarda
e8f25db6d8 update underscore to 1.7.0 2014-09-25 16:41:14 -07:00
Stephen Birarda
1c899daa1c don't escape setting help to allow for html 2014-09-25 16:37:08 -07:00
Stephen Birarda
33a411b895 combine settings and setup into single tab 2014-09-25 16:32:09 -07:00
Stephen Birarda
2e176589b7 initial use of a json file to describe setup options 2014-09-25 15:12:37 -07:00
Stephen Birarda
769586ef30 remove extra panels in domain-server setup 2014-09-25 14:23:15 -07:00
Stephen Birarda
33462f7466 handle permanent sidebar in setup page 2014-09-25 14:22:32 -07:00
Stephen Birarda
4790f517d6 add a nav panel for setup and pin to left 2014-09-25 13:42:11 -07:00
Atlante45
94edf2c900 Defaulted penumbra filter to true 2014-09-24 15:45:43 -07:00
Stephen Birarda
0b83795a13 simplify the domain setup page to just handle domain ID 2014-09-24 14:43:28 -07:00
Stephen Birarda
62e0d98d6b add username and password to domain setup page 2014-09-24 14:39:10 -07:00
Stephen Birarda
4a040b3f5e add base of modal to choose from user domains 2014-09-24 14:36:08 -07:00
Stephen Birarda
25150b9285 update to newer bootstrap, add stub of setup form 2014-09-24 13:56:15 -07:00
Craig Hansen-Sturm
8e6d5da8fd disable positional filter by default 2014-09-18 16:05:15 -07:00
Stephen Birarda
f1458dec3f fix presentation of checkboxes who default to true 2014-09-17 08:46:08 -07:00
Craig Hansen-Sturm
ea6f89c9f4 head penumbra filter tuning / head penumbra filter now turned on by default 2014-09-15 18:46:10 -07:00
Craig Hansen-Sturm
e941e58626 merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00
Craig Hansen-Sturm
4cd1f4afef add support for head-shadow/penumbra filter for positional audio streams 2014-08-24 22:17:07 -07:00
wangyix
db0fbcab97 merge with upstream 2014-08-13 11:09:55 -07:00
wangyix
446c888242 AudioMixer print added; untested 2014-08-12 12:22:32 -07:00
wangyix
e276d15ed4 repetition-with-fade implemented; testing interface crash 2014-08-11 16:25:43 -07:00
wangyix
1f011bfe9d repetition-with-fade option added, not implemented 2014-08-11 11:22:37 -07:00
wangyix
fd3425dfd1 knobs confirmed working 2014-08-07 17:05:23 -07:00
wangyix
1153a76ab1 new option knobs added, no new behavior yet 2014-08-07 16:37:36 -07:00
Stephen Birarda
4f0218090c have the domain-server brand in navbar link back to home 2014-08-04 16:23:28 -07:00
Stephen Birarda
4407ea4480 make assignment selector a dropdown 2014-08-04 16:02:13 -07:00
Stephen Birarda
6febca3533 add missing domain-server javascript file 2014-08-04 15:37:06 -07:00
Stephen Birarda
c786ee5c26 dynamically change active link in domain-server navbar 2014-08-04 15:27:34 -07:00
Stephen Birarda
2c1277ef37 remove voxel settings from domain-server settings until ready to go 2014-08-04 14:47:17 -07:00
Stephen Birarda
40375b8c81 add a navbar to domain-server web page 2014-08-04 14:46:33 -07:00
Stephen Birarda
453c37f4b9 Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth 2014-07-31 10:05:40 -07:00
wangyix
daeb2a898d added staticDesiredJitterBufferFrames feature; AudioMixer crashing 
moved some callbacks from Application::updateAvatar() to
Application::update()
 2014-07-30 15:35:40 -07:00
wangyix
ecfd5c2757 default max frames over desired changed to 10 2014-07-29 17:37:59 -07:00
Stephen Birarda
9dbe74b02f parse voxel costs to the DomainHandler object 2014-07-29 17:22:17 -07:00
Stephen Birarda
5fd7a11c6b rename the voxel cost settings 2014-07-29 16:38:07 -07:00
wangyix
d49970d010 maxFramesOverDesired added; settable from domain page and preferences 2014-07-29 15:57:32 -07:00
Stephen Birarda
ef5db5321d make voxel charges affect agents 2014-07-29 09:46:59 -07:00
Stephen Birarda
ebf5379275 default voxel costs to free, add a wallet ID for voxel change payments 2014-07-23 11:13:12 -07:00
Stephen Birarda
1a13fbb437 add a setting section for voxel costs 2014-07-23 10:54:55 -07:00
Stephen Birarda
a77e49d2ab add back missing colon for node port 2014-07-21 10:47:07 -07:00
Stephen Birarda
624bb33b1d display the node's username in underscore template 2014-07-21 10:34:12 -07:00
Stephen Birarda
731690e358 add querying for settings that affect a specific type 2014-06-26 16:29:44 -07:00
Stephen Birarda
ab50432ead use underscorejs templating for queued assignments 2014-06-26 15:45:31 -07:00
Stephen Birarda
e56f4aba0a use underscorejs for nodes table template 2014-06-26 15:40:10 -07:00
Stephen Birarda
5cd2dc594f only post changed values to settings.json, fix for bool values 2014-06-26 08:45:12 -07:00
Stephen Birarda
13169fa664 replace handlebars with underscore for templating 2014-06-25 16:35:44 -07:00
Stephen Birarda
4188a4eab1 change unattenuated zone placeholder and offer method to grab JSON settings 2014-06-25 14:16:24 -07:00
Stephen Birarda
6519d4028a populate the settings page correctly with existing values 2014-06-25 13:55:32 -07:00
Stephen Birarda
f8dccad6ec enable persisting of posted settings to a JSON file 2014-06-25 11:20:09 -07:00
Stephen Birarda
11f23ca6f6 add POSTing of settings to DS via form2js 2014-06-24 15:56:53 -07:00
Stephen Birarda
cf0e1ab1a9 finish up handlebars template for settings 2014-06-24 14:24:56 -07:00
Stephen Birarda
afe2e57701 add a settings page to DS that uses handlebars template library 2014-06-24 12:33:40 -07:00
Stephen Birarda
5b3b19011e display pending credits in DS web page 2014-05-20 17:04:41 -07:00
Stephen Birarda
67cc186964 optional sending of assignment pool from ds assignment page 2014-04-16 16:29:22 -07:00
Stephen Birarda
5adcf68752 sort nodes on DS page by their uptime 2014-04-07 09:08:51 -07:00
Stephen Birarda
44860a5f5a put servers alphabetically first in node list 2014-03-28 12:01:37 -07:00
Stephen Birarda
cb617c9e17 add a button on DS admin page to kill all nodes 2014-03-26 11:37:30 -07:00
Stephen Birarda
49fd413722 fix for stats styling 2014-03-25 11:50:25 -07:00
Stephen Birarda
4f7a8473fd make stats red when they become stale 2014-03-24 16:40:14 -07:00
Stephen Birarda
364df16a9f pretty up the stats table 2014-03-24 16:34:00 -07:00
Stephen Birarda
f8279c1f5b handle query params in HTTPManager, display stats table from DS 2014-03-24 14:14:26 -07:00
Stephen Birarda
fc76103fa0 link to node stats page from table 2014-03-24 12:18:42 -07:00
Stephen Birarda
55bc9c059d show stats for node at /nodes/UUID 2014-03-24 12:15:36 -07:00
ZappoMan
ed703673b6 first cut at flocking birds, change willEmitVisualCallback to update 2014-03-04 14:41:06 -08:00
Stephen Birarda
f237b77fa7 fix a bad cast to Assignment, closes #1935 2014-02-07 15:26:18 -08:00
Stephen Birarda
9694a622b5 update placeholder and give edit packet senders to Agent 2014-02-05 15:35:13 -08:00
Stephen Birarda
58b426590f make sure boundary in script upload is followed by new line 2014-01-17 11:38:24 -08:00
Stephen Birarda
bce40a9963 add basic SSI include support to HttpManager 2014-01-17 10:40:49 -08:00
Stephen Birarda
4cbb98028f temp remove audio from agent, fix GOL placeholder 2013-11-07 12:07:34 -08:00
Stephen Birarda
9339538a74 fixes for admin interface with multiple nodes of same type 2013-10-24 16:37:41 -07:00
Stephen Birarda
37c618927e make the colon and port gray for sockets 2013-10-23 16:56:40 -07:00
Stephen Birarda
0d6f363ed5 fix to correct colors based on @problem provided values 2013-10-23 16:52:13 -07:00
Stephen Birarda
7c40a47155 remove the non-minified bootstrap files 2013-10-23 16:43:48 -07:00
Stephen Birarda
6608e4bc5b rename top table now that it is displaying nodes 2013-10-23 14:44:56 -07:00
Stephen Birarda
d85ed014ba switch to bootstrap 3, complete initial index page 2013-10-23 14:43:59 -07:00
Stephen Birarda
fdf9b05dab add bootstrap to DS, stub fulfilled and queued assignments on index page 2013-10-22 17:38:14 -07:00
Stephen Birarda
e8b0790b3e updates to VoxelScriptingInterface for smarter packet sending 2013-10-02 11:42:27 -07:00
Stephen Birarda
77193dd707 change the placeholder javascript to be 32x32 game of life 2013-09-23 09:56:07 -07:00
Stephen Birarda
3d1c77d047 expose the TREE_SCALE to JS 2013-09-20 14:47:36 -07:00
Stephen Birarda
76df707e31 add the ability to ask for multiple instances from JS page 2013-09-17 11:48:08 -07:00
Stephen Birarda
83ed162d49 include jquery and remove javascript includes from net 2013-09-13 12:42:14 -07:00
Stephen Birarda
c40e848220 move DS web to resources for deploys 2013-09-13 11:21:03 -07:00