19 commits

Author	SHA1	Message	Date
samcake	2fbdb22493	Cleaning up the lighting with the simpler approach where emissive and lightmap is displayed on forward	2016-07-08 18:14:05 -07:00
samcake	670826effc	appeasing linux gods ?	2016-05-12 14:50:41 -07:00
samcake	c6aeaf308b	appeasing linux gods ?	2016-05-12 14:36:45 -07:00
samcake	a436c54817	make scribe spit out bigger chunks of litteral strings	2016-05-12 14:14:05 -07:00
samcake	2d573963bb	Introducing the unlit material	2016-05-04 18:50:52 -07:00
Brad Davis	aea07fe671	Merge branch 'master' into gl4_1 ... Conflicts: libraries/gpu/src/gpu/Config.slh libraries/render-utils/src/deferred_light_limited.slv libraries/render-utils/src/simple.slf libraries/render-utils/src/simple_textured.slf tests/render-utils/src/main.cpp tools/scribe/src/main.cpp	2015-07-31 15:08:37 -07:00
Atlante45	256c786e28	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-17 17:59:19 -07:00
Brad Davis	d8dde71c8f	Make scribe generated shaders more readable	2015-07-12 18:46:08 -07:00
Atlante45	7b5a5a339a	Use make_shared/create to make shared pointers	2015-07-01 19:46:06 -07:00
Brad Davis	f51c43f90d	Working on GL 4.1	2015-06-23 09:47:18 -07:00
Sam Gateau	d9c071a2a9	trying to put the atmospheric effect in a shader header and use it on the directional lighting pass	2015-03-10 00:47:27 -07:00
Sam Gateau	ccc77ce7a6	fixing command for scribe	2014-12-30 14:30:18 -08:00
Sam Gateau	7ea9f92492	polishing the scribe -c++ case	2014-12-23 18:25:35 -08:00
dev	42157161e0	fix the c++ header generation for mac though the brand new raw string format of c++11	2014-12-23 18:19:25 -08:00
Sam Gateau	c5eb04336f	first version of SCribe used for shaders in render-utils	2014-12-23 16:27:02 -08:00
Sam Gateau	4004831377	Fixing typo and syntax	2014-12-23 14:46:58 -08:00
Sam Gateau	522ca55ed8	Fixing typo and syntax	2014-12-23 14:41:49 -08:00
Sam Gateau	e16da55b1b	cleaning scribe main and checking naming	2014-12-22 16:02:58 -08:00
Sam Gateau	4ee005affa	adding scribe tool	2014-12-22 11:51:54 -08:00