2186 commits

Author	SHA1	Message	Date
Cain Kilgore	4f8d958831	Some code cleaning, added comment for reasoning of specifying min and max in the qml	2017-07-14 00:56:42 +01:00
Cain Kilgore	d74c834f12	Fixed colour scheming and changed to a reload icon	2017-07-13 22:40:37 +01:00
Cain Kilgore	60300f5d7b	changed to icon (hopefully)	2017-07-13 22:06:44 +01:00
Cain Kilgore	f91a8c0f53	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler	2017-07-13 21:25:39 +01:00
Cain Kilgore	247e7b8bed	indentation!!!	2017-07-13 19:25:31 +01:00
Cain Kilgore	092725ad1a	a thing	2017-07-13 19:24:30 +01:00
Cain Kilgore	5329c1ce42	Fixed Indentation, removed old debug code	2017-07-13 19:23:28 +01:00
Cain Kilgore	521babb6bd	Avatar Scaler - should be PR Ready.	2017-07-13 19:18:51 +01:00
Cain Kilgore	43782a29c7	Avatar Scaler - WIP	2017-07-12 22:04:58 +01:00
Zach Fox	d786820670	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-11 16:16:37 -07:00
Zach Fox	ea62ef165c	Fix image container background	2017-07-10 16:13:45 -07:00
Zach Fox	4a74522884	Ensure tablet button shows up; protections for controller mapping	2017-07-10 15:16:16 -07:00
David Kelly	b87d69b15d	Insure spectator camera preview is up when reopening tablet	2017-07-10 13:16:08 -07:00
Dante Ruiz	89a072cfee	fixed hmd keyboard for goto	2017-07-10 19:05:07 +01:00
David Kelly	1c9c36a8c8	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreview	2017-07-10 10:22:31 -07:00
David Kelly	4843b91f47	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-10 09:50:17 -07:00
druiz17	6e44c95d53	Merge pull request #10906 from druiz17/audio-qml-fix ... Made the output audio listview dynamically change height base on content size	2017-07-07 16:48:15 -07:00
Zach Fox	dbb48cd1aa	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-07 16:03:04 -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
Seth Alves	fc8b7c7cc5	Merge pull request #10904 from druiz17/window-root-spam ... fixed log spamming from windowRoot.qml in toolbar mode	2017-07-07 07:17:08 -07:00
Zach Fox	ee9cdaff90	Set admin status even if QML can't find user in PAL	2017-07-06 23:26:40 -07:00
David Kelly	b41c470064	first cut, still stereo	2017-07-06 15:59:24 -07:00
Dante Ruiz	1ac415aa14	dynamic listview height	2017-07-06 23:50:32 +01:00
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	b0130896d1	fixed spamming from windowRoot.qml	2017-07-06 22:01:08 +01: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
David Rowe	cfd155c198	Merge branch 'master' into 21418	2017-07-06 16:56:10 +12:00
Dante Ruiz	6c15dffb9d	added new glyph	2017-07-06 00:45:59 +01:00
Zach Fox	39bdc20b4f	On checkbox language change	2017-07-05 16:13:36 -07:00
Zach Fox	f6583a1b87	Use correct text color for checkboxes	2017-07-05 14:46:59 -07:00
Zach Fox	0af53bb4a5	Instructions and cool static :)	2017-07-05 14:46:59 -07:00
Zach Fox	aea5779ed6	When a display texture isn't set, show preview instructions	2017-07-05 14:46:58 -07:00
Zach Fox	44cb48b17d	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-05 09:59:57 -07:00
David Kelly	373bd0cc8a	aspect ratio preserved upon blitting, minor qml tweak, warnings fixed	2017-07-03 14:23:23 -07:00
David Kelly	5f015ec77f	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-07-03 13:57:25 -07:00
Zach Fox	9411c2e732	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-03 10:24:02 -07:00
Dante Ruiz	063984f573	Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update	2017-07-03 16:44:47 +01:00
David Kelly	073eae39b2	timer now resumes when visible again	2017-06-30 18:44:32 -07: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
David Rowe	07697c5083	Merge branch 'master' into 21418 ... # Conflicts: # interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml # interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml Removed stray "Vive Controller Picks" configuration item which no longer exists.	2017-07-01 11:19:00 +12:00
Brad Davis	31d2c9980e	Merge pull request #10797 from ctrlaltdavid/21396 ... Make Leap Motion a plugin	2017-06-30 14:37:23 -07:00
David Kelly	09d959bdeb	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-06-30 14:16:01 -07:00
Zach Fox	e66b4f1761	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-30 10:12:24 -07:00
Dante Ruiz	a7e4dc1473	clean up code	2017-06-28 23:51:00 +01:00
David Rowe	be0e1a75a4	User-friendly SDL2 controller name	2017-06-29 10:03:58 +12:00
Dante Ruiz	a2df2f8472	added user activity status	2017-06-28 19:52:19 +01:00
David Kelly	b73102d063	Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview	2017-06-28 08:57:04 -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
Zach Fox	5d8d2fd83e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-27 16:47:44 -07: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
David Rowe	72d712ac76	Add "enabled" setting for Sixense; bail in update if note enabled	2017-06-26 16:43:06 +12:00
David Rowe	31714675c3	Remove unused Sixense preference and associated methods	2017-06-26 16:14:57 +12:00
David Rowe	361bc1ce03	Add "enabled" setting for SDL2 joystick; bail in update if not enabled	2017-06-26 16:00:18 +12: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
Zach Fox	a1dfbc91da	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-06-22 10:27:52 -07:00
Zach Fox	a4a4ba817f	Fixup merge - whoops	2017-06-22 10:27:28 -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
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