30784 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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	269d5bb6da	Resolve bugs with *Cache changes	2015-08-26 14:04:55 -07:00
Ryan Huffman	aed1ba31c4	Fix bugs in Menu.cpp	2015-08-26 12:26: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
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
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
Ryan Huffman	d90ceb200a	Add asset uploader to Menu	2015-08-26 09:27:50 -07:00
Clément Brisset	29aee1ee13	Merge pull request #17 from Atlante45/update_protocol ... Update protocol with master	2015-08-26 16:53:52 +02:00
Atlante45	179ee73e26	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +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	b19f1e0631	Merge pull request #5658 from ctrlaltdavid/20653 ... Add Desktop object to JavaScript with width and height properties	2015-08-25 23:18:20 -07:00
Brad Hefta-Gaub	1cd699de9d	Merge pull request #5657 from birarda/master ... fix for 0 entity avg ping	2015-08-25 22:27:44 -07: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
Seiji Emery	d29a368688	removed debug	2015-08-25 16:50:09 -07:00
Ryan Huffman	0bfa0c4942	Add progress to AssetResourceRequest	2015-08-25 16:35:41 -07:00
Ryan Huffman	0e98b179dd	Update Asset gettings and uploading in AssetClient	2015-08-25 16:34:44 -07:00
Seiji Emery	140edd0589	try removing quotes...	2015-08-25 16:21:38 -07:00
David Rowe	9d3d104ec3	Add Desktop object to JavaScript with width and height properties	2015-08-25 16:13:36 -07:00
Ryan Huffman	12b2dfb2f9	Clean up HTTPResourceRequest	2015-08-25 15:45:00 -07:00
Ryan Huffman	3eff605d72	Update asset server number	2015-08-25 15:44:37 -07:00
Stephen Birarda	67816c033a	output megabits per second not per interval	2015-08-25 15:43:21 -07:00
Seiji Emery	248d0729a6	test	2015-08-25 15:29:36 -07:00
Ryan Huffman	1e6ff8a1e4	Merge branch 'protocol' of github.com:birarda/hifi into atp-server	2015-08-25 15:25:52 -07:00
Ryan Huffman	3959928bbb	Update ResourceRequest::moveData to getData	2015-08-25 15:20:00 -07:00
Ryan Huffman	2efba00e3e	Update BasePacket::read to do a copy	2015-08-25 15:19:07 -07:00
Ryan Huffman	6bba2f4cb1	Update Packet to properly copy packet position and message number	2015-08-25 15:18:40 -07:00
Ryan Huffman	4e3d0758e5	Remove UNUSED_2	2015-08-25 15:07:07 -07:00
Ryan Huffman	dc5d5cbb63	Add asset server ping to stats	2015-08-25 15:06:40 -07:00