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

1934 commits

Author SHA1 Message Date
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
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