12044 commits

Author	SHA1	Message	Date
Stephen Birarda	c80c4a9b45	resolve conflicts on merge with origin/protocol	2015-08-27 14:45:22 -07:00
Stephen Birarda	183a2ab996	Merge pull request #18 from Atlante45/protocol ... Cleanup connections	2015-08-27 14:41:00 -07:00
Ryan Huffman	dabea21d66	Remove unused variable	2015-08-27 14:30:48 -07:00
Ryan Huffman	5aa5bca8f7	Add path to headers	2015-08-27 14:29:54 -07:00
Stephen Birarda	1da9eeab1f	handle double handshake in Connection	2015-08-27 14:27:29 -07:00
Ryan Huffman	755c33e551	Remove unused variable	2015-08-27 14:11:40 -07:00
Ryan Huffman	24eef654e0	Remove unnecessary debug	2015-08-27 14:11:29 -07:00
Ryan Huffman	4fcfd5b8f8	Fix indentation	2015-08-27 13:58:28 -07:00
Ryan Huffman	b401a62d7f	Disable request limiting for ATP requests in ResourceCache	2015-08-27 13:58:17 -07:00
Ryan Huffman	12d3cf557a	Remove assert in ScriptCache	2015-08-27 12:58:57 -07:00
Ryan Huffman	33d6f561eb	Reintroduce request limit in ResourceCache	2015-08-27 12:52:11 -07:00
Ryan Huffman	750080fe66	Remove early return in Model::restoreJointPosition	2015-08-27 12:52:01 -07:00
Ryan Huffman	b30a008162	Fix bug with NetworkTexture occasionally breaking on assert	2015-08-27 12:48:55 -07:00
Ryan Huffman	a49a1eb0d6	Add extension to atp requests	2015-08-27 11:51:45 -07:00
Ryan Huffman	c6493b1720	Remove extension from hash in AssetResourceRequest	2015-08-27 10:27:12 -07:00
Ryan Huffman	1d45293184	Fix lambda callback affinity in BatchLoader	2015-08-27 09:56:26 -07:00
Ryan Huffman	667db200c0	Cleanup BatchLoader	2015-08-27 09:39:12 -07:00
Ryan Huffman	8765329a46	Add ASSET_TOO_LARGE to AssetUtils	2015-08-27 09:32:39 -07:00
Ryan Huffman	92dbe9997c	Clean up AssetRequest	2015-08-27 09:31:50 -07:00
Ryan Huffman	15854c6715	Make AssetClient methods private	2015-08-27 09:31:34 -07:00
Ryan Huffman	b72e7e356d	Clean up AssertClient	2015-08-27 09:31:17 -07:00
Ryan Huffman	c2fcf5865a	Update log message for uploading assets	2015-08-26 16:02:47 -07:00
Ryan Huffman	d66c521200	Move SendAssetTask to separate file	2015-08-26 15:37:23 -07:00
Ryan Huffman	2e585256ff	Update asset hash to Sha256	2015-08-26 14:20:24 -07:00
Ryan Huffman	269d5bb6da	Resolve bugs with *Cache changes	2015-08-26 14:04:55 -07:00
Ryan Huffman	aa7d8678e1	Merge branch 'protocol' of github.com:birarda/hifi into atp-server	2015-08-26 12:26:11 -07:00
Atlante45	5b5dc94335	Make DoubleLock thread-safe but not self-unlocked	2015-08-26 20:03:04 +02:00
Atlante45	b1fa12cc43	Better debug message	2015-08-26 19:38:24 +02:00
Atlante45	cd8d6df287	Use high_resolution_clock instead of clock	2015-08-26 19:36:18 +02:00
Atlante45	7a5ed24485	typo (I can't spell inactive correctly)	2015-08-26 19:31:33 +02:00
Stephen Birarda	3a918eedca	resolve conflicts on merge with upstream master	2015-08-26 10:01:24 -07:00
Ryan Huffman	c878eb0cd9	Fix atomics not being initialized in SendQueue	2015-08-26 09:31:03 -07:00
Ryan Huffman	868558b4f0	Add registration of QSharedPointer<NLPacketList> meta type	2015-08-26 09:29:46 -07:00
Ryan Huffman	24faab2089	Add sendPacketList that take Node	2015-08-26 09:29:15 -07:00
Atlante45	3184dee10a	Emit queueInnactive when flow window is full for too long	2015-08-26 17:49:17 +02:00
Atlante45	8049819beb	Tweak DoubleLock	2015-08-26 17:11:32 +02:00
Atlante45	179ee73e26	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
Atlante45	6958a31efe	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-08-26 16:37:45 +02:00
Atlante45	c96632d4b6	Cleanup connection on node kills	2015-08-26 16:07:47 +02:00
Atlante45	373d4b8944	Remove connection from socket when innactive ... If innactive for more than 5 seconds, remove it from hash	2015-08-26 15:53:49 +02:00
Atlante45	00b224e769	Merge branch 'protocol' of https://github.com/birarda/hifi into protocol	2015-08-26 14:57:31 +02:00
Clément Brisset	2745cc5d12	Merge pull request #15 from birarda/wait-condition ... add a wait condition in SendQueue if there's nothing to do	2015-08-26 14:57:16 +02:00
Brad Hefta-Gaub	029c59fb77	Merge pull request #5654 from jherico/barney ... Fix stereo modes aspect ratio	2015-08-25 22:16:30 -07:00
Brad Hefta-Gaub	5d5c1584c3	Merge pull request #5659 from jherico/nelson ... Fix UserInputMapper event generation	2015-08-25 22:14:37 -07:00
samcake	fda9827100	Merge pull request #5529 from SeijiEmery/gputest ... gputest	2015-08-25 20:03:08 -07:00
Brad Davis	073567558e	Fix UserInputMapper event generation	2015-08-25 19:15:06 -07:00
Brad Davis	f176003dad	Fixing aspect ratio on stereo plugins	2015-08-25 19:05:31 -07:00
Stephen Birarda	d5e77ba907	clear the pending received messages on handshake receive	2015-08-25 18:26:30 -07:00
Stephen Birarda	54f2dc54f6	add a condition_variable wait_until to not lock for handshake	2015-08-25 18:23:50 -07:00
Stephen Birarda	0ce8e05f19	reset the receiver's state on handshake	2015-08-25 18:01:37 -07:00