1545 commits

Author	SHA1	Message	Date
Stephen Birarda	dc7d7ef444	make SendAssetTask be consistent with new UploadAssetTask	2015-08-31 15:17:40 -06:00
Stephen Birarda	3f85e8a2fe	add an UploadAssetTask so uploading is on diff thread	2015-08-28 11:12:52 -07:00
Stephen Birarda	0b712eef55	Merge branch 'protocol' of github.com:birarda/hifi into atp	2015-08-28 09:10:12 -07:00
Stephen Birarda	28d9610bd4	add a listen port option to ACs	2015-08-28 07:31:17 -07:00
Atlante45	12fdec232b	CR	2015-08-28 16:31:02 +02:00
Atlante45	ea05fcea0c	Forward AssetResourceRequest loading errors	2015-08-28 16:03:31 +02:00
Ryan Huffman	efef60af04	Rename assetHashHex to hexHash	2015-08-27 15:57:35 -07:00
Ryan Huffman	8452289e00	Fix issue with raw hash not being converted to hex	2015-08-27 15:56:07 -07:00
Stephen Birarda	8eeb808572	Merge branch 'protocol' of github.com:birarda/hifi into asset-hash	2015-08-27 15:16:41 -07:00
Stephen Birarda	e3e529c4e5	resolve conflicts on merge with origin/protocol	2015-08-27 14:52:29 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
Stephen Birarda	eae90cbe8a	resolve conflicts on merge with origin/protocol	2015-08-27 14:47:35 -07:00
Ryan Huffman	5aa5bca8f7	Add path to headers	2015-08-27 14:29:54 -07:00
Stephen Birarda	86a7a42d24	use compact hash representation for asset-server	2015-08-27 14:22:21 -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
Ryan Huffman	628f275013	Fix asset server upload errors	2015-08-27 10:07:53 -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
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
Ryan Huffman	34f7aa74f3	Move SendAssetTask declaration to header	2015-08-26 14:27:46 -07:00
Ryan Huffman	2e585256ff	Update asset hash to Sha256	2015-08-26 14:20:24 -07:00
Ryan Huffman	aa7d8678e1	Merge branch 'protocol' of github.com:birarda/hifi into atp-server	2015-08-26 12:26:11 -07:00
Seth Alves	695ffa29c7	call setup_memory_debugger from common macros rather than from every CMakeLists.txt file	2015-08-26 11:09:59 -07:00
Ryan Huffman	9b174bfbf4	Remove extension from filename	2015-08-26 09:28:19 -07:00
Ryan Huffman	d503c5293a	Remove commented out line	2015-08-26 09:28:06 -07:00
Atlante45	179ee73e26	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
Brad Davis	d311e4f2ea	Fixing problems reported by static analysis tool	2015-08-25 19:18:55 -07:00
Ryan Huffman	85f80ff6f9	Update AssetServer to use PacketList	2015-08-25 15:05:35 -07:00
Ryan Huffman	0352782e46	Add SendAssetTask	2015-08-25 12:46:44 -07:00
Ryan Huffman	b865a3f8fb	Add thread pool to AssetGet requests	2015-08-25 12:41:55 -07:00
Stephen Birarda	d76e8a7e48	remove double settings request for testing	2015-08-25 11:27:31 -07:00
Stephen Birarda	f7799bcf8f	add TODO for settings fail, cleanup	2015-08-24 17:02:47 -07:00
Thijs Wenker	f512205f6f	add ability to include scripts from a relative path in assignment-client (for persistent scripts only)	2015-08-22 01:30:07 +02:00
Thijs Wenker	176d7372ad	add QWebSockets to assignment-client project (cmake)	2015-08-21 23:03:26 +02:00
Thijs Wenker	d89ecc1e42	Move WebSocketServer to be accessable from Assignment-Client:Agent only.	2015-08-21 22:43:49 +02:00
Ryan Huffman	0a290da529	Merge branch 'ordered-sending' into atp-server	2015-08-20 11:50:06 -07:00
Seth Alves	c25082d86f	use -fsanitize=address in all code rather than just the top-level links	2015-08-20 10:14:16 -07:00
Atlante45	62c76d0332	registerListenerForTypes optimisations	2015-08-20 14:56:35 +02:00
Seth Alves	2056f588e3	if environment variable HIFI_MEMORY_DEBUGGING is defined when cmake is run, enable -fsanitize=address on linux	2015-08-19 18:03:16 -07:00
Stephen Birarda	6860f3d126	add readWithoutCopy for clarity in Packet read	2015-08-19 14:32:26 -07:00
Stephen Birarda	42a7262707	Merge pull request #5565 from murillodigital/node-version ... DO NOT MERGE - Node versioning	2015-08-19 13:32:48 -07:00
Ryan Huffman	5884fcb17b	Merge branch 'ordered-sending' into atp-server	2015-08-19 12:23:31 -07:00
Ryan Huffman	a168a1058f	Update filename regex in AssetServer to allow extensions	2015-08-19 12:09:46 -07:00
Stephen Birarda	fd43c48eac	resolve conflicts on merge with birarda/protocol	2015-08-18 11:48:36 -07:00
Stephen Birarda	0f77ab8611	resolve conflicts on merge with upstream/master	2015-08-18 11:45:55 -07:00