427 commits

Author	SHA1	Message	Date
Olivier Prat	1ce1aca79f	Merged with samcake's 'black' branch	2017-12-07 08:59:38 +01:00
Seth Alves	66e38af1b3	Merge pull request #11671 from ElderOrb/case8553 ... 8380 Mouse Disappears when switching between HMD and Desktop Mode while in Create	2017-10-25 10:31:31 -07:00
beholder	39b2c0f83a	fix for FB 8553 & FB 8380	2017-10-25 01:59:56 +03:00
SamGondelman	046e5ca716	fix backwards HUD in mirror mode	2017-10-24 13:24:09 -07:00
Sam Gateau	ec934335dc	CLeaning up the pr regarding the scripts with my branch blue	2017-10-15 22:34:58 -07:00
SamGondelman	3acbd7820b	build error	2017-10-09 11:48:54 -07:00
SamGondelman	e95ecc3f27	fix missing sensorToWorld matrix	2017-10-06 15:37:23 -07:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00
SamGondelman	601b30f062	fix flash when switching display modes	2017-10-05 15:31:45 -07:00
samcake	7f86a4ee28	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-10-04 13:35:31 -07:00
SamGondelman	477dfdff1e	wip hud layering and fix crashes	2017-10-04 11:45:21 -07:00
SamGondelman	fa838e4715	merge from master	2017-10-03 15:53:33 -07:00
samcake	6639287418	Merging with master	2017-10-02 17:03:09 -07:00
Andrew Meadows	8d2153d2f3	cleanup debug stats, use more correct names	2017-10-02 13:08:17 -07:00
SamGondelman	b59ec07171	move hud rendering to render thread, still need to separate out hud overlays	2017-09-29 09:49:08 -07:00
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
samcake	3adeb80858	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-09-20 10:18:49 -07:00
Anthony J. Thibault	809e986738	Fixes for lasers on 2d HUD	2017-09-20 09:21:14 -07:00
Bradley Austin Davis	bc4193f276	Merge branch 'master' into android_new	2017-09-19 14:27:31 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Anthony J. Thibault	7e2b2960ed	Fix for lighting as IPD scale changes. ... (cherry picked from commit a260aaaae8)	2017-09-18 12:15:32 -07:00
samcake	dbeb4e9b27	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-09-11 15:25:58 -07:00
Anthony J. Thibault	b81f85e1ae	Merge branch 'master' into feature/ant-man	2017-09-11 15:14:03 -07:00
Anthony J. Thibault	2f850826f2	Allow override of near/far clip planes in Oculus and OpenVR plugins	2017-09-06 11:02:44 -07:00
samcake	e70f261de4	Adding the full code path, starting debugging the problems in hmd,	2017-09-05 18:09:46 -07:00
Anthony J. Thibault	f0912987a3	Fix ray picks against HUD sphere at different sensor scale factors	2017-09-05 10:03:19 -07:00
Bradley Austin Davis	d0fdf175fd	Fix access to menu on background thread	2017-08-31 16:30:17 -07:00
humbletim	9348048387	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-08-24 16:23:47 -04:00
Sam Gondelman	cbf2bb3a61	Merge pull request #10980 from SamGondelman/sharks ... Reduce laser pointer lag	2017-08-18 13:14:38 -07:00
Zach Fox	ecd1f13197	Allow users to take a snapshot from the secondary camera	2017-08-16 15:34:06 -07:00
humbletim	3bcbec87e0	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-30 16:15:34 -04:00
SamGondelman	e3288a9004	fix flicker, scissor warning, and handControllerGrab sphere size	2017-07-27 11:17:30 -07:00
Sam Gondelman	fcaa39b245	Merge branch 'master' into sharks	2017-07-26 18:18:09 -07:00
SamGondelman	6e78238f58	warning	2017-07-25 15:48:41 -07:00
SamGondelman	658acd91f2	experimenting with drawHUDLayer depth testing	2017-07-25 14:17:39 -07:00
SamGondelman	0117950546	can edit drawHUDLayer property	2017-07-25 12:57:52 -07:00
SamGondelman	3149c3e16c	warnings	2017-07-25 10:16:50 -07:00
SamGondelman	3c8b964cc9	replace setHandLasers with drawHUDLayer overlay property	2017-07-24 18:16:40 -07:00
Andrew Meadows	8dafc30bf9	fix debug build: stub pure virtual function	2017-07-18 15:57:00 -07:00
humbletim	f9e0e616f7	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-18 17:34:39 -04:00
David Kelly	88a449c1af	Fixes hmd preview when resizing	2017-07-12 16:49:26 -07:00
David Kelly	e1df3feb5c	fix hmd preview	2017-07-11 10:54:35 -07:00
David Kelly	f18e64ed1a	first pass at blitting correct hmd preview (in mono)	2017-07-07 15:53:29 -07:00
David Kelly	b41c470064	first cut, still stereo	2017-07-06 15:59:24 -07:00
David Kelly	2a3b4b3bfb	minor cleanup, and adjusted includes per austin's suggestion	2017-07-03 15:54:54 -07:00
David Kelly	373bd0cc8a	aspect ratio preserved upon blitting, minor qml tweak, warnings fixed	2017-07-03 14:23:23 -07:00
David Kelly	5f015ec77f	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-07-03 13:57:25 -07:00
David Kelly	133af0b522	jittery, still not working in tablet	2017-06-30 12:55:11 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00