8069 commits

Author	SHA1	Message	Date
SamGondelman	e7d12dc4f8	fix snapshots and preview	2019-04-17 15:43:05 -07:00
SamGondelman	c730e51d1e	wip redo stencil work	2019-04-11 13:22:51 -07:00
Sam Gondelman	660818aded	Revert "Case 20060: Grab correct stencil masks from display plugins"	2019-04-05 11:59:46 -07:00
Wayne Chen	b10faa8109	Merge pull request #14738 from r3tk0n/project-freeloco ... Case 21777: Locomotion Project	2019-04-04 16:18:32 -07:00
Sam Gondelman	85bf1da0a1	Merge pull request #15266 from SamGondelman/stencil ... Case 20060: Grab correct stencil masks from display plugins	2019-04-04 13:36:25 -07:00
r3tk0n	874fb6b6d7	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-04-03 12:42:33 -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
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
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
Brad Davis	58abfb44c4	Globally disallow use of the camera or microphone by hosted web content	2019-03-31 11:14:29 -07:00
NissimHadar	171aebd6aa	Remove disabling of --url for Android.	2019-03-28 13:04:16 -07:00
SamGondelman	4ed7c09016	grab correct stencil masks from display plugins	2019-03-26 13:42:18 -07: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
r3tk0n	3ac42e69e3	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-25 11:27:31 -07:00
Wayne Chen	390ce9bb26	wip for getting AvatarInputsBar to switch accordingly	2019-03-22 15:34:06 -07:00
Wayne Chen	ee1a14505a	adding constants, removing entity creation in cpp	2019-03-22 14:54:15 -07:00
Wayne Chen	d0116abc52	separating out bubble icon qml - adding support for transparency	2019-03-22 14:54:13 -07:00
Wayne Chen	20e181cd82	staging avatar inputs for ignore radius	2019-03-22 14:42:51 -07:00
Wayne Chen	77b7cc2457	separating out bubble icon qml - adding support for transparency	2019-03-22 14:16:29 -07:00
Wayne Chen	d382893e75	staging avatar inputs for ignore radius	2019-03-22 14:16:28 -07:00
Sam Gondelman	40f5a0263c	Merge pull request #15201 from SamGondelman/emit ... Case 21756: Entities.emitScriptEvent works now	2019-03-21 18:05:17 -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	108e8b9994	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-21 15:17:56 -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
Shannon Romano	a6d4f98ee7	Merge pull request #15204 from roxanneskelly/Case21025 ... Case 21025 conditionalizing TabletWebView features	2019-03-20 14:21:37 -07:00
danteruiz	2ab8eb98e8	better implementation	2019-03-17 14:00:41 -07:00
SamGondelman	d4e1ec9741	fix emitScriptEvent	2019-03-15 16:20:01 -07:00
SamGondelman	83bac723ef	fix wearable duplication on domain switch	2019-03-15 13:38:25 -07:00
Roxanne Skelly	9182db8bd4	Case 21025 conditionalizing TabletWebView features	2019-03-15 12:56:43 -07:00
SamGondelman	609c4ab52e	try to fix audio injector threading issues	2019-03-12 18:41:43 -07:00
r3tk0n	39342b9771	Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco	2019-03-11 16:27:05 -07:00
Wayne Chen	07ddd4e1dd	moving key press detection to JSON	2019-03-11 14:27:47 -07:00
Wayne Chen	7b51061b5f	fixing initialization in switch statement	2019-03-10 19:46:01 -07:00
Wayne Chen	20487b2ad1	connecting pushingToTalkChanged with handlePushedToTalk	2019-03-10 19:39:45 -07:00
Wayne Chen	48d1ec850c	removing debug statement	2019-03-08 16:07:48 -08:00
Wayne Chen	18b86d550d	adding PushToTalk action	2019-03-08 16:07:48 -08:00
r3tk0n	15d49fd9a9	Initial implementation (deadlocks still occurring in Audio.cpp)	2019-03-08 16:02:14 -08:00
Shannon Romano	a8f6e74ca4	Merge pull request #15135 from SamGondelman/text81 ... Case 21628: Fix text rendering on AMD/Mac	2019-03-08 14:59:37 -08:00
Roxanne Skelly	c33d2aafda	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-03-08 11:41:34 -08:00
Roxanne Skelly	750dbfae21	Stand-alone Tags: Throw up popup for first unoptimized domain ... Throw up a popup in stand-alone builds when user attempts to go to an unoptimized domain.	2019-03-08 10:48:42 -08:00
SamGondelman	af03fb5f85	try to fix text rendering on amd with transparency	2019-03-07 16:23:12 -08:00
Shannon Romano	76958ffda2	Merge pull request #15102 from danteruiz/keyboard-for-web-entities ... Case 21144: Can't enter text in a Web Entity with the new keyboard	2019-03-07 15:46:31 -08:00
Roxanne Skelly	b38fc65372	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-03-07 10:06:05 -08:00
Shannon Romano	4f3d593d90	Merge pull request #15072 from SamGondelman/clear ... Case 11775: Don't clear my avatar entities on domain switch	2019-03-05 15:42:51 -08:00
danteruiz	e6a63a9a69	add keyboard for html content	2019-03-05 14:24:38 -08:00