Commit graph

777 commits

Author SHA1 Message Date
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
Stephen Birarda
d671dec61b fix for ice server sock addr in domain-server 2014-11-04 13:21:48 -08:00
Stephen Birarda
96dd1eaf76 report restricted access state from domain-server in heartbeat 2014-11-03 16:57:10 -08:00
Stephen Birarda
0348251cc1 allow case insensitivity for allowed users in domain-server 2014-11-03 15:32:45 -08:00
Stephen Birarda
2250cdfcc2 have the domain-server unverifiably heartbeat the number of connected users 2014-11-03 14:50:45 -08:00
Stephen Birarda
22f4e8ec70 cleanup heartbeat method names 2014-11-03 14:37:56 -08:00
Stephen Birarda
eb856095a9 fix the domain server heartbeat timer 2014-11-03 12:49:24 -08:00
Stephen Birarda
d50a8f6309 send a heartbeat to data server every 15s 2014-11-03 12:40:56 -08:00
Stephen Birarda
e53ad09b3f rename the automatic networking update method to heartbeat 2014-11-03 12:24:17 -08:00
Stephen Birarda
d3bbd251db move Logging to LogHandler 2014-10-28 13:59:23 -07: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
Brad Hefta-Gaub
023d47918f Merge pull request #3620 from birarda/domain-tunnel
repairs to domain change reset to correctly clear nodes
2014-10-17 16:05:28 -07:00
Brad Hefta-Gaub
af9090cadf Merge pull request #3618 from birarda/master
styling fixes for locked table settings in domain-server
2014-10-17 16:05:04 -07:00
AndrewMeadows
415c7375cb Merge pull request #3614 from ZappoMan/removeParticles
Remove particles
2014-10-17 15:53:19 -07:00
Stephen Birarda
e72b86059e Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-17 14:48:43 -07:00
Atlante45
89cb464eaa Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 14:03:11 -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
Stephen Birarda
c89daa30da fix another dumb conditional mistake in domain-server 2014-10-17 11:07:02 -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
9ee0138ccf Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 10:50:08 -07:00
Stephen Birarda
d00e11541e fix for pub key format returned to data-server 2014-10-17 09:39:04 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
Atlante45
ea7c2e2fa3 Added reverb settings to DS settings 2014-10-16 15:28:24 -07:00
Stephen Birarda
e856191bf3 Merge pull request #3605 from birarda/master
fix for interest list pull when node requests domain list
2014-10-16 12:05:25 -07:00
Stephen Birarda
7bbaaf6b78 cleanup some username signature debug, fix interest list pull 2014-10-16 11:54:55 -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
Stephen Birarda
cbbf11e28f add missing indentation for OpenSSL warnings 2014-10-15 13:31:44 -07:00
Stephen Birarda
9a3ba972e1 preload the public keys for allowed users to allow immediate connection 2014-10-15 10:21:11 -07:00
Stephen Birarda
1613b16a93 remove another extra space 2014-10-15 09:51:52 -07:00
Stephen Birarda
3800389eb4 fix a bad equality check on QJsonObject 2014-10-15 09:51:40 -07:00
Stephen Birarda
05728681a5 add a check to warn if OpenSSL is OS X system version 2014-10-15 09:49:03 -07:00
Stephen Birarda
4d8e44afd1 remove an extra space 2014-10-15 09:19:02 -07:00
Stephen Birarda
50f27d3e16 handle verification of username signature during connection 2014-10-14 18:02:22 -07:00
Stephen Birarda
e3ba8cddbb store returned public keys in domain-server 2014-10-14 16:35:07 -07:00
Stephen Birarda
e9bcc90166 handle remaining conversions for AccountManager passing QNetworkReply 2014-10-14 16:16:54 -07:00
Stephen Birarda
c4b0dc9dcc initial handling of username signature in domain-server 2014-10-14 16:03:35 -07:00
Atlante45
2edc2eed6d Changed arrows style 2014-10-14 12:31:17 -07:00