71597 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dante Ruiz	ec2d89fd25	fixing toolbar disappering	2018-09-06 11:16:58 -07:00
sabrina-shanman	7839ba42db	Make the Collision Pick threshold scale with the largest dimension of the parent	2018-09-06 11:02:07 -07:00
Roxanne Skelly	8a20969103	Fix typo	2018-09-06 10:38:10 -07:00
sam gateau	129e2ce188	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-09-06 10:30:41 -07:00
sabrina-shanman	3f7a7fb11a	Return early from AvatarTransformNode and similar when getTransform fails	2018-09-06 10:29:01 -07:00
sabrina-shanman	e8ea95e375	Use elseifs in PickScriptingInterface::createTransformNode	2018-09-06 10:21:48 -07:00
sabrina-shanman	390e89a64d	Fix missing NestableTransformNode import	2018-09-06 10:20:26 -07:00
Ryan Huffman	80b5f90160	Merge pull request #13857 from thoys/fix/interactiveWindows/onlyOnTopWhileMainWindowActive ... MS17463: only show InteractiveWindow on top of interface window	2018-09-06 10:15:20 -07:00
sabrina-shanman	f7226757ad	Just import TransformNode in AvatarTransformNode.h and similar	2018-09-06 10:03:05 -07:00
Dante Ruiz	200f6d540a	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-09-06 09:59:51 -07:00
David Back	f382b76abc	Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView	2018-09-06 09:57:24 -07:00
Seth Alves	042044ceaf	dammit	2018-09-06 09:38:12 -07:00
Seth Alves	5a0a259c21	dammit	2018-09-06 09:37:01 -07:00
Bradley Austin Davis	fade3a8de0	Fixing shader implicit type conversions	2018-09-06 09:08:36 -07:00
Brad Davis	650f112f16	Fix keyword in shader layout	2018-09-06 09:08:36 -07:00
Brad Davis	50f4932d9c	PR feedback: structure alignement and size	2018-09-06 09:07:53 -07:00
Seth Alves	69ae04ab09	protect Base3DOverlay::_name with a mutex	2018-09-06 09:03:28 -07:00
Brad Davis	9a28e04e37	Remove all tabs from shaders	2018-09-06 08:59:07 -07:00
Brad Davis	2df2bbef46	Adding missing locations	2018-09-06 08:59:07 -07:00
Brad Davis	87b9594bd0	Fix warnings	2018-09-06 08:59:06 -07:00
Brad Davis	730cdb4257	Remove uniforms from unused shaders	2018-09-06 08:59:06 -07:00
Brad Davis	f704ddc11c	Remove uniform from SDF text rendering	2018-09-06 08:59:06 -07:00
Brad Davis	a4cd56532e	Removing uniforms from antialiasing	2018-09-06 08:59:06 -07:00
Brad Davis	07fba89f0f	Remove uniforms from item status	2018-09-06 08:59:06 -07:00
Brad Davis	271651737b	Cleanup gpu shader constants	2018-09-06 08:59:06 -07:00
Brad Davis	5a5e1ad498	Remove uniforms from polyvox	2018-09-06 08:59:06 -07:00
Brad Davis	cafd981744	Remove uniforms from bloom debug effect	2018-09-06 08:59:06 -07:00
Brad Davis	719ae25adb	Remove uniforms from drawCellBounds	2018-09-06 08:59:05 -07:00
Brad Davis	c8eb4da6b6	Remove simple draw task uniforms	2018-09-06 08:59:05 -07:00
Brad Davis	ac84a498b3	Cleanup dead declarations	2018-09-06 08:59:05 -07:00
Brad Davis	35d86dd798	Fail unit test on non-compiling pipelines	2018-09-06 08:59:05 -07:00
Brad Davis	b6247e0850	Remove cmake spam	2018-09-06 08:59:05 -07:00
Brad Davis	105a615745	Fix no-ui crashes	2018-09-06 08:59:05 -07:00
Wayne Chen	3f1eba418d	modifying location of links for user/pw	2018-09-06 00:07:23 -07:00
Wayne Chen	6d055ba136	changing sign up label	2018-09-05 23:49:49 -07:00
Wayne Chen	78fa52285f	adding show password toggle in textfield	2018-09-05 23:48:21 -07:00
Wayne Chen	7a136812bf	Merge branch 'login-update' of https://github.com/alexiamandeville/hifi into loginOnLaunch	2018-09-05 20:05:19 -07:00
Wayne Chen	581aa0c02d	Merge branch 'fly-login-upon-launch' of https://github.com/sethalves/hifi into loginOnLaunch	2018-09-05 20:04:34 -07:00
David Rowe	ab47e16be1	Fix up titles and leading white space of some dev menu tablet dialogs	2018-09-06 14:35:08 +12:00
David Rowe	8420afd143	Fix title not not going back to "Settings" upon Save or Cancel	2018-09-06 14:00:33 +12:00
Anthony Thibault	3a3ffcc98c	First pass at improving anim stats.	2018-09-05 18:14:06 -07:00
David Back	82ed57e41f	triple list structure, added columns, sorting	2018-09-05 17:59:03 -07:00
amantley	6fb335429d	starting to re-implement the walking state detection for smoothwalking	2018-09-05 17:55:27 -07:00
sam gateau	4ef8f29522	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-09-05 17:50:21 -07:00
sam gateau	21f65d8a78	position are used correctly for evaluting bounds in the Mesh	2018-09-05 17:50:06 -07:00
Sam Gateau	03f51352aa	Merge pull request #13932 from SamGondelman/framebuffer ... Fix framebuffer debugging	2018-09-05 17:38:21 -07:00
Alexia Mandeville	901de120a6	Removing flavortext	2018-09-05 17:20:49 -07:00
SamGondelman	cde2dc2eaa	please work	2018-09-05 17:04:05 -07:00
sabrina-shanman	84a2512f31	Fix collision pick scale not being used	2018-09-05 16:51:27 -07:00
sabrina-shanman	e8ce152687	Scale collision picks relative to parent by adding and using more ... specialized transform nodes.	2018-09-05 16:51:28 -07:00