2791 commits

Author	SHA1	Message	Date
Wayne Chen	a00d6ec9f6	removing debug statement	2019-03-04 19:42:30 -08:00
Wayne Chen	0f2792930a	adding switches and buttons to testing audio	2019-03-04 19:28:12 -08:00
Wayne Chen	a68aaaa7a4	adding timer and ui color changes	2019-03-04 16:06:50 -08:00
Wayne Chen	4187104b17	culling mute state	2019-03-04 14:12:09 -08:00
Seth Alves	9614216006	don't disable server echo when audio qml page is closed	2019-03-04 13:47:55 -08:00
Seth Alves	d5e8cba1ee	make server-audio-loopback button work in HMDs	2019-03-04 13:47:55 -08:00
Seth Alves	6ee236e783	added a button to enable server loopback of audio	2019-03-04 13:47:55 -08:00
Seth Alves	3ecd86caee	add a way to disble muted warning from audio panel. ... fix positioning of warning. hide warning when removing timer.	2019-03-04 13:47:55 -08:00
Wayne Chen	028cce5394	change short username to 14 characters, displaying as normal text	2019-02-26 12:26:50 -08:00
Wayne Chen	650b34c463	adding clock	2019-02-25 18:00:56 -08:00
Brad Davis	d60dcb99d2	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-19 12:37:30 -08:00
Howard Stearns	d7d6ff53ca	Merge pull request #14765 from howard-stearns/artist-stocking-inventory ... Case 20657: artist stocking inventory	2019-02-19 10:46:01 -08:00
Howard Stearns	e9b323a807	fix HFC symbol location at checkout, and the display of unavailable items	2019-02-15 16:56:31 -08:00
John Conklin II	4520236873	Merge pull request #14917 from thoys/feat/avatarTools/avatarDoctor ... Case 21012: Avatar Doctor	2019-02-15 15:43:18 -08:00
Howard Stearns	f16eb1c029	Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory	2019-02-15 15:15:13 -08:00
Thijs Wenker	e900d3784b	fixes	2019-02-15 23:58:42 +01:00
Roxanne Skelly	2c4f485079	QmlMarketplace invert arrow direction on sort.	2019-02-15 12:31:01 -08:00
Thijs Wenker	74ce98a075	Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarDoctor	2019-02-15 20:57:20 +01:00
Thijs Wenker	556a55ff16	Better scale and texture checks	2019-02-15 20:55:27 +01:00
Roxanne Skelly	fb524f8900	Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace	2019-02-15 11:35:06 -08:00
Howard Stearns	490ef3542e	update for marketplace-in-qml, and make specific to username	2019-02-15 10:58:09 -08:00
Brad Davis	0b171ffe13	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-15 10:31:04 -08:00
Howard Stearns	30c0dda9ed	Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory	2019-02-15 09:27:48 -08:00
Simon Walton	748747da2d	Merge pull request #14864 from SimonWalton-HiFi/pal-sort-loudness-persist ... Case 19724: If sorting PAL by loudness re-sort upon loudness updates	2019-02-15 09:24:34 -08:00
Brad Davis	292602afd7	Resolving more master differences	2019-02-14 12:55:28 -08:00
Brad Davis	0f4d1f073b	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-14 12:49:56 -08:00
Sam Gateau	969c62d0df	Merge pull request #14907 from danteruiz/fix-qml-crash-on-mac ... Case 21157: Fix Desktop.qml crash on local mac build	2019-02-14 12:15:50 -08:00
Thijs Wenker	3026fd625a	Avatar Doctor	2019-02-14 18:52:50 +01:00
danteruiz	a111aa1724	fix blocks app	2019-02-12 16:45:45 -08:00
Shannon Romano	10e5e9e0c3	Merge pull request #14900 from MarkBrosche/avatarAppKeyboardFix ... Fixed MS21059: Avatar App Keyboard Raise in Desktop	2019-02-12 15:02:28 -08:00
Brad Davis	db121957d2	Merge remote-tracking branch 'upstream/master' into feature/quest	2019-02-12 15:00:03 -08:00
Roxanne Skelly	a82221d2a5	Case 21118 - descending sorts don't work in new (qml) marketplace	2019-02-12 13:20:47 -08:00
Brad Davis	a6f23f48d6	Merge branch 'feature/quest_custom_plugins' into feature/quest	2019-02-12 09:53:12 -08:00
Mark	9d81ace243	Fixed MS21059: Avatar App Keyboard Raise in Desktop	2019-02-12 09:45:51 -08:00
Simon Walton	73296aa986	Change update rate to 1 Hz	2019-02-11 16:59:18 -08:00
Simon Walton	4f2223ced3	Change max update to 10 Hz	2019-02-11 14:17:55 -08:00
Roxanne Skelly	4f8de7ed0b	Case 21123, Case - marketplace license display has weird crud in it (new qml version)	2019-02-11 12:48:04 -08:00
Roxanne Skelly	a0199c5884	Case 21119, 21120 ... Case 21119 - text filter doesn't change as you type in new (qml) marketplace Case 21120 - text filter doesn't clear in new (qml) marketplace	2019-02-11 12:27:02 -08:00
Simon Walton	44c163b7cc	Tweak inventory-delete message to be more accurate	2019-02-11 10:30:51 -08:00
Brad Hefta-Gaub	a23f436a9f	Merge pull request #14880 from kencooke/audio-meter-improvements ... Case 21091: Improved audio metering	2019-02-08 19:08:31 -08:00
Roxanne Skelly	93665fa501	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-02-08 14:21:29 -08:00
Ken Cooke	5681a996a1	Fix meter color gradient, to encourage proper mic levels. ... High levels are now yellow, actual digital clipping sets red indicator light.	2019-02-07 16:33:41 -08:00
Ken Cooke	d2abf1a56d	Add "clipping" indicator to audio level meter	2019-02-07 15:52:29 -08:00
Ken Cooke	52aa20b4d5	Add "gated" indicator to audio level meter	2019-02-07 15:47:56 -08:00
Roxanne Skelly	4bbb030ad7	Show only free items when running from the oculus store	2019-02-07 15:34:44 -08:00
danteruiz	d71fb2a100	moved missed QtWebEngine references to +webengines	2019-02-07 14:57:25 -08:00
Roxanne Skelly	c775a9b23f	Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace	2019-02-07 13:23:59 -08:00
Roxanne Skelly	d04445c244	Qml Marketplace - remove some quest incompatibilities and disable ... links for quest	2019-02-07 13:22:49 -08:00
danteruiz	95d30e5cbf	Merge branch 'master' of github.com:highfidelity/hifi into feature/quest	2019-02-07 10:41:44 -08:00
Sam Gateau	632d6e8a73	Merge pull request #14863 from danteruiz/android-apps-directories ... Case 20877: Support CMake time configuration of QmlFileSelectors	2019-02-07 09:30:49 -08:00