3330 commits

Author	SHA1	Message	Date
Olivier Prat	53a92c1506	Fade edit is working again and time based transitions are garbage collected	2017-07-13 12:31:10 +02:00
Olivier Prat	2f9885870b	First merge with Sam's fader branch with custom pipeline support in shape plumber	2017-07-12 17:29:21 +02: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
Olivier Prat	9758a6ded0	Edition picking again (but without bounding box highlighting)	2017-07-10 17:57:02 +02: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
Olivier Prat	06d69d04c3	TransitionStage + FadeJob compiling but not linked to entity events	2017-07-07 18:22:11 +02: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
Olivier Prat	018c0489f4	Merged with 21378	2017-07-06 16:53:47 +02: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
Olivier Prat	2525fe5869	Working save and load	2017-07-04 17:31:24 +02:00
Olivier Prat	7d851c1cbd	Added timing parameters and visual debug of threshold	2017-07-04 12:01:28 +02:00
ZappoMan	d5acc8a6f9	Merge branch 'master' of https://github.com/highfidelity/hifi into godview	2017-07-03 12:21:29 -07:00
Olivier Prat	d9a83539b2	Merged with master	2017-07-03 15:32:30 +02:00
Olivier Prat	af7957491b	Working avater enter/leaves + manual threshold	2017-07-03 12:40:58 +02: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
Brad Davis	6e5eff9407	Fix snapshot connection errors	2017-06-29 10:01:48 -07:00
Olivier Prat	c5ca23f4ea	Changing edited fade category properly updates widgets in edit window	2017-06-29 17:14:20 +02:00
Olivier Prat	6a31dc2659	Selection of edited object working	2017-06-29 12:13:55 +02:00
Olivier Prat	8a12d0c106	Fade effect working again for basic enter domain but with various Fade jobs	2017-06-29 08:54:23 +02:00
utkarshgautamnyu	e6be838e79	Update snapshot.js	2017-06-28 15:30:49 -07:00
Olivier Prat	b76a8a6f9b	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-06-28 14:37:03 +02: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
Chris Collins	19d3646fef	Merge pull request #10817 from kencooke/audio-scripting-fix ... Audio scripting fixes	2017-06-26 10:01:52 -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
Ken Cooke	fba1a8ddaa	Fix halfDuplex script	2017-06-26 08:28:29 -07:00
Ken Cooke	db2b702221	Fix reverbTest script	2017-06-26 08:08:52 -07:00
Olivier Prat	1bb0d51849	Merged with master	2017-06-26 11:55:46 +02:00
David Rowe	bed0e8ef87	Merge branch 'master' into 21396 ... # Conflicts: # interface/src/avatar/MySkeletonModel.cpp	2017-06-26 12:07:25 +12:00
anshuman64	9d9f4ee64a	Merge pull request #10811 from ctrlaltdavid/21414 ... EZRECORD app	2017-06-24 22:46:30 -07:00
anshuman64	d1891069d2	Merge pull request #10763 from hyperlogic/feature/puck-attach ... Added script that will attach an entity to a vive sensor	2017-06-24 22:35:45 -07:00
David Rowe	48caad1ad2	Add user activity logging	2017-06-24 16:03:55 +12:00
David Rowe	3de1c0a312	Make and save recording	2017-06-24 15:57:57 +12:00
David Rowe	bae04966f9	Add "REC" indicator	2017-06-24 14:35:28 +12:00
David Rowe	6543b74b52	Add beeps	2017-06-24 14:26:01 +12:00
David Rowe	ce32f1704e	Start/cancel/finish recording logic	2017-06-24 13:22:00 +12:00
David Rowe	1ddae1c61a	Change keyboard shortcut to avoid conflict	2017-06-24 13:19:25 +12:00
David Rowe	ced9473eb3	Icon toggling and keyboard shortcut	2017-06-24 12:49:45 +12:00