135 commits

Author	SHA1	Message	Date
samcake	00782b0e76	GOing home, this is in the middle of adding the Roughness texture and potentially cleaning up the different compinations of shaders regarding the material textures	2016-02-22 18:19:36 -08:00
samcake	39a7852979	MOving forward with PBR rendering, cleaning up the lighting shaders and the packi/unpack deferredBuffer shaders	2016-02-19 18:43:07 -08:00
samcake	903824809c	trying to have better support for the materials	2016-02-18 18:33:32 -08:00
samcake	0ad7bacf02	Changing diffuse to albedo and breaking everything...	2016-02-15 21:50:10 -08:00
Zach Pomerantz	d21f9d555a	Update NetworkMaterial maps when changing textures	2016-02-12 12:37:07 -08:00
Brad Davis	421160eeb6	Make the file parsing threads run at lower priority	2016-02-08 23:55:02 -08:00
samcake	f98f8d5bbb	Revert "Adds a fix for a rendering issue where models with a texture driving both color and opacity would be rendered fully opaque"	2016-01-22 11:51:02 -08:00
ericrius1	0ffcf437e9	Fix for transparent textures not being rendered with opacity	2016-01-20 16:22:49 -08:00
ericrius1	eb5a950f85	texture opacity potential fix	2016-01-20 15:08:39 -08:00
Brad Hefta-Gaub	29b9592c8c	Merge pull request #6838 from ctrlaltdavid/20763 ... Fix reading model's "textures" property	2016-01-15 17:02:14 -08:00
Brad Hefta-Gaub	8f8afabbfe	Merge pull request #6811 from Atlante45/master ... Fix skybox not always rendering correctly	2016-01-13 21:00:48 -08:00
David Rowe	a59cbd1aca	Merge branch 'master' into 20763	2016-01-14 17:25:44 +13:00
Atlante45	205c14eb43	Remove unused headers	2016-01-13 11:47:43 -08:00
Atlante45	0008b1a055	Code cleanup	2016-01-12 20:49:25 -08:00
Atlante45	3f90312375	Fix for XCode auto indent	2016-01-12 20:49:25 -08:00
David Rowe	fc2bf8f585	Miscellaneous code tidying, noticed in passing	2016-01-08 10:17:36 +13:00
David Rowe	a6bfecf038	Format original textures property string more properly	2016-01-07 16:52:29 +13:00
samcake	a50b14dfae	Merging with upstream graphics	2015-12-14 18:18:39 -08:00
samcake	3554f54e17	Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster	2015-12-14 17:38:56 -08:00
Atlante45	ce51350b65	Fix warnings on windows 64bit	2015-12-11 15:42:15 -08:00
Sam Cake	9faec326da	CHanging the lighting BUffer format and adding tone mapping	2015-12-08 08:34:42 -08:00
samcake	762a241fa6	Adding specific path for loading lightmaps	2015-12-02 18:03:58 -08:00
Brad Davis	6f5f6450df	Cleanup CMake files	2015-10-11 00:01:03 -07:00
samcake	429d82e650	Fixing review comments	2015-10-06 09:54:37 -07:00
samcake	894c8c0a93	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2015-10-05 19:23:30 -07:00
samcake	edaa8f998a	Migrating to the new mesh for rendering and having problems with multi part mesh	2015-10-02 18:12:16 -07:00
Brad Davis	83c9ebf06c	Fixing Linux build failure	2015-10-02 11:57:14 -07:00
samcake	840f92bd06	Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes	2015-09-29 10:54:09 -07:00
samcake	2a487a79a3	Getting something done today	2015-09-28 17:24:31 -07:00
samcake	d7d332acd4	Merge branch 'master' of https://github.com/highfidelity/hifi into orange ... t :wq	2015-09-23 09:51:31 -07:00
Brad Hefta-Gaub	52842cb287	more warnings fixes	2015-09-22 20:34:40 -07:00
samcake	518f5fe17c	Starting to clean the mesh part of the RenderItem....	2015-09-22 18:21:36 -07:00
Brad Hefta-Gaub	efda121619	fix a bunch of warnings on windows	2015-09-22 16:40:17 -07:00
samcake	910038cf82	Merging	2015-09-21 17:47:23 -07:00
samcake	d3b1bcb86d	Redistributing the files to create the model-networking lib and separate that from the redner-utils	2015-09-21 13:21:35 -07:00