8200 commits

Author	SHA1	Message	Date
Andrew Meadows	355de0e6d5	move Application::setFailedToConnect() to cpp for easier debugging	2019-06-26 15:41:01 -07:00
Sam Gateau	35d7211aca	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-21 11:38:33 -07:00
Sam Gateau	a856fdb3ca	getting rid of the resolution Scale on the display plugin	2019-06-21 10:36:25 -07:00
amer cerkic	67e42148ef	Merge branch 'master' of https://github.com/highfidelity/hifi	2019-06-21 09:43:33 -07:00
Sam Gateau	69bb9ac0b6	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-06-20 22:23:15 -07:00
Sam Gateau	22cd631a04	Merge And Modifying the Graphics settings and the dev menu	2019-06-20 17:48:36 -07:00
amer cerkic	1218f7e014	moved audioclient stop to dtor	2019-06-20 15:10:21 -07:00
Andrew Meadows	cd9b450475	re-expose mic and camera to disable crash	2019-06-20 15:03:15 -07:00
Sam Gateau	b5e4a47375	Proper allocation of the resource in forward and starting to remove the ui as we have it	2019-06-19 17:33:26 -07:00
Andrew Meadows	eee52deefe	destroy WebSurfaces on shutdown	2019-06-12 16:07:15 -07:00
Shannon Romano	453085f992	Merge pull request #15741 from huffman/feat/set-and-get-bookmarks ... BUGZ-484: Add --setBookmark and getAddress API	2019-06-11 15:31:41 -07:00
Ryan Huffman	a1b7392854	Add --setBookmark and getAddress API	2019-06-11 14:10:09 -07:00
dante ruiz	01fab12942	fixing interface and laucnher script argument	2019-06-11 09:18:20 -07:00
Shannon Romano	69094aa8f3	Merge pull request #15715 from kencooke/audio-injecctor-shutdown-crashfix ... BUGZ-399: Fix shutdown crash in AudioInjectorManager::stop()	2019-06-10 10:12:26 -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
Ken Cooke	9d57f5ac62	Defer DependencyManager::destroy<AudioInjectorManager>() until all ScriptAudioInjectors have been destroyed	2019-06-07 18:35:39 -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
amer cerkic	f2c6cb79f7	if formatting	2019-06-07 14:17:49 -07:00
amer cerkic	fd7dd7948f	reverted vs spacing changes	2019-06-07 13:41:14 -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
Seth Alves	06436e6a7d	quiet build warning	2019-06-04 13:00:26 -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
SamGondelman	e29bf376a4	fix address manager crash	2019-05-31 14:01:58 -07:00
sabrina-shanman	fa79d0ec18	Fix Application not checking window minimize state properly	2019-05-31 11:36:52 -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	bf7617ea8e	INtroducing the PerformanceManager	2019-05-29 15:47:14 -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
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
Andrew Meadows	5988f8cce6	avoid calling removeOwnershipData() from multiple threads	2019-05-24 16:12:21 -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
luiscuenca	8db3d03772	add display name as param	2019-05-23 10:21:47 -07:00
Howard Stearns	f1e8343b30	put DomainServerCheckIn on NodeList thread	2019-05-17 14:30:30 -07:00
Sam Gateau	ffbe055fa8	Merge pull request #15569 from SamGondelman/switch ... BUGZ-187: Proper Render Scripting Interface with renderMethod property	2019-05-16 18:29:18 -07:00
Brad Hefta-Gaub	1ac1735d55	Merge pull request #14533 from SamGondelman/oculusHome ... Case 22439: Fix HMD auto switch detection	2019-05-16 16:26:04 -07:00
SamGondelman	451c52fa47	merge with master	2019-05-16 16:02:52 -07:00
SamGondelman	fee20d9e46	render scripting interface + renderMethod control	2019-05-16 16:01:21 -07:00
Sam Gateau	6b3707873b	Merge pull request #15562 from jherico/bugz-133 ... BUGZ-133: Expose additional functionality to QML/Scripts	2019-05-16 12:03:22 -07:00
Brad Davis	9bcc23f0c4	PR comments	2019-05-16 09:40:22 -07:00
Brad Davis	5db78ef2e1	Add scripting to set the refresh rate	2019-05-15 12:55:25 -07:00
Zach Fox	966965af5b	Merge pull request #15538 from zfox23/simplifiedUI ... Simplified UI v1	2019-05-14 17:45:30 -07:00
Roxanne Skelly	68fb43ec7f	Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug	2019-05-14 10:11:02 -07:00
Zach Fox	c57ddf969a	Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI	2019-05-14 09:32:07 -07:00
Shannon Romano	8597a51657	Merge pull request #15556 from jherico/fix/watchdog_spam ... BUGZ-131: Additional silencing of watchdog spam	2019-05-14 08:10:02 -07:00