30864 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	eae90cbe8a	resolve conflicts on merge with origin/protocol	2015-08-27 14:47:35 -07:00
Stephen Birarda	0807d1bf4d	Merge pull request #16 from birarda/handshake ... add a handshake before UDT connection starts	2015-08-27 14:46:26 -07:00
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
Stephen Birarda	fa3cdce46e	Merge pull request #19 from huffman/atp-server ... Asset server	2015-08-27 14:40:52 -07:00
Stephen Birarda	59775e5756	actually add the additional error to the dialog	2015-08-27 14:40:12 -07:00
Stephen Birarda	26757eae7a	immediately show permission denied error if applicable	2015-08-27 14:37:44 -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	f238c1b167	include the extension in upload confirmation	2015-08-27 14:29:42 -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
Stephen Birarda	229015a5da	don't allow asset-server upload if no server present	2015-08-27 12:21:38 -07:00
Stephen Birarda	f3797964e2	resolve conflicts on merge with huffman/atp-server	2015-08-27 12:21:15 -07:00
Stephen Birarda	16eee10cab	repairs to permission error for asset-server upload	2015-08-27 12:13:20 -07:00
Stephen Birarda	c212ef5734	fix PacketReceiver cleanup, return permission error for upload	2015-08-27 12:01:24 -07:00
Ryan Huffman	a49a1eb0d6	Add extension to atp requests	2015-08-27 11:51:45 -07:00
Stephen Birarda	b3bd94c8db	show a QMessageBox if not connected to asset-server	2015-08-27 11:37:27 -07:00
Stephen Birarda	f92ee597e5	fix width of asset upload dialog to fit ATP url	2015-08-27 11:32:03 -07:00
Stephen Birarda	0f4a4b5cc1	resolve conflicts on merge with huffman/atp-server	2015-08-27 10:30:56 -07:00
Ryan Huffman	c6493b1720	Remove extension from hash in AssetResourceRequest	2015-08-27 10:27:12 -07:00
Stephen Birarda	513cae0d40	thread the AssetUpload so it doesn't take over main	2015-08-27 10:23:02 -07:00
Ryan Huffman	628f275013	Fix asset server upload errors	2015-08-27 10:07:53 -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	3731091d5e	Remove max chunk requesting from SendAssetTask	2015-08-27 09:30:47 -07:00
Ryan Huffman	f95957a271	Cleanup AssetServer	2015-08-27 09:30:34 -07:00
Stephen Birarda	c277584f2e	Merge branch 'atp-server' of https://github.com/huffman/hifi into asset-upload	2015-08-27 09:17:25 -07:00
Stephen Birarda	5b5941fea2	move asset upload to AssetUploadDialogFactory	2015-08-26 16:30:09 -07:00
Ryan Huffman	c2fcf5865a	Update log message for uploading assets	2015-08-26 16:02:47 -07:00
Ryan Huffman	4105b7369c	Remove AssetScriptingInterface	2015-08-26 15:55:29 -07:00
Ryan Huffman	59b32751f0	Cleanup AssetScriptingInterface	2015-08-26 15:54:02 -07:00
Ryan Huffman	4ed5748afa	Fix new asset loading in directory	2015-08-26 15:37:58 -07:00
Ryan Huffman	287f2533eb	Remove AssetServer dtor	2015-08-26 15:37:38 -07:00
Ryan Huffman	d66c521200	Move SendAssetTask to separate file	2015-08-26 15:37:23 -07:00
Stephen Birarda	0450e84008	Merge branch 'atp-server' of https://github.com/huffman/hifi into asset-upload	2015-08-26 15:30:25 -07:00
Stephen Birarda	1a019187af	Merge branch 'ds-cleanup' into asset-upload	2015-08-26 15:07:43 -07:00
Stephen Birarda	cd7d0f383b	allow editors who can't be verified in the short term	2015-08-26 15:07:29 -07:00
Stephen Birarda	9e286666b5	add UDT to comment for Connection cleanup	2015-08-26 14:55:59 -07:00