950 commits

Author	SHA1	Message	Date
Sam Gateau	1a71a63a8b	Merge pull request #15867 from SamGondelman/unlit ... BUGZ-661: Add unlit property to text entities	2019-07-03 18:43:26 +02:00
SamGondelman	fa416adaf6	adding unlit property to text, fixing transparency, normals, other cleanup	2019-07-02 10:28:36 -07:00
Anna	f44bc52d58	implemented requested changes, fixed math error in filmic curve	2019-07-01 17:05:13 -07:00
Anna	95f2dfa551	added horizontal flip back to mirror mode	2019-07-01 15:31:26 -07:00
Anna	e6abaf76f3	Merge branch 'master' of github.com:highfidelity/hifi into display-simplification	2019-07-01 10:56:47 -07:00
Anna	787359fdfb	fixed ui flipping issue	2019-07-01 10:52:03 -07:00
SamGondelman	a5b92a6c7b	fix layered rendering of group culled sub items	2019-06-28 14:24:33 -07:00
Sam Gateau	cb1bf57bd1	Address pr review comments	2019-06-24 16:54:06 -07:00
Sam Gateau	22cd631a04	Merge And Modifying the Graphics settings and the dev menu	2019-06-20 17:48:36 -07:00
SamGondelman	f2e3218ec0	possible fix for do_setPipeline crash and other mac fixes	2019-06-19 16:34:38 -07:00
Sam Gateau	251faf2171	Trying to clean up the solution...	2019-06-18 17:08:08 -07:00
Sam Gateau	12f8c7486b	getting rescaling to work for forward yop	2019-06-14 00:48:07 -07:00
Seth Alves	2fe8979206	fix warning	2019-06-11 15:46:12 -07:00
Seth Alves	c5e1f2aedc	change ContextStats::evalDelta to better handle wrapping values in graphics stats	2019-06-11 11:56:49 -07:00
Shannon Romano	d8791c4379	Merge pull request #15710 from SamGondelman/lightmap ... BUGZ-596: Fix baking of light maps	2019-06-10 10:13:55 -07:00
SamGondelman	129d96a997	get rid of lightmapMap	2019-06-07 14:53:31 -07:00
sabrina-shanman	21966fe345	Fix stuck transition due to removing sub render items before parent	2019-06-07 11:14:32 -07:00
sabrina-shanman	9a75feecde	Fix binding to temporary transitionStage pointer	2019-06-06 14:52:42 -07:00
sabrina-shanman	971d563f49	Add debug icons for transitions	2019-06-06 13:25:06 -07:00
sabrina-shanman	faf5db5476	Change semantic for removing transitions	2019-06-06 13:25:06 -07:00
sabrina-shanman	833946ceb3	Clean up transition naming	2019-06-06 13:25:06 -07:00
sabrina-shanman	5587193640	Add more transition icon debugging	2019-06-06 13:25:00 -07:00
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