1947 commits

Author	SHA1	Message	Date
Dante Ruiz	2c3db0fb91	finished calibration-ui	2017-06-21 01:07:12 +01: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
Dante Ruiz	cfffb74a29	Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks	2017-06-19 21:40:26 +01:00
Dante Ruiz	734cde33e7	better calibrate button	2017-06-19 21:40:09 +01:00
Howard Stearns	532df863b9	Merge pull request #10726 from zfox23/PAL_FixGoToUser ... Fix teleporting to another user from the PAL	2017-06-16 18:08:11 -07:00
Brad Davis	0af6b3b749	Merge pull request #10719 from ctrlaltdavid/21397 ... Ensure desktop dialogs' title bars are visible	2017-06-16 17:35:18 -07:00
Dante Ruiz	da29157a3c	fixed merge conflict'	2017-06-17 00:40:50 +01:00
Dante Ruiz	2015f059c7	fixed hand calibration	2017-06-17 00:37:33 +01:00
Zach Fox	6230dcf93d	Thanks to Thoys!	2017-06-16 16:34:35 -07:00
Zach Fox	74fde8efd7	Revert "Fix teleporting to another user from the PAL" ... This reverts commit 6b659101d5.	2017-06-16 15:33:47 -07:00
Zach Fox	6b659101d5	Fix teleporting to another user from the PAL	2017-06-16 15:09:13 -07:00
David Rowe	3cee2b3764	Ensure desktop dialogs' title bars are visible	2017-06-16 20:10:24 +12:00
Dante Ruiz	07102cc98d	improving the ui	2017-06-16 00:25:27 +01:00
Zach Pomerantz	eb4255e1ac	fix audio checkbox bindings	2017-06-15 18:21:23 -04:00
Zach Pomerantz	3093a73ce1	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-15 15:04:06 -04:00
Dante Ruiz	a1782bf7d2	Merge branch 'controller-ui' into hand-pucks	2017-06-15 16:27:55 +01:00
Dante Ruiz	d65c0dfbac	Merge branch 'master' of github.com:highfidelity/hifi into controller-ui	2017-06-15 16:24:59 +01:00
Zach Pomerantz	bc44e7beaf	bring qml to standard	2017-06-14 10:25:41 -04:00
Zach Fox	37e72f25a3	Make the PAL's tab background color white	2017-06-13 16:04:14 -07: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
Dante Ruiz	ef9a211f6e	adding hand punck	2017-06-13 21:15:16 +01:00
Zach Pomerantz	20c0dac8e8	update QML with Audio.muted	2017-06-13 16:10:16 -04:00
Zach Pomerantz	bf5c70501d	rm tester script	2017-06-13 14:54:53 -04:00
Zach Pomerantz	1a046b4d91	propagate title in Audio dialog qml	2017-06-13 14:42:48 -04:00
Zach Pomerantz	89bd895054	mv showAudioTools to just AvatarInputs	2017-06-13 12:31:05 -04:00
Zach Pomerantz	b37a0239b0	up to reverb (needs cherry-picking)	2017-06-12 18:00:52 -04:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Dante Ruiz	89b0e31edc	update calibrate button glyph	2017-06-12 22:21:46 +01:00
Dante Ruiz	bbe675ab72	making final changes	2017-06-12 22:01:41 +01:00
Zach Pomerantz	858b980c16	add qml Separator	2017-06-12 15:18:16 -04:00
Dante Ruiz	1b13cd6d45	saving work	2017-06-12 17:31:02 +01:00
Dante Ruiz	067fc9bb98	fixed merge conflict	2017-06-12 16:45:34 +01:00
druiz17	f6ef1443c8	some more clean up	2017-06-11 12:08:45 -07:00
Dante Ruiz	ef1be931dc	preparing to clean code	2017-06-10 00:50:32 +01:00
ZappoMan	6fe20f90a3	add better debugging for audio problems ... use OS default device if settings have no values	2017-06-09 13:36:12 -07:00
Dante Ruiz	73e628461e	confiration update status	2017-06-09 00:44:05 +01:00
Dante Ruiz	c97ea84cbf	saving work	2017-06-08 17:44:55 +01:00
howard-stearns	fa74daf875	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-07 16:43:25 -07:00
Dante Ruiz	11409aae9b	connect the ui with the input plugins	2017-06-08 00:34:52 +01:00
Dante Ruiz	4ba1fdc323	elimated uncofigurable items from the list	2017-06-07 00:48:12 +01:00
Dante Ruiz	70ba344f1b	finished openvr ui	2017-06-07 00:25:08 +01:00
Zach Pomerantz	2b99f299c8	testing	2017-06-06 17:54:52 -04:00
Dante Ruiz	bb7c424d47	get ui working	2017-06-06 21:09:09 +01:00
Dante Ruiz	038ffe920a	fixing merge conflicts	2017-06-06 16:42:08 +01:00
Dante Ruiz	19b134b0ac	base ui working	2017-06-06 00:32:20 +01:00
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
Zach Pomerantz	d8815d1dce	prep audio menu	2017-06-05 16:24:00 -04:00
Zach Pomerantz	7cb38d22c3	fix AudioBuffers to work in tablet	2017-06-05 15:06:47 -04:00