2955 commits

Author	SHA1	Message	Date
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
Andrew Meadows	1e23fa7baa	Merge pull request #10822 from hyperlogic/feature/no-toe-wiggle ... Eliminated toe wiggle while pucks are enabled.	2017-06-28 08:30:27 -07:00
Vladyslav Stelmakhovskyi	51b44d9021	Implement same for HMD mode	2017-06-28 16:36:25 +02:00
Vladyslav Stelmakhovskyi	d3282a4ed0	Cleanup	2017-06-28 15:56:35 +02:00
Vladyslav Stelmakhovskyi	0d4328fa51	Merge branch 'master' into file_dialog_crash_qt59	2017-06-28 15:54:53 +02:00
Vladyslav Stelmakhovskyi	241231c00c	file lists works, but not initial yet	2017-06-27 22:14:58 +02:00
Anthony J. Thibault	8602d57a57	Eliminated to wiggle while pucks are enabled. ... * Added new anim node AnimDefaultPose * AnimNodeLoader was changed to support the addition of the AnimDefaultPose node * Edited default avatar-animation.json to insert an AnimOverlay and AnimDefaultPose between the IK node and the rest of the "underPose". * Rig uses this to fade in default pose for the toes when the hip/feet puck are active. This effectively deadens the toe animations, without effecting the hand animations. * Also, the rig was changed to use the LimitCenter solution when the feet are enabled but the hips are not.	2017-06-26 14:09:10 -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
Brad Hefta-Gaub	6314a8d273	Merge pull request #10782 from vladest/fix_browse_black ... Make background with default color. Fix few warnings	2017-06-26 09:50:09 -07:00
anshuman64	8d5bdd2d84	Merge pull request #10730 from hyperlogic/feature/pole-vector ... Pole vector support for elbow and knee joints	2017-06-24 23:08:22 -07:00
Ryan Huffman	b56cfa56c7	Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated	2017-06-23 14:23:20 -07:00
Brad Davis	d50c448151	Fix heap corruption coming out of running scripts dialog	2017-06-22 19:15:58 -07:00
Anthony J. Thibault	79d9bbe6c5	Merge branch 'master' into feature/pole-vector	2017-06-22 13:37:55 -07:00
Vladyslav Stelmakhovskyi	30714d5d25	Make background with default color. Fix few warnings	2017-06-22 16:47:40 +02:00
Seth Alves	c70365d04a	Merge pull request #10729 from druiz17/hand-pucks ... Hand pucks and Calibration UI	2017-06-21 18:10:15 -07:00
Anthony J. Thibault	2dcca2125b	Merge branch 'master' into feature/pole-vector	2017-06-21 15:50:03 -07:00
Dante Ruiz	c4699e00ca	added hand offsets	2017-06-21 23:10:08 +01:00
Brad Hefta-Gaub	88a4f5c576	Merge pull request #10766 from humbletim/sort-running-scripts ... Sort Running Scripts... list alphabetically	2017-06-21 13:08:47 -07:00
Ryan Huffman	0e7ddfd29f	Disable silence/ban buttons in PAL if avatar is replicated	2017-06-21 09:49:16 -07:00
Dante Ruiz	729065749f	fixed merge conficts	2017-06-21 16:59:53 +01:00
Zach Fox	8dab93e299	Merge pull request #10762 from zzmp/audio/input-select-active-level ... Add a VU meter to the active mic selection	2017-06-20 18:38:49 -07:00
Dante Ruiz	17832b6022	edited some button behavior	2017-06-21 01:38:05 +01:00
Dante Ruiz	2e329602f7	minimize diff	2017-06-21 01:13:45 +01:00
Dante Ruiz	b7286db523	fixed merge conflict	2017-06-21 01:10:54 +01:00
Dante Ruiz	2c3db0fb91	finished calibration-ui	2017-06-21 01:07:12 +01:00
Zach Pomerantz	0075d8619a	center MUTED text in InputLevel	2017-06-20 17:04:54 -07:00
Zach Pomerantz	1f7e1e8287	add level to active input selection	2017-06-20 17:04:54 -07:00
Zach Pomerantz	baafe1ad09	give Audio menu mute its own row	2017-06-20 16:15:05 -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	7e84f67391	Merge pull request #10744 from zzmp/audio/output-sample ... Add "Play sample sound" to audio setting	2017-06-20 15:32:57 -07:00
Zach Pomerantz	278a122291	bring visibleChanged to standard	2017-06-20 14:04:50 -07:00
Zach Pomerantz	dc6542c615	fix typo	2017-06-20 12:20:49 -07:00
Zach Pomerantz	6823e7cae0	Audio -> HifiAudio to avoid collision	2017-06-20 12:20:14 -07:00
Zach Pomerantz	8d4307460c	Audio -> HifiAudio to avoid collision	2017-06-20 12:19:42 -07:00
Zach Pomerantz	6c776e27af	fix PlaySampleSound glyphs	2017-06-20 12:16:08 -07:00
Zach Pomerantz	ab6c8505b8	stop audio sample on visibleChanged	2017-06-20 12:15:23 -07:00
Zach Pomerantz	c33853f4cf	update AvatarInputs with MicBar	2017-06-20 11:43:02 -07:00
Zach Pomerantz	ab68c44177	MicBar tweaks	2017-06-20 11:43:02 -07:00
Zach Pomerantz	c826858458	revamp tablet MicBar	2017-06-20 11:43:02 -07:00
Brad Hefta-Gaub	cbded766b1	Merge pull request #10676 from NeetBhagat/21369 ... WL 21369 - Implement parts of the JS "console" object	2017-06-20 11:06:34 -07:00
Zach Pomerantz	7f90f8af45	Merge pull request #10746 from zzmp/audio/mute-check ... Emphasize mute state with red	2017-06-20 10:58:11 -07:00
Dante Ruiz	33b89c9d32	adding glyph and text	2017-06-20 17:26:17 +01:00
Dante Ruiz	13dff29bd5	adding calibration screen	2017-06-20 01:19:10 +01:00
Zach Pomerantz	7512332104	replace mic-mute icons with red variants	2017-06-19 15:07:28 -07:00
Zach Pomerantz	6adfe34661	make mute red check	2017-06-19 15:07:28 -07:00
Zach Pomerantz	f0bc080502	fix tab	2017-06-19 14:51:30 -07:00
Zach Pomerantz	a7e1b75909	stopgap with MyAvatar.qmlPosition	2017-06-19 14:41:01 -07:00
Zach Pomerantz	d3d36324c0	play sample output sound	2017-06-19 14:41:01 -07:00
Zach Pomerantz	071a8a783c	add sample sound	2017-06-19 14:41:01 -07:00