623 commits

Author	SHA1	Message	Date
Seth Alves	9baf4c7078	comfort mode -- squeeze vision to avoid sickness	2019-07-12 09:14:17 -07:00
Anna	f44bc52d58	implemented requested changes, fixed math error in filmic curve	2019-07-01 17:05:13 -07:00
Anna	f52376563d	remove redundant getRenderTexturePipeline() override from HMD display plugin	2019-07-01 11:14:54 -07:00
Anna	787359fdfb	fixed ui flipping issue	2019-07-01 10:52:03 -07:00
Anna	9b85c7f1ac	Merge branch 'master' of github.com:highfidelity/hifi into gamma-simplification	2019-06-28 09:47:17 -07:00
Anna	24b6d64e34	removed extraneous code for hmd	2019-06-26 17:27:53 -07:00
Anna	6f5b37ec87	removed extraneous conversion to SRGB and back during deferred rendering	2019-06-26 16:36:04 -07:00
Anna	59505ab20f	fixed color banding on rift	2019-06-26 09:29:06 -07:00
Anna	792cef1a91	fixed bad merge	2019-06-24 15:57:09 -07:00
Anna	8c3ddc049c	works on desktop, android mobile, rift and quest	2019-06-21 20:08:09 -07:00
Anna	17163a1ce8	undid some VS auto format changes	2019-06-21 13:41:41 -07:00
Anna	70fbe840a5	added getCompositeFBColorSpace back into updateCompositeFramebuffer	2019-06-21 12:00:20 -07:00
Anna	3d36c5714f	added comments and cleaned up	2019-06-21 11:34:10 -07:00
Anna	250d18d7df	restructured gamma correction so snapshots look correct	2019-06-21 11:11:44 -07:00
Sam Gateau	a66bd04810	Merge pull request #15803 from SamGondelman/setPipeline ... BUGZ-703: Possible fix for do_setPipeline crash and other Mac fixes	2019-06-20 09:27:16 -07:00
SamGondelman	f2e3218ec0	possible fix for do_setPipeline crash and other mac fixes	2019-06-19 16:34:38 -07:00
Anna	c215831df8	fixed potential unreachable code warnings	2019-06-19 15:41:53 -07:00
Anna	a19efce173	implemented samuel's requested changes	2019-06-19 10:34:55 -07:00
Anna	803fe1e178	added comments	2019-06-18 19:33:31 -07:00
Anna	a1a3eccad9	fixed gamma on rift, removed extraneous code from quest, clarified variable names	2019-06-18 19:23:40 -07:00
Anna	4cf8023d0e	fixed gamma on windows	2019-06-18 15:19:02 -07:00
Anna	1d3867d777	works on quest but not desktop	2019-06-17 18:34:26 -07:00
Seth Alves	54906a270e	don't hang if somehow setting display plugin to the current one	2019-06-07 10:31:48 -07:00
Zach Fox	5749392e83	New bg color; Final status indicator design; Fixed HMD icon	2019-05-21 14:10:27 -07:00
Sam Gateau	2f380b3669	Detailing the info from the refresh rate	2019-05-14 17:58:32 -07:00
amer cerkic	49cecdee6e	fixing spacing	2019-04-30 11:52:37 -07:00
amer cerkic	978108b3ba	found a more simplified way to stop rendering the mouse unless its the Reticle cursor	2019-04-30 11:34:11 -07:00
amer cerkic	00a153c730	moving work location	2019-04-29 16:39:34 -07:00
Sam Gateau	d08e2e5ca1	Fixing th emerge conflict	2019-04-26 13:44:49 -07:00
danteruiz	b60e35040e	another round of CR	2019-04-26 10:08:06 -07:00
Sam Gateau	5d87c4caad	REintroduce the gl context make current and done for Macos...	2019-04-25 16:24:00 -07:00
danteruiz	9e1671a1bf	making requested changes	2019-04-25 16:02:12 -07:00
Dante Ruiz	0bdc37859d	Refresh Rate Controller	2019-04-24 16:16:08 -07:00
SamGondelman	4fc97effda	combine snapshotOperator lists per sam's suggestions	2019-04-22 16:22:18 -07:00
SamGondelman	06fbc8440e	Merge remote-tracking branch 'upstream/master' into stencil2	2019-04-22 13:28:30 -07:00
SamGondelman	e7d12dc4f8	fix snapshots and preview	2019-04-17 15:43:05 -07:00
SamGondelman	c730e51d1e	wip redo stencil work	2019-04-11 13:22:51 -07:00
Sam Gateau	89ff63e8bb	Merge pull request #15267 from jherico/fix/tracing ... Case 21930: Don't change OpenGL context state every frame	2019-04-10 09:42:09 -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
Brad Davis	0c78c8fd87	Disable per-frame context switch on present thread	2019-03-26 13:50:46 -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
Sam Gateau	4ee2b43229	FIxing the gamma correction for Quest, intoducing simple gpu lib conversion shaders	2019-02-24 20:49:51 -08:00
Sam Gateau	26ad42b965	FIxing the gamma correction for Quest, intoducing simple gpu lib conversion shaders	2019-02-24 19:07:56 -08:00
Sam Gateau	dab0df1113	Trying to fix the damn gamma	2019-02-22 18:03:23 -08:00
John Conklin II	87556059d3	Merge pull request #13901 from Cristo86/android_handshake ... case 20058: Android - Handshake implementation	2019-02-20 13:33:52 -08:00
Sam Gateau	6edf7e7907	Merge pull request #14931 from jherico/fix/vive_crash ... Case 21230: Fix crash in vive and interleaved stereo plugins	2019-02-15 11:41:03 -08:00
Brad Davis	5483971855	Fix crash in vive and interleaved stereo plugins	2019-02-15 10:46:08 -08:00