81660 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Shannon Romano	15f27e53cb	Merge pull request #16372 from ctrlaltdavid/DEV-2055 ... DEV-2055: Sanitize LODManager.setWorldQualityDetail() parameter value	2019-10-24 15:20:34 -07:00
amerhifi	5dd5447095	moved call to hmd device name prior to locking device mutex	2019-10-24 15:03:55 -07:00
Rebecca Stankus	9a8fda2705	Feedback changes	2019-10-24 12:07:34 -07:00
Rebecca Stankus	f8102be74d	Added a timeout to update the content holder parent after interactive window has finished loading	2019-10-24 12:07:25 -07:00
Rebecca Stankus	8e8c157567	Debugging stuff	2019-10-24 12:07:20 -07:00
Rebecca Stankus	83a6155592	Added tons of logging to debug interactive window	2019-10-24 12:06:49 -07:00
Anthony J. Thibault	dc7b611e8e	documentation and warning fixes	2019-10-24 09:53:11 -07:00
HifiExperiments	1e100a672e	merge with master and try to fix opacity mode stuff	2019-10-23 22:21:45 -07:00
Anthony J. Thibault	d43d12dfa7	Merge branch 'master' into feature/arkit-blendshapes	2019-10-23 21:45:10 -07:00
Anthony Thibault	edb181bd16	Merge pull request #16317 from luiscuenca/setAvatarLookAtAPI ... DEV-2285: Improve eyes look at	2019-10-23 20:42:27 -07:00
Anthony J. Thibault	f28d317914	Clean up reamining issues	2019-10-23 16:43:10 -07:00
dante ruiz	31c78d7a70	edit home location	2019-10-23 16:42:37 -07:00
dante ruiz	0222f188a7	do not force people to hq	2019-10-23 16:15:13 -07:00
amer cerkic	ac8b664537	addresing pr comments	2019-10-23 15:39:38 -07:00
amer cerkic	ed4df09a26	updated logging added clarifying comment for emit	2019-10-23 15:15:41 -07:00
Maia Hansen	651b3e90d3	Merge pull request #16393 from kencooke/audio-wasapi-qt5.12.3-fix ... DEV-2521: Volume of other programs is reduced by approx 50%	2019-10-23 15:02:44 -07:00
Shannon Romano	3268fa7a9f	Merge pull request #16386 from luiscuenca/fixStrafingError ... DEV-2475: Fix head twitching when strafing	2019-10-23 14:48:57 -07:00
amer cerkic	d7996c77f4	android build fix	2019-10-23 14:48:25 -07:00
danteruiz	0c81f30a3c	Merge branch 'qt-launcher' of github.com:danteruiz/hifi into qt-launcher	2019-10-23 14:40:49 -07:00
Zach Fox	a27e7f9fdd	Merge pull request #16396 from zfox23/emptyServerless ... DEV-2463: Put FTUE users in an empty serverless domain instead of the tutorial	2019-10-23 14:40:31 -07:00
danteruiz	850dcb839d	adding build qt-lite build rules	2019-10-23 14:39:34 -07:00
Zach Fox	a6bcbe4c66	DEV-2463: Put FTUE users in an empty serverless domain instead of the tutorial	2019-10-23 14:32:03 -07:00
luiscuenca	9432a37567	Undo changes in HeadData.cpp	2019-10-23 14:26:53 -07:00
luiscuenca	bb0849d3a0	Move changes to Head and remove leftover code	2019-10-23 14:23:29 -07:00
Shannon Romano	fb7589eff9	Merge pull request #16347 from ctrlaltdavid/DOC-195 ... DOC-195: Keyboard JSDoc	2019-10-23 14:01:03 -07:00
Zach Fox	1b24f61dd9	Merge pull request #16395 from zfox23/menuInstanceCheck ... DEV-2498: Fix a crash in MenuScriptingInterface	2019-10-23 13:42:45 -07:00
David Rowe	2591aed686	Exclude AudioScope API from JSDoc output	2019-10-24 09:20:24 +13:00
David Rowe	423074463d	Typo	2019-10-24 09:17:13 +13:00
David Rowe	a949f327d2	Merge branch 'master' into DOC-199	2019-10-24 09:14:08 +13:00
David Rowe	116510225a	Typo	2019-10-24 09:10:26 +13:00
David Rowe	9d905dbec4	Merge branch 'master' into DOC-126	2019-10-24 09:05:41 +13:00
David Rowe	777f969919	Typo	2019-10-24 09:00:29 +13:00
amer cerkic	179f5e0873	fixed context switching issue with hmd. included additional output info for other audio crash issues	2019-10-23 12:56:43 -07:00
luiscuenca	9849205ca0	Add perf timer to code block	2019-10-23 12:32:16 -07:00
David Rowe	fffb81b474	Merge branch 'master' into DOC-191	2019-10-24 08:23:27 +13:00
Zach Fox	f847d364a8	DEV-2498: Fix a crash in MenuScriptingInterface	2019-10-23 11:52:07 -07:00
Zach Fox	cc3e390565	Merge pull request #16394 from zfox23/newJumpToText ... DEV-2541: Update 'Jump To' top bar expanded text	2019-10-23 11:27:10 -07:00
Zach Fox	df782edcd9	DEV-2541: Update 'Jump To' top bar expanded text	2019-10-23 11:14:22 -07:00
Maia Hansen	cf79f4807c	Merge pull request #16385 from jherico/fix/DEV-2425 ... DEV-2425: web video playback on OSX	2019-10-23 10:25:30 -07:00
danteruiz	1d3be46068	Merge branch 'master' of github.com:highfidelity/hifi into qt-launcher	2019-10-23 10:17:46 -07:00
Shannon Romano	42a92785e8	Merge pull request #16388 from samcake/yellow ... Adding more detailed description of the Material properties from the material inspector tool	2019-10-23 09:05:18 -07:00
Brad Hefta-Gaub	c236ad51e4	Merge pull request #16387 from zfox23/ESSAvatarList ... Implement DEV-257: Allow scripts running on the ESS to access avatar info via the AvatarHashMap	2019-10-23 08:49:24 -07:00
Anthony Thibault	552480a2eb	Merge pull request #16383 from dooglifeSF/Fix_strafe_pops ... Fix glitches when strafing left <-> right.	2019-10-23 08:30:51 -07:00
Anthony J. Thibault	61b9f08fec	Blendshapes for OtherAvatars should update even if no joints have changes.	2019-10-22 22:19:03 -07:00
Sam Gateau	32b23c70e6	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-10-22 16:25:38 -07:00
Sam Gateau	b987c6b58a	remove unecessary comments	2019-10-22 16:25:16 -07:00
Zach Fox	f325cef4d6	Implement DEV-257: Allow scripts running on the ESS to access avatar info via the AvatarHashMap	2019-10-22 15:45:49 -07:00
dante ruiz	bfa89452e0	updating launcher text	2019-10-22 14:24:32 -07:00
Ken Cooke	e1fa10b4de	Updated Qt 5.12.3 WASAPI plugin. ... Reverted patch that applied "eCommunications" role to our audio streams.	2019-10-22 14:14:41 -07:00
David Rowe	ea864e4e97	Remove unused variable	2019-10-23 08:13:46 +13:00