29553 commits

Author	SHA1	Message	Date
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
Sam Gateau	07ddc535a0	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-06-07 09:32:50 -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	d406e52d71	Messing around	2019-06-06 16:37:49 -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
David Rowe	beb70988c3	Tablet and related JSDoc	2019-06-07 08:34:53 +12: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
David Rowe	caf29dc45a	Doc review	2019-06-06 11:24:10 +12: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
David Rowe	f91c6dec3a	Miscellaneous fixes noticed in passing	2019-06-05 08:38:52 +12:00
David Rowe	231d1373b6	Update MyAvatar, Avatar JSDoc per recent changes	2019-06-05 08:38:34 +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
Sam Gateau	54d1705f06	Testing a different approach	2019-05-31 18:42:26 -07:00
Sam Gondelman	d94b685c94	Merge pull request #15661 from SamGondelman/avatarCrash ... BUGZ-478: Fix address manager crash	2019-05-31 16:01:07 -07:00
Brad Hefta-Gaub	52d02f61a1	Merge pull request #15657 from zfox23/newPerformanceAPI ... BUGZ-447: Use new performance preset API	2019-05-31 15:31:07 -07:00
SamGondelman	e29bf376a4	fix address manager crash	2019-05-31 14:01:58 -07:00
Zach Fox	aefda30cf9	Merge pull request #15658 from zfox23/homeButton ... DEV-92: Add a Home button to the Avatar app	2019-05-31 13:25:30 -07:00
Brad Hefta-Gaub	f7f17cfbff	Merge pull request #15659 from sabrina-shanman/bug_mac_framerate_minimized ... (BUGZ-416) Fix Application not checking window minimize state properly	2019-05-31 13:22:56 -07:00
Zach Fox	97bd0d5413	Make this work!	2019-05-31 12:50:32 -07:00
Zach Fox	7b04a6d361	Sounds	2019-05-31 12:39:13 -07:00
Zach Fox	8b085c79ad	Can't use window.location in QML	2019-05-31 12:36:28 -07:00
Zach Fox	b9b320d01c	DEV-92: Add a Home button to the Avatar app	2019-05-31 11:43:13 -07:00
sabrina-shanman	fa79d0ec18	Fix Application not checking window minimize state properly	2019-05-31 11:36:52 -07:00
Zach Fox	8e5c94abb0	BUGZ-447: New performance preset API	2019-05-31 11:08:51 -07:00
Andrew Meadows	297517c85d	minimize lock duration	2019-05-31 11:06:16 -07:00
Andrew Meadows	5f9262cf5e	change data member names to not poke other devs in the eye	2019-05-31 11:03:11 -07:00
Sam Gateau	4e2480d032	cleaning up case of enum names and aligning the PerformancePreset with the PlatformTier	2019-05-31 00:00:44 -07:00
Sam Gateau	916ff31cf6	adjust the preset options	2019-05-30 17:51:21 -07:00
Andrew Meadows	0c916e0c03	guard MyAvatar::_scriptEngine with mutex	2019-05-30 16:08:47 -07:00
Sam Gateau	bb7a182544	Merge branch 'nut' of github.com:samcake/hifi into nut	2019-05-30 12:03:58 -07:00
Sam Gateau	b88deb52b0	Cleaning up the interface for the Performance PRESET and the associated debug ui	2019-05-30 12:03:44 -07:00
Sam Gateau	3100fe4833	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-05-29 19:11:11 -07:00
Sam Gateau	a212a8a36a	COnnect the profile tier to the performance setting and assign on first run or after reset...	2019-05-29 17:49:17 -07:00
Dante Ruiz	b0ace1c098	Merge pull request #15646 from huffman/feat/get-home-bookmark ... DEV-62: Add getHomeLocationAddress to bookmark API	2019-05-29 17:35:40 -07:00
Sam Gateau	48ecb4265c	re declare q_enum on platformProfile	2019-05-29 16:43:28 -07:00
Sam Gateau	2a42fb16da	Merge branch 'master' of github.com:highfidelity/hifi into nut	2019-05-29 15:56:30 -07:00
Sam Gateau	bf7617ea8e	INtroducing the PerformanceManager	2019-05-29 15:47:14 -07:00
Ryan Huffman	344410ea79	Add getHomeLocationAddress to bookmark API	2019-05-29 15:45:22 -07:00
Simon Walton	ecc3312114	Use unique_ptr for temp signature array	2019-05-29 12:17:07 -07:00
Sam Gateau	aedc631c45	Gathering all the needed settings in one place	2019-05-28 21:55:17 -07:00
Sam Gateau	0862e40b41	Adding ui to debug render settings	2019-05-28 18:01:39 -07:00
Shannon Romano	24049a4321	Merge pull request #15631 from SamGondelman/questKeyboard ... BUGZ-413: Re-enable Quest 3D Keyboard	2019-05-28 15:55:25 -07:00
Shannon Romano	d065847bee	Merge pull request #15638 from samcake/nut ... case BUGZ-191: Implement patform tier profile from platform description	2019-05-28 15:28:05 -07:00
Zach Fox	9c960f901c	Merge pull request #15641 from zfox23/BUGZ-146 ... Fix BUGZ-146: Clicking on the gear icon causes three click sounds	2019-05-28 15:02:23 -07:00
Zach Fox	92b944464a	Fix BUGZ-146: Clicking on the gear icon causes three click sounds	2019-05-28 12:41:58 -07:00
Sam Gateau	546639fdfe	Adding a script and ui to check the values returned by the PlatformInfo ui	2019-05-26 12:30:50 -07:00
Sam Gateau	5001a04326	Updating the platform lib, implementing the first version of the profiler and exposing all these through the PlatformInfoScriptingInterface	2019-05-25 15:53:54 -07:00
Andrew Meadows	5988f8cce6	avoid calling removeOwnershipData() from multiple threads	2019-05-24 16:12:21 -07:00
Amer	9b26f70e2f	Merge pull request #15633 from amerhifi/master ... BUGZ 220: Docked Widget Whitelisting	2019-05-24 15:52:18 -07:00
amerhifi	5a3585ea5b	adressing pr comments	2019-05-24 14:36:42 -07:00
amerhifi	6f04e039fe	adding whitelisting for dockedWidgets	2019-05-24 14:12:24 -07:00
SamGondelman	41e486b120	re-enable quest keyboard	2019-05-24 13:14:54 -07:00
Zach Fox	6cf2145c16	Fix BUGZ-312; BUGZ-311	2019-05-24 12:58:38 -07:00
Zach Fox	51d22c1988	Fix BUGZ-344	2019-05-24 12:12:55 -07:00
Sam Gateau	a5d17883d0	Merge pull request #15602 from SamGondelman/tests ... BUGZ-21, Case 22219: Fix skyboxes/ambient maps on AMD	2019-05-24 11:29:04 -07:00
amerhifi	ee3e2f0dd7	merge master	2019-05-24 11:00:30 -07:00
amerhifi	bd88a68a0f	testing context passing to dockWidget via whitelisting.	2019-05-24 10:58:13 -07:00
Brad Hefta-Gaub	5765957fe1	Merge pull request #15618 from luiscuenca/addCredentials ... Pass tokens as params for automatic login	2019-05-24 09:13:53 -07:00
luiscuenca	050682c84c	Keep logged in after first run	2019-05-23 19:53:37 -07:00
luiscuenca	42c1f4be33	fix typo and entry on first run when --url is set	2019-05-23 17:07:06 -07:00
Shannon Romano	aaf4bef34e	Merge pull request #15625 from zfox23/SUI/BUGZ-336 ... Fix BUGZ-336: Microphone test does not stop unless you press the button to "stop test"	2019-05-23 15:17:37 -07:00
Anthony Thibault	fecd488b4b	Merge pull request #15623 from AndrewMeadows/plug-otherAvatar-resource-leak ... BUGZ 345: avoid resource leak in AvatarManger::_otherAvatarsToChangeInPhysics	2019-05-23 14:51:29 -07:00