7628 commits

Author	SHA1	Message	Date
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
Seth Alves	84385e6061	work around fb-21767 with a timer	2019-03-26 09:40:22 -07:00
Seth Alves	4303dd589f	make sure equip attachment-points pulled from settings are reasonable before using them	2019-03-26 09:40:22 -07:00
Seth Alves	195472bd43	make equipping of clonables more reliable	2019-03-26 09:40:22 -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
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
Thijs Wenker	9a14cfc7df	make sure that onWebEventReceived has the correct context in VR	2019-03-21 23:46:33 +01:00
Roxanne Skelly	87d75ec75c	Case 20617 - People app filter bar breaks when deleting connections	2019-03-21 12:08:42 -07:00
John Conklin II	4483e3c069	Merge pull request #15168 from danteruiz/fix-notifications-scaling ... Case 21501: Notification bar text fails to render when avatar is scaled very small	2019-03-21 09:47:55 -07:00
Thijs Wenker	20c3a36308	Merge pull request #15227 from thoys/fix/create/dontIgnoreAllUpdatesWhenFocussed ... Case 21816: don't ignore updates that originate from entityPropertiesTool itself [master]	2019-03-20 19:43:37 +01:00
Roxanne Skelly	640b05304a	Case 21392 - Excise unneeded code from marketplacesInject.js	2019-03-19 16:24:07 -07:00
Thijs Wenker	19c51b25d1	don't ignore updates that originate from entityPropertiesTool itself	2019-03-20 00:18:21 +01:00
danteruiz	5dab4c0010	remove white-space	2019-03-15 10:47:48 -07:00
Thijs Wenker	aeb56ff22a	EntityList -> re-focus the rename field rather then re-selecting the text fully ... EntityProperties -> ignore selection updates when nothing is changed and window is focused	2019-03-14 01:26:06 +01:00
danteruiz	1e354fb280	fix notications scaling	2019-03-12 17:18:15 -07:00
Wayne Chen	0279373d11	Merge branch 'master' into ptt	2019-03-11 17:09:37 -07:00
Wayne Chen	84b177996b	removing dead code	2019-03-11 16:43:26 -07:00
Wayne Chen	36c2358dc0	Merge branch 'master' into muteWarningModified	2019-03-11 14:35:13 -07:00
Shannon Romano	864c37d310	Merge pull request #15155 from sethalves/fix-clonables ... Fix cloneables	2019-03-11 14:17:20 -07:00
Seth Alves	e515e9cc66	fix cloneEntity function	2019-03-11 12:38:54 -07:00
Seth Alves	2fb5e1ebc2	quiet some logging	2019-03-11 12:36:29 -07:00
Roxanne Skelly	e4e8a61328	Case 21326 - missing marketplaceInject.js ... The re-addition of marketplaceInject.js didn't merge from 80 for some reason.	2019-03-11 10:46:51 -07:00
r3tk0n	ec0cf3ee3a	Fix typo.	2019-03-11 09:58:20 -07:00
Wayne Chen	3dcc53a945	Merge branch 'master' into ptt	2019-03-10 17:14:54 -07:00
Shannon Romano	ca87e217bd	Merge pull request #15097 from wayne-chen/audioSettingsModified ... Case 21562: Audio settings screen	2019-03-08 16:22:52 -08:00
Wayne Chen	18b86d550d	adding PushToTalk action	2019-03-08 16:07:48 -08:00
r3tk0n	5f48a6d104	Fix typo.	2019-03-08 16:07:47 -08:00
r3tk0n	24d6646e8d	Fix activation / deactivation criteria for PTT controller module.	2019-03-08 16:07:47 -08:00
r3tk0n	3b274c2b6e	Enable pushToTalk.js controller module.	2019-03-08 16:02:16 -08:00
r3tk0n	f6add9cafd	Add pushToTalk.js controllerModule.	2019-03-08 16:02:15 -08:00
Wayne Chen	b7d44403e1	updating compile failure + icons/settings update	2019-03-08 16:02:15 -08:00
Wayne Chen	7cb17b2d6e	laying groundwork for audio app + fixing deadlocks	2019-03-08 16:02:14 -08:00
r3tk0n	15d49fd9a9	Initial implementation (deadlocks still occurring in Audio.cpp)	2019-03-08 16:02:14 -08:00
Roxanne Skelly	e94d248ac5	Merge pull request #15126 from howard-stearns/domainUnlimited ... unlimited certified copies in a domain	2019-03-08 10:23:42 -08:00
Shannon Romano	e776cf2627	Merge pull request #15127 from danteruiz/fix-websurface-module ... Case 20734: HMD lasers on 3D overlay do not appear + trigger event does not get called	2019-03-07 16:04:57 -08:00
Shannon Romano	45ab5efcef	Merge pull request #15121 from danteruiz/fix-stylus-gizmo ... Case 21603: Tablet x button is nearly impossible to hit with stylus	2019-03-07 16:03:13 -08:00
Shannon Romano	b567fd6cac	Merge pull request #15105 from danteruiz/disable-entity-scaling ... Case 20830: Disable entity scaling while grabbing	2019-03-07 16:01:34 -08:00
Shannon Romano	37727c8b60	Merge pull request #14938 from dback2/draggableNumberDisabled ... Case 20662: Entity Properties - fix disabling draggable numbers	2019-03-07 15:33:21 -08:00
danteruiz	87cfbe48d1	fix webSurfaceIntersection	2019-03-07 13:11:18 -08:00
danteruiz	05dc30a740	more requested changes	2019-03-07 10:49:37 -08:00
danteruiz	9ca3805499	making requested changes	2019-03-07 10:27:16 -08:00
Howard Stearns	97bfa538ff	unlimited certified copies in a domain	2019-03-07 09:51:20 -08:00
SamGondelman	96eb137df2	fix debugAvatarMixer.js	2019-03-06 15:53:25 -08:00
Roxanne Skelly	a54171d60c	Merge pull request #15104 from roxanneskelly/79hero-master ... merge PR 15026 15051 15067 15070 from v0.79.HERO-rc into master	2019-03-06 13:06:45 -08:00
Shannon Romano	fc2f1ff994	Merge pull request #14955 from thoys/fix/create/reloadCrash ... Case 18299: Remove workaround for Interactive window crash now that it is fixed	2019-03-06 12:46:00 -08:00
danteruiz	272ca5dc1c	disable entity scaling	2019-03-05 16:23:40 -08:00
Roxanne Skelly	fae6393663	Merge commit '743d1a58e2c4d07fa26f61b1512190263225fa42'	2019-03-05 15:11:25 -08:00
Roxanne Skelly	3ef02085ff	Merge commit '041a561dbcaa7280fd2c14ba2051b2add756ca6f'	2019-03-05 15:07:49 -08:00
Wayne Chen	19ac8cae31	culling mute state	2019-03-04 14:18:10 -08:00