3316 commits

Author	SHA1	Message	Date
Stephen Birarda	efcf506383	resolve conflicts on merge with upstream master	2014-04-07 09:32:08 -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
Atlante45	df718c430a	Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata	2014-04-03 11:20:24 -07:00
Stephen Birarda	1c4d44ba4a	attempt to complete handshake every 100ms instead of every 1s	2014-04-02 18:08:44 -07:00
Atlante45	5acc8313ba	Manual merge	2014-04-02 18:07:55 -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
Andrew Meadows	715f2c53d5	merge upstream/master into avatar-interaction ... Conflicts: interface/interface_en.ts	2014-04-02 17:28:22 -07:00
Atlante45	52df77b4b5	Final work on models metadata support	2014-04-02 16:25:35 -07:00
Andrew Meadows	97ba5250a5	Only simulate() Avatar Models when necessary ... Also: rebuild collision shapes when Model scale changes	2014-04-02 12:01:18 -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
Andrzej Kapolka	afb5711879	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-04-01 10:40:38 -07:00
Andrzej Kapolka	5aa9b981be	Hopefully, a fix for the Windows build.	2014-03-31 18:43:38 -07:00
Andrzej Kapolka	929f08dec2	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-03-31 18:22:43 -07:00
Andrzej Kapolka	005ae79928	Various fixes and what-not, got the basic spanner clipping working.	2014-03-31 18:21:28 -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
Stephen Birarda	135d97d0a7	add a pretty important missing line for symmetric socket activation	2014-03-31 15:59:54 -07:00
Stephen Birarda	62da4d622d	don't require an MD5 hash in non-verified packets	2014-03-31 15:36:32 -07:00
Stephen Birarda	6c08e2a407	add option for domain-server to enforce DTLS	2014-03-31 15:06:58 -07:00
Stephen Birarda	da30d21f6e	complete inital DTLS setup in domain-server	2014-03-31 14:02:11 -07:00
Andrzej Kapolka	10588cff9f	"Clear spanners" clears the voxelized attributes, too.	2014-03-30 15:51:39 -07:00
Andrzej Kapolka	40b1d2f284	Fix for voxelization on removal.	2014-03-29 22:39:49 -07:00
Andrzej Kapolka	7580951b92	More progress on voxelizing spanners.	2014-03-28 20:19:28 -07:00
Andrzej Kapolka	176d8f746e	Finally at the point of actually getting spanners to turn into voxels.	2014-03-28 15:19:40 -07:00
Stephen Birarda	61711c7aaa	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-03-28 13:30:06 -07:00
Andrzej Kapolka	cba57f20dd	Working on spanner attributes.	2014-03-28 11:38:02 -07:00