3070 commits

Author	SHA1	Message	Date
Zach Fox	e1c198903d	Merge pull request #15973 from zfox23/fixGatedLog ... BUGZ-972: Fix errant log involving 'gated' property	2019-07-24 11:19:02 -07:00
Zach Fox	03b5f9f7f8	BUGZ-972: Fix errant log involving 'gated' property	2019-07-24 10:18:03 -07:00
Zach Fox	b918979fab	DEV-301: Adjust size of VR-mode header icon	2019-07-24 10:02:26 -07:00
milad	a3b8ded56a	changed sessionDisplayName logic	2019-07-17 14:17:58 -07:00
Zach Fox	1cd136f178	Fix BUGZ-814 in VR mode: Add a top margin to tablet graphics settings	2019-07-16 15:15:08 -07:00
Zach Fox	5828f46c6b	Incorrect ID fixed - thanks Milad	2019-07-12 12:27:55 -07:00
Zach Fox	e0392642f7	Don't enable supersampling from graphics settings	2019-07-12 11:18:34 -07:00
Zach Fox	56a55efbb3	Fix a quick renderer bug	2019-07-11 16:12:40 -07:00
Zach Fox	4c7d0fc6f4	Updated layout	2019-07-11 14:46:05 -07:00
Zach Fox	ce2b7e5baa	Finish all of the logic and most of the layout	2019-07-11 12:05:13 -07:00
Zach Fox	2471a3eb72	Merge branch 'master' of github.com:highfidelity/hifi into newGraphicsSettings	2019-07-11 09:02:42 -07:00
Zach Fox	4caa00d6cc	Start BUGZ-814: Start working on a new Graphics dialog for Metaverse version of Interface	2019-07-10 16:42:48 -07:00
Howard Stearns	7eaa29c147	Merge pull request #15904 from howard-stearns/new-account-wallets-in-simplified-ui ... new-account wallets in simplified UI	2019-07-10 15:09:59 -07:00
Howard Stearns	4191c37f6e	indentation	2019-07-09 14:48:17 -07:00
Howard Stearns	79a3d45eae	new-account wallets in simplified UI	2019-07-09 14:25:11 -07:00
Zach Fox	d622e53458	Some comments; changed the code to be backwards compatible	2019-07-08 17:10:11 -07:00
Zach Fox	5048b8bd89	Implement DEV-218 & DEV-219 and commit a starting point for the Emote app	2019-07-08 16:46:58 -07:00
Zach Fox	243733028b	Merge pull request #15891 from zfox23/SUI/audioIOAboutSwitch ... BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About	2019-07-05 12:59:56 -07:00
Zach Fox	38ad93a7ed	BUGZ-917: Fix log spam in NameCard.qml due to errant line of code	2019-07-05 12:24:05 -07:00
Zach Fox	4223800af7	BUGZ-923: Fix an edge case in Audio I/O devices in Settings -> About	2019-07-05 12:17:28 -07:00
Zach Fox	1f54f3c159	BUGZ-911: Place selected audio I/O information in About tab and in 'Copy to Clipboard' clipboard text	2019-07-03 12:49:23 -07:00
Zach Fox	73db19464f	DEV-194: Iterate on PTT Ducking Slider design	2019-07-01 11:28:48 -07:00
Zach Fox	8af469992e	BUGZ-858: Implement 'Reduce Other Volume While Pushing-to-Talk' option	2019-06-27 15:55:58 -07:00
Zach Fox	6e4b9c1723	Merge pull request #15774 from PrestonB1123/iconChanges ... New Top Bar Icons	2019-06-26 11:01:12 -07:00
Preston Bezos	f0dd28e71a	removed extra line	2019-06-26 09:54:43 -07:00
Preston Bezos	bd3fe8a092	fixed conflict and spacing	2019-06-26 09:12:32 -07:00
Zach Fox	b7a3d82f0f	DEV-170: Increase the speed of the animation when clicking between tabs in Settings	2019-06-25 11:30:25 -07:00
Preston Bezos	1481c7424f	changed ptt muted icon	2019-06-25 11:02:44 -07:00
Preston Bezos	5686f51171	fixed hmd settings buttons spacing	2019-06-25 09:19:30 -07:00
Zach Fox	3e2e020731	BUGZ-746: About tab: Better CPU/GPU info reporting; New copied info (including OS version)	2019-06-24 12:48:13 -07:00
RebeccaStankus	30dd667b17	Changed qml import method	2019-06-19 10:40:32 -07:00
RebeccaStankus	feaea12b24	Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles	2019-06-19 10:14:04 -07:00
Zach Fox	18f703ee43	BUGZ-732: Enable text selection by mouse in Profile/Display Name field	2019-06-18 14:11:14 -07:00
Zach Fox	f6822f17a9	Add computer description	2019-06-18 12:43:45 -07:00
Zach Fox	bd02a5eafd	Better text formatting	2019-06-18 12:29:52 -07:00
Zach Fox	4670c11397	Tighten up the graphics on level 3	2019-06-18 12:26:03 -07:00
Zach Fox	ec4fc672b6	Better design; Interface version	2019-06-18 12:09:37 -07:00
Zach Fox	34def0fd6b	DEV-145: About screen for platform info	2019-06-18 11:09:15 -07:00
RebeccaStankus	cd508a5475	Merge branch 'master' of github.com:highfidelity/hifi into migrateEditFiles	2019-06-18 09:10:41 -07:00
RebeccaStankus	5a49ac9a22	moved files	2019-06-17 16:45:54 -07:00
Zach Fox	32aec78ea2	Merge pull request #15782 from zfox23/SUI/resizeSignal ... BUGZ-699: Make PSFListModel fetch early when making container bigger	2019-06-17 15:27:21 -07:00
Zach Fox	9cb4ad61ee	BUGZ-699: Make PSFListModel fetch early when making container bigger	2019-06-17 15:06:20 -07:00
Preston Bezos	538b15dd57	caught a couple of edge cases for mic states	2019-06-17 13:20:25 -07:00
Preston Bezos	7879dbf687	changed width of ptt muted icon	2019-06-17 13:13:43 -07:00
Zach Fox	1d2ed1985f	DEV-142 & DEV-140: Scrollbars in Your Profile and Settings	2019-06-17 12:35:45 -07:00
Preston Bezos	bd78dd96a0	replaced icons with icons that are on the whole pixel so as not to cause blur	2019-06-17 11:05:47 -07:00
Preston Bezos	a954ef6068	Merge branch 'master' of github.com:highfidelity/hifi into iconChanges	2019-06-17 10:43:43 -07:00
Preston Bezos	d9f1aa73ba	switched top bar icons and changes input device meter to be in icon instead of in bar	2019-06-17 09:12:32 -07:00
Zach Fox	503fc18d70	Make this slightly more robust	2019-06-13 16:08:29 -07:00
Zach Fox	fcda85a3d1	Merge pull request #15759 from zfox23/SUI/autoSwitchAvatar2 ... BUGZ-658: Don't let the user switch avatar models to Woody	2019-06-13 10:55:55 -07:00