54207 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Atlante45	927efc88f0	Fix GPUKTXPayload conflict across platforms	2017-04-26 10:48:57 -07:00
Ryan Huffman	6e307dd6eb	Remove debug logging	2017-04-26 10:48:57 -07:00
Ryan Huffman	14f8c91e23	Adjust gl45 backend to request interest in mips and keep track of min requested	2017-04-26 10:48:57 -07:00
Ryan Huffman	970be9d2c5	Add check for canPopulate to gpu backend	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	bc6d476a4d	Cleanup Texture_ktx.cpp	2017-04-26 10:48:57 -07:00
Ryan Huffman	5901ab6381	Fix initalization order warnings in KTX.h and TextureCache.cpp	2017-04-26 10:48:57 -07:00
Ryan Huffman	790290f40c	Fix NetworkTexture build errors on osx/linux	2017-04-26 10:48:57 -07:00
Ryan Huffman	b2ff0a711e	Replace canPromoteAndPopulate with multiple function calls	2017-04-26 10:48:24 -07:00
Ryan Huffman	7cab70deba	Remove gl error logging	2017-04-26 10:48:24 -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	d5f1e6fb37	Adjust handling of requested mips in gl backend	2017-04-26 10:48:24 -07:00
Ryan Huffman	472c888529	Fix handling of failed ktx downloads	2017-04-26 10:48:24 -07:00
Ryan Huffman	841d301dec	Fix build errors due to TexturePointer change	2017-04-26 10:48:24 -07:00
Ryan Huffman	cc7169b754	Add debug logging for ktx downloads	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	70eaac8d6c	Add persisting of ktx min mips available to ktx cache file	2017-04-26 10:48:24 -07:00
Ryan Huffman	5594e81fe4	Improve gl backend handling of unavailable mips	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	20f4d14e07	Add compressed KTX size evaluation	2017-04-26 10:48:23 -07:00
Ryan Huffman	b21dc12cc6	Cleanup NetworkTexture ktx handling	2017-04-26 10:47:32 -07:00
Ryan Huffman	ab7099b3eb	Add loading of lower mips to NetworkTexture	2017-04-26 10:47:32 -07:00
Ryan Huffman	39c3fee838	Add caching of imageOffset to ktx ImageDescriptor	2017-04-26 10:47:32 -07:00
Ryan Huffman	e9bb895bff	Implement KTXStorage::assignMipData and add writing of mips to ... TextureCache	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	aca7ad27c6	Fix ktx dependencies	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
Thijs Wenker	0363e96f34	Allow skeletons with different bone structures to become friends (still requires hands)	2017-04-26 18:55:50 +02:00
Thijs Wenker	a25584c90f	ESLINT, style and spelling fixes	2017-04-26 18:51:55 +02:00
Zach Fox	6e6fd608dd	Merge pull request #10288 from zfox23/fixConnectionLogs ... Fix incorrect logging in makeUserConnection	2017-04-26 09:13:27 -07:00
Zach Fox	3e24296996	Swap the two lines	2017-04-26 09:10:05 -07:00
anshuman64	c82bd67a14	Update BUILD_WIN.md	2017-04-26 09:07:40 -07:00
Dante Ruiz	d8e6e8e7d0	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-26 16:53:02 +01:00
Dante Ruiz	79d827c6be	added requested features	2017-04-26 16:52:51 +01:00
Howard Stearns	0f8ee7051c	lint	2017-04-26 08:20:12 -07:00
David Rowe	4581b9a0df	Refresh countdown number upon reopening dialog	2017-04-26 20:13:21 +12:00
Triplelexx	01b11022e3	add menu item to control grabbable setting on newly created entites	2017-04-26 07:26:00 +01:00
humbletim	84c8b2945a	detect and update doppleganger when user changes skeletonModelURLs; cleanup	2017-04-26 01:58:51 -04:00
Philip Rosedale	8826dbef78	removed old gravity example	2017-04-25 22:37:20 -07:00
Philip Rosedale	c69d064cc3	code review fixes	2017-04-25 22:14:03 -07:00
Seth Alves	86e09b8d34	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-2-redux	2017-04-25 21:29:37 -07:00
David Rowe	06f56f024b	Increase delay of checking a recording loaded to reduce false positives	2017-04-26 15:55:59 +12:00
Seth Alves	c7ab4994ea	Merge pull request #10282 from druiz17/tablet-webview-keyboard ... Added tabletwebview keyboard for HMD	2017-04-25 19:30:49 -07:00
David Rowe	c5f384d8fb	Don't fade playback avatar when approaches observer	2017-04-26 14:02:45 +12:00