928 commits

Author	SHA1	Message	Date
sabrina-shanman	03a8e77ade	Move RenderItemStatusIcon to Item.h	2019-05-20 12:07:41 -07:00
sabrina-shanman	fa7621896a	Add debug icon which shows on render items with transitions	2019-05-20 11:58:01 -07:00
SamGondelman	eb8c722080	fix runtime switch	2019-05-13 09:58:55 -07:00
SamGondelman	04198c6bfc	use weak ptrs, add comment about SelectSortItems performance	2019-05-08 13:13:05 -07:00
SamGondelman	da092cc5f0	fix zone issues	2019-05-08 11:04:54 -07:00
SamGondelman	200cf7aacb	try to fix transition crash	2019-05-02 14:31:43 -07:00
SamGondelman	06fbc8440e	Merge remote-tracking branch 'upstream/master' into stencil2	2019-04-22 13:28:30 -07:00
SamGondelman	c730e51d1e	wip redo stencil work	2019-04-11 13:22:51 -07:00
SamGondelman	27338c3639	fix cauterization of entities that are children of MyAvatar's head	2019-04-08 19:48:11 -07:00
Sam Gondelman	660818aded	Revert "Case 20060: Grab correct stencil masks from display plugins"	2019-04-05 11:59:46 -07:00
Sam Gondelman	85bf1da0a1	Merge pull request #15266 from SamGondelman/stencil ... Case 20060: Grab correct stencil masks from display plugins	2019-04-04 13:36:25 -07:00
Brad Davis	44fc0d21db	Revert "Remove _compositeFramebuffer from display plugins" ... This reverts commit cb311408c6.	2019-04-03 13:43:39 -07:00
Shannon Romano	cf7eeb7355	Merge pull request #15285 from danteruiz/avatar-fading ... Case 21415: Avatars stay behind after they disconnect	2019-04-01 18:04:42 -07:00
danteruiz	fcb838a71f	addressing review requests	2019-04-01 15:43:04 -07:00
danteruiz	db17f094da	adding entities to fade out list;	2019-03-29 15:23:16 -07:00
danteruiz	b9d04c6ebb	adding entity to a faded list	2019-03-28 16:42:29 -07:00
danteruiz	04d9858f02	fixing remaining issues	2019-03-28 11:43:53 -07:00
danteruiz	40d424a01d	avatar fading	2019-03-27 16:42:34 -07:00
SamGondelman	4ed7c09016	grab correct stencil masks from display plugins	2019-03-26 13:42:18 -07:00
Brad Davis	cb311408c6	Remove _compositeFramebuffer from display plugins	2019-03-12 12:20:20 -07:00
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