6396 commits

Author	SHA1	Message	Date
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
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
Zach Fox	78fdd2d673	Fix BUGZ-336	2019-05-23 14:25:06 -07:00
Zach Fox	da011fd042	Fix BUGZ-312; fix BUGZ-311	2019-05-23 13:37:25 -07:00
Zach Fox	4bbbaa8c19	Merge branch 'master' of github.com:highfidelity/hifi into SUI/audioListFixes	2019-05-23 09:39:38 -07:00
Zach Fox	934ea76966	Merge pull request #15613 from zfox23/SUI/newAudioProperties ... Fix the janky audio output settings UI	2019-05-22 16:45:02 -07:00
Zach Fox	d75fe04038	Fix BUGZ-311	2019-05-22 16:24:40 -07:00
Zach Fox	8df706abcb	Handle the case when the user doesn't have any avatars yet	2019-05-22 15:51:46 -07:00
Zach Fox	3ed47b4f23	Show error states in Avatar app (BUGZ-310)	2019-05-22 15:45:18 -07:00
Zach Fox	46ee148a69	Fix a bug and remove magic numbers	2019-05-22 15:24:33 -07:00
Zach Fox	3a4bf2e8f7	Fix the janky audio output settings UI	2019-05-22 14:27:06 -07:00
Zach Fox	ddb299a387	Merge pull request #15608 from zfox23/SUI/envVol ... Fix environment volume slider (BUGZ-213); optimize sliders	2019-05-22 14:11:57 -07:00
Zach Fox	30c13fd988	Fix environment volume slider (BUGZ-213); optimize sliders	2019-05-22 12:01:38 -07:00
Zach Fox	6f7557b00d	Implement BUGZ-305 and BUGZ-306	2019-05-22 09:56:28 -07:00
SamGondelman	b92e26722c	rebake default skybox	2019-05-21 15:58:46 -07:00
SamGondelman	a672b79cd8	add version to default skybox	2019-05-21 15:35:43 -07:00
Zach Fox	5749392e83	New bg color; Final status indicator design; Fixed HMD icon	2019-05-21 14:10:27 -07:00
Zach Fox	15bdb66943	Integrate Status into top bar; improve Audio settings; improve spacing between settings	2019-05-17 17:25:48 -07:00
Zach Fox	e40e34856b	Remove some extra menus from top bar; Only show VR button if headset connected	2019-05-17 13:28:59 -07:00
Zach Fox	70a4d6e8d5	Implement Performance settings and VR mode top bar switch	2019-05-16 16:15:05 -07:00
Zach Fox	90a5b25600	A bunch of changes here	2019-05-16 14:18:04 -07:00
Zach Fox	a9bc7c8806	Images, not glyphs	2019-05-15 17:14:02 -07:00
Zach Fox	966965af5b	Merge pull request #15538 from zfox23/simplifiedUI ... Simplified UI v1	2019-05-14 17:45:30 -07:00
Howard Stearns	a9635a2c9a	Merge pull request #15551 from roxanneskelly/queueDepthDebug ... Queue depth debugging code	2019-05-14 17:32:53 -07:00
Howard Stearns	ee97e2faa1	Merge pull request #15559 from SimonWalton-HiFi/avatar-theft-challenge ... Allow for delayed challenges if salt is empty	2019-05-14 16:53:12 -07:00
Zach Fox	971e07c646	update spacing between settings	2019-05-14 16:44:25 -07:00
Zach Fox	bbd3d0fab5	Remove settings subtitles	2019-05-14 16:39:48 -07:00
Roxanne Skelly	a7595496f6	CR fixes	2019-05-14 16:39:39 -07:00
Zach Fox	e3bec7ef2a	CR Round 1 - thanks Milad	2019-05-14 16:29:03 -07:00
Roxanne Skelly	fad7fa4c07	Merge branch 'master' of https://github.com/highfidelity/hifi into queueDepthDebug	2019-05-14 16:25:10 -07:00
Simon Walton	e768beb9b1	Allow for delayed challenges if salt is empty	2019-05-14 15:53:35 -07:00
Brad Hefta-Gaub	7440ef3cf3	Merge pull request #15506 from SaracenOne/unify_primitives ... Case 19510: Unify cube and sphere edit menu entries into one.	2019-05-14 15:31:06 -07:00
Zach Fox	f9b51df296	Reduce size of output muted overlay; restore scroll to 0 on settings tab switch	2019-05-14 15:05:26 -07:00
Zach Fox	f43c376a6a	Tweak top bar	2019-05-14 12:41:56 -07:00
Zach Fox	8724cf4edf	UIT TextField	2019-05-14 12:27:33 -07:00
Zach Fox	2080aa6676	Some fun motion for experimentation	2019-05-14 11:56:07 -07:00
Zach Fox	cf46f3c9d4	CheckBox UIT and CheckBox added to Avatar app	2019-05-14 11:50:07 -07:00
Zach Fox	89006cd9c5	Hide controls in top left; don't remove certain menus; fixup slider UIT	2019-05-13 17:26:19 -07:00
Zach Fox	7bb2d6871b	Simlpified Slider (not totally working; position is off)	2019-05-13 15:58:04 -07:00
Roxanne Skelly	72fe3a66f5	Debugging code to monitor the queue depth for a few critical threads	2019-05-13 15:56:55 -07:00
Zach Fox	f799f96fba	simplifiedUI UIT switch	2019-05-13 13:04:12 -07:00
Zach Fox	feb5021372	UIT RadioButton	2019-05-13 11:07:39 -07:00
Zach Fox	112e13383b	Dock it!	2019-05-10 12:03:29 -07:00
Zach Fox	314c04ab96	Simplified UI v1	2019-05-10 10:49:25 -07:00
Wayne Chen	845ad38106	Merge pull request #15503 from wayne-chen/useThresholdMutedWarning ... Case 22447: The "MUTED" indicator (which warns when talking while muted) constantly flickers	2019-05-06 13:55:59 -07:00
Saracen	43ddf7ca23	Unify cube and sphere edit menu entries into one.	2019-05-02 22:40:11 +01:00
Wayne Chen	d31ed9ac22	adding timer for muted warning	2019-05-02 12:23:58 -07:00
Simon Walton	60389017a4	Merge from master, including avatar protocol change ... Tony had added HandController version-type.	2019-04-26 18:51:41 -07:00
Simon Walton	1fe8f4332f	Fixes to banner; swap out avatar on client; reviewer comments; other WIP	2019-04-26 18:45:48 -07:00
Sam Gateau	c647bbcb16	Merge pull request #15400 from danteruiz/throttle-refresh-rate ... Case 22253: Refresh Rate Controller	2019-04-26 12:04:39 -07:00
danteruiz	b60e35040e	another round of CR	2019-04-26 10:08:06 -07:00
Anthony Thibault	93b03a588f	Merge pull request #15445 from amantley/AnimRandomSwitchSquash ... AnimRandomSwitch class for random idle implementation	2019-04-26 10:06:37 -07:00
Angus Antley	395a4cc9c4	added final animations and json to the resource	2019-04-25 19:14:31 -07:00
Shannon Romano	d0108301a0	Merge pull request #15410 from wayne-chen/fixMuteWarningSwitchText ... Case 22297: Fix Mute Warning Switch Text	2019-04-25 17:11:45 -07:00
danteruiz	9e1671a1bf	making requested changes	2019-04-25 16:02:12 -07:00
Angus Antley	27ed468946	made changes requested	2019-04-25 14:42:41 -07:00
Simon Walton	f3efee56c0	Merge remote-tracking branch 'upstream/master' into avatar-verification	2019-04-25 13:40:27 -07:00
Sam Gondelman	ef64de7c04	Merge branch 'master' into openurl	2019-04-25 13:21:27 -07:00
Thijs Wenker	cdcdae2fda	Merge pull request #15393 from ctrlaltdavid/M22188 ... Update Record app per Marketplace certification requirements	2019-04-25 20:00:13 +02:00
Angus Antley	baca58360e	updated json and talk_righthand anim	2019-04-25 09:50:12 -07:00
Angus Antley	ea173b8d61	more time for talk ease in and updated json random choice times	2019-04-24 21:29:55 -07:00
Simon Walton	de97af5c02	Minimal working version for avatar's client ... Also merge of Wayne's proof-of-concept	2019-04-24 17:42:51 -07:00
SamGondelman	31b3f0e8f1	possible fix for openUrl exploit	2019-04-24 16:39:31 -07:00
Shannon Romano	404be42bfb	Merge pull request #15409 from wayne-chen/fixShieldIconBehavior ... Case 22290: Fixing Shield Icon Behavior in Desktop Mode	2019-04-24 16:35:02 -07:00
Dante Ruiz	0bdc37859d	Refresh Rate Controller	2019-04-24 16:16:08 -07:00
Angus Antley	eb0506ee12	updated json	2019-04-24 14:58:30 -07:00
Angus Antley	45f4cb2018	added animation files and updated ease in function in rig	2019-04-24 14:56:38 -07:00
amantley	7f3101eefb	working on the ease in function for the talk idle	2019-04-23 18:13:15 -07:00
Wayne Chen	464e5924d6	changing method name to reflect recent change in code	2019-04-23 16:59:12 -07:00
amantley	70d8200bdc	added on done for movement7 to json	2019-04-23 10:40:37 -07:00
Angus Antley	1291ee5ebc	added new animations to the resource	2019-04-23 07:43:31 -07:00
Wayne Chen	3b1751f2c9	adding proper logic for shield icon behavior	2019-04-17 20:19:21 -07:00
Wayne Chen	7d38cd9290	change text to display	2019-04-17 17:25:02 -07:00
amantley	035c8a687d	fixed merge conflict	2019-04-17 10:16:39 -07:00
amantley	ba9b539bd2	removed hand fbx files that will be used in the future for default hand overrides	2019-04-16 14:12:32 -07:00
David Rowe	249df3dce4	Update Record app per Marketplace certification requirements	2019-04-16 07:53:55 +12:00
John Conklin II	759d59c709	Merge pull request #15336 from r3tk0n/controller-help-update ... Case 22069: Update Controller Help Screen	2019-04-05 17:31:29 -07:00
r3tk0n	d6ff1caee9	Convert tabs to spaces.	2019-04-05 16:32:20 -07:00
r3tk0n	9dda272acd	Update gamepad with new graphic.	2019-04-05 16:22:31 -07:00
r3tk0n	6d03182ed9	Fix scaling issue.	2019-04-05 16:21:42 -07:00
r3tk0n	e3fdbc3b3c	Set bounds of image.	2019-04-05 15:44:34 -07:00
Roxanne Skelly	057ee2b01c	Case 21890 - Marketplace search doesn't refresh when enter is pressed	2019-04-05 15:20:23 -07:00
r3tk0n	e03e78cc8c	Add href element to image.	2019-04-05 15:04:35 -07:00
r3tk0n	84a67641a8	Update images.	2019-04-05 14:39:02 -07:00
Wayne Chen	4f738a5b42	code review feedback/formatting issues	2019-04-04 12:03:48 -07:00
r3tk0n	874fb6b6d7	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-03 12:42:33 -07:00
r3tk0n	ec37ad7dc6	Address Wayne and Angus' comments on github.	2019-04-03 09:38:14 -07:00
Shannon Romano	1bfa0397f0	Merge pull request #15048 from wayne-chen/newAudioMuteStates ... Case 21899: New Audio Mute States	2019-04-01 15:27:03 -07:00
r3tk0n	4fb7bbabe1	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-01 14:52:21 -07:00
Wayne Chen	a9802570d7	Merge pull request #15305 from wayne-chen/repositionPeopleAppAudioQml ... Case 22003: Reuse Blank Space from Volume Slider	2019-04-01 14:23:27 -07:00
Wayne Chen	abe5748e60	Merge branch 'master' into newAudioMuteStates	2019-04-01 12:24:46 -07:00
Wayne Chen	eba1f271ef	Merge pull request #15253 from wayne-chen/fixPTTMacAudio-master ... Case 21892: Mac Audio Push To Talk fix	2019-04-01 12:19:10 -07:00
Wayne Chen	0a8d195f6f	adding top padding for my name card	2019-04-01 11:32:52 -07:00
Wayne Chen	0d83e622ff	Revert "Attempt to add acceleration curve." (#23) ... This reverts commit 9ea476ea89.	2019-04-01 13:47:49 -04:00
Wayne Chen	c4cccc6ef7	fix opacity for containing mouse only	2019-03-29 17:04:44 -07:00
Shannon Romano	dbecf1f611	Merge pull request #15292 from thoys/fix/avatarTools/fbxCasing ... Case 20625: On avatar project creation, the .fbx filter for selecting an FBX is case-sensitive.	2019-03-29 17:04:37 -07:00
Wayne Chen	426ffe5a14	Fixing typo	2019-03-29 15:38:42 -07:00
Wayne Chen	2622408792	warn when muted only affects hmd	2019-03-29 10:45:40 -07:00
Shannon Romano	a83b90cdc6	Merge pull request #15044 from sethalves/lock-wearables ... case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables	2019-03-29 10:41:21 -07:00
Wayne Chen	248f9ba375	adding mute overlay back into HMD and have warn when muted disable in desktop	2019-03-29 10:32:13 -07:00
Angus Antley	55b42946a4	cleaned up ugly brace style in json	2019-03-28 19:07:01 -07:00
Thijs Wenker	7e21a3f372	disable case sensitivity in file browsers (allow .fbx .fBx .FBX instead of only .fbx)	2019-03-29 01:48:57 +01:00
Wayne Chen	3241d2f960	don't allow clicking on push to talk in MicBarApplication	2019-03-28 16:24:37 -07:00
Wayne Chen	f2b0e47c39	changing opacity	2019-03-28 16:19:35 -07:00
Roxanne Skelly	73cf51182e	Merge pull request #15262 from roxanneskelly/Case20832 ... Case20832- Inventory app Login and Cancel buttons do not respond if user logs out while Inventory is open.	2019-03-28 12:01:24 -07:00
Wayne Chen	8627a92f29	adding functions to update variables	2019-03-28 11:29:34 -07:00
Wayne Chen	c3e5c49f69	update muted in AudioScriptingInterface	2019-03-28 10:40:39 -07:00
Wayne Chen	9349514ff7	make audio screen inputs/outputs unflickable	2019-03-28 10:35:28 -07:00
Wayne Chen	f3708ba27b	Merge branch 'master' into newAudioMuteStates	2019-03-27 15:49:39 -07:00
Ken Cooke	abb0a166b1	Merge pull request #15260 from kencooke/audio-mixer-volume-control ... Case 21902: System-wide independent volume controls	2019-03-27 13:19:30 -07:00
Angus Antley	d71c6c28de	added the new hand anims to the resource, and added hand reset to initAnimGraph	2019-03-27 12:00:50 -07:00
Seth Alves	e085a00256	cause 'save' button to unghost if an attachment is adjusted via grab while the adjust-wearables page is open	2019-03-27 10:12:58 -07:00
Seth Alves	d25d290394	refer to ungrabbable wearables as 'frozen' rather than locked, because locked is such an overloaded term	2019-03-27 10:12:58 -07:00
Seth Alves	29af3b1612	add a button to Avatar panel to lock or unlock wearables. ... allow grabbing / adjusting others' wearables if they are unlocked.	2019-03-27 10:12:57 -07:00
Angus Antley	02d9331603	This changes the avatar-animation json so that we have override ... animations for the right and left hand, similar to how we have whole body override animations.	2019-03-26 23:27:54 -07:00
Seth Alves	16f842b2ac	missed one	2019-03-26 16:07:18 -07:00
Seth Alves	7d21222232	the test-audio button causes a local audio-loopback rather than a server one	2019-03-26 16:03:56 -07:00
Wayne Chen	c0b71150ea	removing an extra button	2019-03-26 10:58:04 -07:00
Wayne Chen	e44cdb0d7b	Merge branch 'audio-mixer-volume-control' into addNewAudioControls	2019-03-26 10:39:29 -07:00
Wayne Chen	a2d754cebd	fixing audio screen with master	2019-03-26 10:26:29 -07:00
Ken Cooke	7b56bef838	Prototype an updated Audio tab with 3 independent volume controls	2019-03-26 09:41:58 -07:00
Wayne Chen	c54e8f5569	showing ptt text always + hmd mode switch fix	2019-03-25 17:32:03 -07:00
Wayne Chen	6aebd000d6	changing api to match verbiage of overall code	2019-03-25 15:41:03 -07:00
Wayne Chen	49ce30d536	adding changes to design + truly separating muted/ptt	2019-03-25 15:35:05 -07:00
Thijs Wenker	0173c87695	Fix clashing hyperlinks in AvatarPackager project page	2019-03-25 22:48:30 +01:00
Roxanne Skelly	90b9de8623	Merge branch 'master' of https://github.com/highfidelity/hifi into Case20832	2019-03-25 14:48:26 -07:00
Roxanne Skelly	1608b24be1	ase 20832 - Inventory app login and cancel buttons don't work on logout	2019-03-25 14:48:17 -07:00
Shannon Romano	16d791703d	Merge pull request #15206 from thoys/feat/avatarTools/avatarDoctorWarningURLs ... Case 21353: Avatar Doctor documentation / Video URLs	2019-03-25 14:36:30 -07:00
Wayne Chen	9a8c5e5a54	Merge branch 'master' into newAudioMuteStates	2019-03-25 13:33:24 -07:00
Shannon Romano	6710cd3e03	Merge pull request #15233 from roxanneskelly/Case20407 ... Case 20407 - Pay-In API doesn't display error when no username specified	2019-03-25 12:41:57 -07:00
Wayne Chen	59a420b160	adding signals + slots to when muted + display mode changes	2019-03-25 12:24:13 -07:00
Wayne Chen	f551d49f4f	adding signal for updating push to talk variables	2019-03-25 11:32:08 -07:00
Wayne Chen	7f5d9cbd40	adding push to talk fix for loadData	2019-03-25 11:32:08 -07:00
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
r3tk0n	3ac42e69e3	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-25 11:27:31 -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
Wayne Chen	b98eda4674	removing debug statemeng	2019-03-22 16:42:37 -07:00
Wayne Chen	3ea45de7c7	fixing qml bug in MicBar	2019-03-22 16:37:23 -07:00
Wayne Chen	390ce9bb26	wip for getting AvatarInputsBar to switch accordingly	2019-03-22 15:34:06 -07:00
Wayne Chen	0edbf12fa3	removing extra onLevelChanged	2019-03-22 15:26:57 -07:00
Wayne Chen	1f71a291a5	displaying offset values	2019-03-22 14:54:18 -07:00
Wayne Chen	554a144b0e	adding tool to change avatar inputs properties	2019-03-22 14:54:17 -07:00
Wayne Chen	584fa1f17b	more wip	2019-03-22 14:54:17 -07:00
Wayne Chen	6cf8b06c6d	more wip on adding qml to adjusting ui position	2019-03-22 14:54:16 -07:00
Wayne Chen	d0116abc52	separating out bubble icon qml - adding support for transparency	2019-03-22 14:54:13 -07:00
Wayne Chen	e5133d6f4d	fixing muted text	2019-03-22 14:50:13 -07:00
Wayne Chen	cd7b6e7ed0	moving file as MicBarApplication	2019-03-22 14:50:12 -07:00
Wayne Chen	84fcd50b3b	adding user speaking level rotated vertically and muted symbol	2019-03-22 14:49:11 -07:00
Wayne Chen	48b4fe37b4	don't display gated state	2019-03-22 14:35:01 -07:00
Wayne Chen	db6bf46ee7	adding more opacity, cleanup	2019-03-22 14:33:54 -07:00
Wayne Chen	8e8ceaac47	moving file as MicBarApplication	2019-03-22 14:21:24 -07:00
Wayne Chen	d063882d37	adding user speaking level rotated vertically and muted symbol	2019-03-22 14:18:19 -07:00
Wayne Chen	77b7cc2457	separating out bubble icon qml - adding support for transparency	2019-03-22 14:16:29 -07:00
Wayne Chen	4dca4cbc40	update icons again	2019-03-22 14:16:28 -07:00
Wayne Chen	5b6ce8736d	adding new icons with gated icon	2019-03-22 14:16:28 -07:00
Wayne Chen	811fa8dcb2	allowing bubble icon to toggle	2019-03-22 14:16:28 -07:00
Wayne Chen	087f613d60	fixing muted text	2019-03-22 14:16:28 -07:00
Wayne Chen	26895e6f5d	don't display gated state	2019-03-22 14:16:28 -07:00
Wayne Chen	835153c0df	don't display gated state	2019-03-22 14:16:28 -07:00
Wayne Chen	e129201d2a	adding more opacity, cleanup	2019-03-22 14:16:27 -07:00
Wayne Chen	ddacc0ee60	bubble icon opacity to 0.3	2019-03-22 14:16:27 -07:00
Wayne Chen	3ceb1598f6	adding working bubble icon	2019-03-22 14:16:27 -07:00
Wayne Chen	915d22bb15	adding bubble icon (not working)	2019-03-22 14:16:27 -07:00
Wayne Chen	1ba366c0d7	moving file as MicBarApplication	2019-03-22 14:16:27 -07:00
Wayne Chen	0def39dbaa	adding user speaking level rotated vertically and muted symbol	2019-03-22 14:16:27 -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
r3tk0n	86ffa44771	Swap flying binding to other hand.	2019-03-21 17:05:20 -07:00
r3tk0n	108e8b9994	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-21 15:17:56 -07:00
r3tk0n	006e2d09b3	Add jump binding.	2019-03-21 15:16:50 -07:00
r3tk0n	543d53ecde	Add ability to toggle strafing.	2019-03-21 13:12:15 -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
r3tk0n	0bb10544a3	Prevent accidental rotation when teleporting.	2019-03-21 11:43:26 -07:00
Howard Stearns	5888adfd90	update terms of service links	2019-03-20 17:08:42 -07:00
Roxanne Skelly	3775633cc3	Case 20407 - Pay-In API doesn't display error when no username specified	2019-03-20 15:29:13 -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
Thijs Wenker	714115adef	- Video, and new Docs url in QML	2019-03-16 02:09:01 +01: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