3422 commits

Author	SHA1	Message	Date
Zach Fox	d37789234d	Remove from default scripts	2017-07-12 14:37:57 -07:00
Zach Fox	63b0e70833	Prepare for marketplace submission	2017-07-12 14:19:08 -07:00
Zach Fox	bd4fe416b4	Cleanup; no magic numbers for default cam params	2017-07-12 12:08:36 -07:00
Zach Fox	9fe6fbd811	View frustums are strange.	2017-07-12 11:37:18 -07:00
Zach Fox	79cf242fc9	Make far clip plane distance equal to main camera's	2017-07-12 10:51:14 -07:00
Zach Fox	d786820670	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-11 16:16:37 -07:00
Zach Fox	a27644ae4d	Magic numbers	2017-07-11 15:52:12 -07:00
Zach Fox	51c22eb7db	Also re-enable spectator camera after switching domains	2017-07-11 15:38:10 -07:00
Zach Fox	1001097f92	Fix button state	2017-07-11 15:29:00 -07:00
Zach Fox	b0639be8bd	Use function pointers correctly	2017-07-11 15:23:50 -07:00
Zach Fox	c4a4623ba8	Workaround the bug where Avatar Entities can't get deleted after switching domains	2017-07-11 15:18:08 -07:00
Zach Fox	2e8bd3c9cb	Make Spectator Camera icon active when Camera is on	2017-07-11 10:16:55 -07:00
Zach Fox	5823efce76	Cleanup	2017-07-10 15:51:27 -07:00
Zach Fox	4a74522884	Ensure tablet button shows up; protections for controller mapping	2017-07-10 15:16:16 -07:00
Zach Fox	78d12f27ed	Merge pull request #10933 from zfox23/spectatorCamera_forceMonoPreview ... Force Mono Preview when using Spectator Camera	2017-07-10 13:29:22 -07:00
Zach Fox	303a3d1e4c	Force Mono Preview when using Spectator Camera	2017-07-10 13:27:45 -07:00
David Kelly	91ffb003fd	Merge pull request #10908 from davidkelly/dk/hmdPreview ... hmd preview	2017-07-10 11:14:28 -07:00
Brad Hefta-Gaub	121cf76ee3	Merge pull request #10914 from sethalves/dont-think-during-mouse-move ... Dont think during mouse move	2017-07-10 10:36:03 -07:00
Zach Fox	f170449b88	Don't show SPECTATOR app in Desktop mode	2017-07-10 10:25:37 -07:00
David Kelly	1c9c36a8c8	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreview	2017-07-10 10:22:31 -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
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
David Kelly	688b5dad8b	allow switching display modes to work in desktop	2017-07-07 10:34:11 -07: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	e4aa4823f9	Merge branch 'master' of github.com:highfidelity/hifi into dont-think-during-mouse-move	2017-07-07 08:51:38 -07:00
Zach Fox	ea77557e38	Correctly close PAL when switching domains	2017-07-07 08:09:19 -07:00
David Kelly	93840bf936	hack to not switch display to hmdPreviewFrame texture (temporary)	2017-07-06 18:13:24 -07:00
Zach Fox	1afa2d3775	Spectator camera icon	2017-07-06 16:24:50 -07:00
David Kelly	b41c470064	first cut, still stereo	2017-07-06 15:59:24 -07:00
Zach Fox	8945b75cda	Merge pull request #10903 from zfox23/PAL_fixAdminColumn ... Ensure admins see PAL admin column	2017-07-06 13:38:10 -07:00
Zach Fox	a5c7324ec5	Ensure admins see PAL admin column	2017-07-06 12:15:44 -07:00
ZappoMan	c3c9df0cd0	restore old camera state	2017-07-06 10:41:46 -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
ZappoMan	10341af819	Merge branch 'master' of https://github.com/highfidelity/hifi into godview	2017-07-06 09:39:33 -07:00
Seth Alves	55b7c2d767	avoid doing a lot of work during mouse-move event-handlers	2017-07-05 15:50:05 -07:00
Zach Fox	aea5779ed6	When a display texture isn't set, show preview instructions	2017-07-05 14:46:58 -07:00
Zach Fox	6f2e7f5b83	Tweak the Snapshot 'Share' button to make its purpose more clear	2017-07-05 12:39:15 -07:00
Seth Alves	d917878638	fix whitespace	2017-07-05 11:29:09 -07:00
Seth Alves	ab340530b8	don't do a lot of processing during the mouse-move event handler	2017-07-05 11:27:13 -07:00
Mohammed Nafees	eb354a4333	Cleanup menu shortcut keys	2017-07-05 14:50:48 +05:30
ZappoMan	d5acc8a6f9	Merge branch 'master' of https://github.com/highfidelity/hifi into godview	2017-07-03 12:21:29 -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
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
Brad Davis	31d2c9980e	Merge pull request #10797 from ctrlaltdavid/21396 ... Make Leap Motion a plugin	2017-06-30 14:37:23 -07:00
Zach Fox	9bd80ec2bf	Improve naming and API	2017-06-30 14:07:00 -07:00
Brad Davis	3f48c7aef5	Merge pull request #10855 from jherico/snapshot ... Fix snapshot connection errors	2017-06-30 12:58:48 -07:00
Zach Fox	947a3bf8a8	Pull in crash fix from other branch	2017-06-30 11:43:48 -07:00
Zach Fox	3c9291062d	Clarify setDisplayTexture cases, also fixing crash bug	2017-06-30 11:43:11 -07:00
Zach Fox	f78903eead	Clarify setDisplayTexture cases, also fixing crash bug	2017-06-30 11:31:48 -07:00