2637 commits

Author	SHA1	Message	Date
David Rowe	283976fd87	Merge branch 'master' into vr-edit-a	2017-07-11 14:51:25 +12: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
David Rowe	a447e07ba5	Merge branch 'master' into vr-edit-a	2017-07-08 12:33:55 +12: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
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
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
ZappoMan	10341af819	Merge branch 'master' of https://github.com/highfidelity/hifi into godview	2017-07-06 09:39:33 -07:00
David Rowe	732e3d224a	Merge branch 'master' into vr-edit-a	2017-07-06 15:46:31 +12: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	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
David Rowe	cadd4685ee	No haptic pulse in edit modes when hand enters near-grab distance	2017-07-04 15:59:04 +12:00
David Rowe	83a78aa407	No handControllerGrab.js lasers while in VR edit mode	2017-07-04 15:54:33 +12:00
ZappoMan	d5acc8a6f9	Merge branch 'master' of https://github.com/highfidelity/hifi into godview	2017-07-03 12:21:29 -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
Brad Davis	3f48c7aef5	Merge pull request #10855 from jherico/snapshot ... Fix snapshot connection errors	2017-06-30 12:58:48 -07:00
utkarshgautamnyu	82597ac424	Update snapshot.js	2017-06-30 10:22:05 -07:00
David Rowe	a863e37eb5	Communicate VR edit enabled state to hand controller script	2017-06-30 12:11:06 +12: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
Brad Davis	de88a34e97	Fix toolbar button activation states	2017-06-26 23:33:32 -07:00
Ryan Huffman	209a4f33b5	Merge pull request #10784 from huffman/feat/pal-replicated ... Disable silence + ban buttons for replicated users	2017-06-26 12:50:23 -07:00
Brad Hefta-Gaub	a32f7b2395	Merge pull request #10743 from humbletim/21383 ... CR 21383: Integrate attachments into doppleganger mirror	2017-06-26 09:54:04 -07:00
David Rowe	bed0e8ef87	Merge branch 'master' into 21396 ... # Conflicts: # interface/src/avatar/MySkeletonModel.cpp	2017-06-26 12:07:25 +12:00
David Rowe	6543b74b52	Add beeps	2017-06-24 14:26:01 +12:00
Ryan Huffman	b56cfa56c7	Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated	2017-06-23 14:23:20 -07:00
David Rowe	9d0407cbdf	Merge branch 'master' into 21396	2017-06-23 16:52:04 +12:00
Brad Hefta-Gaub	7668fbb7a0	Merge pull request #10755 from seefo/fb5278 ... Fixed an issue where toolbar buttons duplicated themselves when reloading scripts	2017-06-22 13:35:05 -07:00
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
Ryan Huffman	0e7ddfd29f	Disable silence/ban buttons in PAL if avatar is replicated	2017-06-21 09:49:16 -07:00
Zach Pomerantz	8e1cf763e3	Merge pull request #10756 from zzmp/audio/input-level ... Update chrome for the audio input level meter	2017-06-20 15:33:17 -07:00
Zach Pomerantz	c826858458	revamp tablet MicBar	2017-06-20 11:43:02 -07:00
seefo	00a3fc77a1	Fixed an issue where toolbar buttons duplicated themselves when reloading scripts	2017-06-20 11:18:22 -07:00
David Rowe	513e0cd232	Fix import of JSON with parent-child relationships	2017-06-20 16:44:25 +12:00
humbletim	89ebf4998f	relocate/archive original doppleganger mirror into unpublishedScripts/marketplace/doppleganger-mirror	2017-06-19 10:28:56 -04:00
Stephen Birarda	39e8510ccb	Merge pull request #10720 from seefo/fb5386 ... Fixed a bug where you could not print polaroids if you took a gif	2017-06-16 15:03:45 -07:00
seefo	a4d008eec9	Fixed a bug where you could not print polaroids if you took a gif	2017-06-16 08:57:27 -07:00
David Rowe	a8501a7ac6	Remove old Leap Motion code	2017-06-15 14:45:40 +12:00
Zach Pomerantz	a8f69bb2e0	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -04:00
Zach Pomerantz	e7da007acd	only show Audio menu title when appropriate	2017-06-13 17:13:39 -04:00
Zach Pomerantz	20c0dac8e8	update QML with Audio.muted	2017-06-13 16:10:16 -04:00
Zach Pomerantz	337b6bca14	update JS with Audio.muted	2017-06-13 16:02:58 -04:00
Anthony Thibault	0d46b78bff	Merge pull request #10541 from Menithal/21324 ... Reworked Particle Editor UI	2017-06-13 13:00:54 -07:00
Matti Lahtinen	35f83afd09	Removed unneccessary print	2017-06-13 20:43:14 +03:00