Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-10 21:42:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
82073 commits 67 branches 56 tags 1.2 GiB
Commit graph

2099 commits

Author SHA1 Message Date
Roxanne Skelly
4f1eeecc2f Revert "Merge pull request #15620 from highfidelity/revert-15612-domaincheckin" 
This reverts commit 4735b9f19a, reversing
changes made to bc4a88beb7.
 2019-05-23 11:00:43 -07:00
Howard Stearns
a71e902a49
Revert "BUGZ-322 - add domain checkin lag logging" 2019-05-23 10:27:05 -07:00
Roxanne Skelly
b331bb0683 Initialize structure member as per code review suggestion. 2019-05-22 15:03:39 -07:00
Roxanne Skelly
4ca77ba3ac BUGZ-322 - add domain checkin lag logging 2019-05-22 13:51:43 -07:00
Shannon Romano
b5f23f550f
Merge pull request #14519 from MattHardcastle/use-qsavefile 
Use QSaveFile when persisting domain settings to disk
 2019-05-15 13:41:34 -07:00
Zach Fox
e87381f431 Merge branch 'master' of github.com:highfidelity/hifi into privateUserData 2019-05-13 14:13:34 -07:00
Zach Fox
55138ed088 CR feedback 2019-05-13 14:12:51 -07:00
Clement
c691ee496e CR 2019-05-09 13:58:50 -07:00
Clement
5c42838261 Change timeouts to try to prevent ICE disconnects 2019-05-08 18:38:35 -07:00
Clement
b3d0705e39 Extend ICE logging + make it more searchable 2019-05-08 18:38:00 -07:00
Zach Fox
d53b528994 Some fixes - i don't think this code is complete 2019-05-06 13:38:09 -07:00
Zach Fox
2046fcfd09 Merge branch 'master' of github.com:highfidelity/hifi into privateUserData 2019-05-06 11:08:36 -07:00
Zach Fox
d0e5087b20 Add permission 2019-05-06 10:19:58 -07:00
Shannon Romano
827cab7f1b
Merge pull request #15483 from SimonWalton-HiFi/set-connection-rate-high 
22431: Set default avatar-mixer connection rate to effectively unlimited
 2019-05-06 08:01:57 -07:00
Simon Walton
a0fd828ef7 Set default av-mixer connection-rate to 1e7 2019-04-30 16:00:35 -07:00
David Kelly
5554b0bf2c There is no anon restriction - only open, hifi, acl 2019-04-25 13:53:00 -07:00
Shannon Romano
5d1c1010c5
Merge pull request #15294 from sethalves/fix-refreshGroupsCache-asan-error 
case 21977: fix asan reported error when returning QString reference to refreshGroupsCache
 2019-04-17 11:43:12 -07:00
Roxanne Skelly
629d5e50ff CR Fix 2019-04-05 16:16:34 -07:00
Roxanne Skelly
9888f5feda Copy Pasta 2019-04-05 16:02:09 -07:00
Roxanne Skelly
a63171fb94 Case22025 - Show 'create temporary place' button when no places are present 
The metaverse urls were hard-coded to be production.  Fix is to pull them
from the domain server, which will pull them from the environment variable.
 2019-04-05 14:54:02 -07:00
Seth Alves
cbc51b75f9 fix asan reported error when returning QString reference to refreshGroupsCache 2019-04-04 19:55:13 -07:00
Roxanne Skelly
75671be2de Case 22025 - Create temporary placename doesn't appear when no places are listed 2019-04-03 13:57:37 -07:00
Roxanne Skelly
2d71ec1c75 Case20410 Automatic Content Archives doesn't restore correctly with old Tutorial content set 
The tutorial content set had a content set Id of Null, which caused a failure
to parse the content set.
 2019-04-02 13:19:06 -07:00
Shannon Romano
6ccf16dfe5
Merge pull request #15288 from roxanneskelly/Case21726 
Case 21726 - Domain lost recent entity edits upon restart
 2019-03-29 17:06:31 -07:00
Roxanne Skelly
88b7687183 Case 21726 - Domain lost recent entity edits upon restart 
When an entity server starts up, grabs the version of the models.json
file locally, and then queries the domain server for its copy of the
models.json file...iff the domain server version is newer.

There was a bug in this process in that the comparison was made between
the wrong version, specifically the 'file format version' which doesn't
change unless there was a protocol change...and not the data version,
which increments every time a change is made to a domain.

Therefore, the version of the models.json on the domain server was never
downloaded to the entity server, even when it was newer.

It would be newer if the entity server assignment was moved to a machine
with an old version of the models.json file, which was in fact the case
on distributed3 during this period of time.
 2019-03-28 13:19:16 -07:00
Simon Walton
a1660dad95 Follow dynamic updates to hero zones; make reserved fraction a domain setting 2019-03-22 12:30:49 -07:00
Roxanne Skelly
38981a5f25 Merge commit 'a804d3532e6b04fb86e5e520147bd34c331b3f36' 2019-03-05 15:08:39 -08:00
Shannon Romano
0f0ed0fbc4
Merge pull request #15007 from Atlante45/fix/kick-bug-master 
Case 21402: Don't send a KillAvatar packet on kick
 2019-02-28 12:26:30 -08:00
Clement
717c12fe16 Add new connection rate limitting 
Limit rate of connection for new Agents
 2019-02-27 18:22:49 -08:00
Clement
d3b3dfd76d Don't send a KillAvatar packet on kick 
The DS already takes cares of removing nodes no longer allowed when
the permissions are updated and KillAvatar was never meant to be used
from the DS.
 2019-02-25 09:47:55 -08:00
Clement
d27d624c3f Don't send a KillAvatar packet on kick 
The DS already takes cares of removing nodes no longer allowed when
the permissions are updated and KillAvatar was never meant to be used
from the DS.
 2019-02-25 09:47:35 -08:00
David Kelly
2202b69575 Guard against accidentally calling wrong api/v1/places endpoint 
spaces
 2019-02-20 13:09:29 -07:00
Clement
95714b7eb3 Add failed backup as corrupted during creation 2019-01-24 16:11:38 -08:00
Matt Hardcastle
f4b6db5def Use QSaveFile when persisting domain settings to disk 
Prior to this change the `DomainServerSettingsManager::persistToFile()`
method wrote directly to the settings file. It also did limited error
checking. These limitations could lead to a situation where a crashed
domain-server process, a file system backup, a settings file copy, or a
hardware error could corrupt the setting file.

This change swaps the `QFile` class for `QSaveFile` and uses its atomic
saving features, which writes the changes to the settings file to a file
in the same directory as the settings file and then does a rename to
replace the original. If the rename, or any of the file operations, fail
the original settings file remains in place.
 2019-01-02 10:03:07 -08:00
Simon Walton
9e2b3fe820 Remove out-of-date backups on startup as well as on rule-evaluation 2018-12-17 11:39:58 -08:00
Clément Brisset
3386e5042f
Merge pull request #14450 from birarda/bug/case-insensitive-paths 
match domain paths match case-insensitively
 2018-12-07 13:59:49 -08:00
birarda
b2bd0d99de add a warning for cloud domain ID changes 2018-11-20 16:07:48 -08:00
birarda
b0aa1b2af2 make domain settings maps keyed case insensitively 2018-11-20 14:47:33 -08:00
John Conklin II
9b886ff725
Merge pull request #14391 from SimonWalton-HiFi/upload-to-ds-chunked 
Upload content to domain server in multiple chunks
 2018-11-19 17:53:44 -08:00
Simon Walton
2a7e22bf31 Identify initial chunk of an upload so as to be more resilient 2018-11-19 15:26:08 -08:00
Simon Walton
2d2cc0eaca Use a random session id for a sequence of chunks 2018-11-16 15:56:39 -08:00
Simon Walton
5883035991 Gcc doesn't like QTemporaryFile in a map so store unique ptrs 2018-11-16 14:50:03 -08:00
Simon Walton
5f51ed0210 Keep pending content per remote address 2018-11-16 09:44:21 -08:00
birarda
bb0f046a72 add throttle start and backoff to DS settings 2018-11-15 17:28:34 -08:00
Simon Walton
22c3f5239a Relay upoaded content.zip chunks to temp file 
Entities uploads still build in-memory. Move out chunk
handling to new routine.
 2018-11-15 16:59:52 -08:00
Simon Walton
cd00abd216 Add upload progress bar 2018-11-15 09:47:43 -08:00
Simon Walton
f5e14565b8 Clean-up javascript formatting 2018-11-14 10:17:48 -08:00
Simon Walton
e96cad230a Merge branch 'master' into upload-to-ds-chunked 2018-11-14 09:23:09 -08:00
Simon Walton
167a8fdc04 Merge branch 'master' into max-json-size 2018-11-13 14:57:06 -08:00
Simon Walton
dab025304d Set chunk size to 1 MB 2018-11-13 12:22:30 -08:00
Simon Walton
6ee837d47c OctreeDataUtils - use new json from DS also; allow upload of large domains 2018-11-12 15:43:09 -08:00
Simon Walton
a21d10ad1b Restore content archives (zip) correctly; other tweaks 2018-11-08 16:34:02 -08:00
Simon Walton
bb60324335 Chunked content upload - working proof-of-concept 2018-11-08 14:01:27 -08:00
Brad Davis
8c4f0ec774 Vcpkg migration 2018-11-08 12:28:06 -08:00
Brad Davis
8c4237b520 Fix warnings 2018-11-08 12:27:56 -08:00
Simon Walton
298c5efe69 Simple demo of uploading file in chunks 2018-11-08 12:13:56 -08:00
Stephen Birarda
154414e42e
Merge pull request #14189 from Atlante45/fix/archive-timeout 
Increase content archive upload timeout
 2018-10-22 09:40:57 -07:00
Clement
d79a47eac3 Increase AJAX timeout until we make a proper fix 2018-10-11 11:31:36 -07:00
Clement
8983fe2bcf Fix new Mac warnings 2018-10-09 12:11:55 -07:00
Brad Hefta-Gaub
d8959367c6
Merge pull request #14104 from birarda/bug/zone-ordering 
fix for row re-ordering causing no change alone
 2018-10-01 16:45:50 -07:00
Seth Alves
b69d0f3997 get interface building and working with clang-7 on ubuntu 18 2018-09-28 13:46:51 -07:00
Stephen Birarda
97d5e8f614 fix for row re-ordering causing no change alone 2018-09-27 17:11:10 -07:00
Stephen Birarda
d8b5a1a4a6 always remove old socket-matching node before add 2018-08-24 14:21:54 -07:00
Simon Walton
217e4efdda Fix regex for web i/f single-node kill 2018-08-20 13:43:48 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy 
Trying to fix dependency shutdown
 2018-08-16 13:14:58 -07:00
Stephen Birarda
e686df6fb9
Merge pull request #13720 from Atlante45/feat/test-tool 
Stack tester changes
 2018-08-08 13:40:05 -04:00
SamGondelman
e3756a6dae Merge branch 'destroy' of github.com:SamGondelman/hifi into destroy 2018-08-06 11:21:51 -07:00
SamGondelman
9806bce403 weak pointers to nodeList 2018-08-06 11:21:32 -07:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy 2018-08-06 09:51:14 -07:00
John Conklin II
3a6a72a079
Merge pull request #13643 from SimonWalton-HiFi/user-setting-hmac 
Add DS option to disable HMAC packet authentication
 2018-08-03 17:45:32 -07:00
SamGondelman
1ba28de5b6 try to fix nodelist not getting destroyed 2018-08-01 17:52:27 -07:00
Clement
f8e98d2c6a Remove 2 year old migration code 2018-07-30 17:18:32 -07:00
Clement
9e84603ca4 Make proper -v and -h options for interface 2018-07-30 17:18:32 -07:00
Simon Walton
81c8fe6114 Change 'Enable Authentication' to 'Enable Packet Verification' 2018-07-24 17:06:09 -07:00
Clément Brisset
071a11ce93
Merge pull request #13580 from SimonWalton-HiFi/avatar-settings-validate 
Validate user-supplied avatar height range before accepting
 2018-07-23 11:39:24 -07:00
Simon Walton
3002abeddc Add DS option to turn off packet authentication 2018-07-18 18:22:36 -07:00
Stephen Birarda
499aa4ad13 404 malformed agent script requests, check doc root 2018-07-18 15:22:45 -07:00
Simon Walton
beb878f10e Update avatar field description 2018-07-11 10:33:42 -07:00
Simon Walton
09b7787bc9 Use jQuery correctly, other clean-up 2018-07-11 10:27:17 -07:00
Simon Walton
7455f9fc18 Update the correct file this time 2018-07-10 18:25:43 -07:00
Simon Walton
41b08fcf40 Validate user-supplied avatar height range before accepting 2018-07-10 18:17:34 -07:00
Simon Walton
91e8f1f0f8 Ensure 'verifiedUsername' is always lower case 2018-07-02 15:30:58 -07:00
Simon Walton
abda0b2381 Use case-insensitive matching on friends lists in DomainGatekeeper 2018-06-29 18:25:06 -07:00
Stephen Birarda
b5254f1ea5 cleanup race on deleteLater after callback processed 2018-06-27 11:41:37 -07:00
Stephen Birarda
e90ea82ef5 move AddressManager to NodeList thread, fix AccountManager invokes 2018-06-27 11:41:37 -07:00
Stephen Birarda
743cb7c7e8
Merge pull request #13241 from Atlante45/fix/corrupted-backup 
Don't mark backups from domains with no asset server corrupted
 2018-06-11 10:50:16 -07:00
Stephen Birarda
112abc9d7e
Merge pull request #13148 from birarda/feat/new-version-numbers 
add SHA to PR/master version, add build_type (stable/master/pr/dev)
 2018-06-08 14:44:22 -07:00
Clement
caa01aa25e Don't mark Asset-less DS's backups corrupted 
If the DS doesn't choose to run an Asset Server, add an empty
mappings file to the archive so they do not show as corrupted
 2018-05-25 12:31:51 -07:00
Clement
5f41505846 Store big web requests on disk 2018-05-24 17:30:32 -07:00
Clement
e096ff91f6 Explicitely manage HTTPManager lifetime 2018-05-24 17:30:32 -07:00
Stephen Birarda
2cb7c9cc62 add a BUILD_TYPE to BuildInfo, fix conditional 2018-05-24 12:04:32 -07:00
Stephen Birarda
c3595a3216 pass STABLE_BUILD instead of BUILD_BRANCH through cmake 2018-05-24 12:03:03 -07:00
Stephen Birarda
d1ace7914e make domain server reliably broadcast all node disconnects 2018-05-23 12:56:12 -07:00
Stephen Birarda
8f6600facf remove ICE peers once nodes connect or are killed 2018-05-22 14:21:49 -07:00
Stephen Birarda
666bdb03b7 never re-use node ID during domain connection 2018-05-22 13:47:31 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Clement
e1c5eb9bda Fix wizard wording 2018-05-02 17:17:19 -07:00
Simon Walton
2f72b789a3 Fix for null sourceNode use 2018-04-23 12:13:31 -07:00
Simon Walton
3f894fe5fa Merge fix 2018-04-20 11:15:59 -07:00
Simon Walton
ed0fd8c4d2 Merge fix 2018-04-20 11:13:15 -07:00