908 commits

Author	SHA1	Message	Date
SamGondelman	5ce8f566cc	more overlay wip	2019-01-25 11:10:11 -08:00
Sam Gateau	b24a2d33bf	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-06 19:51:05 -08:00
Adam Smith	653974ca30	Merge pull request #14293 from SamGondelman/branching ... Case 19473: Reduce branching in our shaders	2018-12-05 16:42:42 -08:00
Sam Gateau	a295c6ffc8	scripts\developer\utilities\lib\jet\qml\TaskListView.qml	2018-12-04 22:41:36 -08:00
sam gateau	2c4cd68a00	iterating on a simpler engine graph	2018-11-30 17:43:27 -08:00
sam gateau	14bf383c50	MIgrating everything to collect the items out from the render task	2018-11-29 17:59:04 -08:00
Sam Gondelman	f728a8ba5a	Update drawCellBounds.slv	2018-11-27 10:57:57 -08:00
sam gateau	f348cc35c4	separting debug in its own task	2018-11-26 15:20:45 -08:00
Sam Gondelman	968ffe7ec3	Merge branch 'master' into branching	2018-11-16 10:25:02 -08:00
Sam Gateau	0166d7748a	Merging with master around rc76 cut time	2018-11-15 22:52:37 -08:00
John Conklin II	60c538309a	Merge pull request #14411 from SamGondelman/fading ... Fix for avatar flashing on fade out	2018-11-15 13:58:43 -08:00
SamGondelman	597ff773e1	fix for avatar flashing	2018-11-15 10:52:22 -08:00
Sam Gondelman	a206d9e25a	Merge branch 'master' into branching	2018-11-14 17:08:08 -08:00
Olivier Prat	45e0f65972	Merge branch 'ao' of http://github.com/Zvork/hifi into ao	2018-11-14 09:48:24 +01:00
Sam Gondelman	13f650d514	Merge pull request #14093 from SamGondelman/police ... Case 19409, Case 19468: Fading fixes and shader cleanup	2018-11-13 15:00:23 -08:00
SamGondelman	df1a848811	fix fade out	2018-11-12 12:58:40 -08:00
John Conklin II	9d404a6cf3	Merge pull request #14379 from Cristo86/gles_use_tbo_no_ssbo ... case 19562: GLES - Use TBO instead of SSBO and make shaders use it when it is not gl45 (master)	2018-11-12 10:45:52 -08:00
SamGondelman	1d1510e18e	Merge remote-tracking branch 'upstream/master' into police	2018-11-09 13:32:41 -08:00
Olivier Prat	9d5dcec0a0	Merge from master	2018-11-08 09:14:42 +01:00
Sam Gateau	fa0c58fa0e	Assign the correct binding slots for the Resource Buffers to fix the deformed mesh rendering of the Avatar in gles backend	2018-11-02 00:08:47 -07:00
Sam Gondelman	e534e09801	Update LightClusterGrid_shared.slh	2018-11-01 15:35:48 -07:00
SamGondelman	dc9405775f	more branching removal	2018-10-29 16:42:46 -07:00
SamGondelman	e8c5324e39	start removing branching	2018-10-25 11:59:04 -07:00
Olivier Prat	69ace03919	Merged with master	2018-10-24 08:27:39 +02:00
SamGondelman	0efbdc1ab5	merge with master	2018-10-23 14:33:57 -07:00
sam gateau	4565422876	Merge branch 'master' of github.com:highfidelity/hifi into black-bis	2018-10-23 14:02:15 -07:00
SamGondelman	d254db02dc	small cleanup	2018-10-23 11:27:17 -07:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
sam gateau	702f6229b8	Removing the pseudo fix for lod culling that is not ready in this pr	2018-10-23 08:50:10 -07:00
Olivier Prat	5f3a299fd9	Merge with master	2018-10-22 14:02:24 +02:00
Sam Gateau	0379e0dd05	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-20 23:52:35 -07:00
Clement	8983fe2bcf	Fix new Mac warnings	2018-10-09 12:11:55 -07:00
Olivier Prat	cfcf6f05a2	Merge with master	2018-10-09 14:18:02 +02:00
Sam Gateau	5fbf10c2f3	INtroducing the LODEnabled flag on the render item in order prevent LOD to hide important objects regardless of the LOD level.	2018-10-08 23:48:12 -07:00
Olivier Prat	4c84ae02fa	Merge branch 'master' of http://github.com/highfidelity/hifi into ao	2018-10-02 18:13:57 +02:00
Sam Gateau	c593f00839	Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis	2018-10-01 19:10:18 -07:00
Seth Alves	b69d0f3997	get interface building and working with clang-7 on ubuntu 18	2018-09-28 13:46:51 -07:00
sam gateau	85b3b883f9	REmove cruft	2018-09-27 11:11:14 -07:00
sam gateau	b5a47b2e76	Finalizing the renaming from Skinned to Deformed	2018-09-26 14:11:22 -07:00
sam gateau	e41b8f06e1	Cleaning up the pipeline and checking that it is working for all cases	2018-09-25 13:57:50 -07:00
Sam Gateau	69734ce21b	Getting better'	2018-09-24 22:34:43 -07:00
Olivier Prat	b1db7ab403	Fixed for stereo rendering with resolution level 0	2018-09-20 10:18:06 +02:00
Bradley Austin Davis	fade3a8de0	Fixing shader implicit type conversions	2018-09-06 09:08:36 -07:00
Brad Davis	9a28e04e37	Remove all tabs from shaders	2018-09-06 08:59:07 -07:00
Brad Davis	87b9594bd0	Fix warnings	2018-09-06 08:59:06 -07:00
Brad Davis	07fba89f0f	Remove uniforms from item status	2018-09-06 08:59:06 -07:00
Brad Davis	719ae25adb	Remove uniforms from drawCellBounds	2018-09-06 08:59:05 -07:00
Brad Davis	c8eb4da6b6	Remove simple draw task uniforms	2018-09-06 08:59:05 -07:00
sam gateau	194903692e	clening up the code in LODmanager and the associated js/qml	2018-08-30 18:09:11 -07:00
Sam Gateau	63eb57c741	Exploring PID again	2018-08-28 08:58:25 -07:00