51415 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
sam	fbb0a24c4f	FIxing the bug preventing to deserialize normals, clean up the ktx usage of the storage::Storage class and cleaning up somewhat the Qt pixel formats used	2017-02-23 02:08:46 -08:00
samcake	bbded6aa51	fix issues while testing the ktxStorage	2017-02-22 19:07:01 -08:00
samcake	e8835b34f4	fix issues while testing the ktxStorage	2017-02-22 19:05:20 -08:00
samcake	262d7c3b79	Merging with upstream smarter_textures and Austin's pr	2017-02-22 17:54:38 -08:00
samcake	8659059c8c	Merge pull request #9731 from jherico/smarter_textures ... Smarter textures work	2017-02-22 17:25:23 -08:00
samcake	ad40e2d7d9	Trying to address the ktx serialization problem with normal, still have a bug	2017-02-22 17:16:37 -08:00
Brad Davis	055db531b1	Update 'caching' of textures to KTX file backing	2017-02-22 15:59:05 -08:00
Brad Davis	81cee57bb1	Add gamma-aware scaling test image	2017-02-22 15:44:27 -08:00
Brad Davis	62422690d0	More KTX testing, functionality	2017-02-22 15:44:06 -08:00
Brad Davis	05efac9ddf	Add compile time toggle for threaded buffering	2017-02-22 15:42:51 -08:00
samcake	c2831a513b	Adjusting the representation of the format in the KTX for sRGB, unfortunately not working with PicoPixel	2017-02-22 14:41:43 -08:00
samcake	9ca4926c1d	Fixing the bad assignment for the srgb textures	2017-02-22 13:43:23 -08:00
Brad Davis	61ba2dd11e	Disable texture cache processing for now	2017-02-22 13:29:10 -08:00
Brad Davis	a2269f488f	Add some testing / validation for KTX	2017-02-22 13:29:09 -08:00
Brad Davis	c6b72dfe3c	Make memory storage mutable	2017-02-22 13:29:08 -08:00
samcake	274f238ac0	Merging with upstream and the NOEXCEPT macro	2017-02-22 13:09:01 -08:00
samcake	b40e4d4e85	Merge pull request #9727 from zzmp/fix/ktx-noexcept ... macro NOEXCEPT for ktx on msvc	2017-02-22 13:07:08 -08:00
samcake	3f67f05b02	Remove the noexcept	2017-02-22 13:06:34 -08:00
Zach Pomerantz	748d7c0ce4	macro NOEXCEPT for ktx on msvc	2017-02-22 15:06:01 -05:00
samcake	6938948501	Merge branch 'master' of https://github.com/highfidelity/hifi into texmex	2017-02-22 12:00:11 -08:00
Chris Collins	c967f9383a	Merge pull request #9706 from ZappoMan/avatarMixerLoopImprovements ... Multi-core Avatar Mixer	2017-02-22 11:20:28 -08:00
Seth Alves	a8de6c8c93	Merge pull request #9723 from hyperlogic/bug-fix/tablet-ui-reload-script-bug ... Fix for system toolbar hiding when scripts are reloaded	2017-02-22 07:34:20 -08:00
Chris Collins	04d8c78089	Merge pull request #9707 from hyperlogic/bug-fix/mac-os-deadlock ... MacOS: Fix for audio, toolbar and tablet.	2017-02-21 17:39:07 -08:00
Anthony J. Thibault	379b7bc56d	Fix for system toolbar hiding when scripts are reloaded	2017-02-21 17:24:22 -08:00
Brad Hefta-Gaub	97fc88491f	Merge pull request #9718 from AndrewMeadows/sort-avatars-correctly ... fix sorting algorithm for avatar render updates	2017-02-21 16:14:12 -08:00
Chris Collins	c0f893fe82	Merge pull request #9699 from sethalves/overlays-uuid ... Overlays uuid	2017-02-21 15:28:28 -08:00
Andrew Meadows	dd447689e0	expose avatar sort coefficients for fine tuning	2017-02-21 15:09:44 -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
Seth Alves	3b181eb803	code review	2017-02-21 13:56:28 -08:00
Seth Alves	8cf71ebc65	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-21 13:54:21 -08:00
Andrew Meadows	27dd82b517	fix sorting algorithm for avatar render updates	2017-02-21 13:34:07 -08:00
Stephen Birarda	10828d7534	Merge pull request #9692 from birarda/feat/es-get-children-parents ... Give implicit access to family tree of server scripted entities in ESS	2017-02-21 13:17:46 -08:00
Brad Davis	3a0e13387d	Merge pull request #9716 from zzmp/fix/ubuntu ... Compile interface in Ubuntu	2017-02-21 11:54:37 -08:00
Zach Pomerantz	be4a9dcd5a	clear buffer without rref	2017-02-21 14:50:12 -05:00
Zach Pomerantz	666be6912b	fix KTX gcc errors	2017-02-21 14:46:25 -05:00
Brad Davis	7a21466b68	Merge remote-tracking branch 'sam/texmex' into smarter_textures	2017-02-21 10:50:34 -08:00
samcake	5e307f247e	Add support for the R8 textures	2017-02-21 10:46:49 -08:00
Brad Davis	3633fb8f7c	Merge pull request #9711 from samcake/texmex ... Smarter_textures branch: adding support for cube maps with KTX	2017-02-21 10:38:00 -08:00
samcake	ba54b5ce11	Rebasing with current upstream	2017-02-21 10:07:42 -08:00
samcake	bd12331846	Merge pull request #9708 from jherico/bar ... Adding new storage backing for gpu::Texture, moving mip format into storage abstraction	2017-02-21 09:33:07 -08:00
Stephen Birarda	3b996f2b7f	bump packet version for new JSON query options	2017-02-21 09:29:07 -08:00
sam	e5c2f6f651	enabled the usage and cube map with KTX correctly	2017-02-21 01:28:13 -08:00
sam	9c93de3704	Merge branch 'smarter_textures' of https://github.com/highfidelity/hifi into texmex	2017-02-20 20:25:27 -08:00
sam	b502b1e200	assigning the names of source to the texture	2017-02-20 19:40:39 -08:00
Brad Hefta-Gaub	ec8a95037d	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements	2017-02-20 17:01:29 -08:00
Philip Rosedale	5c782deb4d	Merge pull request #9701 from ctrlaltdavid/21175 ... Fix laser beam jumping upon grabbing entity	2017-02-20 13:37:11 -08:00
Seth Alves	70c9853189	Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid	2017-02-20 12:38:13 -08:00
Seth Alves	4a650ff2bb	Overlays::getOverlayAtPoint was depending on the order in which the overlays were added	2017-02-19 18:37:35 -08:00
Brad Davis	27e8750b9b	Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction	2017-02-19 18:11:56 -08:00
Brad Davis	07506b0078	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-02-19 14:00:52 -08:00