2014 commits

Author	SHA1	Message	Date
druiz17	b4182fe7ac	Merge pull request #10899 from druiz17/calibration-update-2.0 ... Updates to the Calibration UI	2017-07-06 14:24:45 -07:00
Dante Ruiz	1fcb3b32d6	fixed letter cap	2017-07-06 20:55:19 +01:00
Seth Alves	0374d24b15	Merge pull request #10901 from druiz17/goto-keyboard-fix ... Fixed the keyboard not showing up for goto in HMD mode	2017-07-06 12:46:13 -07:00
Dante Ruiz	2d876377d5	keyboard know disappears when you click of the address line	2017-07-06 20:04:44 +01:00
Dante Ruiz	de5802418f	fixed some keybaord logic	2017-07-06 19:27:48 +01:00
Dante Ruiz	4e3dba1767	goto HMD keyboard fix	2017-07-06 19:12:52 +01:00
Dante Ruiz	9e4b5693c7	fixed merge conflicts	2017-07-06 18:49:46 +01:00
Dante Ruiz	6e1f9d275c	chnaged default head offset	2017-07-06 17:54:06 +01:00
Dante Ruiz	258c21838e	finished calibration-ui updates	2017-07-06 17:32:40 +01:00
Dante Ruiz	6c15dffb9d	added new glyph	2017-07-06 00:45:59 +01:00
Dante Ruiz	063984f573	Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update	2017-07-03 16:44:47 +01:00
Dante Ruiz	6f30cb1825	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-01 00:48:49 +01:00
Dante Ruiz	51792769b5	finished vive in desktop mode	2017-07-01 00:48:36 +01:00
Brad Davis	31d2c9980e	Merge pull request #10797 from ctrlaltdavid/21396 ... Make Leap Motion a plugin	2017-06-30 14:37:23 -07:00
Dante Ruiz	a7e4dc1473	clean up code	2017-06-28 23:51:00 +01:00
Dante Ruiz	a2df2f8472	added user activity status	2017-06-28 19:52:19 +01: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
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	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
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	6e266dfbac	Merge branch 'master' into 21396	2017-06-24 09:19:12 +12:00
Brad Davis	d50c448151	Fix heap corruption coming out of running scripts dialog	2017-06-22 19:15:58 -07:00
Vladyslav Stelmakhovskyi	30714d5d25	Make background with default color. Fix few warnings	2017-06-22 16:47:40 +02:00
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12: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
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