2480 commits

Author	SHA1	Message	Date
Brad Davis	85c80f3be8	Merge remote-tracking branch 'upstream/master' into smarter_textures ... Conflicts: libraries/gpu/src/gpu/Texture.cpp	2017-03-22 14:25:23 -07:00
samcake	e05abf2a2f	Fixing the spherical harmonics gneration	2017-03-20 16:41:21 -07:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
samcake	03e1c5e0f2	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-03-20 15:10:09 -07:00
Chris Collins	509057c6d8	Merge pull request #9941 from Triplelexx/21232 ... 21232 - Remove Mini Mirror from View menu	2017-03-20 09:55:37 -07:00
Sam Cake	a804bc723f	Keep pushing and debugging ambient lighting	2017-03-20 00:32:06 -07:00
Sam Cake	3a08611c26	Fix the typo in the assert for isWireframe	2017-03-19 17:33:28 -07:00
Sam Cake	8584d80bb8	KEep exploring the ambient lighting	2017-03-19 17:00:42 -07:00
Triplelexx	8b845658e2	remove redundant declarations	2017-03-18 05:00:05 +00:00
samcake	8b8f9d7b1a	Fix a problem of the ambient lighting diffuse beeing too sstrong, we found a nice balance together with Alan	2017-03-17 18:26:48 -07:00
Triplelexx	a9b1a38665	remove Mini Mirror from View menu ... Avatar inputs only contains the audio meter now.	2017-03-18 00:53:13 +00:00
samcake	e1a0984fed	Merge pull request #9906 from samcake/red ... Expose rendering in wireframe mode	2017-03-17 17:09:44 -07:00
Seth Alves	eba2417f41	Merge pull request #9912 from AndrewMeadows/model-cleanup-4 ... minor cleanup of render pipeline for models and avatars	2017-03-16 10:39:43 -08:00
samcake	0399249a03	Expeand the wireframe to the primitive entities and the polyvox	2017-03-15 16:58:31 -07:00
Andrew Meadows	d3fa28d4bc	remove cruft and fix indentation	2017-03-15 16:17:59 -07:00
Andrew Meadows	cf848d73e4	don't updateClusterMatrices() in render()	2017-03-15 16:03:36 -07:00
Andrew Meadows	f250c0d298	simpler bindTransform() for ModelMeshPartPayload	2017-03-15 14:41:13 -07:00
samcake	ea2f1359bc	Expose rendering in wireframe mode	2017-03-15 12:23:44 -07:00
samcake	e0f0cc2102	Fix the unsupported ktx format, it was coming from the BUmp map case	2017-03-14 15:49:44 -07:00
Anthony J. Thibault	d38b994f4c	Fix for potential crash due to DebugDraw data race. ... (cherry picked from commit 1b8a624edb)	2017-03-13 15:23:16 -07:00
Brad Davis	e94f803b84	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-08 09:03:21 -08:00
Seth Alves	71c2b4215d	Merge pull request #9811 from ZappoMan/triangleSet ... Cleanup how Models do ray-picking and determination of point inside of convex hull	2017-03-07 14:12:56 -08:00
Brad Hefta-Gaub	f7e824e47c	Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet	2017-03-07 12:18:36 -08:00
Seth Alves	694fc58374	restore missing shading pipeline for simple opaque in deferred	2017-03-07 12:07:24 -08:00
Brad Hefta-Gaub	87934ee82d	fix bugs in some meshes	2017-03-06 21:50:32 -08:00
Brad Davis	8782fe1d93	Merge branch 'master' into smarter_textures ... Conflicts: libraries/model-networking/src/model-networking/TextureCache.cpp	2017-03-06 15:29:41 -08:00
Andrew Meadows	1b8f6b9835	Merge pull request #9784 from samcake/blue ... Fixing Emissive on overlay for models (opaque and transparent)	2017-03-06 13:24:00 -08:00
Brad Hefta-Gaub	f27475613f	Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet	2017-03-06 12:53:59 -08:00
samcake	21f36d7212	removing comments and restoring the correct behavior for Pal.js	2017-03-06 12:41:00 -08:00
ZappoMan	af97e9bdd9	CR feedback	2017-03-06 10:49:38 -08:00
ZappoMan	2a663cbcb1	cleanup	2017-03-05 19:28:15 -08:00
ZappoMan	87bcced409	cleanup use of triangleSet for picking	2017-03-05 19:23:55 -08:00
ZappoMan	32add6635d	checkpoint on reducing raypicking recalcs	2017-03-04 23:33:17 -08:00
Ken Cooke	a5571bd49d	redo unsafe optimization	2017-03-04 16:02:39 -08:00
ZappoMan	9908723bb9	fist cut at basic TriangleSet class	2017-03-03 22:27:38 -08:00
Bradley Austin Davis	efad7da508	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-03 08:59:24 -08:00
Seth Alves	5f570c1ba8	fix up bounds handling in Line3DOverlay	2017-03-02 16:16:48 -08:00
Bradley Austin Davis	fa5b315e09	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-01 15:16:18 -08:00
samcake	6ac85aee7e	Adding support for the unliti materials too for overlay's	2017-02-28 18:12:35 -08:00
samcake	576660f6ef	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-27 18:17:28 -08:00
sam	709c2e4240	Fixing the emissive on overlayfor models	2017-02-27 02:52:00 -08:00
sam	a53d5e8fbd	adjusted the PLumber shape keys to coever non material shapes in main pass	2017-02-25 13:00:37 -08:00
samcake	9ffdc03dc9	setting the shaeKeys for the overly properly because most of them are CustomPipleline	2017-02-24 18:25:24 -08:00
samcake	1b501487fd	simple shader checks	2017-02-24 16:03:28 -08:00
Seth Alves	6e9854cad0	don't crash if geometry fails to load	2017-02-24 13:01:01 -08:00
sam	5257194c48	SImplify the overlay PLumber	2017-02-24 01:11:59 -08:00
sam	e1aad8bd63	Deep dive into the shape key and filters and the PLumber construction	2017-02-24 00:35:10 -08:00
sam	67031850aa	Deep dive into the shape key and filters and the PLumber construction	2017-02-24 00:05:54 -08:00
samcake	6d59144a4f	Trying to fix the emissive for overlay in front ?	2017-02-23 17:42:02 -08:00
samcake	c7b164d8f2	Adding differenciation for the Material shapeKey bit	2017-02-22 18:21:18 -08:00