2113 commits

Author	SHA1	Message	Date
Zach Fox	af3c249ae5	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-21 17:16:10 -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	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
David Kelly	b4c75c3f87	working, except tablet issue	2017-06-19 14:41:42 -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	1bf16c4318	update fonts	2017-06-19 14:41:00 -07:00
Zach Fox	e9ba223c09	Uncheck 'disable preview' when opening Spectator app	2017-06-19 13:40:50 -07: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
Zach Fox	d0b68b8c32	First steps - also make letterbox closable only when clicking on gray	2017-06-19 11:46:56 -07:00
Zach Fox	08eb07242d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-19 10:31:31 -07:00
Vladyslav Stelmakhovskyi	36ff765d7f	Make sure registered object have different name from iport alias	2017-06-18 22:19:28 +02: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
David Kelly	6dd1e6e069	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-06-16 16:24:30 -07:00
David Kelly	5284b8dc0c	fix for upside down preview, for now	2017-06-16 15:37:25 -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
Zach Fox	7a76c9cf7f	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-16 14:59:23 -07:00
Zach Fox	749dede8b3	Start with empty string for checkbox	2017-06-16 10:08:58 -07:00
Zach Fox	3df414df36	Bugfixes and language changes	2017-06-16 10:08:58 -07:00
Zach Fox	8cf9c8708d	Allow user to click left thumbstick to switch 'MONITOR SHOWS'	2017-06-16 10:08:58 -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
David Rowe	febd0eaf98	Add Leap Motion settings	2017-06-16 10:58:11 +12:00
Zach Pomerantz	eb4255e1ac	fix audio checkbox bindings	2017-06-15 18:21:23 -04:00
David Kelly	3d922f5db6	works, sorta, but blinks like crazy, cursor gets f-ed up...	2017-06-15 14:17:43 -07: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
NeetBhagat	a6b1b17d45	Merge branch 'master' into 21369	2017-06-15 11:04:22 +05:30
David Kelly	54dfc33b38	initial skeleton of qml objects	2017-06-14 14:36:37 -07:00
Zach Fox	6b6b6026a4	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-14 13:44:13 -07: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
NeetBhagat	9646eba873	Complete console.trace and added a testcases for all 13 functions.	2017-06-13 23:52:48 +05:30
Zach Fox	7d1a7f4c0b	Merge branch 'master' of https://github.com/highfidelity/hifi into ... spectator-camera - INCLUDING MERGE CONFLICT FIXES	2017-06-13 09:42:14 -07:00
Zach Pomerantz	89bd895054	mv showAudioTools to just AvatarInputs	2017-06-13 12:31:05 -04:00
NeetBhagat	b0e9c62c12	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-13 10:10:44 +05:30
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
NeetBhagat	e6a5930365	Merge branch 'master' into 21369	2017-06-12 11:17:26 +05:30
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
Zach Fox	a4f5d327a2	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-09 11:38:35 -07:00
NeetBhagat	c5d8268007	Merge branch 'master' of https://github.com/highfidelity/hifi into 21369	2017-06-09 18:04:34 +05:30
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
howard-stearns	8db81ee5c9	wire up preview vs camera display in scripts	2017-06-07 16:19:36 -07:00
Zach Fox	d1719fade6	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-07 09:46:04 -07:00
NeetBhagat	ead0d42cf3	Merge branch 'master' into 21369 ... # Conflicts: # libraries/gl/src/gl/OffscreenQmlSurface.cpp # libraries/gl/src/gl/OffscreenQmlSurface.h	2017-06-07 15:47:19 +05:30
NeetBhagat	904e25c9e3	intial commit #21369 Working on clear method of console	2017-06-07 14:37:18 +05:30
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 Fox	6e9b083be1	Function renaming; turn cam off when changing domains	2017-06-06 15:49:15 -07:00
Zach Fox	383ef542a1	Remove 'debugSelfie.js'; Change 'HMD' to 'VR headset'	2017-06-06 14:59:26 -07:00
Zach Pomerantz	2b99f299c8	testing	2017-06-06 17:54:52 -04:00
Zach Fox	b50cf6cee6	Quick feedback from Alan	2017-06-06 14:50:01 -07:00
Zach Fox	ca05e3d0b6	Improvements to switch; switch settings persist	2017-06-06 14:17:38 -07:00
Zach Fox	afb7e72b25	Separator; Switch.qml updates; etc	2017-06-06 13:51:07 -07:00
Dante Ruiz	bb7c424d47	get ui working	2017-06-06 21:09:09 +01:00
Zach Fox	557d1c65a3	Another checkpoint; added Switch.qml	2017-06-06 11:59:23 -07:00
Zach Fox	9970802142	Another checkpoint	2017-06-06 11:59:22 -07:00
Zach Fox	1fc7094b2c	Checkpoint	2017-06-06 11:59:22 -07:00
Zach Fox	e9bb982651	First checkpoint!	2017-06-06 11:59:22 -07: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
Howard Stearns	556dcd69ac	wording change regarding use of exact for floors	2017-06-03 15:48:48 -07:00
Dante Ruiz	f0f10f74c6	inpput configutration stub	2017-06-03 00:30:00 +01:00
Brad Davis	9a80a81321	Merge pull request #10565 from vladest/fix_claraio_download_clones ... Make sure that there is only one connection created for web events, s…	2017-06-01 20:42:50 -07:00
anshuman64	694d1d042d	Merge pull request #10573 from druiz17/head-puck ... Added head puck configuration	2017-06-01 16:06:00 -07:00
David Kelly	f79c9ea021	we can sort on ignored	2017-06-01 07:29:31 -07:00
David Kelly	a17886aa58	do not allow sorting on non-sortable columns in PAL	2017-06-01 07:24:03 -07:00
Zach Pomerantz	2b40ad4275	mv Audio... to Settings as dialog	2017-05-28 17:42:24 -04:00
Zach Pomerantz	8ca8c3aa69	mv AudioPreferencesDialog to AudioBuffers	2017-05-28 17:40:57 -04:00
Vladyslav Stelmakhovskyi	bcee25acc7	Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated	2017-05-28 19:54:41 +02:00
Dante Ruiz	a45bea2c90	fixed merge conflicts	2017-05-27 00:57:09 +01:00
Sam Gateau	f9c6cecb23	Merge pull request #10529 from samcake/ambient ... Fix compressed texture size evaluation and Cleaning up the texture counters (number and memory) for better reporting	2017-05-24 10:48:21 -07:00
Brad Hefta-Gaub	eca045714b	Merge pull request #10532 from ctrlaltdavid/21344 ... Display spinner in Web controls when they're loading an HTTP page	2017-05-23 16:39:17 -07:00
Thijs Wenker	962d95ca46	add more precision to attachment scale in attachment dialog	2017-05-23 18:16:08 +02:00
David Rowe	bc4af86b57	Display spinner in Web controls when they're loading an HTTP page	2017-05-23 15:40:35 +12:00
samcake	e0487f7e04	Solving the size evaluation for compressed format	2017-05-22 16:51:54 -07:00
samcake	e4f9f2935e	Solving the size evaluation for compressed format	2017-05-22 15:42:18 -07:00
samcake	80b6fd65ae	Cleaning up counters and naming schemes...	2017-05-17 18:31:28 -07:00
Zach Fox	b9ddc3b19f	Improve robustness of display name focus in PAL	2017-05-16 16:25:22 -07:00
David Kelly	a9716313be	cr feedback -- really good feedback in fact	2017-05-11 17:02:37 -07:00
David Kelly	ae5f9e4fb1	animate scroll of partially visible cards	2017-05-11 15:10:19 -07:00
druiz17	e4df4369ad	Merge pull request #10436 from druiz17/config-ui ... Added the ability to choose puck configuration from the general settings	2017-05-11 13:39:05 -07:00
Vladyslav Stelmakhovskyi	bd6ac7a39e	Code style fixes	2017-05-11 20:38:09 +02:00
Dante Ruiz	4365907462	drop down puck configuration for gernal settings	2017-05-10 22:12:11 +01:00
Vladyslav Stelmakhovskyi	2328da3c48	Merge branch 'master' into audio-source-sync	2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi	2d46f9d30e	Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum	2017-05-10 21:21:39 +02:00
Zach Fox	cf3c10c5b1	Fix the bugs, add the feature	2017-05-09 14:40:41 -07:00
Vladyslav Stelmakhovskyi	7ab6909c77	Merge branch 'master' into audio-source-sync	2017-05-09 11:08:08 +02:00
David Rowe	116175cf9f	Fix going back from Twitter password recovery page	2017-05-09 09:03:48 +12:00
David Rowe	c8328e9b9f	Merge branch 'master' into 21319	2017-05-09 08:04:27 +12:00
Vladyslav Stelmakhovskyi	fa9a4053ca	Save selected device in settings to make sure it will not be changed back in Menu	2017-05-08 21:24:46 +02:00
Vladyslav Stelmakhovskyi	d0111ac0bb	Merge branch 'master' into audio-source-sync	2017-05-08 20:09:34 +02:00
David Rowe	1b26ba22cb	Fix browser history in goto "i" pages on tablet	2017-05-06 11:13:13 +12:00
Zach Fox	6b00688289	Merge pull request #10392 from zfox23/AvailabilityLanguageChanges ... "Set Availability" UI changes	2017-05-05 14:03:39 -07:00
Zach Fox	a10606b994	OMG language changed again	2017-05-05 11:44:59 -07:00
Zach Fox	905f36976f	New language	2017-05-05 11:28:49 -07:00