646 commits

Author	SHA1	Message	Date
HifiExperiments	1e100a672e	merge with master and try to fix opacity mode stuff	2019-10-23 22:21:45 -07:00
Brad Davis	960cab9994	Qt 5.13 warnings & fixes	2019-10-08 15:40:13 -07:00
Brad Davis	d69a83a2f2	fix warnings	2019-10-04 18:20:10 -07:00
Brad Davis	243120b95c	Even better frame capture	2019-10-04 14:57:39 -07:00
Brad Davis	3c6e98f16b	New format for captured GPU frames	2019-10-04 08:34:06 -07:00
Sam Gateau	3c34443f24	where possible (in OpenGLDisplayPLugin) remove the need for the eye specific function and keep it in the HMD display plugin for the case of the POinter drawcall	2019-09-09 13:43:32 -07:00
Sam Gateau	3509a797a1	Avoiding to rely on the display plugin resource in the getHUDOperator to avoid a case of unallocated resource	2019-09-09 11:33:05 -07:00
HifiExperiments	97b9179144	merge with master	2019-09-05 00:46:56 -07:00
Simon Walton	99e1178d9c	Move getRequiredThreadCount override from OculusBaseDisplayPlugin to HmdDisplayPlugin	2019-08-08 11:14:02 -07:00
Simon Walton	0f6ad43531	Set desktop reserved threads to 1; HMD reserved threads to 2	2019-08-06 15:34:13 -07:00
Shannon Romano	8e708b29de	Merge pull request #15934 from ctrlaltdavid/DOC-62 ... DOC-62: Reticle JSDoc	2019-07-22 15:32:48 -07:00
Seth Alves	22a913bee2	fix bug that caused comfort-mode to be active at all times in HMD	2019-07-15 21:10:42 -07:00
David Rowe	8be59633f4	Reticle JSDoc	2019-07-16 12:49:54 +12:00
Shannon Romano	3f7e5a48bb	Merge pull request #15533 from sethalves/squeeze-vision-while-moving ... Case 21663: comfort mode	2019-07-15 14:54:31 -07:00
SamGondelman	60600779c9	merge with master	2019-07-12 11:01:17 -07:00
Seth Alves	9baf4c7078	comfort mode -- squeeze vision to avoid sickness	2019-07-12 09:14:17 -07:00
amer cerkic	d5d5741d42	removed extra lines	2019-07-10 17:17:53 -07:00
amer cerkic	73097113c7	adding a null check to the display plugin. Possible that display plugin was disposed off during the check if hmdmode	2019-07-10 17:13:34 -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
SamGondelman	9c1b139d5f	merge with master	2019-06-25 23:46:39 -07:00
Anna	792cef1a91	fixed bad merge	2019-06-24 15:57:09 -07:00
Sam Gondelman	e4847cc4ae	Merge branch 'master' into proceduralMesh	2019-06-24 10:16:45 -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
SamGondelman	37feb7f027	merge with master	2019-06-10 10:29:39 -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
Sam Gondelman	3d05a954bc	Merge branch 'master' into proceduralMesh	2019-05-23 09:35:14 -07:00
Zach Fox	5749392e83	New bg color; Final status indicator design; Fixed HMD icon	2019-05-21 14:10:27 -07:00
SamGondelman	283cc18269	Merge remote-tracking branch 'upstream/master' into proceduralMesh	2019-05-16 16:33:16 -07:00
SamGondelman	da254c2ccc	(¬‿¬)	2019-05-15 23:48:04 -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