Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 10:50:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
11582 commits 25 branches 0 tags 1.1 GiB
Commit graph

1270 commits

Author SHA1 Message Date
Stephen Birarda
6681754994 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 14:26:10 -07:00
Stephen Birarda
e417e7670b cleanup DomainServer debug during config parsing 2014-04-08 14:07:31 -07:00
Stephen Birarda
c2ff438182 add a CL + JSON settings reader 2014-04-08 13:37:07 -07:00
Atlante45
eaca699a6d Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_work 2014-04-08 10:35:23 -07:00
Atlante45
e1a1ff3988 Code review 2014-04-08 10:32:49 -07:00
Stephen Birarda
080b0d7221 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-08 10:28:14 -07:00
Brad Hefta-Gaub
881383a5f2 Merge pull request #2609 from AndrewMeadows/avatar-interaction 
More details in JS collision events
 2014-04-08 06:52:04 -10:00
Atlante45
3be2319081 Removed all the temporaryDir junk 2014-04-07 16:18:23 -07:00
Atlante45
262c6d3206 Fixed double JSON callback when http error occurs 2014-04-07 14:35:13 -07:00
Atlante45
e85703d25b Added feedback and a better success check 2014-04-07 13:48:28 -07:00
Atlante45
cec99caa47 Added upload progress tracking to AccountManager via JSON 2014-04-07 13:45:30 -07:00
Stephen Birarda
02e2135a2e allow setting of expected DTLS cert hostname from AC 2014-04-07 12:52:26 -07:00
Stephen Birarda
86a0b715f3 verify DTLS certificate to ensure trust before handshaking 2014-04-07 11:36:32 -07:00
Stephen Birarda
0f92e02da7 add the hifi root CA trusted cert to source 2014-04-07 11:19:06 -07:00
Andrew Meadows
84d7e39d72 merge upstream/master into avatar-interaction 2014-04-07 10:05:25 -07:00
Andrew Meadows
d902580d6f Add Collision metatype to JS script system 2014-04-07 10:03:10 -07:00
Stephen Birarda
69504b0a9d proper cleanup of CA credentials on DTLSClientSession side 2014-04-07 09:47:51 -07:00
Stephen Birarda
efcf506383 resolve conflicts on merge with upstream master 2014-04-07 09:32:08 -07:00
Stephen Birarda
5adcf68752 sort nodes on DS page by their uptime 2014-04-07 09:08:51 -07:00
Stephen Birarda
45d796e8f3 allow re-handshake in NodeList after domain refresh 2014-04-04 15:56:02 -07:00
Andrzej Kapolka
1f3a5d09d9 Merge pull request #2593 from Atlante45/display_models_metadata 
Display models metadata
 2014-04-04 15:18:18 -07:00
Stephen Birarda
c015fdd212 leverage a DummyDTLSSession to not require cleanup of DTLSSession for cookies 2014-04-04 11:42:14 -07:00
Stephen Birarda
b40dd6a31a say bye and de-init DTLS session from DomainServer 2014-04-04 11:17:50 -07:00
Stephen Birarda
fd8e32190e perform cleanup of GnuTLS structures across targets 2014-04-04 11:08:53 -07:00
Stephen Birarda
e2224e0f0c cleanup node silence timing and use for DTLS timeouts 2014-04-04 10:56:04 -07:00
Stephen Birarda
c840904642 output a message when handshake has completed with a client 2014-04-04 10:44:15 -07:00
Stephen Birarda
efd176f93c complete check in and heartbeat via DTLS 2014-04-04 09:56:57 -07:00
Stephen Birarda
7b6ce77690 add processing of DTLS datagrams to domain-server 2014-04-04 09:20:40 -07:00
Atlante45
ba4ccc22ef Changed FstReader name to ModelUploader 2014-04-03 16:19:33 -07:00
Atlante45
3bb6d9b3b3 Added call back to model upload. 2014-04-03 16:07:25 -07:00
Atlante45
d15e12da77 Changed FstReader categories to place models in the right dirs 2014-04-03 12:25:50 -07:00
Stephen Birarda
1c4d44ba4a attempt to complete handshake every 100ms instead of every 1s 2014-04-02 18:08:44 -07:00
Stephen Birarda
62de84315e detect handshake completion in DS and client 2014-04-02 17:56:04 -07:00
Stephen Birarda
e1cae6d295 initial handshaking for DTLS sessions between DS and clients 2014-04-02 17:29:14 -07:00
Atlante45
52df77b4b5 Final work on models metadata support 2014-04-02 16:25:35 -07:00
Atlante45
b73598ae8a Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-02 11:40:41 -07:00
Stephen Birarda
dc3a4d4957 remove some unneeded parenthesis 2014-04-02 09:07:34 -07:00
Stephen Birarda
fd1ed13de0 fix static x509CACredentials method 2014-04-01 16:53:17 -07:00
Stephen Birarda
632dc6b8e4 set GnuTLS credentials for DTLSClientSession 2014-04-01 16:51:05 -07:00
Stephen Birarda
b5b4edc999 add notion of server and client DTLSSessions 2014-04-01 16:47:45 -07:00
Stephen Birarda
ce6f845681 remove some gnutls handshake debugging 2014-04-01 14:47:30 -07:00
Stephen Birarda
94b29782eb re-scaffold some client side DTLS in DTLSSession 2014-04-01 14:19:07 -07:00
Stephen Birarda
0be2eb57bf repairs to NodeList and LimitedNodeList 2014-04-01 13:56:33 -07:00
Stephen Birarda
45c6ae44a6 use a LimitedNodeList in domain-server 2014-04-01 13:33:30 -07:00
Stephen Birarda
62041d91a8 rename NodeList DomainInfo to DomainHandler 2014-04-01 13:09:35 -07:00
Stephen Birarda
caf2473df8 add a DTLSSession object to handle GnuTLS DTLS sessions 2014-04-01 13:08:00 -07:00
Atlante45
bdd5c291b0 Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata 2014-04-01 12:03:45 -07:00
Atlante45
03958f2fa0 work on metadata in the model browser + real time updates 2014-04-01 12:02:47 -07:00
Atlante45
77f5a50738 Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes 2014-03-31 17:19:45 -07:00
Atlante45
f027aac76b Fix to model upload in account manager 2014-03-31 17:19:04 -07:00