4403 commits

Author	SHA1	Message	Date
Sam Gateau	df0eb901a2	REverting the change in the jittering sequence length	2019-09-03 17:01:03 -07:00
Sam Gateau	03c5dfad3d	propagating the Bloom on off correctly and fixing the problem where Luci prevents from seeing the zone and finally, update the luci.js with the newer version	2019-09-03 16:28:32 -07:00
Sam Gateau	cda2943b9a	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-03 12:01:12 -07:00
Andrew Meadows	8957cc5b2b	render opaque PolyLines with opaque pipepline	2019-08-22 08:13:11 -07:00
Sam Gateau	e1e4d9ac6c	Exposing the AA mode of the AA job	2019-08-20 18:15:35 -07:00
Sam Gateau	c5bd9ecf4f	REfreshing the antialiasing qml na dconfig of the Jitter Job	2019-08-19 18:14:29 -07:00
Sam Gateau	aeb407698d	bloom ui	2019-08-18 22:15:20 -07:00
Sam Gateau	859016bf37	Addressing review comments	2019-08-14 10:28:42 -07:00
Sam Gateau	4a93b23d83	Address the procedural to populate all reflection versions with user uniforms bindings and make EnigneInspector works correctly	2019-08-13 18:47:57 -07:00
Sam Gateau	9139edc8b1	Maybe fixed the problem, cannot render the gl41 version properly	2019-08-12 00:44:14 -07:00
MiladNazeri	ae7b415152	Merge pull request #16008 from HifiExperiments/text ... Supporting text effects + fonts on Text Entities	2019-08-02 14:25:28 -07:00
HifiExperiments	029a494beb	try to fix android shader build error	2019-08-01 21:29:01 -07:00
Anna	4e4f8866cd	fix android/mac build error	2019-07-30 13:15:26 -07:00
Anna	f58400950a	made color format for resolve FB a parameter, reverted name of tonemapping task to preserve back compatibility	2019-07-30 11:57:01 -07:00
Anna	0cd532a47b	cleaning up	2019-07-30 10:08:38 -07:00
HifiExperiments	078ca7edea	supporting text effects + fonts on text entities	2019-07-30 09:59:45 -07:00
Anna	458b3f18df	changes from cr	2019-07-29 18:25:36 -07:00
Anna	379a262b07	bug fix in deferred, finish merging android & windows forward	2019-07-29 18:15:54 -07:00
Anna	d3107efb82	added optional output buffer to ToneMapAndResampleTask	2019-07-29 16:27:54 -07:00
Anna	3a437cf190	fix on android, merge android and windows forward pipelines	2019-07-29 14:59:15 -07:00
Anna	2fca77867b	broken on android again somehow	2019-07-29 13:45:08 -07:00
Anna	db49a0b9d6	fixed some typos from merge	2019-07-29 11:55:12 -07:00
Anna	0cc8c1f434	making my changes work on android	2019-07-29 10:43:20 -07:00
Anna	8aef9db4b9	works on android!	2019-07-26 20:09:18 -07:00
Anna	6a6b2f6d27	added tone mapping back	2019-07-26 18:55:08 -07:00
Anna	0d2b2a2aef	added tone mapping config	2019-07-26 12:53:18 -07:00
Anna	16595d9412	created tonemapandresample	2019-07-26 11:56:25 -07:00
Anna	1b0d8ee603	removed typo	2019-07-24 13:37:33 -07:00
Anna	27586727db	make tonemapandresampletask run on android	2019-07-24 11:38:47 -07:00
Shannon Romano	2942bfaad0	Merge pull request #15939 from SamGondelman/shader ... Condense directional light shaders using slp defines	2019-07-24 09:01:49 -07:00
Anna	1df43fc83a	Merge branch 'master' of github.com:highfidelity/hifi into combine-tone-map-resample	2019-07-23 15:41:01 -07:00
Brad Davis	449f3d00f9	BUGZ-987: fix depth testing of HUD layer 3D objects	2019-07-23 12:09:12 -07:00
Anna	45d1672edd	remove testing variables	2019-07-16 15:44:29 -07:00
Anna	58a04c1ccf	fix jenkins errors for real this time	2019-07-16 15:44:29 -07:00
Anna	2cd2e35736	fixing jenkins build errors	2019-07-16 15:44:29 -07:00
Anna	8d9760ae0c	typo fix	2019-07-16 15:44:29 -07:00
Anna	e129f88723	deleted tone mapping mirrored slf and slp since they auto generate	2019-07-16 15:44:29 -07:00
Anna	b59d967b6c	fixed luci, made tone mapping mirrored auto generate, changed color format on forward, bug fixes	2019-07-16 15:44:28 -07:00
Anna	0b51e3c129	progress	2019-07-16 15:43:47 -07:00
Anna	24f022ec3b	init commit for this pr, still buggy	2019-07-16 15:41:01 -07:00
Shannon Romano	53a67dcfa9	Merge pull request #15872 from SamGondelman/bias ... DEV-202: Expose shadow bias and max distance to Zone Entity	2019-07-16 15:22:37 -07:00
SamGondelman	965feb6f7a	condense direction light shaders using slp defines	2019-07-16 11:24:19 -07:00
SamGondelman	1789e16cc4	possible fix for shader compilation error	2019-07-12 16:22:01 -07:00
SamGondelman	046b25ab67	fix haze on web entities, deferred and forward	2019-07-11 14:56:17 -07:00
SamGondelman	22a7a97a9a	fix forward web + parabola blending	2019-07-11 12:23:04 -07:00
SamGondelman	9539664749	add haze to skybox	2019-07-11 11:00:30 -07:00
SamGondelman	d545ba5bc6	haze on most entities, working on skybox	2019-07-10 23:52:50 -07:00
SamGondelman	8fd2251612	mostly working equation?	2019-07-09 13:34:33 -07:00
SamGondelman	68b2c8c2fb	wip adding haze to forward rendering	2019-07-09 00:46:24 -07:00
Sam Gondelman	732a7b0a89	fix build error	2019-07-03 22:43:35 -07:00