4171 commits

Author	SHA1	Message	Date
Sam Gateau	9ad783135c	Bringing back brownBis to just msaa support	2019-02-11 19:42:05 -08:00
Sam Gateau	8a4f7fe2b6	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2019-02-11 18:57:33 -08:00
SamGondelman	4202685a4b	Merge remote-tracking branch 'upstream/master' into fst	2019-02-11 16:07:36 -08:00
Sabrina Shanman	baf72eaae0	Merge pull request #14802 from sabrina-shanman/hfm_prep_joints ... Case 20887: Move FST joint property handling to the model preparation step	2019-02-08 15:02:23 -08:00
John Conklin II	851b968501	Merge pull request #14737 from SamGondelman/zone ... Case 19291: Fix zone bugs	2019-02-08 14:07:26 -08:00
Sam Gateau	35491bf5b0	Multisampling works in 4.1	2019-02-06 00:05:17 -08:00
SamGondelman	3ee448a89a	fix scattering and working on resource cache bug	2019-02-05 17:32:15 -08:00
Anthony Thibault	569bef50fd	AnimPose operator* optimizations	2019-02-05 14:48:05 -08:00
Sam Gateau	4089f8c5b0	Adding Color filter to the tone mapper	2019-02-04 23:45:35 -08:00
Sam Gateau	d0a044120a	Adding the sub samples control	2019-02-03 21:31:19 -08:00
Sam Gateau	84db9f4729	testing the water...	2019-01-31 16:18:47 -08:00
Sam Gateau	b47ecc9890	Merge branch 'master' of github.com:highfidelity/hifi into brown	2019-01-30 09:17:02 -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	5be6a31b6c	possible fix for transparency	2019-01-29 12:20:46 -08:00
sabrina-shanman	203e8e2455	Realize joint properties isFree and freeLineage are unused, so tear them out	2019-01-29 11:55:35 -08:00
Sam Gateau	3ab66fde5e	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2019-01-28 19:22:33 -08:00
Sam Gondelman	faeb5b36dc	Merge pull request #14764 from SamGondelman/NOverlays12 ... Case 20722: Ring Gizmo Entities to replace Circle Overlays	2019-01-28 18:09:23 -08:00
Sam Gateau	e39a6b5a7d	Merging with master	2019-01-28 17:58:17 -08:00
Shannon Romano	d8f781deae	Merge pull request #14719 from jherico/feature/quest_frame_serialization ... case 20883: GPU frame serialization and related tools	2019-01-28 15:47:55 -08:00
SamGondelman	13cb70a6a5	Merge remote-tracking branch 'upstream/master' into NOverlays12	2019-01-28 11:37:15 -08:00
Sam Gateau	a747bf4cbd	Exploring removing the COmpositing buffer in the display plugin, using srgb for swapchain and debuging from there	2019-01-27 23:48:55 -08:00
Sam Gateau	a2bd802707	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2019-01-26 12:15:53 -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
Adam Smith	dadd49f535	Merge pull request #14667 from SamGondelman/NOverlays9 ... Case 20535: renderLayer, primitiveMode, groupCulled Entity properties	2019-01-24 14:36:27 -08:00
SamGondelman	ac513df103	ring gizmo entities	2019-01-23 17:46:04 -08:00
Sam Gateau	3ec9290dca	Merge pull request #14619 from SamGondelman/matTarget ... Case 20240: Better material entity targeting	2019-01-23 15:47:22 -08:00
Brad Davis	6fb869126e	GPU state cleanup	2019-01-22 10:37:08 -08:00
Sam Gateau	f9891775fc	Enabling msaa framebuffer and testing for forward	2019-01-21 23:07:59 -08:00
SamGondelman	49947d9f6d	better default values	2019-01-21 16:51:08 -08:00
SamGondelman	5b1ea24d20	glsl initializer lists are 4.2	2019-01-21 12:35:48 -08:00
SamGondelman	d17e04967a	fix zone bugs	2019-01-18 13:49:16 -08:00
SamGondelman	717da1b6fa	track texture loading	2019-01-17 15:59:32 -08:00
SamGondelman	8d2e81a13b	Merge remote-tracking branch 'upstream/master' into matFallthrough	2019-01-17 10:27:43 -08:00
SamGondelman	5dd59dd9e9	correct lighting of layered shapes	2019-01-08 14:02:57 -08:00
SamGondelman	10068cc42c	merge with master	2019-01-08 12:14:32 -08:00
SamGondelman	928ea55d95	fix light crash?	2019-01-08 11:47:28 -08:00
SamGondelman	1b5c1d0677	working on primitiveMode and groupCulled	2019-01-08 10:02:03 -08:00
SamGondelman	b609cfaa2b	renderLayer	2019-01-07 15:43:35 -08:00
SamGondelman	ff3545beab	working with texture transform fallthrough	2019-01-07 13:28:00 -08:00
Andrew Meadows	0072684d98	remove cruft and fix error in transform to mesh frame	2019-01-04 12:37:23 -08:00
SamGondelman	a2fe8ef9e7	merge with master	2019-01-03 13:51:07 -08:00
SamGondelman	ea11497a67	Merge remote-tracking branch 'upstream/master' into NOverlays7	2019-01-02 18:09:19 -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
Jeff Clinton	bb27acf934	Merge pull request #14530 from SamGondelman/NOverlays4 ... Case 20134: Grid Entities	2019-01-02 09:12:34 -08:00
Adam Smith	52980559b8	Merge pull request #14491 from SamGondelman/v3 ... Case 20080: v3 + v4 procedurals and misc shader fixes	2018-12-28 15:17:50 -08:00
SamGondelman	87947a7165	try to fix grid color issue	2018-12-25 02:17:37 -05:00