4683 commits

Author	SHA1	Message	Date
Wayne Chen	4658e34b4b	update indent spacing	2019-03-25 11:29:27 -07:00
Wayne Chen	1952ad4be6	Merge branch 'master' into audio-mixer-volume-control	2019-03-25 11:28:14 -07:00
Wayne Chen	e9253a630b	Merge pull request #15211 from wayne-chen/fixAudioSettingsScreen-master ... Case 21781: show up audio screen using Settings > Audio	2019-03-25 11:25:42 -07:00
Wayne Chen	7b5c379bb9	Merge pull request #15182 from wayne-chen/fixAudioSettingsScreenScrolling ... Case 21717: adding scrolling in audio settings window	2019-03-25 11:25:30 -07:00
Ken Cooke	b5e8176b0f	Merge branch 'master' into audio-mixer-volume-control	2019-03-23 16:15:29 -07:00
Ken Cooke	649bb92e6c	Prototype an updated Audio tab with 3 independent volume controls	2019-03-23 16:00:02 -07:00
Roxanne Skelly	efffb8b819	Merge pull request #15239 from roxanneskelly/Case20617 ... Case 20617 - People app filter bar breaks when deleting connections	2019-03-22 11:31:46 -07:00
Shannon Romano	9f19ee61e2	Merge pull request #15236 from howard-stearns/termsofservice ... update terms of service links	2019-03-21 19:35:34 -07:00
Sam Gondelman	04ecdb463f	Merge pull request #15173 from SamGondelman/audio ... Case 21457, Case 16836, Case 15782: Improve AudioInjector threading	2019-03-21 18:03:58 -07:00
Shannon Romano	b82c808562	Merge pull request #15207 from danteruiz/kick-ui ... Case 21771: Possible Entity Scipt Ban Incident	2019-03-21 13:10:54 -07:00
Roxanne Skelly	87d75ec75c	Case 20617 - People app filter bar breaks when deleting connections	2019-03-21 12:08:42 -07:00
Howard Stearns	5888adfd90	update terms of service links	2019-03-20 17:08:42 -07:00
Shannon Romano	e256c34823	Merge pull request #15191 from roxanneskelly/Case21467 ... Case 21728 - tab in marketplace search bar causes an update of search results	2019-03-20 14:22:10 -07:00
Shannon Romano	a6d4f98ee7	Merge pull request #15204 from roxanneskelly/Case21025 ... Case 21025 conditionalizing TabletWebView features	2019-03-20 14:21:37 -07:00
Shannon Romano	4ac25121e0	Merge pull request #15190 from roxanneskelly/Case20393 ... Case20393 - Add item counts to interface categories	2019-03-19 17:53:30 -07:00
Roxanne Skelly	27fa0dc4c6	CR fixes	2019-03-19 17:24:19 -07:00
Roxanne Skelly	ab61f65ea2	CR fix	2019-03-19 17:08:04 -07:00
Roxanne Skelly	94739aa7c7	Case 21769 - updatable items not showing up as updatable ... after clicking 'show updates' button.	2019-03-19 13:44:16 -07:00
Roxanne Skelly	b6e583087e	Stand-alone Tagging: tagged places not coming first in GOTO list	2019-03-18 17:40:01 -07:00
Roxanne Skelly	fe28eaca7c	fix typo	2019-03-18 11:23:48 -07:00
Wayne Chen	db22fa9eec	show up audio screen using Settings > Audio	2019-03-18 09:23:17 -07:00
danteruiz	5f3e31b119	add ui to kick api	2019-03-15 18:15:18 -07:00
Roxanne Skelly	9182db8bd4	Case 21025 conditionalizing TabletWebView features	2019-03-15 12:56:43 -07:00
Roxanne Skelly	b220b76874	Merge branch 'master' of https://github.com/highfidelity/hifi into Case21467	2019-03-14 13:05:08 -07:00
Roxanne Skelly	f971d17acc	Merge branch 'master' of https://github.com/highfidelity/hifi into Case20393	2019-03-14 12:36:42 -07:00
Roxanne Skelly	4470cf9ae5	Marketplace category dropdown UI tweaks	2019-03-14 12:35:54 -07:00
Wayne Chen	10eae54d8c	changing content height and snap mode to allow scroll	2019-03-14 12:08:08 -07:00
Wayne Chen	a3dfd09e26	adding scrolling in audio settings window	2019-03-13 17:03:53 -07:00
Roxanne Skelly	c3ecc29c4b	Merge branch 'master' of https://github.com/highfidelity/hifi into Case20393	2019-03-13 16:04:34 -07:00
Roxanne Skelly	559351a6eb	Case 21701 - Items were showing up in marketplace as "updates" when they ... weren't	2019-03-13 15:33:46 -07:00
Roxanne Skelly	42bf812019	Case 21704 - marketplace button formatting fixes	2019-03-13 15:03:29 -07:00
Roxanne Skelly	822e5ceb98	Case 21703 - Disable SUBMIT before balance is retrieved ... to prevent sending a send-money request with too large of a balance	2019-03-13 13:42:55 -07:00
Roxanne Skelly	2dc38df779	Case 20393 - Display item counts in categories dropdown in Marketplace	2019-03-13 10:17:39 -07:00
SamGondelman	609c4ab52e	try to fix audio injector threading issues	2019-03-12 18:41:43 -07:00
Wayne Chen	6b82b8cd7f	fix for steam complete profile bug	2019-03-12 17:55:14 -07:00
Shannon Romano	95bdf29f35	Merge pull request #15151 from roxanneskelly/Case20622 ... Case 20622 - Qml Marketplace - Fix categories dropdown UI issues	2019-03-12 17:42:47 -07:00
Wayne Chen	0279373d11	Merge branch 'master' into ptt	2019-03-11 17:09:37 -07:00
Wayne Chen	80821e8b7e	changing mic bar indicator when muted in PTT	2019-03-11 16:15:47 -07:00
Wayne Chen	ca5ff3381b	changing position of the mute warning setting	2019-03-11 16:02:18 -07:00
Wayne Chen	36c2358dc0	Merge branch 'master' into muteWarningModified	2019-03-11 14:35:13 -07:00
Roxanne Skelly	c9cb284c19	Case 21467 - only update search when search field content has changed	2019-03-11 14:33:00 -07:00
Shannon Romano	801306364a	Merge pull request #15148 from samcake/rc81-hero ... Case 21639: RC81: Adding Hero support in simulation of avatars	2019-03-11 14:13:49 -07:00
r3tk0n	8aedc98a58	Fix QML formatting issue.	2019-03-11 10:54:48 -07:00
r3tk0n	c1ed01115d	Fix logic for HMD vs Desktop.	2019-03-11 09:58:35 -07:00
Wayne Chen	cf3694e8e3	fixing error in master + getting ptt to show up	2019-03-10 19:00:41 -07:00
Wayne Chen	15eb90f634	Merge pull request #16 from wayne-chen/pttSwitchToItem ... fixng ptt checkbox	2019-03-10 17:18:47 -07:00
Wayne Chen	54973375a4	fixng ptt checkbox	2019-03-10 17:18:18 -07:00
Wayne Chen	3dcc53a945	Merge branch 'master' into ptt	2019-03-10 17:14:54 -07:00
Wayne Chen	2eaa1e63d3	switch from column layout to item	2019-03-10 17:07:02 -07:00
Sam Gateau	3464fe09c1	Applying the hero changes to master soon to be rc81	2019-03-08 18:13:20 -08:00