21766 commits

Author	SHA1	Message	Date
Chris Collins	6fe210da66	Merge pull request #10094 from sethalves/tablet-ui-fix-hmd-login ... fix login-screen for hmd+tablet	2017-03-31 17:17:30 -07:00
Zach Fox	8a96969471	Merge pull request #9873 from highfidelity/PAL_v2 ... PAL v2.0	2017-03-31 17:00:41 -07:00
Seth Alves	3cd134d138	fix login-screen for hmd+tablet	2017-03-31 16:41:21 -07:00
Andrew Meadows	0181783290	Merge pull request #10064 from samcake/ambient ... Fix the sharp reflection happening after pr 10036 and bugs on backend 4.1	2017-03-31 16:04:00 -07:00
samcake	467ea787c6	Adress Seth's review	2017-03-31 14:54:00 -07:00
Howard Stearns	0c07003768	Merge pull request #10049 from AndrewMeadows/avoid-invisible-avatars ... Avoid invisible avatars	2017-03-31 13:48:41 -07:00
samcake	c8970dd704	Fixing the warning on windows	2017-03-31 11:34:03 -07:00
samcake	6a0c07a692	Fixing a bad counter for numFaces	2017-03-31 10:39:13 -07:00
Sam Cake	dd73cb7b8e	Use a magic number gpu::Texture::SINGLE_MIP instead of 1	2017-03-30 23:46:37 -07:00
Sam Cake	61d78bc931	BRinging the cool texture management of the gl45 backend to gl41, which fixes the broken ao on 41 among other things	2017-03-30 23:29:37 -07:00
samcake	47e9668b8f	improving the gl41 backend to mimic the gl45	2017-03-30 17:59:59 -07:00
samcake	25edb44b75	Fix the problem with the cursor and scattering,	2017-03-30 15:15:14 -07:00
samcake	26000288d7	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-03-30 11:45:12 -07:00
David Kelly	e66c075f8e	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-30 10:14:29 -07:00
samcake	73a8ec3e72	Merge pull request #10068 from kencooke/audio-debugbuild-fix ... Fix the crash in Debug builds	2017-03-30 10:12:37 -07:00
David Kelly	348674a267	Merge pull request #10034 from davidkelly/dk/avatarEntityIssue ... bad serialization of Avatar Entity parentID	2017-03-30 10:12:19 -07:00
Ken Cooke	69863dd735	Fix the crash in Debug builds, caused by undeclared metatype for AudioInjector*	2017-03-30 08:52:04 -07:00
Sam Cake	1c9bc2d71e	Trying to debug the crash on gl4.1	2017-03-29 23:28:06 -07:00
samcake	5584853340	Keep on cleaning	2017-03-29 18:22:21 -07:00
samcake	b6504bba56	Moving the num mips per texture to the creator so it s immutable and simpler	2017-03-29 17:58:56 -07:00
Zach Fox	1b74576259	Fix tablet-close behavior for PAL; remove users-tablet.js	2017-03-29 14:53:45 -07:00
samcake	60208bca69	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-03-29 10:58:05 -07:00
samcake	9bc7e41642	Remove extra calls for binding default textures, not needed	2017-03-29 10:57:08 -07:00
samcake	8fd413e7c3	Merge pull request #10037 from highfidelity/revert-10036-revert-10020-ktx_refactor ... Don't hold KTX files open for longer than transfers require	2017-03-29 10:02:33 -07:00
Andrew Meadows	7100f44927	refresh AvatarData when receiving identity data	2017-03-28 21:03:01 -07:00
Zach Fox	b776f25b3b	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-28 18:09:17 -07:00
Zach Fox	81264c998b	Revert "Merge from upstream/master" ... This reverts commit b5ba4a109d.	2017-03-28 17:39:45 -07:00
Zach Fox	b5ba4a109d	Merge from upstream/master	2017-03-28 17:37:34 -07:00
Seth Alves	6080c4782a	fix polyvox shader	2017-03-28 16:44:31 -07:00
samcake	a1bf1beab4	Merge pull request #10014 from samcake/blue ... Fixing the roughness/reflection quantization bug	2017-03-28 14:50:24 -07:00
Seth Alves	4516ddf855	Merge pull request #9847 from highfidelity/tablet-ui ... Tablet ui	2017-03-28 14:48:02 -07:00
samcake	a2b2e3e169	Revert "Revert "Don't hold KTX files open for longer than transfers require""	2017-03-28 14:45:04 -07:00
samcake	08e1a2ba4c	Revert "Don't hold KTX files open for longer than transfers require"	2017-03-28 14:06:09 -07:00
samcake	e42cb52bd1	Merge pull request #10020 from jherico/ktx_refactor ... Don't hold KTX files open for longer than transfers require	2017-03-28 14:06:02 -07:00
Seth Alves	6df4dda746	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 11:42:14 -07:00
David Kelly	4b40633104	oops damn space	2017-03-28 11:22:18 -07:00
Seth Alves	1cf6945bf2	pass radials argument to AABox::touchesAAEllipsoid as const reference	2017-03-28 11:12:00 -07:00
Seth Alves	9789476a73	handle case where AAEllipsoid is entirely inside the AABox	2017-03-28 10:57:03 -07:00
Seth Alves	6f6343420c	don't crash if entity dimensions somehow include a zero	2017-03-28 10:56:33 -07:00
Seth Alves	7641677902	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-28 10:14:49 -07:00
Seth Alves	9e675d4c93	Merge pull request #9990 from hyperlogic/bug-fix/sliders ... Added inputMode property to Web3DOverlay	2017-03-28 10:07:37 -07:00
Bradley Austin Davis	9fc9253eeb	Fixing warnings	2017-03-28 09:54:18 -07:00
David Kelly	e119c38748	bad serialization of parentID	2017-03-28 09:26:40 -07:00
Seth Alves	b50a02ea19	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 08:16:59 -07:00
Seth Alves	651d87dc2a	move Qt-related stuff out of model and into model-networking	2017-03-28 07:53:25 -07:00
Seth Alves	8da91695df	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-27 20:15:54 -07:00
Andrew Meadows	5fc1e97166	fix windows build of render-utils-test	2017-03-27 16:49:43 -07:00
Bradley Austin Davis	2cf7ba4119	Fixing pending transfer calculation	2017-03-27 16:34:08 -07:00
Bradley Austin Davis	638364497d	Trying a different tactic to avoid multiple concurrent file access	2017-03-27 16:18:04 -07:00
Andrew Meadows	92b41d7a38	fix link error for linux build	2017-03-27 15:50:40 -07:00