20992 commits

Author	SHA1	Message	Date
Zach Fox	e537c494e5	Prevent Image3DOverlays from drifting	2017-07-07 16:04:08 -07:00
Zach Fox	dbb48cd1aa	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-07 16:03:04 -07:00
Zach Fox	3d14d3755e	Merge pull request #10898 from 1P-Cusack/21425 ... Add View->Enter First Person Mode in HMD checkbox.	2017-07-07 14:01:36 -07:00
Andrew Meadows	57842ce5a5	Merge pull request #10878 from mnafees/21355 ... CR for Job #21355 - Clean up and remove menu hotkeys	2017-07-07 14:01:21 -07:00
1P-Cusack	77001712ab	Default 'Enter First Person Mode in HMD' to true.	2017-07-07 15:35:32 -04:00
Zach Fox	e222753aac	Merge pull request #10911 from zfox23/PAL_adminFix2 ... Set admin status even if QML can't find user in PAL	2017-07-07 10:24:53 -07:00
Seth Alves	fc8b7c7cc5	Merge pull request #10904 from druiz17/window-root-spam ... fixed log spamming from windowRoot.qml in toolbar mode	2017-07-07 07:17:08 -07:00
Seth Alves	81cc46beb4	Merge pull request #10909 from jherico/overlay_crashes ... Fixing overlay crashes, for real	2017-07-07 07:11:52 -07:00
Zach Fox	ee9cdaff90	Set admin status even if QML can't find user in PAL	2017-07-06 23:26:40 -07:00
Brad Davis	f8b76d65ab	Fixing overlay crashes, for real	2017-07-06 18:01:26 -07:00
Zach Fox	1afa2d3775	Spectator camera icon	2017-07-06 16:24:50 -07:00
druiz17	b4182fe7ac	Merge pull request #10899 from druiz17/calibration-update-2.0 ... Updates to the Calibration UI	2017-07-06 14:24:45 -07:00
Clément Brisset	34e3f56002	Merge pull request #10843 from birarda/bug/user-activities-interface-only ... disable user activity logger in DS/AC/ac-client	2017-07-06 14:01:49 -07:00
Dante Ruiz	b0130896d1	fixed spamming from windowRoot.qml	2017-07-06 22:01:08 +01:00
Dante Ruiz	1fcb3b32d6	fixed letter cap	2017-07-06 20:55:19 +01:00
Seth Alves	0374d24b15	Merge pull request #10901 from druiz17/goto-keyboard-fix ... Fixed the keyboard not showing up for goto in HMD mode	2017-07-06 12:46:13 -07:00
Dante Ruiz	2d876377d5	keyboard know disappears when you click of the address line	2017-07-06 20:04:44 +01:00
Dante Ruiz	de5802418f	fixed some keybaord logic	2017-07-06 19:27:48 +01:00
Dante Ruiz	4e3dba1767	goto HMD keyboard fix	2017-07-06 19:12:52 +01:00
Dante Ruiz	9e4b5693c7	fixed merge conflicts	2017-07-06 18:49:46 +01:00
anshuman64	e384f6d1b7	Merge pull request #10866 from druiz17/vive-in-desktop ... Allowing Vive controllers and trackers to be used in desktop mode	2017-07-06 10:40:56 -07:00
Stephen Birarda	916f57772b	default the UAL off for all targets, enable manually for Interface	2017-07-06 10:21:07 -07:00
Zach Fox	ee86638c4e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-06 09:58:00 -07:00
Dante Ruiz	6e1f9d275c	chnaged default head offset	2017-07-06 17:54:06 +01:00
David Kelly	1ccf0da7d8	Merge pull request #10897 from davidkelly/dk/cacheSwitchFix ... redo cache switch	2017-07-06 09:53:01 -07:00
Dante Ruiz	258c21838e	finished calibration-ui updates	2017-07-06 17:32:40 +01:00
Andrew Meadows	4fad9d9b1a	Merge pull request #10858 from jherico/trace_cores ... Additional threaded tracing of CPU cores	2017-07-06 08:23:21 -07:00
David Kelly	936c21e849	remove unnecessary cacheDir member	2017-07-06 07:24:58 -07:00
David Kelly	4a22fbca1b	redo cache switch	2017-07-05 17:01:31 -07:00
Dante Ruiz	6c15dffb9d	added new glyph	2017-07-06 00:45:59 +01:00
Zach Fox	39bdc20b4f	On checkbox language change	2017-07-05 16:13:36 -07:00
Zach Fox	f6583a1b87	Use correct text color for checkboxes	2017-07-05 14:46:59 -07:00
Zach Fox	0af53bb4a5	Instructions and cool static :)	2017-07-05 14:46:59 -07:00
Zach Fox	aea5779ed6	When a display texture isn't set, show preview instructions	2017-07-05 14:46:58 -07:00
Brad Davis	7f1bc07d04	Trying to fix overlay crashes again	2017-07-05 14:30:01 -07:00
David Kelly	89c05244bf	remove unnecessary extra update() calls	2017-07-05 13:24:31 -07:00
David Kelly	85813ac908	render issue fixes	2017-07-05 11:29:34 -07:00
Dante Ruiz	b86a8b8338	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-05 18:27:33 +01:00
Zach Fox	44cb48b17d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-05 09:59:57 -07:00
Mohammed Nafees	eb354a4333	Cleanup menu shortcut keys	2017-07-05 14:50:48 +05:30
Seth Alves	fad686571a	Merge pull request #10874 from jherico/overlay_mutex ... Restore mutex in overlay interface	2017-07-03 17:25:42 -07:00
Zach Fox	fcc131187d	Merge pull request #10856 from zfox23/spectatorCamera_positionSpeedup ... Spectator Camera position/orientation update speedup	2017-07-03 16:44:12 -07:00
David Kelly	36467983d8	cr stuff	2017-07-03 16:29:26 -07:00
David Kelly	2a3b4b3bfb	minor cleanup, and adjusted includes per austin's suggestion	2017-07-03 15:54:54 -07:00
David Kelly	99bf100ff8	fix for jitter and not rendering in tablet	2017-07-03 15:19:04 -07:00
Chris Collins	1f7d2b283a	Merge pull request #10872 from jherico/fix_laggy_overlays ... Don't use a blocking connection for a high-frequency script function	2017-07-03 14:58:32 -07:00
Brad Davis	97edbb7f37	Restore mutex in overlay interface	2017-07-03 14:49:57 -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	045b009b00	Merge branch 'dk/spectatorCameraPreview' of https://github.com/davidkelly/hifi into dk/spectatorCameraPreview	2017-07-03 13:57:05 -07:00