51895 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Davis	5acf966b73	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-02-23 08:19:44 -08:00
Brad Davis	305938f599	Merge pull request #9734 from samcake/texmex ... TEXTURES: Fixing bugs with ktx to texture conversion and a few more issues	2017-02-23 08:18:54 -08:00
Seth Alves	37004e4347	steps toward making mouse work on tablet	2017-02-23 08:11:31 -08:00
sam	d7cb479dbe	clean the clean ups	2017-02-23 02:17:18 -08:00
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
Menithal	5c0bf690fb	Merge branch 'master' into grab-clone	2017-02-23 10:35:24 +02:00
Menithal	e95e50ad6e	Preliminary work on edit.js to allow for new param	2017-02-23 10:34:04 +02:00
Brad Hefta-Gaub	4f17498daf	fix warning	2017-02-23 00:19:06 -08:00
Brad Hefta-Gaub	d4adee8b38	add over bandwidth exit to sorted avatar loop	2017-02-23 00:15:07 -08:00
Brad Hefta-Gaub	40037bee55	added some stats for the random drops	2017-02-22 23:28:40 -08:00
Brad Hefta-Gaub	06f0087459	wire up radius properly	2017-02-22 22:36:37 -08:00
Brad Hefta-Gaub	edf7c016a1	more cleanup	2017-02-22 22:06:28 -08:00
Brad Hefta-Gaub	4c4506b1f7	some cleanup	2017-02-22 21:47:40 -08:00
Seth Alves	41ef7b8dbb	add setting to control if tablet is an entity or overlay	2017-02-22 21:13:42 -08:00
Seth Alves	4a778b9113	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-22 20:39:47 -08:00
Seth Alves	1b26c3469f	fix signed/unsigned joint index problem	2017-02-22 20:39:34 -08:00
Brad Davis	c0feb28c17	Merge pull request #9728 from samcake/texmex ... Updating with upstream master and fixing bad srgb format assignment	2017-02-22 19:38:13 -08:00
Seth Alves	84f95e6776	oops	2017-02-22 19:18:42 -08:00
Seth Alves	b4be942348	trying to get tablet overlay to show up in the right place	2017-02-22 19:18:03 -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	c7b164d8f2	Adding differenciation for the Material shapeKey bit	2017-02-22 18:21:18 -08:00
Chris Collins	b295a146e0	Merge pull request #9715 from hyperlogic/bug-fix/tablet-ui-toolbar-highlight ... More consistent highlights/toggle for toolbar buttons	2017-02-22 18:07:38 -08:00
samcake	262d7c3b79	Merging with upstream smarter_textures and Austin's pr	2017-02-22 17:54:38 -08:00
Brad Hefta-Gaub	10f465f8ea	Merge pull request #8 from AndrewMeadows/avatarBandwidthBudgetImprovements ... count avatar joint updates and non-updates	2017-02-22 17:53:15 -08:00
Seth Alves	273f0130f3	fix sphere vs box check for grabbing overlays. fix newly introduced equipping bug.	2017-02-22 17:43:09 -08:00
samcake	8659059c8c	Merge pull request #9731 from jherico/smarter_textures ... Smarter textures work	2017-02-22 17:25:23 -08:00
Andrew Meadows	6ac33dbf61	count avatar joint updates and non-updates	2017-02-22 17:23:36 -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
Seth Alves	bcf1f9ab4c	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-22 16:50:29 -08:00
Seth Alves	bfc4853947	make overlays near-grabbable. make tablet be an overlay	2017-02-22 16:50:02 -08:00
Ryan Huffman	dd895dc04a	Fix js linting issues in shortbow	2017-02-22 16:49:22 -08:00
Brad Davis	055db531b1	Update 'caching' of textures to KTX file backing	2017-02-22 15:59:05 -08:00
Anthony Thibault	44136e550c	Merge pull request #9729 from sethalves/tablet-ui-no-haptics-for-tablet ... don't do a haptic pulse when av's hand goes near grabbable tablet	2017-02-22 15:55:01 -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
Chris Collins	94517057d6	Merge pull request #9721 from hyperlogic/bug-fix/tablet-ui-tablet-placement ... More consistent tablet angle when first creating the tablet.	2017-02-22 15:00:17 -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
Seth Alves	aed1d69377	don't do a haptic pulse when av's hand goes near grabbable tablet	2017-02-22 14:14:10 -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
howard-stearns	de3a0d3d0c	button styling	2017-02-22 13:02:05 -08:00
howard-stearns	023a32563c	work around .qml settings issues	2017-02-22 12:59:40 -08:00
Zach Pomerantz	748d7c0ce4	macro NOEXCEPT for ktx on msvc	2017-02-22 15:06:01 -05:00