20952 commits

Author	SHA1	Message	Date
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
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
Zach Fox	44cb48b17d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-05 09:59:57 -07:00
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
anshuman64	70b9e9b41e	Merge pull request #10849 from druiz17/calibration-ui-update ... Updated calibration UI visuals and added UserActivity events.	2017-07-03 12:42:09 -07:00
Brad Davis	6c86c297cb	Don't use a blocking connection for a high-frequency function like editOvleray	2017-07-03 12:40:52 -07:00
Zach Fox	9c96cf811e	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectatorCamera_positionSpeedup	2017-07-03 10:33:55 -07:00
Zach Fox	9411c2e732	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-03 10:24:02 -07:00
Seth Alves	70a7b302fc	Merge pull request #10860 from jherico/deadlock_guards ... Don't use blocking connections on the main thread	2017-07-03 09:05:56 -07:00
Dante Ruiz	063984f573	Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update	2017-07-03 16:44:47 +01:00
David Kelly	073eae39b2	timer now resumes when visible again	2017-06-30 18:44:32 -07:00
David Kelly	455233dc16	black background when camera is off	2017-06-30 16:08:40 -07:00
Zach Fox	7851c8002f	Remove unnecessary guard	2017-06-30 15:25:33 -07:00
Zach Fox	36dfff78e2	Emit qDebug() error when trying to change position or orientation while attachedEntityId is defined	2017-06-30 15:13:31 -07:00
Ryan Downe Karpf	ddce264dd9	Merge pull request #10819 from Menithal/21387 ... WL21387 - Avatar Bookmarks now save Attachment Data and scale PR#2	2017-06-30 14:57:04 -07:00
Brad Davis	31d2c9980e	Merge pull request #10797 from ctrlaltdavid/21396 ... Make Leap Motion a plugin	2017-06-30 14:37:23 -07:00
David Kelly	09d959bdeb	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-06-30 14:16:01 -07:00
Zach Fox	9bd80ec2bf	Improve naming and API	2017-06-30 14:07:00 -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
Zach Fox	f765b4136d	Cleanup	2017-06-30 10:12:47 -07:00
Zach Fox	5ceb80b3e7	It's working!	2017-06-30 10:12:46 -07:00
Zach Fox	8d89ea75f5	Initial commit	2017-06-30 10:12:46 -07:00
Zach Fox	e66b4f1761	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-30 10:12:24 -07:00
Zach Fox	0f9c917965	Merge pull request #10853 from samcake/brown ... Fix projection & lighting issues identified with 2nd rendering pipeline In Master	2017-06-30 10:05:54 -07:00
Brad Davis	8372d73fec	Additional thread safety	2017-06-30 09:15:06 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Menithal	bf0a8e0f91	Updated Comment	2017-06-29 23:18:52 +03:00
David Kelly	02b712716b	testing some rendering issues...	2017-06-29 11:12:10 -07:00
Seth Alves	c4667aa1a7	Merge pull request #10839 from vladest/file_dialog_crash_qt59 ... File dialog crash qt59	2017-06-29 10:34:26 -07:00
Zach Fox	00966966df	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-29 10:13:11 -07:00
Zach Fox	3170bdd08c	Merge pull request #10837 from samcake/flash ... Fix projection & lighting issues identified with 2nd rendering pipeline	2017-06-29 10:12:03 -07:00
Sam Gateau	b766c256db	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-29 10:29:05 +02:00
Thijs Wenker	e781f97ddc	Merge pull request #10846 from sethalves/fix-server-scripts-more ... make ResourceManager be owned by DependencyManager	2017-06-28 17:05:30 -07:00
Howard Stearns	3606418a22	Merge pull request #10836 from davidkelly/dk/scriptsSwitchBug ... minor fix for --scripts switch	2017-06-28 16:11:18 -07:00
Dante Ruiz	f077e40dd3	Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update	2017-06-28 23:51:13 +01:00
Dante Ruiz	a7e4dc1473	clean up code	2017-06-28 23:51:00 +01:00
Seth Alves	794495c197	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00