29503 commits

Author	SHA1	Message	Date
Anna	fd872009fe	added workaround for bug in Qt StackView push method	2019-06-10 09:25:12 -07:00
Anna	67775c59f1	Merge branch 'master' of github.com:highfidelity/hifi	2019-06-10 08:55:48 -07:00
Shannon Romano	e213fd6b5e	Merge pull request #15712 from amerhifi/master ... case BUGS:560 . wrapping dependencyManager::get<ddeFacetracker>with ifdef	2019-06-07 18:59:34 -07:00
Anthony Thibault	d6331d1bf6	Merge pull request #15714 from hyperlogic/bug-fix/settings-on-tablet ... Fix crash using Settings in the Tablet in VR	2019-06-07 18:15:56 -07:00
Anna	0b282b201c	typo fix	2019-06-07 18:01:47 -07:00
Anthony J. Thibault	00bba828ee	Fix crash using Settings in the Tablet in VR ... This was introduced in Qt5.12.3. There are several issues in their bug tracker about this issue. https://bugreports.qt.io/browse/QTBUG-75516 https://bugreports.qt.io/browse/QTBUG-75335 To workaround this, we call Qt.createComponent() manually, instead of letting StackView do it for us.	2019-06-07 16:41:56 -07:00
PrestonB1123	059d931d17	Merge pull request #15711 from PrestonB1123/removingShortcuts ... DEV-108: Removed ctrl+b and ctrl+n as shortcuts	2019-06-07 16:26:38 -07:00
amer cerkic	b57e4869c8	removed debug info	2019-06-07 16:26:21 -07:00
amer cerkic	da071abd8b	wrapping the dependencyManager::get<> call with ifdef to prevent the log from constantly spitting out that instance does not exist	2019-06-07 16:25:04 -07:00
Preston Bezos	a0753f6393	removed ctrl+b and ctrl+n as shortcuts	2019-06-07 15:41:44 -07:00
Shannon Romano	e4b26656d4	Merge pull request #15703 from amerhifi/master ... case : BUGZ 560: disabling dde initialization due to random crashes while closing down…	2019-06-07 15:15:46 -07:00
amer cerkic	f2c6cb79f7	if formatting	2019-06-07 14:17:49 -07:00
amer cerkic	049ff8e618	fixed last space	2019-06-07 14:11:13 -07:00
amer cerkic	c61f0bcf3e	more vs cleanup	2019-06-07 14:07:06 -07:00
amer cerkic	64534913af	more vs changes udo	2019-06-07 13:59:18 -07:00
amer cerkic	fd7dd7948f	reverted vs spacing changes	2019-06-07 13:41:14 -07:00
amer cerkic	9498e0a462	addressing comment concerning preferences	2019-06-07 12:47:04 -07:00
Preston Bezos	e89f499c1a	this should work	2019-06-07 12:02:15 -07:00
Preston Bezos	4eccb7a124	Revert "made one more change to get rid of ubuntu warning" ... This reverts commit e7255298de.	2019-06-07 12:00:36 -07:00
Preston Bezos	e7255298de	made one more change to get rid of ubuntu warning	2019-06-07 11:59:26 -07:00
Preston Bezos	27de181d0c	Merge branch 'master' of github.com:highfidelity/hifi into logspam	2019-06-07 11:54:48 -07:00
Preston Bezos	ad562b8f91	really need to stop clanging myself	2019-06-07 11:22:11 -07:00
Preston Bezos	e63d98e137	fixed a couple of doc errors and accounted for some edge cases	2019-06-07 11:09:21 -07:00
Preston Bezos	3ab4be6b8d	I got clanged	2019-06-07 10:42:31 -07:00
amerhifi	b1df463f56	disabling dde initialization due to random crashes while closing down the socket connection on mac	2019-06-07 10:16:36 -07:00
Shannon Romano	1e827a925a	Merge pull request #15699 from SamGondelman/avatarPick ... BUGZ-373, BUGZ-407: Put avatar spheres in R3 in simulation	2019-06-07 09:59:42 -07:00
SamGondelman	3bb645b2d7	put avatar spheres in r3 in simulation	2019-06-06 17:17:18 -07:00
PrestonB1123	f3f0c4de43	Merge pull request #15688 from PrestonB1123/PushToTalk ... DEV-94: Push to Talk	2019-06-06 16:49:08 -07:00
Sam Gateau	4c18ce7ae6	Merge pull request #15693 from sabrina-shanman/bug_avatar_res-state ... (BUGZ-559) Improve transition debugging and transition clean-up	2019-06-06 16:35:04 -07:00
Preston Bezos	a7a765b025	added a couple more notifies and fixed a couple of jsdocs	2019-06-06 16:23:54 -07:00
Zach Fox	b737e31421	Merge pull request #15696 from zfox23/emitWhenDocking ... Fix BUGZ-201: Prevent MUTED banner from being cut off when muted on startup	2019-06-06 15:45:32 -07:00
Preston Bezos	36e1366cc4	added Notifies to various QProperties in order to remove warnings in interface logs	2019-06-06 14:51:43 -07:00
Zach Fox	a7ad087bd0	Fix BUGZ-201: Prevent MUTED banner from being cut off when muted on startup	2019-06-06 14:23:18 -07:00
Sabrina Shanman	73ac38a6a6	Merge pull request #15686 from samcake/nut ... BUGZ-442: Adding extra check when setting Performance & render api enums	2019-06-06 13:58:09 -07:00
sabrina-shanman	971d563f49	Add debug icons for transitions	2019-06-06 13:25:06 -07:00
sabrina-shanman	833946ceb3	Clean up transition naming	2019-06-06 13:25:06 -07:00
Sam Gateau	ae4edebcbc	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-06-06 12:29:33 -07:00
Zach Fox	fa2217c188	DEV-113: Remove headphones icon from status indicator in top bar	2019-06-06 12:20:43 -07:00
Preston Bezos	2592784814	Changed InputDeviceButton to unmute on push and hold while in push to talk mode	2019-06-06 09:19:32 -07:00
Sam Gateau	afdc323622	Merge branch 'nut' of github.com:samcake/hifi into nut	2019-06-05 17:56:34 -07:00
Sam Gateau	9bc6c3bfcd	INtroduce range check for int value against the several enums we exposed through the js api for REnder and PErformance settings	2019-06-05 17:56:14 -07:00
Shannon Romano	7e572cbfbc	Merge pull request #15682 from zfox23/NUI/systemSoundsLabel ... BUGZ-530: Rename 'System Sounds' to 'UI FX'	2019-06-05 15:16:42 -07:00
Zach Fox	326d1615e0	Change old UI too	2019-06-05 14:07:10 -07:00
Zach Fox	0ba849d65b	BUGZ-530: Rename 'System Sounds' to 'UI FX'	2019-06-05 13:25:28 -07:00
David Rowe	6299d38673	Distinguish between Uuid API and Uuid type in JSDoc	2019-06-05 14:39:05 +12:00
Seth Alves	c5eb9c03d5	fix uninitialized read	2019-06-04 13:00:26 -07:00
Seth Alves	06436e6a7d	quiet build warning	2019-06-04 13:00:26 -07:00
Sam Gateau	f51e491d85	Removing the atomics and fixing mistakes pointed out inreview	2019-06-04 10:11:12 -07:00
Sam Gateau	2a4d0cfaec	Addressing the initialization bug not applying REnderMethod properly, Adjusting RefrehRateProfile to Realtime in High performancePreset	2019-06-03 18:06:28 -07:00
Sam Gateau	db04f61c5b	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-06-03 09:37:13 -07:00