3241 commits

Author	SHA1	Message	Date
ZappoMan	834a447d62	remove debugging code	2017-04-26 18:36:44 -07:00
Ryan Huffman	ac0a738945	Merge pull request #10261 from Atlante45/feat/progressive-load-ktx ... Add progressive load for KTX textures	2017-04-26 18:36:01 -07:00
ZappoMan	a26dca73b1	more logging	2017-04-26 18:02:09 -07:00
Ryan Huffman	f5b7feccde	Update AssetClient/Request to use const byteRange	2017-04-26 18:01:56 -07:00
ZappoMan	3de92121e0	more logging	2017-04-26 15:28:10 -07:00
Andrew Meadows	08972da843	remove unused Node::_isAlive cruft	2017-04-26 12:47:56 -07:00
Ryan Huffman	1555fc3088	Update Resource to only clear load priorities if successful	2017-04-26 11:37:48 -07:00
Ryan Huffman	01724c9c90	Update default load priority to be 0	2017-04-26 11:37:47 -07:00
Ryan Huffman	4f16eb9bcc	Cleanup KTX logging and add fragment to resource url to indicate mip level	2017-04-26 11:32:35 -07:00
Atlante45	043c587395	Fix byte range for file resource requests	2017-04-26 10:49:23 -07:00
Atlante45	8269e01474	Fix atp-get compile error	2017-04-26 10:49:23 -07:00
Stephen Birarda	3928e11611	fix valid byte range check and send asset from 0	2017-04-26 10:48:57 -07:00
Stephen Birarda	814970c4e2	cleanup invalid byte range handling	2017-04-26 10:48:57 -07:00
Stephen Birarda	fab1bdaeb7	push asset server packet versions for range requests	2017-04-26 10:48:57 -07:00
Stephen Birarda	7ae8c741c5	pass the byte range to asset client from AssetResourceRequest	2017-04-26 10:48:57 -07:00
Stephen Birarda	229a481232	add byte range handling to FileResourceRequest	2017-04-26 10:48:57 -07:00
Stephen Birarda	397a29039e	add support for byte range requests to ATP	2017-04-26 10:48:57 -07:00
Ryan Huffman	8d03d50d35	Cleanup progressive ktx debugging	2017-04-26 10:48:57 -07:00
Ryan Huffman	4e58341631	Remove http proxy	2017-04-26 10:48:24 -07:00
Ryan Huffman	18fb695614	Disable pipelining in HTTPResourceRequest	2017-04-26 10:48:24 -07:00
Ryan Huffman	ce12a216c0	I think it might be working.	2017-04-26 10:48:24 -07:00
Ryan Huffman	70b816827e	Improve handling of KTX downloads in NetworkTexture	2017-04-26 10:48:24 -07:00
Ryan Huffman	11751611e1	Update NetworkTexture to track current KTX download state	2017-04-26 10:48:23 -07:00
Ryan Huffman	39c3fee838	Add caching of imageOffset to ktx ImageDescriptor	2017-04-26 10:47:32 -07:00
Ryan Huffman	cf3dc12542	Add object labels to GL objects and add ktx min mip kv	2017-04-26 10:47:32 -07:00
Ryan Huffman	b20fcbfcdb	Add a way to write data to a storage object	2017-04-26 10:45:50 -07:00
Ryan Huffman	ccd9c4697b	Add extended ktx header/high-mip request handling to NetworkTexture	2017-04-26 10:45:50 -07:00
Ryan Huffman	1fec531c68	Add basic mip writing to gpu::Texture	2017-04-26 10:45:50 -07:00
Ryan Huffman	00cbfa0f70	Add start of progressive ktx-loading	2017-04-26 10:45:50 -07:00
Ryan Huffman	105d17e85e	Add byte range support to HTTPResourceRequest	2017-04-26 10:45:14 -07:00
David Rowe	4a5f84f4b9	Merge branch 'master' into 21249 ... # Conflicts: # libraries/audio-client/src/AudioClient.cpp	2017-04-26 13:24:18 +12:00
ZappoMan	90cdeb9582	Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL	2017-04-25 16:09:59 -07:00
Andrew Meadows	157dc1475b	Merge pull request #10281 from birarda/bug/session-refresh-login ... force DS to use new node ID if connect is re-sent	2017-04-25 15:02:57 -07:00
Stephen Birarda	c00dfcc7d7	send the domain disconnect packet before UUID is cleared	2017-04-25 14:32:21 -07:00
David Rowe	c05954ee4b	Add logAction() method to UserActivityLogger JavaScript API	2017-04-25 13:40:57 +12:00
ZappoMan	d179135a87	remove dead code	2017-04-24 18:21:22 -07:00
ZappoMan	95a3e0a092	fix whitespace	2017-04-24 18:06:33 -07:00
ZappoMan	c9aad6b762	new approach to the tpose fix, as well as other improvements	2017-04-24 17:36:05 -07:00
ZappoMan	da68c49dc1	more cleanup	2017-04-21 13:31:40 -07:00
ZappoMan	f07884602a	more CR feedback	2017-04-21 13:13:29 -07:00
ZappoMan	088cdae320	CR feedback	2017-04-21 11:14:47 -07:00
ZappoMan	ff45ad53a3	some more CR cleanup	2017-04-21 10:40:41 -07:00
ZappoMan	f133713d0e	CR feedback	2017-04-21 10:21:34 -07:00
ZappoMan	7f1a87ac4f	remove random http failure	2017-04-20 17:31:20 -07:00
ZappoMan	e89b6c5d2c	some initial debugging on tpose avatars	2017-04-20 17:26:31 -07:00
Seth Alves	41fb05ecf7	bump protocol version	2017-04-14 16:26:54 -07:00
Seth Alves	d17d12446b	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 12:49:03 -07:00
Thijs Wenker	6f58e91d76	Merge pull request #10121 from birarda/bug/recording-cache ... cleanup Agent RSI handling, make loadRecording async	2017-04-14 21:35:51 +02:00
Seth Alves	7695d2ac05	put the protocol version back to what's in master, for now	2017-04-13 11:29:40 -07:00
Seth Alves	1ab3a1eb60	bump entity-protocol version	2017-04-12 16:36:04 -07:00
Chris Collins	c86acfafef	Merge pull request #10120 from huffman/feat/stick-default-avatar ... Change default avatar to ball and stick avatar	2017-04-11 12:56:25 -07:00
Seth Alves	938fab6f59	Merge pull request #10061 from humbletim/fix-cached-ResourceCache ... Fix cached ResourceCache::prefetch() state updates	2017-04-11 07:04:06 -07:00
Ryan Huffman	af11f5f327	Update avatar mixer packet version for stick+ball avatar	2017-04-10 21:27:47 -07:00
Seth Alves	a1cab2c0d1	working toward fixing compound hulls	2017-04-09 17:23:56 -07:00
David Kelly	1b6bf90843	initial analytics for connections	2017-04-05 11:10:06 -07:00
Stephen Birarda	c7a28a527a	cleanup Agent recording handling, make loadRecording async	2017-04-04 10:56:25 -07:00
humbletim	6f2f1d6452	call finished() when cached resource has already failed to load	2017-03-29 19:42:19 -04:00
Zach Fox	e1a880a5d4	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
Zach Fox	e88895935b	Revert "Actually merge from master" ... This reverts commit 056d6fbe4f.	2017-03-24 17:56:48 -07:00
Brad Davis	82d502ae9f	Correctly initialize a file cache with the proper key	2017-03-24 13:35:37 -07:00
Zach Fox	056d6fbe4f	Actually merge from master	2017-03-24 10:10:17 -07:00
Zach Fox	915ace0087	Revert "Merge from Master" ... This reverts commit e48123b5bb.	2017-03-24 10:04:51 -07:00
Zach Fox	e48123b5bb	Merge from Master	2017-03-23 09:54:14 -07:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
Zach Fox	fc2a501474	Cleanup JS<->QML messaging	2017-03-16 15:38:39 -07:00
Brad Davis	2837ae9183	More VS 2017/2015 fixes	2017-03-15 16:13:15 -07:00
Brad Davis	b8ded015c6	Fix packetlist compilation on VS 2017	2017-03-15 15:20:41 -07:00
Brad Davis	3e68018a12	Fix node persmissions hash	2017-03-15 14:33:32 -07:00
Zach Pomerantz	808973d7d2	use QStandardPaths instead of hardcoded paths	2017-03-13 17:26:42 -04:00
Zach Pomerantz	463f6454f8	use Local instead of Roaming for FileCache	2017-03-13 17:26:38 -04:00
Zach Pomerantz	172a638ef0	move resource paths to PathUtils	2017-03-13 17:26:34 -04:00
Zach Pomerantz	a0c56618b3	update FileCache to rm manifest	2017-03-13 13:41:44 -04:00
Brad Davis	43d8433d9a	Removing unused include	2017-03-10 09:19:00 -08:00
Bradley Austin Davis	8a438948b9	Fix OSX link failure	2017-03-09 10:42:56 -08:00
Zach Pomerantz	170df4a1f4	Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27	2017-03-06 17:14:11 -07:00
Andrew Meadows	6ea6477c73	Merge pull request #9683 from jherico/cache_flush ... Clear caches on domain switch	2017-03-06 11:05:44 -08:00
Zach Pomerantz	6a7ee4321b	suppress logs for file_cache	2017-03-02 13:30:51 -05:00
Zach Pomerantz	cca1f2fb25	include <atomic> in FileCache	2017-03-02 11:28:49 -05:00
Zach Pomerantz	1425eb0936	Merge branch 'smarter_textures' of github.com:highfidelity/hifi into 2-27	2017-03-01 21:01:37 -05:00
Zach Pomerantz	febeeeca3a	namespace cache::FileCache and use unique_ptr	2017-03-01 20:58:00 -05:00
Zach Pomerantz	c71e614dd5	add loading from persisted files	2017-03-01 20:18:31 -05:00
Zach Pomerantz	a6a0fd3851	fix FileCache persistence	2017-03-01 11:32:11 -05:00
David Kelly	efe44425a6	cr feedback, plus something I missed	2017-03-01 09:26:03 -07:00
Zach Pomerantz	de23a11dee	wip	2017-02-28 17:25:56 -05:00
David Kelly	c10b0389de	Add a getAvatarGain method to NodeList and UsersScriptingInterface	2017-02-28 14:45:34 -07:00
Zach Pomerantz	b03f51dd26	fix double fclose	2017-02-28 16:08:54 -05:00
Zach Pomerantz	8969d7df1d	FileCache	2017-02-27 17:58:48 -05:00
Seth Alves	73774a6590	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-24 11:34:59 -08:00
Seth Alves	0a2a1b1637	include visible_to_others in UserActivityLoggerScriptingInterface::openedTablet	2017-02-23 15:25:09 -08:00
Brad Hefta-Gaub	05995163cf	add support for tuning sorting	2017-02-22 09:49:47 -08:00
Brad Hefta-Gaub	a58ddad3aa	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarBandwidthBudgetImprovements	2017-02-21 14:36:03 -08:00
Brad Hefta-Gaub	a526db1779	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements	2017-02-21 14:18:36 -08:00
Stephen Birarda	3b996f2b7f	bump packet version for new JSON query options	2017-02-21 09:29:07 -08:00
Brad Hefta-Gaub	d49c83cac3	fix build buster, some tweaks	2017-02-16 14:19:14 -08:00
Brad Hefta-Gaub	d532b3a4b8	more work on multi-core	2017-02-16 13:25:51 -08:00
Stephen Birarda	a3c123818d	Merge pull request #9661 from Atlante45/fix/possible-race ... Fix possible race condition	2017-02-15 18:38:01 -08:00
Brad Davis	127a014b46	Clear caches on domain switch	2017-02-15 15:21:08 -08:00
David Kelly	5184cbe615	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2	2017-02-15 12:08:55 -07:00
Zach Pomerantz	2f52c09320	alphabetize io_stats	2017-02-14 23:17:11 +00:00
Zach Pomerantz	276c1abd0a	Merge branch 'master' of https://github.com/highfidelity/hifi into load/audio/packets-in	2017-02-14 23:06:36 +00:00