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

1981 commits

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