130 commits

Author	SHA1	Message	Date
HifiExperiments	af82860751	fix shape issue that alezia found	2020-08-19 19:51:16 -07:00
HifiExperiments	eb26d9b4e3	working on parenting fixes	2020-04-06 13:41:01 -07:00
HifiExperiments	e0a29d9367	material entities support cullFaceMode and support gltf doubleSided	2019-12-12 23:01:57 -05:00
HifiExperiments	6e961b9f2f	procedural vertex shaders ... Signed-off-by: Kasen IO <kasenvr@gmail.com>	2019-12-12 22:49:48 -05:00
HifiExperiments	97b9179144	merge with master	2019-09-05 00:46:56 -07:00
HifiExperiments	7b29f0f718	reduce locking necessary for render updates	2019-07-31 11:21:29 -07:00
SamGondelman	60600779c9	merge with master	2019-07-12 11:01:17 -07:00
SamGondelman	8b9fcd43b1	merge with master	2019-07-03 17:58:23 -07:00
SamGondelman	fa416adaf6	adding unlit property to text, fixing transparency, normals, other cleanup	2019-07-02 10:28:36 -07:00
Sam Gondelman	e4847cc4ae	Merge branch 'master' into proceduralMesh	2019-06-24 10:16:45 -07:00
SamGondelman	8409119ad0	possible fix for black shape issue	2019-06-21 12:58:49 -07:00
Sam Gondelman	53e6e00773	Merge branch 'master' into uber	2019-06-10 10:36:54 -07:00
SamGondelman	37feb7f027	merge with master	2019-06-10 10:29:39 -07:00
SamGondelman	129d96a997	get rid of lightmapMap	2019-06-07 14:53:31 -07:00
Sam Gondelman	16a56dc1ec	Merge branch 'master' into proceduralMesh	2019-06-04 09:56:25 -07:00
SamGondelman	6111c8a108	initial work on combining shader variants	2019-06-03 19:36:01 -07:00
SamGondelman	3f42d083f5	fix some transparency issues on amd	2019-06-03 16:14:09 -07:00
SamGondelman	6d3e23a7fe	merge with master	2019-05-16 20:03:10 -07:00
SamGondelman	da254c2ccc	(¬‿¬)	2019-05-15 23:48:04 -07:00
SamGondelman	eb8c722080	fix runtime switch	2019-05-13 09:58:55 -07:00
Olivier Prat	7d412f9109	Simplified material binding in shadow mode. Added opacity mask to shadow fade. Adjusted default bias.	2019-04-19 11:03:43 +02:00
Sam Gondelman	968dbb825a	Merge pull request #15243 from SamGondelman/proceduralTime ... Case 21876: New procedural uniforms for time, iEntityTime and iLocalCreatedTime	2019-03-29 11:35:41 -07:00
SamGondelman	36921276c6	fix transparent shape flickering	2019-03-27 11:52:37 -07:00
SamGondelman	7db498a130	fix shadows when tablet is open and misc threading issues	2019-03-22 16:20:54 -07:00
SamGondelman	4fd2c4449d	new procedural uniforms for time	2019-03-21 12:15:03 -07:00
SamGondelman	79dda7a6c7	build errors	2019-03-15 14:29:50 -07:00
SamGondelman	8748a7561b	fix lighting/color grading for everything	2019-03-15 12:48:32 -07:00
SamGondelman	af03fb5f85	try to fix text rendering on amd with transparency	2019-03-07 16:23:12 -08:00
amerhifi	35dc13e06a	Merge branch 'master' into quest-demo	2019-02-28 14:06:47 -08:00
SamGondelman	dbc3ae3793	hmmm not working	2019-02-22 14:18:59 -08:00
danteruiz	aa8563f3fe	fix quest ui elements	2019-02-22 10:40:32 -08:00
Jeff Clinton	3b84580e88	Merge pull request #14794 from SamGondelman/colors ... Case 20888: Fix color space	2019-01-30 09:09:07 -08:00
SamGondelman	56096708d3	one more try	2019-01-29 15:26:49 -08:00
SamGondelman	e41f5617e9	fix color space	2019-01-29 14:52:57 -08:00
SamGondelman	a10f52c66d	merge with master	2019-01-25 14:16:07 -08:00
Jeff Clinton	d92d256cfc	Merge pull request #14656 from SamGondelman/matFallthrough ... Case 20241: Material entity fallthrough	2019-01-25 14:01:27 -08:00
SamGondelman	611998f799	add pulse group properties to shapes, particles, text, web, image, and grid	2019-01-16 13:34:10 -08:00
SamGondelman	5dd59dd9e9	correct lighting of layered shapes	2019-01-08 14:02:57 -08:00
SamGondelman	1b5c1d0677	working on primitiveMode and groupCulled	2019-01-08 10:02:03 -08:00
SamGondelman	ff3545beab	working with texture transform fallthrough	2019-01-07 13:28:00 -08:00
SamGondelman	a2fe8ef9e7	merge with master	2019-01-03 13:51:07 -08:00
SamGondelman	a9d798070a	wip	2019-01-02 18:08:59 -08:00
SamGondelman	1a62b59a8f	Merge remote-tracking branch 'upstream/master' into matFallthrough	2019-01-02 10:11:46 -08:00
SamGondelman	32bec57cfe	Merge remote-tracking branch 'upstream/master' into NOverlays6	2019-01-02 09:53:29 -08:00
SamGondelman	9155853889	working on material fallthrough	2018-12-20 16:03:58 -08:00
SamGondelman	250baa9c72	add missing properties to text entities	2018-12-11 15:42:24 -08:00
SamGondelman	2acb6b6857	v3 procedurals and shader fixes	2018-11-28 17:58:27 -08:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
Seth Alves	1e8ae1a294	fix scaling of worn shape entities	2018-09-15 16:36:55 -07:00
Sam Gondelman	16b483b338	Merge pull request #13766 from SamGondelman/shaders ... Miscellaneous shader fixes	2018-08-08 11:34:36 -07:00