29009 commits

Author	SHA1	Message	Date
Wayne Chen	4f738a5b42	code review feedback/formatting issues	2019-04-04 12:03:48 -07:00
r3tk0n	17e559f8e8	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-03 16:17:00 -07:00
r3tk0n	283ec97bb9	Fix desktop movement.	2019-04-03 16:09:13 -07:00
Sam Gateau	0d8169bd35	Merge pull request #15311 from danteruiz/double-avatars ... Case 21415: Avatars stay behind after they disconnect	2019-04-03 16:07:35 -07:00
r3tk0n	8b670110a9	Fix omitted return in MyAvatar::scaleMotorSpeed	2019-04-03 13:06:22 -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	ac2971894b	Fix sprint mode scalar.	2019-04-03 11:42:40 -07:00
Shannon Romano	f2ff5bebc7	Merge pull request #15275 from howard-stearns/ddv-all ... DDV all, including domainUnlimited	2019-04-03 11:03:16 -07:00
r3tk0n	ec37ad7dc6	Address Wayne and Angus' comments on github.	2019-04-03 09:38:14 -07:00
NissimHadar	facf8a9305	Merge pull request #15287 from NissimHadar/21893-enableTheUrlCommandLineParameterOnAndroid ... Case 21893: Remove disabling of --url for Android.	2019-04-03 07:50:31 -07:00
danteruiz	ff3e5bbc61	make sure to delete avatar when thier is no reason	2019-04-02 16:20:10 -07:00
Shannon Romano	cf7eeb7355	Merge pull request #15285 from danteruiz/avatar-fading ... Case 21415: Avatars stay behind after they disconnect	2019-04-01 18:04:42 -07:00
danteruiz	8115ef6d36	addressing more requested changes	2019-04-01 16:46:15 -07:00
danteruiz	fcb838a71f	addressing review requests	2019-04-01 15:43:04 -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
Shannon Romano	04eac57950	Merge pull request #15300 from jherico/fix/web_camera_master ... Case 21993: Globally disallow use of the camera or microphone by hosted web content	2019-04-01 14:05:22 -07:00
Wayne Chen	abe5748e60	Merge branch 'master' into newAudioMuteStates	2019-04-01 12:24:46 -07:00
Wayne Chen	afdf95c894	remove unused slotted function	2019-04-01 12:20:55 -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
Brad Davis	58abfb44c4	Globally disallow use of the camera or microphone by hosted web content	2019-03-31 11:14:29 -07: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
danteruiz	db17f094da	adding entities to fade out list;	2019-03-29 15:23:16 -07:00
Shannon Romano	c4925ddfa0	Merge pull request #15259 from SimonWalton-HiFi/avatar-hero-zone-improvements ... Avatar hero zone improvements	2019-03-29 10:49:06 -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
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
Thijs Wenker	687409b756	ignore case for .fbx file extension in AvatarDoctor	2019-03-29 01:46:57 +01:00
danteruiz	b9d04c6ebb	adding entity to a faded list	2019-03-28 16:42:29 -07: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
NissimHadar	171aebd6aa	Remove disabling of --url for Android.	2019-03-28 13:04:16 -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
danteruiz	04d9858f02	fixing remaining issues	2019-03-28 11:43:53 -07:00
Wayne Chen	8627a92f29	adding functions to update variables	2019-03-28 11:29:34 -07:00
Anthony Thibault	65507cfe11	Merge pull request #15180 from luiscuenca/flowCppFixes ... Fix Flow touch and scale issues	2019-03-28 11:11:08 -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
danteruiz	d9b522d10c	remove error file	2019-03-27 16:43:03 -07:00
danteruiz	40d424a01d	avatar fading	2019-03-27 16:42:34 -07:00
Wayne Chen	f3708ba27b	Merge branch 'master' into newAudioMuteStates	2019-03-27 15:49:39 -07:00
Howard Stearns	3da66dacc9	Merge branch 'master' of github.com:highfidelity/hifi into ddv-all	2019-03-27 15:08:03 -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
Sam Gondelman	2005293b3f	Merge pull request #15269 from sethalves/audio-loopback-button-is-local ... case 21932: the test-audio button causes a local audio-loopback rather than a server one	2019-03-27 10:54:57 -07:00