Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 23:14:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51434 commits 25 branches 0 tags 1.1 GiB
Commit graph

1564 commits

Author SHA1 Message Date
Seth Alves
e9961110e9 if we have new ice-server information, retry right away, even if the previous attempt failed 2016-10-10 15:40:59 -07:00
Seth Alves
9712301172 avoid a race that can cause metaverse to not have correct ice-server information about a domain 2016-10-10 11:54:33 -07:00
Brad Hefta-Gaub
41e90eda49 Merge pull request #8648 from sethalves/no-groups-no-log-spam 
don't check for user membership in a null list of groups
 2016-09-30 11:23:30 -07:00
Thijs Wenker
7e3073e163 fix spelling bugs 2016-09-29 22:13:27 +02:00
Chris Collins
5f325f7923 Merge pull request #8629 from sethalves/ice-troubles-1 
domain-server tells metaverse if it has no ice-server
 2016-09-23 15:26:50 -07:00
Seth Alves
8cadd299a2 Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles-1 2016-09-23 13:16:26 -07:00
Zach Pomerantz
a9318d052b Merge branch 'master' of github.com:highfidelity/hifi into clean/audio-config 2016-09-23 13:11:52 -07:00
Seth Alves
f546524c1f don't checkout for user membership in a null list of groups 2016-09-23 09:46:10 -07:00
Seth Alves
bd2ee56a27 fix domain-server command-line arguments 2016-09-22 12:45:49 -07:00
Seth Alves
d2c5378627 Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles-1 2016-09-22 11:44:23 -07:00
Seth Alves
c43c83019d Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles 2016-09-22 10:34:25 -07:00
Brad Hefta-Gaub
5d3d4bdbd9 add support for redirection on domain at max capacity 2016-09-21 18:12:38 -07:00
Zach Pomerantz
e2ff738fc3 strip unused audio settings 
- remove parameters on the jitter buffer algorithm, these are now static
- remove parameters on the output starve detection algorithm, now static
- move interface audio settings to the Developer menu
 2016-09-21 17:35:27 -07:00
Seth Alves
7dc8a48dba Merge branch 'ice-troubles' of github.com:sethalves/hifi into ice-troubles-1 2016-09-21 10:08:17 -07:00
Seth Alves
b9ea93de57 use qWarning rather than qCritical because qCritical may exit 2016-09-21 10:08:02 -07:00
Seth Alves
a3aea774fe tell metaverse ice-server is 0.0.0.0 when domain-server doesn't have one 2016-09-21 10:07:12 -07:00
Seth Alves
ba8aa5b50c fix camelcase 2016-09-19 16:38:34 -07:00
Seth Alves
571aaac4d7 Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles 2016-09-19 15:37:53 -07:00
Seth Alves
8108557e10 whitespace 2016-09-19 15:37:50 -07:00
Brad Hefta-Gaub
fd474f6319 add basic support for master vs stable builds 2016-09-19 14:14:32 -07:00
Seth Alves
45b48c01bf command-line arguments to control ice-server ip address and domain-server ID 2016-09-19 13:39:42 -07:00
Brad Hefta-Gaub
3d54600843 Merge pull request #8513 from Atlante45/feat/network-port 
Add settings to change local port
 2016-09-08 18:10:32 -07:00
SamGondelman
544606bccc cmake fix 2016-09-06 17:40:44 -07:00
SamGondelman
74e5814a48 try to fix rpath issue 2016-09-06 17:40:43 -07:00
SamGondelman
9d447d4dcc enabled qnetworkrequest redirects everywhere I could find them 2016-09-06 17:35:06 -07:00
Atlante45
eb007b24cd Use invalid port to signal no value passed 2016-09-06 11:59:07 -07:00
Stephen Birarda
43b8e01d46 don't force auto networking on non metaverse domains 2016-08-23 11:21:15 -07:00
Stephen Birarda
d098a1ae28 allow temporary domains to use an access token when present 2016-08-22 10:50:39 -07:00
Seth Alves
9bcda1bb45 merge from upstream 2016-08-20 15:25:04 -07:00
Seth Alves
ac4ecc9907 don't send a login-denied packet when we're still waiting for user's public key. 2016-08-19 14:10:27 -07:00
Seth Alves
87dbfa7e47 add -Wsuggest-override to compile flags and deal with fallout 2016-08-18 09:51:41 -07:00
Ryan Huffman
727d59ab27 Add backup directory setting to domain server 2016-08-16 17:33:32 -07:00
Stephen Birarda
5bac88c004 default domain-server permissions to connect for standard 2016-08-11 10:52:36 -07:00
Zander Otavka
3df8aa0dba Suppress repeated ice server connection messages 2016-08-08 17:01:32 -07:00
Seth Alves
f348b56106 remove hidden attribute from advanced settings button 2016-08-05 18:16:48 -07:00
Brad Hefta-Gaub
652bea8cd0 Merge pull request #8363 from birarda/no-temp-ice-update 
Avoid DS heartbeats with non-metaverse domain ID
 2016-08-05 16:48:00 -07:00
Seth Alves
3ca1ee1d82 Fix some group-related code to handle CamelCase usernames 2016-08-04 17:39:41 -07:00
Stephen Birarda
f3e30221f0 only force a new temp name if already a temp domain-server 2016-08-04 09:33:31 -07:00
Stephen Birarda
ba49fd2c61 don't heartbeat immediately unless metaverse domain 2016-08-04 09:33:31 -07:00
Stephen Birarda
a1220b87f1 set key ID for verified user in right place 2016-08-02 14:35:51 -07:00
Stephen Birarda
760223a550 check for existing public key with lowercase username 2016-08-02 14:35:51 -07:00
Stephen Birarda
5eb890e4f5 add a simple IP address sanitizer for DS settings save 2016-08-02 14:35:51 -07:00
Stephen Birarda
39e6ac0974 cleanup API for HifiConfigVariantMap after migration 2016-08-02 14:35:11 -07:00
Stephen Birarda
62af203d08 migrate the deprecated merged master/user config 2016-08-02 14:35:11 -07:00
Stephen Birarda
285478f1b2 don't repack the same permissions after kick 2016-08-02 14:35:11 -07:00
Stephen Birarda
5b04ab6d53 add node kick request handling to DS 2016-08-02 14:35:11 -07:00
Stephen Birarda
eaf52ae111 default kick perms for localhost 2016-08-02 14:35:11 -07:00
Stephen Birarda
f04996a53d add the kick permission to domain server settings 2016-08-02 14:35:11 -07:00
Stephen Birarda
5d69c9c81e fix sockaddr choice for local nodes 2016-08-02 14:35:11 -07:00
Stephen Birarda
b1e0e6d708 use replacement for IP address perms, not additive 2016-08-02 14:35:11 -07:00
Stephen Birarda
f7298ef767 add packing of IP perms, small cleanup in packing 2016-08-02 14:35:11 -07:00
Stephen Birarda
cd436355fc cleanup handling of defaults for standard user perms 2016-08-02 14:35:11 -07:00
Stephen Birarda
f8ea180127 match naming of forbidden IP settings group to groups 2016-08-02 14:35:11 -07:00
Stephen Birarda
a674c843c2 add unpack for IP, DRYup unpackPermissions 2016-08-02 14:35:11 -07:00
Stephen Birarda
edce249d2c remove subnet from IP address security 2016-08-02 14:35:11 -07:00
Stephen Birarda
6836b09f87 add sections to DS security for IP/Subnet 2016-08-02 14:35:11 -07:00
Seth Alves
60d6673950 switch data-web urls to point at production server rather than dev one 2016-08-01 12:00:08 -07:00
Seth Alves
c72cfb165c damnit 2016-07-29 18:33:06 -07:00
Seth Alves
2443166d78 update for new friends api 2016-07-29 16:41:17 -07:00
Seth Alves
ebdfede89f switch to new friends api 2016-07-29 16:34:59 -07:00
Seth Alves
11cf01e5ae Merge branch 'groups' of github.com:sethalves/hifi into groups 2016-07-29 13:10:30 -07:00
Seth Alves
8e1820f911 make sure permissions have the correct ID in the case where a user has been verified 2016-07-29 13:10:14 -07:00
Zander Otavka
39c8ce2a1a Fix new group message to be more intuitive 2016-07-29 10:19:18 -07:00
Zander Otavka
bcff561eb8 Add category collapsing and expanding 2016-07-28 18:14:00 -07:00
Zander Otavka
987a8c802f Add basic input validation 2016-07-28 17:21:40 -07:00
Zander Otavka
aa909a1366 Polish category/row addition and deletion 2016-07-28 17:21:40 -07:00
Zander Otavka
93f9f93b5a Enable adding groups 2016-07-28 17:21:40 -07:00
Zander Otavka
3234de9f92 Add category headers to groups 2016-07-28 17:21:40 -07:00
Seth Alves
390ee9aaeb clean up some code, add some debugging prints 2016-07-27 14:03:32 -07:00
Seth Alves
3a3b1489c6 code review 2016-07-27 11:46:52 -07:00
Seth Alves
8663b260f6 code review -- applyPermissionsForUser to setPermissionsForUser, don't take input permissions as an argument 2016-07-27 10:14:18 -07:00
Seth Alves
d69d5bff28 remove redundant call to userPerms.setVerifiedUserName 2016-07-27 10:06:02 -07:00
Seth Alves
a2d35df34e fix a couple of mistakes made during code-review response 2016-07-27 09:57:57 -07:00
Seth Alves
bc2ded2f97 code review 2016-07-27 08:46:46 -07:00
Seth Alves
148793011d code review 2016-07-27 07:55:09 -07:00
Seth Alves
b3e04b5370 small cleanups for permissions help text 2016-07-26 09:35:58 -07:00
Seth Alves
f35b935031 do some cleaning-up of the domain-server settings page group tables 2016-07-22 17:51:31 -07:00
Seth Alves
82dfdebd46 move permissions for specific-users below groups. turn debug-prints back off 2016-07-22 14:14:03 -07:00
Seth Alves
8e5262872e fix bug that was losing verified status for users with permissions specific to their account 2016-07-22 14:00:46 -07:00
Seth Alves
6ec8aff645 remove group-related debug prints 2016-07-22 12:02:17 -07:00
Seth Alves
96fd1cb841 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-22 11:40:29 -07:00
Seth Alves
adba4cde0b book-keeping around groups and ranks 2016-07-22 11:40:23 -07:00
Seth Alves
97b40ab87d adapting to api changes 2016-07-21 14:04:55 -07:00
Howard Stearns
51bc3c51ca less logging, change constant name. 2016-07-21 08:35:21 -07:00
Seth Alves
c1b27a9249 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-20 10:03:22 -07:00
howard-stearns
98f76924c5 log hearbeat like we do updates 2016-07-18 14:49:56 -07:00
howard-stearns
1a66574adb add protocol version signature to metaverse heartbeat 2016-07-18 14:29:49 -07:00
Seth Alves
4d9f5ce777 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-16 07:39:36 -07:00
Ken Cooke
b03686c37f Change the default domain attenuation level to 0.5 2016-07-15 22:02:56 -07:00
Seth Alves
8e6b3ed8c2 rename variable to make its use more clear 2016-07-14 12:24:44 -07:00
Seth Alves
599b892296 refresh cached group information every 15 seconds 2016-07-14 11:20:57 -07:00
Seth Alves
641746f2c0 fix describe-settings 2016-07-13 15:29:00 -07:00
Seth Alves
f47b5120bc Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-13 14:48:28 -07:00
Seth Alves
0e86be8660 use dev metaverse 2016-07-13 14:48:23 -07:00
Brad Hefta-Gaub
f8910d475e Merge pull request #8225 from ZappoMan/codecPlugins 
Audio codec plugins
 2016-07-13 14:47:03 -07:00
Seth Alves
02ce2468df Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-07-12 13:46:29 -07:00
Clément Brisset
2f07f0d24f Revert "Revert "Fix crash in packet list"" 2016-07-12 11:39:16 -07:00
Brad Hefta-Gaub
a71baf5601 handle codec prioritization, handle multiple codec choices 2016-07-08 21:18:03 -07:00
Clément Brisset
d933238bda Revert "Fix crash in packet list" 2016-07-08 18:15:14 -07:00
Atlante45
97da515585 Assign random UUID to DS without one. 2016-07-08 15:15:58 -07:00
Seth Alves
55d76abf48 back-out accidently changed api urls 2016-07-06 16:42:31 -07:00
Seth Alves
e6f456f494 each rank in a group has its own permissions 2016-07-06 16:39:08 -07:00
Seth Alves
2a25f458fc fetch rank names from web api after getting a group's ID 2016-07-04 10:20:25 -07:00
Seth Alves
aae42e3802 updates to track zach's changes to api 2016-06-30 16:14:46 -07:00
Seth Alves
408a77dd13 merge from upstream 2016-06-29 18:49:33 -07:00
Stephen Birarda
1b87e902de fix initialization of DEFAULT_HOURS in DomainMetadata 2016-06-29 13:23:52 -07:00
Zach Pomerantz
80fceccb7e simplify hours parsing in domain metadata 2016-06-29 12:43:39 -07:00
Zach Pomerantz
c406538301 properly parse domain metadata hours 2016-06-28 12:40:25 -07:00
Zach Pomerantz
56038a97a6 add domain settings getter for descriptors, validates nested vals 2016-06-28 12:39:00 -07:00
Seth Alves
d4cc4bf1e4 represent node permissions as a bitfield rather than a list of bools 2016-06-27 14:55:13 -07:00
Seth Alves
c7d56493b1 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-06-27 10:07:38 -07:00
Brad Hefta-Gaub
2e8f6c2cc6 Merge pull request #8118 from sethalves/tmp-rez-cap-rather-than-reject 
cap lifetime rather than reject edits from nodes which only have tmp-rez rights
 2016-06-24 14:08:29 -07:00
Seth Alves
ead6e476a9 add a list of blacklist groups which remove permissions rather than grant them 2016-06-24 14:03:43 -07:00
Brad Hefta-Gaub
cea4b27b4d Merge pull request #8128 from zzmp/feat/heartbeat-build-version 
add build version to heartbeat
 2016-06-24 12:20:16 -07:00
Seth Alves
cc1b6f0cb2 add a permissions-grid row for friends-of-domain-owner 2016-06-24 11:42:56 -07:00
Zach Pomerantz
1fcd7aa0c4 add build version to heartbeat 2016-06-23 19:55:16 -07:00
Zach Pomerantz
b1b378a91f add back access token to domain-server 2016-06-23 19:38:41 -07:00
Zach Pomerantz
13310923c4 reset to temp domain after logout 2016-06-23 19:38:23 -07:00
Zach Pomerantz
1de1c632af use private_description instead of description for domain settings 2016-06-23 17:16:42 -07:00
Seth Alves
c4b0f1899e merge from upstream 2016-06-23 13:26:01 -07:00
Zach Pomerantz
4a30d549ad force temp domain reset on 404 too (401 already) 2016-06-22 12:04:26 -07:00
Zach Pomerantz
a6115cba6e update temporary domains to use api_key 2016-06-22 12:04:26 -07:00
Zach Pomerantz
b6b73af2b4 Clean up domain-server setup 2016-06-22 12:02:35 -07:00
Seth Alves
fbfb6f169b Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject 2016-06-22 10:02:12 -07:00
Zach Pomerantz
e03974181a reformat operating hours to [[open,close]] 2016-06-21 17:19:37 -07:00
Seth Alves
9ca27f267d cap lifetime rather than reject edits from nodes which only have tmp-rez rights 2016-06-21 16:48:04 -07:00
Seth Alves
c97618f8bc reduce the number of user public-key downloads during a login attempt 2016-06-21 11:40:55 -07:00
Zach Pomerantz
52170eb12e use refs for domain metadata parsing 2016-06-21 11:21:20 -07:00
Seth Alves
f397c4760f comments 2016-06-21 09:56:39 -07:00
Zach Pomerantz
807596596f fix badging, parsing of operating hours 2016-06-21 00:18:38 -07:00
Zach Pomerantz
7fa7abdb1d add operating hours to domain-server settings/UI 2016-06-20 22:58:20 -07:00
Zach Pomerantz
4e0aeea2b8 add time offset to domain-server UI 2016-06-20 16:19:19 -07:00
Zach Pomerantz
cfe9ac32d4 fix narrowing warning by casting -1 2016-06-20 14:46:20 -07:00
Seth Alves
69f2f2e765 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-06-20 14:07:22 -07:00
Seth Alves
ba032ce0b4 apply a group's permissions to users who belong to the group 2016-06-20 14:06:09 -07:00
Seth Alves
fdafbd2015 apply a group's permissions to users who belong to the group 2016-06-20 14:02:23 -07:00
Seth Alves
82dd36459d apply a group's permissions to users who belong to the group 2016-06-20 14:02:04 -07:00
Seth Alves
af52f6da82 remove some duplicate the's 2016-06-20 13:59:56 -07:00
Zach Pomerantz
25b21dacda clean domain metadata and update acl 2016-06-20 13:44:14 -07:00
Zach Pomerantz
40f2d36487 fix hosts/tags in domain-server settings 2016-06-20 11:38:38 -07:00
Zach Pomerantz
1c188a270d Merge pull request #8087 from zzmp/feat/send-domain-descriptors 
send domain metadata to metaverse for authed domains
 2016-06-20 11:22:01 -07:00
Seth Alves
764da926a3 merge sethalves:make-permissions-names-case-insensitive 2016-06-17 19:22:22 -07:00
Seth Alves
e606ffb002 use constant rather than hard-coding metaverse url 2016-06-17 18:12:03 -07:00
Seth Alves
d8a67850f2 treat usernames in permissions-grid on domain-server settings page as case-insensitive 2016-06-17 15:17:51 -07:00
Seth Alves
de100e8141 after receiving a group's ID from api, save it 2016-06-17 13:29:42 -07:00
Seth Alves
3fc9bdb3d0 undo accidental change 2016-06-16 16:44:18 -07:00
Seth Alves
6fae35d9f2 start on handling group permissions 2016-06-16 16:42:15 -07:00
Seth Alves
dd24143d16 start on handling group permissions 2016-06-16 16:41:47 -07:00
Seth Alves
d184aade1b comments 2016-06-16 16:40:57 -07:00
Seth Alves
52e3be4f5d allow for read-only text-fields in table input rows 2016-06-16 16:40:36 -07:00