4137 commits

Author	SHA1	Message	Date
SamGondelman	5ce8f566cc	more overlay wip	2019-01-25 11:10:11 -08:00
SamGondelman	5d19666f60	merge with master	2019-01-23 17:58:56 -08:00
SamGondelman	ac513df103	ring gizmo entities	2019-01-23 17:46:04 -08:00
Sam Gateau	3ec9290dca	Merge pull request #14619 from SamGondelman/matTarget ... Case 20240: Better material entity targeting	2019-01-23 15:47:22 -08:00
SamGondelman	49947d9f6d	better default values	2019-01-21 16:51:08 -08:00
SamGondelman	5b1ea24d20	glsl initializer lists are 4.2	2019-01-21 12:35:48 -08:00
SamGondelman	5dd59dd9e9	correct lighting of layered shapes	2019-01-08 14:02:57 -08:00
SamGondelman	10068cc42c	merge with master	2019-01-08 12:14:32 -08:00
SamGondelman	928ea55d95	fix light crash?	2019-01-08 11:47:28 -08:00
SamGondelman	1b5c1d0677	working on primitiveMode and groupCulled	2019-01-08 10:02:03 -08:00
SamGondelman	b609cfaa2b	renderLayer	2019-01-07 15:43:35 -08:00
Andrew Meadows	0072684d98	remove cruft and fix error in transform to mesh frame	2019-01-04 12:37:23 -08:00
SamGondelman	ea11497a67	Merge remote-tracking branch 'upstream/master' into NOverlays7	2019-01-02 18:09:19 -08:00
SamGondelman	32bec57cfe	Merge remote-tracking branch 'upstream/master' into NOverlays6	2019-01-02 09:53:29 -08:00
Jeff Clinton	bb27acf934	Merge pull request #14530 from SamGondelman/NOverlays4 ... Case 20134: Grid Entities	2019-01-02 09:12:34 -08:00
Adam Smith	52980559b8	Merge pull request #14491 from SamGondelman/v3 ... Case 20080: v3 + v4 procedurals and misc shader fixes	2018-12-28 15:17:50 -08:00
SamGondelman	87947a7165	try to fix grid color issue	2018-12-25 02:17:37 -05:00
SamGondelman	a25c9395b3	glsl initializer lists are 4.2	2018-12-25 00:46:42 -05:00
SamGondelman	835615fbbd	separate out v3 and v4	2018-12-20 16:33:13 -08:00
SamGondelman	9fc7813e24	Merge remote-tracking branch 'upstream/master' into v3	2018-12-20 16:05:06 -08:00
SamGondelman	bb030660bd	Merge remote-tracking branch 'upstream/master' into NOverlays4	2018-12-20 13:26:23 -08:00
sam gateau	7e1f75e0f3	Fixing the debug of shadow frustum for real	2018-12-20 13:16:41 -08:00
sam gateau	21577ba311	fixing warnings and the debug of shadows	2018-12-20 09:27:15 -08:00
Sam Gateau	80a55e2ae9	Compiling	2018-12-19 20:01:14 -08:00
sam gateau	253a71a20c	updating some code and probably broken in this version	2018-12-19 18:22:01 -08:00
SamGondelman	bf704c2d0d	remove gl_DepthRange	2018-12-19 16:21:12 -08:00
SamGondelman	3578df7a0e	material targeting	2018-12-19 13:28:33 -08:00
sam gateau	9c436bc28c	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-19 09:31:41 -08:00
sam gateau	b8d96d98b8	fixing warnings from the build	2018-12-18 16:25:24 -08:00
sam gateau	5b50b0332d	more fixes	2018-12-18 15:30:45 -08:00
sam gateau	2f18555ee0	removing comments and dead code, rewiring the debug	2018-12-18 14:42:45 -08:00
sam gateau	237fb4dc4c	Shadows are completely working with settings on both pipeline	2018-12-17 17:34:47 -08:00
Sam Gateau	318bf20ede	Shadow is working correctly in both pipelines	2018-12-17 00:27:07 -08:00
Angus Antley	77fa4e7d13	took out the unnecessary hfm.jointindex code	2018-12-16 17:29:16 -08:00
sam gateau	a4b9ec50e9	one step closer	2018-12-14 17:00:58 -08:00
SamGondelman	5dd00bed1d	new improved polylines	2018-12-14 14:15:56 -08:00
Sam Gateau	0b03012e5e	introducing the Shadow Stage	2018-12-14 06:55:34 -08:00
Sam Gateau	e07bc208f3	introducing the Shadow Stage	2018-12-14 00:58:07 -08:00
sam gateau	8bfca612e3	Separating the state view dependant from the shadow to be able to have several versions in flight	2018-12-13 17:56:14 -08:00
Sam Gateau	7f193d0e7c	WEll it sn not going to be that simple....	2018-12-13 00:32:59 -08:00
SamGondelman	250baa9c72	add missing properties to text entities	2018-12-11 15:42:24 -08:00
SamGondelman	fd8245e258	Merge remote-tracking branch 'upstream/master' into NOverlays6	2018-12-11 10:46:39 -08:00
Sam Gateau	b09d0b10e9	cleaning light clusters	2018-12-09 22:54:49 -08:00
Sam Gateau	653370e284	Assemble lighting stage works	2018-12-09 11:39:35 -08:00
Sam Gateau	79cad36c58	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-08 19:14:21 -08:00
sam gateau	28d36c81e0	there and back , trying to converge with the new Assemble Lighting Stage task	2018-12-07 16:24:51 -08:00
SamGondelman	8431b3b0c1	correct order of mixes	2018-12-07 10:39:10 -08:00
Sam Gateau	50fcd7f40a	trying...	2018-12-06 22:45:44 -08:00
Sam Gateau	b24a2d33bf	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-06 19:51:05 -08:00
sam gateau	e941833676	gathering the lighting stage jobs in their own task away from the renderer specificities	2018-12-06 17:27:13 -08:00