2709 commits

Author	SHA1	Message	Date
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
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
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
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
utkarshgautamnyu	82597ac424	Update snapshot.js	2017-06-30 10:22:05 -07:00
Zach Fox	57692d263d	Remove dead code	2017-06-30 10:12:47 -07:00
Zach Fox	8d89ea75f5	Initial commit	2017-06-30 10:12:46 -07:00
Brad Davis	6e5eff9407	Fix snapshot connection errors	2017-06-29 10:01:48 -07:00
utkarshgautamnyu	e6be838e79	Update snapshot.js	2017-06-28 15:30:49 -07:00
Zach Fox	218b32e9fb	Fix cameraUpdateInterval	2017-06-28 15:12:57 -07:00
Zach Fox	9f8a6c63cc	Fixup after merge	2017-06-28 14:44:26 -07:00
Zach Fox	604bb58987	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectatorCamera_setInterval	2017-06-28 14:12:25 -07:00
Zach Fox	1bebe8aede	Whoops! Missed an if()	2017-06-28 13:49:05 -07:00
Zach Fox	39ae28bfcf	CR feedback	2017-06-28 12:54:40 -07:00
Zach Fox	3e7b1b5696	Slightly update registration point	2017-06-28 12:44:34 -07:00
Patrick Manalich	cb52122726	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera_clean-up	2017-06-28 12:40:36 -07:00
Zach Fox	c54a7a713c	New registration point; attempt to fix button interactions	2017-06-28 12:19:10 -07:00
Zach Fox	99ebd743e6	First steps	2017-06-28 12:16:03 -07:00
Patrick Manalich	9bcaa6d256	Revert "Messing around, howard please refer the commit before this one" ... This reverts commit 1392297da9.	2017-06-28 12:10:16 -07:00
Howard Stearns	064a7cbb9b	Merge pull request #10840 from manapa01/spectator-camera_resize-fix ... Spectator camera resize fix	2017-06-28 12:02:40 -07:00
Patrick Manalich	252d100a5e	Function updateOverlay() made so we don't repeat code	2017-06-28 11:31:40 -07:00
Patrick Manalich	fedbc28da4	Rotation quaternion fix	2017-06-28 10:47:34 -07:00
Patrick Manalich	617e927695	rotation changed to localRotation	2017-06-27 17:13:39 -07:00
Patrick Manalich	1392297da9	Messing around, howard please refer the commit before this one	2017-06-27 16:50:44 -07:00
Zach Fox	5d8d2fd83e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-27 16:47:44 -07:00
Patrick Manalich	994117b524	Small comment change to clarify configurations	2017-06-27 15:08:37 -07:00
Patrick Manalich	6d0b853668	Comment structure changes for compacting	2017-06-27 14:34:01 -07:00