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
Simon Walton
9f9a68188d
Merge remote-tracking branch 'upstream/master' into short-id
2018-04-20 11:10:21 -07:00
Seth Alves
ba43640950
Merge pull request #12785 from birarda/bug/xcode-warnings
...
fix some xcode warnings for unnecessary captured this
2018-04-20 10:30:27 -07:00
John Conklin II
92bf99f436
Merge pull request #12786 from huffman/fix/node-list-connections
...
Fix avatars not coming back when briefly disconnected from avatar mixer
2018-04-20 09:53:50 -07:00
SimonWalton-HiFi
9d06890aea
Merge branch 'master' into short-id
2018-04-19 10:09:34 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
...
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
Simon Walton
01c39d4310
Use NULL_LOCAL_ID in more places, as requested by review
2018-04-18 11:53:47 -07:00
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
