30207 commits

Author	SHA1	Message	Date
Sam Gateau	c8663f7fe6	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-30 09:18:23 -07:00
David Rowe	cd6d9b57c4	Fix Blocks script displaying a blank page	2019-09-28 11:30:56 +12:00
Sam Gateau	25bcc31b72	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-27 09:24:25 -07:00
Sam Gateau	24cc302a8b	second pass of cleaning on the code to make it ready for merge	2019-09-26 16:56:00 -07:00
luiscuenca	ea23a82f33	Make mouse pitch less sensitive	2019-09-26 15:14:47 -07:00
luiscuenca	1b064a0ebe	Fix Q key on first person cam. Let camera control flying Y axis	2019-09-26 14:29:01 -07:00
Sam Gateau	9d999baab2	FIrst pass to clean up before pushing a pr:	2019-09-26 11:59:01 -07:00
Sam Gateau	ba11c3e702	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-25 17:54:21 -07:00
Amer	1e94a82ee6	Merge pull request #16196 from amerhifi/dev469 ... DEV-469: Default Audio device	2019-09-25 16:28:00 -07:00
amer cerkic	73f14d812f	addressing cr comments	2019-09-25 13:22:50 -07:00
MiladNazeri	7d7024f5eb	Merge pull request #16247 from MiladNazeri/DEV-148/add-mirror-mode-to-settings ... Dev 148/add mirror mode to settings	2019-09-25 12:08:09 -07:00
milad	aba6a28d54	updated camera modes	2019-09-25 11:05:32 -07:00
milad	39d96b76a6	fixed help text	2019-09-25 08:41:38 -07:00
Sam Gateau	3e3c4c2e70	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2019-09-24 18:58:29 -07:00
Clement	96b58756b1	Add flag for account settings feature	2019-09-24 16:50:10 -07:00
milad	677dbe59cc	fixed qml typo	2019-09-24 16:47:07 -07:00
milad	edb135776a	Added selfie view and updated help	2019-09-24 16:44:34 -07:00
Shannon Romano	73c558bc51	Merge pull request #16237 from dooglifeSF/emotes_interrupt_settle ... Transition between walk/emote should be faster	2019-09-24 15:49:31 -07:00
Shannon Romano	0c2ca7500d	Merge pull request #16241 from RebeccaStankus/removeInspect ... Undo removal of User Inspection	2019-09-24 15:41:35 -07:00
amer cerkic	9daf670678	Merge branch 'master' into dev469	2019-09-24 15:38:07 -07:00
Anthony Thibault	6fbcc9151e	Merge pull request #16235 from luiscuenca/resetLookAtOnGoTo ... BUGZ-1553: Reset look at params when the avatar's location is set	2019-09-24 13:20:26 -07:00
RebeccaStankus	978bcaffeb	Undo removal of User Inspection	2019-09-24 11:18:16 -07:00
Shannon Romano	b491d00c00	Merge pull request #16238 from RebeccaStankus/fullSizeWindow ... Prereq work for 'Reduce User Friction'	2019-09-24 10:58:39 -07:00
RebeccaStankus	982bdf5c98	Prereq work for 'Reduce User Friction'	2019-09-23 16:49:16 -07:00
dooglifeSF	7307bea16f	speed up interpolation of point, rework point animation, add transitions for emotes to idle from settle	2019-09-23 16:45:35 -07:00
amerhifi	fbc68e7f69	removed clang format issue, removed old attempt at getting defaults to startup correctly	2019-09-23 15:07:04 -07:00
RebeccaStankus	e41632e3ec	Removing connections to use inspect mode on mouse events	2019-09-23 14:42:13 -07:00
luiscuenca	10f76da3ec	Reset look at values when goToLocation or sitting	2019-09-23 11:53:47 -07:00
amer cerkic	e3db7a43a6	set default value for non set devices, typically only for first time runs	2019-09-23 11:00:51 -07:00
Sam Gateau	483a716839	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-23 10:19:45 -07:00
Shannon Romano	68c37e561a	Merge pull request #16233 from Atlante45/fix/flush-timer ... Put flush timer on right thread without parenting	2019-09-23 09:37:05 -07:00
Sam Gateau	fd3e3aba7b	Merge branch 'master' of github.com:highfidelity/hifi into yellow	2019-09-23 09:32:10 -07:00
Sam Gateau	3c2809b9ed	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2019-09-21 08:52:13 -07:00
Sam Gateau	4480d56433	Rendering just the overlay layer and improving the resoruceCache inspector to sort	2019-09-20 19:00:03 -07:00
Clement	1ca30b688d	Put flush timer on right thread without parenting	2019-09-20 15:39:35 -07:00
dante ruiz	b478a22ed2	fix edge case	2019-09-20 15:25:10 -07:00
Shannon Romano	bd488f0196	Merge pull request #16144 from luiscuenca/addLookAtThirdCamera ... DEV-391: Keyboard Input Controls Camera Not Avatar Orientation	2019-09-20 13:03:03 -07:00
Anthony Thibault	fecef584c9	Merge pull request #16226 from danteruiz/fix-snap-html-issue ... BUGZ-1522: Snap app on tablet is blocked when saving/canceling out of its Settings page	2019-09-20 12:39:01 -07:00
Shannon Romano	22dffa5ce8	Merge pull request #16217 from Atlante45/fix/flush-timer ... BUGZ-489: Make sure the flush timer is not spawned too early	2019-09-20 12:35:39 -07:00
luiscuenca	f979c4e1ab	Add more info to jdocs	2019-09-20 09:51:51 -07:00
dante ruiz	fe2a4c3600	fix fix-snap-html-issue	2019-09-19 18:20:08 -07:00
luiscuenca	365aa1bf03	Add jdoc to camera modes and fix variable namings	2019-09-19 17:30:01 -07:00
Zach Fox	97ef2c030e	Merge pull request #16223 from zfox23/simplifiedGoToIteration ... Whoops! New placeholder text color	2019-09-19 16:40:48 -04:00
Zach Fox	10352f1cb2	New placeholder text color	2019-09-19 13:38:37 -07:00
luiscuenca	279e25ca70	Merge master	2019-09-19 13:21:49 -07:00
Zach Fox	a472e723e2	Merge pull request #16222 from zfox23/simplifiedGoToIteration ... BUGZ-1529: Iteration on JumpTo Field visuals/interaction states	2019-09-19 16:13:21 -04:00
Zach Fox	5077089518	BUGZ-1529: Iteration on JumpTo Field visuals/interaction states. NOTE - need to fix placeholder text swap	2019-09-19 11:15:53 -07:00
luiscuenca	6d98537a20	Clean up code and refactor avatar-animation.json	2019-09-19 10:45:20 -07:00
amerhifi	9cc3b7a5c7	addressing pr comments	2019-09-19 10:08:30 -07:00
Zach Fox	5e96ce8822	DEV-152: Implement 'Smooth/Snap Turn' setting in SimplifiedUI > Settings > VR	2019-09-19 09:48:11 -07:00