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

2043 commits

Author SHA1 Message Date
Simon Walton
104788de50 Take out useless noisy message timer 2018-04-04 16:03:56 -07:00
Simon Walton
d05f0600d4 Handle one-time messages outside LogHandler class 
Also change to std::call_once for the file-scope message IDs.
 2018-04-04 15:44:47 -07:00
Ryan Huffman
2546ff91ca Fix nodelist connections not resetting on both ends 
This change adds a connection ID to ping packets. Each node keeps a
connection id for each other node that it has connected to. When a node
is removed the connection id is incremented. If a node sees another node
with a higher connection id, it will reset its connection with the new
connection id, ensuring that local state is reset on both ends when
nodes lose contact.
 2018-04-04 11:53:05 -07:00
Stephen Birarda
3a8c9de4fb fix some xcode warnings for unnecessary captured this 2018-04-04 10:38:32 -07:00
Simon Walton
692ccfc09b Create HIFI_FCDEBUG(_ID) variants that require a category 
Original macros use default settings.
 2018-04-04 09:49:15 -07:00
Simon Walton
7d16ca9c1c Remove uses of addRepeatedMessageRegex() and its implementation 
Change to new log-message ID scheme.
 2018-04-03 17:54:01 -07:00
Simon Walton
efb1fdbc0d Local IDs - add an explicit null value, use it for replicated packets 2018-03-30 18:29:26 -07:00
Simon Walton
1b0b280f3a Fix SequenceNumberStats, misc. clean-up 2018-03-29 10:47:11 -07:00
Simon Walton
b409e04734 Handle all case of nodes being deleted from nodelist 
Delete erased nodes from local ID mapping, as this uses
SharedPointer. Don't keep the mapping from local IDs
to UUIDs in GateKeeper as it isn't used.
 2018-03-28 17:42:23 -07:00
Clement
cb07fc47dc Fix ESS remote method calls for connect only users 2018-03-28 14:01:03 -07:00
Simon Walton
f823f63211 Add domain local ID to DomainServerList 
Also handle domain local ID for 'domain sourced' packets;
bump packet version.
 2018-03-28 13:27:43 -07:00
Simon Walton
bed4033554 Local node IDs now working correctly 
Move typedef to single location; fixes for replicated packets
(probably still not correct); reserve zero as local ID;
pass domain server's local ID in domain server list;
other tweaks.
 2018-03-27 18:18:14 -07:00
Simon Walton
d3464378b7 Short local source IDs - checkpoint 
DS assigns 16-bit IDs as well as UUIDs; ACs track mappings;
nodes use short IDs in packets. Initial setup works; then
fails prob. due to DS UUID.
 2018-03-27 13:46:58 -07:00
Simon Walton
4ec77e3af6 WIP - assign short IDs to nodes and distribute them. 2018-03-26 14:57:59 -07:00
Simon Walton
b5f165d481 Store a short ID with the Node on the domain-server side 2018-03-23 16:55:19 -07:00
Clément Brisset
feec59655c
Merge pull request #12692 from highfidelity/stable 
Merge stable back into master
 2018-03-22 15:08:30 -07:00
Ryan Huffman
fdeae4c11a Fix missing semicolon in content.js 2018-03-22 10:24:29 -07:00
Ryan Huffman
5485f60677 Add removal of old consolidated backups 2018-03-22 10:23:18 -07:00
Ryan Huffman
dc694fb0b7 Update content backup downloads to be asynchronous 
Previously backups would be consolidated into a full .zip when the
backup was requested. Because of the potential for a large number of
assets, this could take awhile, causing a browser to fail due to timeout
before the backup was available. This change splits the download
endpoint into 2 parts - one to request information about a backup and
possibly kick off a consolidation, and another to request the actual
file once the consolidate backup is available.
 2018-03-21 15:02:38 -07:00
Stephen Birarda
debea3791d Fix DS content backups not loading on IE 
IE does not support Object.assign
 2018-03-16 14:30:03 -07:00
Ryan Huffman
3a98cf284f Fix DS not handling lowercase header keys 2018-03-16 14:30:03 -07:00
Ryan Huffman
d140ccb790 Fix constexpr compile error on Windows 2018-03-15 14:52:15 -07:00
Ryan Huffman
9275fe1f7d Update backup downloads to use .content.zip extension 2018-03-15 12:47:51 -07:00
Ryan Huffman
bee8899c46 Add support for uploading .content.zip files 2018-03-15 12:17:21 -07:00
Clément Brisset
b7ac07f590
Merge pull request #12589 from highfidelity/RC65 
merge back RC65 to master after RC hotfixes
 2018-03-07 17:22:41 -08:00
John Conklin II
e0a11271bf
Merge pull request #12573 from birarda/bug/domain-settings-metaverse 
fix for getSetting QVariant ref in DomainServer
 2018-03-07 12:11:45 -08:00
Stephen Birarda
a83b54e10d fix for getSetting QVariant ref in DomainServer 2018-03-06 13:55:50 -08:00
Atlante45
a23884d0e0 Prevent crash during long backup web requests 2018-03-06 13:21:02 -08:00
Atlante45
85b4c3b422 Protect session UUID from concurrent read/writes 2018-03-02 17:34:18 -08:00
Stephen Birarda
9cc348ef27 Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings 2018-02-27 09:59:37 -08:00
Stephen Birarda
2af0e5fc2b
Merge pull request #12501 from huffman/feat/content-settings 
Code review changes
 2018-02-26 17:58:08 -07:00
Ryan Huffman
ec210e1750 Move OctreeUtils to OctreeDataUtils 2018-02-26 16:51:42 -08:00
Ryan Huffman
3fa538d42d Add RawEntityData subclass 2018-02-26 16:32:09 -08:00
Stephen Birarda
f13412dd56
Merge pull request #12500 from birarda/feat/content-settings 
fixes for comments from code reviews
 2018-02-26 17:12:30 -07:00
Atlante45
8580d181ce Change refresh threshold to 5 minutes. 2018-02-26 15:40:57 -08:00
Ryan Huffman
975bfa6809 Clean up std::chrono usage in DomainContentBackupManager 2018-02-26 15:39:33 -08:00
Ryan Huffman
f23f751e80 Add check to make sure entity data gets written to zip 2018-02-26 15:27:24 -08:00
Atlante45
3592fcf3c2 CR 2018-02-26 14:52:27 -08:00
Stephen Birarda
2872412f9c fixes for comments from code reviews 2018-02-26 14:35:34 -08:00
Ryan Huffman
cd9cdea3e8 Update backup formats to filter out non-whitelisted characters 2018-02-26 14:29:13 -08:00
Ryan Huffman
dbfbee5406 CR 2018-02-26 13:53:20 -08:00
Atlante45
c106fee659 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration 2018-02-22 19:45:43 -08:00
Stephen Birarda
4c44bcfdba
Merge pull request #12487 from Atlante45/feat/backups-integration 
Actually remove Backup from list during delete
 2018-02-22 20:22:43 -07:00
Atlante45
eeda07bba6 Actually remove Backup from list during delete 2018-02-22 19:19:39 -08:00
Stephen Birarda
32830cbcd3
Merge pull request #12486 from Atlante45/feat/backups-integration 
Never delete assets on load
 2018-02-22 19:49:19 -07:00
Clément Brisset
0e5e63bf03
Merge pull request #12481 from birarda/feat/content-settings 
immediately show restore, set restore filename, cleanup old AS baked content on start
 2018-02-22 18:41:13 -08:00
Atlante45
cbabca5e3e Add loadingComplete callback 2018-02-22 18:36:36 -08:00
Atlante45
e5c501a4cd Never delete assets on load 2018-02-22 18:36:22 -08:00
Atlante45
acf04830ee Remove deleted file from the _assetsOnDisk set 2018-02-22 17:43:04 -08:00
Atlante45
277e556b48 Create a standard function to init Hifi Apps 2018-02-22 17:06:09 -08:00
Stephen Birarda
3e4375b1e6 set recovery filename during domain content archive recovery 2018-02-22 16:54:56 -08:00
Stephen Birarda
1251328d2b reload backup information immediately when restore starts 2018-02-22 16:53:49 -08:00
Atlante45
80c0f2a21e Fix crash when passing --checkMinSpec flag 
That flag caused a DLL to be loaded before Application was
	instanced.
	This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes
	the previous registration pointing the startup function in
	the main executable to be overridden with the address of the
	function in the DLL (Since they both link the same static
	library)
	This leads to the correct function running in the wrong address
	space (the DLLs), hence not initializing some global variables
	correctly.
 2018-02-22 16:29:38 -08:00
Stephen Birarda
7fcac581ae fix regex for archive name, add general error message 2018-02-22 15:08:43 -08:00
Ryan Huffman
13b15ced89
Merge pull request #12470 from birarda/bug/content-settings-fixes 
disable click on restore during a restore or for corrupted
 2018-02-22 14:41:41 -08:00
Ryan Huffman
12e881a5e3
Merge pull request #12471 from birarda/feat/validate-manual-backup-names 
refuse to post manual content archive with invalid name
 2018-02-22 14:29:43 -08:00
Stephen Birarda
7c5ed86e3e refuse to post manual content archive with invalid name 2018-02-22 11:41:48 -08:00
Stephen Birarda
3c39c92879
Merge pull request #12468 from huffman/fix/reject-invalid-manual-backup-names 
Fix/reject invalid manual backup names
 2018-02-22 12:17:42 -07:00
Stephen Birarda
99c419c315 disable click on restore during restore or for corrupted 2018-02-22 11:03:31 -08:00
Ryan Huffman
017d10de3d Fix DomainContentBackupManager.* headers 2018-02-22 09:29:59 -08:00
Ryan Huffman
bf4fd867a3 Add rejection for invalid manual backup names 2018-02-22 09:29:18 -08:00
Atlante45
2fb9c324a5 Ignore baked assets in backups 2018-02-21 18:40:06 -08:00
Clément Brisset
8f7944522f
Merge pull request #12465 from birarda/feat/content-settings 
fix restore of object settings for content or domain settings
 2018-02-21 18:15:09 -08:00
Clément Brisset
e83a933f50
Merge pull request #12461 from birarda/bug/delete-add-rule 
fix badging for changes in tables
 2018-02-21 18:14:21 -08:00
Stephen Birarda
af3970e211
Merge pull request #12466 from Atlante45/feat/backups-integration 
Fix crash on manual upload recovery
 2018-02-21 19:13:56 -07:00
Clément Brisset
bbade00f3d
Merge pull request #12434 from birarda/feat/reload-after-restore 
check for recovery complete always, reload content page on restore
 2018-02-21 18:12:37 -08:00
Stephen Birarda
a036de9687 fix restore of object settings 2018-02-21 18:12:00 -08:00
Atlante45
a2c94bd9d2 Fix invalid iterator access 2018-02-21 18:08:21 -08:00
Atlante45
e12ca2683f Fix incorrect "all backups loaded" flag 2018-02-21 18:08:21 -08:00
Stephen Birarda
e967ed0e22
Merge pull request #12459 from Atlante45/feat/backups-integration 
Cleanup timers on the correct thread
 2018-02-21 18:55:39 -07:00
Stephen Birarda
3f9ee4918e
Merge pull request #12457 from birarda/feat/disable-ds-asset-client-caching 
disable caching for asset requests in domain-server
 2018-02-21 18:16:56 -07:00
Stephen Birarda
946474c615 do not init caching for asset requests in domain-server 2018-02-21 16:33:58 -08:00
Stephen Birarda
e80fef4e1b fix badging for changes in tables 2018-02-21 15:52:33 -08:00
Stephen Birarda
468ac62676 mark corrupted backups and refuse to restore from them in web UI 2018-02-21 15:33:12 -08:00
Atlante45
7582395686 Cleanup backup handlers timers on the correct thread 2018-02-21 14:53:04 -08:00
Stephen Birarda
4b25c9c419 handle permissions save with no existing permissions 2018-02-20 15:06:24 -08:00
Atlante45
0c7f5250f3 Update isCorrupted with name indexing 2018-02-20 11:48:25 -08:00
Ryan Huffman
479dfaf330 Add corrupted backup status to domain content backup info 2018-02-20 10:18:12 -08:00
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals 
Material Entities
 2018-02-19 10:58:02 -08:00
Stephen Birarda
3f75bf62d5 check for recovery complete always, reload content page on restore 2018-02-16 18:03:16 -08:00
Atlante45
85c1739df4 Fix filename not being passed in correctly 2018-02-16 17:37:29 -08:00
Stephen Birarda
1e36a5b218
Merge pull request #12430 from birarda/feat/pending-content-archives 
make filename regex less restrictive
 2018-02-16 18:21:56 -07:00
Stephen Birarda
5dd74674ef fix spinner and restart behaviour for manual content upload 2018-02-16 17:18:28 -08:00
Atlante45
c61aa4bf95 Pass in backup name to handler 2018-02-16 17:16:31 -08:00
Stephen Birarda
2faa67c68d make filename regex less restrictive 2018-02-16 17:01:46 -08:00
Atlante45
acc68d65c2 Backup bug fixes 2018-02-16 16:59:12 -08:00
Stephen Birarda
9af7579b85 handle change for programmatic input change badging 2018-02-16 16:32:21 -08:00
Stephen Birarda
4c10dcba96 match previous behavior in DomainGatekeeper 2018-02-16 16:06:29 -08:00
Stephen Birarda
c8308efa0c put back more broad header for content upload 2018-02-16 16:04:52 -08:00
Stephen Birarda
9057918e08 move default security permissions to describe-settings.json 2018-02-16 16:01:40 -08:00
Stephen Birarda
dd5b08bdc1 fix unlock of locker not mutex, don't pack permission defaults 2018-02-16 16:01:40 -08:00
Stephen Birarda
679513599c fix row hiding and paste events for badging 2018-02-16 16:01:40 -08:00
Stephen Birarda
1c053730eb make DomainServerSettingsManager thread-safe for use in content backup 2018-02-16 16:01:40 -08:00
Stephen Birarda
d9f2e1986f set DomainContentBackupManager object name so it appears on thread 2018-02-16 16:01:40 -08:00
Stephen Birarda
8e621a95a3 fix typo in debug for writing new entities 2018-02-16 16:01:40 -08:00
Stephen Birarda
441b55301f cleanup LNL last during DS shutdown 2018-02-16 16:01:40 -08:00
Stephen Birarda
494f93304b take down AssetClient after content manager 2018-02-16 16:01:40 -08:00
Stephen Birarda
5dec3aba50 fix download link and restore behaviour with pending 2018-02-16 16:01:40 -08:00
Stephen Birarda
faacd986b3 remove deleted backups from content archives tables 2018-02-16 16:01:40 -08:00
Stephen Birarda
cb747c9cdf refresh backups for availability and restore status 2018-02-16 16:01:40 -08:00
Stephen Birarda
40078450dd add API to recover from content archive 2018-02-16 16:01:40 -08:00
Stephen Birarda
de75fe8e9f CR fix for typo in comment 2018-02-16 15:37:14 -08:00
Stephen Birarda
2020ce5907 add API to recover from content archive 2018-02-16 15:37:14 -08:00
Stephen Birarda
6f8381d378 use automatic content archives group const 2018-02-16 15:34:55 -08:00
Stephen Birarda
910f3425f8 fix latest backup refreshing with no caching 2018-02-16 15:34:55 -08:00
Stephen Birarda
41b0bb8c58 connect download link from content archive tables 2018-02-16 15:34:55 -08:00
Stephen Birarda
2b39419795 keeping AYS DRY and hooking up restore/delete for content archives 2018-02-16 15:34:55 -08:00
Stephen Birarda
b019895fce handle entity file upload from new content upload 2018-02-16 15:34:55 -08:00
Stephen Birarda
2d9f2ebf81 fix active with anchor and settings dropdowns on non-settings pages 2018-02-16 15:34:55 -08:00
Stephen Birarda
dd5a705836 move rolling interval backup rules to automatic content archives 2018-02-16 15:34:55 -08:00
Stephen Birarda
29ceffd7cc add sections to content page for backup/restore 2018-02-16 15:34:54 -08:00
Ryan Huffman
f4cde44e6a Fix indentation of brace initialization 2018-02-16 15:25:29 -08:00
Ryan Huffman
a2072062f1 Fix recovery filename not being reset when recovery complete 2018-02-16 14:33:37 -08:00
Ryan Huffman
41d7d7efbb Fix initializer list style 2018-02-16 14:33:19 -08:00
Ryan Huffman
936629ec1a Update DomainContentBackupManager to use emplace_back where available 2018-02-16 14:13:12 -08:00
Ryan Huffman
0230abea79 Fix backup loading not getting auto backups 2018-02-16 13:54:35 -08:00
Ryan Huffman
ec3580f596 Fix recovery ID not being recorded 2018-02-16 13:08:57 -08:00
Ryan Huffman
efa55c0a63 Update backup delete to not break rolling backups and remove unused asset files 2018-02-16 13:07:17 -08:00
Stephen Birarda
29349d7bb2 fix for isAvailable boolean in AssetsBackupHandler 2018-02-15 19:18:51 -08:00
Stephen Birarda
4bb8435ef8 don't overwrite general description object with filtered one 2018-02-15 19:18:22 -08:00
Stephen Birarda
81662b5edc don't overwrite general description object with filtered one 2018-02-15 19:14:14 -08:00
Atlante45
b30f98d541 CR 2018-02-15 18:20:14 -08:00
Atlante45
697f0c443c Fix warning 2018-02-15 17:43:02 -08:00
Atlante45
2b85634a21 Fix build error 2018-02-15 17:03:55 -08:00
Atlante45
cae3e0a9dc Add status func to ContentSettingsBackupHandler 2018-02-15 17:00:24 -08:00
Atlante45
771e4cd9f4 Hook up status and progress 2018-02-15 16:48:21 -08:00
Atlante45
57410e4f1c Remove ES restart after restore 2018-02-15 16:48:21 -08:00
Atlante45
b76e1b9750 Add backup status getters 2018-02-15 16:48:21 -08:00
Atlante45
a7ca539899 Simplify BackupHandler pattern 2018-02-15 16:48:21 -08:00
Ryan Huffman
1120b12b8c Fix argument to isAvailable 2018-02-15 16:47:48 -08:00
Ryan Huffman
2942a53a1d Add recovery mode and full backup information to DS 2018-02-15 16:47:48 -08:00
Ryan Huffman
dd0b8a0c2f Add backup download API to DS 2018-02-15 16:47:23 -08:00
Ryan Huffman
9e99c5c744 Add restart of ES during backup recovery 2018-02-15 16:47:23 -08:00
Stephen Birarda
e71f2fa387 use QtHelpers macro for blocking invoke 2018-02-15 16:03:03 -08:00
Stephen Birarda
e06c95f586 make settings manager methods used for backup/restore thread safe 2018-02-15 15:55:13 -08:00
Stephen Birarda
f5cad5683d make sure backup handlers end up on the correct thread 2018-02-15 15:39:25 -08:00
Stephen Birarda
f624e1b464 add a content settings backup handler 2018-02-15 15:10:51 -08:00
Atlante45
3297e39c14 CR 2018-02-15 13:39:18 -08:00
Atlante45
d6e2814081 Write assets to disk when recovering full backup 2018-02-15 11:28:52 -08:00
Atlante45
9fca92facd Move EntitiesBackupHandler to its own file 2018-02-15 11:28:52 -08:00
Atlante45
d8d05fe045 Rename backup supervisor 2018-02-15 11:27:21 -08:00
Atlante45
4482f9c83c Queue all requests until the AS is fully setup 2018-02-15 11:27:21 -08:00
Atlante45
ce93b9a1f4 Simplify BackupHandler pattern 2018-02-15 11:27:20 -08:00
Ryan Huffman
efb2473fcf Updaet createManualBackup to defer response until creation is done 2018-02-15 11:02:55 -08:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals 2018-02-15 11:02:49 -08:00
Ryan Huffman
df809f5a3e Cleanup logging for backup cleanup 2018-02-15 11:02:29 -08:00
Ryan Huffman
4b2e907ada Update entities recover backup to reset id and version 2018-02-15 11:02:14 -08:00
Ryan Huffman
1aba89b908 Fix style of init list 2018-02-15 10:22:35 -08:00
Ryan Huffman
b832e118cc Add 'override' to BackupHandler methods 2018-02-15 10:22:35 -08:00
Ryan Huffman
f2b6823748 Fix initializer in EntitiesBackupHandler 2018-02-15 10:22:35 -08:00