81208 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Anthony J. Thibault	389f5a1d33	ARKit Blendshape hookup work	2019-10-16 10:36:39 -07:00
Anthony J. Thibault	6efd74a339	WIP adding blendshapes to input system	2019-10-16 10:36:38 -07:00
Anthony J. Thibault	da0911e01b	Delete legacy blendshape code ... Move FaceshiftConstants to BlendshapeConstants. Delete FaceTracker and DdeFaceTracker classes. Delete old facetracker menu and preferences	2019-10-16 10:36:37 -07:00
Anthony J. Thibault	8411e6b033	Blendshape script API work ... * Moved hasScriptedBlendshapes, hasProceduralBlinkFaceMovement, hasProceduralEyeFaceMovement, hasAudioEnabledFaceMovement to AvatarData so they are accessable via agent scripts. * Marked setForceFaceTrackerConnected as depricated. * Updated jsdoc comments	2019-10-16 10:36:35 -07:00
Shannon Romano	a6842b5cba	Merge pull request #16346 from dooglifeSF/change_away_animation ... New AFK "away" animation	2019-10-16 09:17:51 -07:00
Shannon Romano	71ef645781	Merge pull request #16351 from dooglifeSF/transition-locomotion-to-idle-based-on-input-and-speed ... Fix sliding when stopping from run.	2019-10-16 09:03:00 -07:00
Shannon Romano	c2270765c1	Merge pull request #16355 from hyperlogic/bug-fix/hmd-flying-fix ... Fix for HMD mode flying	2019-10-16 08:42:22 -07:00
Anthony J. Thibault	288f9bfb16	Fix for HMD mode flying ... In HMD mode you should fly/move in the direction you are looking.	2019-10-15 18:22:42 -07:00
dooglifeSF	0510215240	Move magic number to constant for SLOW_SPEED_THRESHOLD.	2019-10-15 17:48:06 -07:00
Shannon Romano	bebb21fa9e	Merge pull request #16352 from hyperlogic/bug-fix/legacy-sit-script ... Bugfix for legacy sit scripts	2019-10-15 16:19:49 -07:00
Anthony J. Thibault	14e5962675	Bugfix for legacy sit scripts ... Don't return additive clip nodes as valid "roles" for users to override.	2019-10-15 15:29:24 -07:00
Zach Fox	1527bf2e11	Merge pull request #16294 from RebeccaStankus/friction ... First Time User Experience Project	2019-10-15 14:56:25 -07:00
dooglifeSF	a043f0a17e	Create isNotInputSlow var for stategraph switch when no input and speed less than 1.5 m/s	2019-10-15 14:51:42 -07:00
Shannon Romano	f7862a0556	Merge pull request #16348 from sethalves/fix-snap-translate-actions ... fix step translate actions	2019-10-15 13:18:01 -07:00
Zach Fox	9c03de7af6	Merge branch 'friction' of github.com:RebeccaStankus/hifi into friction	2019-10-15 12:26:38 -07:00
Zach Fox	9b9110e163	Remove cachebusting code	2019-10-15 12:26:18 -07:00
Zach Fox	6c92091814	Merge pull request #16349 from zfox23/updateEmoteDisplayIcon ... DEV-2426: Update Emote Indicator icon	2019-10-15 12:13:14 -07:00
Zach Fox	4770008383	DEV-2426: Update Emote Indicator icon	2019-10-15 11:39:00 -07:00
dooglifeSF	e757a6fd86	Merge branch 'master' into change_away_animation	2019-10-15 10:46:24 -07:00
Seth Alves	1f8a7cfea7	fix step translate actions	2019-10-15 09:23:35 -07:00
Zach Fox	3102a6ff08	Merge pull request #16339 from RebeccaStankus/ouputMutedOverlay ... Fixed calculation of overlay position	2019-10-14 16:56:50 -07:00
dooglifeSF	589d4e992c	Change away anim to hosted afk_texting animation.	2019-10-14 16:48:45 -07:00
Shannon Romano	f29d4aad1b	Merge pull request #16322 from Atlante45/feat/xcode-11-compatible-build ... Add Bullet3 patch for Xcode 11 build	2019-10-14 16:28:17 -07:00
RebeccaStankus	5831eb261f	Changed calculation of overlay size	2019-10-14 16:08:01 -07:00
Zach	e495dc7990	Fix crash on MacOS; don't do resizing in C++ anymore	2019-10-14 15:55:33 -07:00
Sabrina Shanman	b8df1c180f	Merge pull request #16343 from jherico/fix/DEV-2375 ... DEV-2375: ensure web entities stop playing audio	2019-10-14 13:04:57 -07:00
RebeccaStankus	4720c64af8	Merge branch 'master' of github.com:highfidelity/hifi into ouputMutedOverlay	2019-10-14 13:02:54 -07:00
Zach Fox	341abb8185	Merge branch 'master' of github.com:highfidelity/hifi into friction	2019-10-14 12:36:35 -07:00
Zach Fox	a1b6b0af35	Merge pull request #16336 from ctrlaltdavid/DEV-1867 ... DEV-1867: Fix toolbarTest.js	2019-10-14 11:50:59 -07:00
Brad Davis	6c35387b8d	also fix DEV-2083	2019-10-14 10:56:23 -07:00
Brad Davis	95b5c8a905	DEV-2375: ensure web entities stop playing audio	2019-10-14 10:46:32 -07:00
Zach Fox	c8b975b2f1	Merge pull request #16342 from zfox23/newInvalidatedLanguage ... DEV-2334: New 'Item Invalidated' language in Inventory	2019-10-14 13:28:33 -04:00
Zach Fox	b45156b44c	Merge pull request #16337 from RebeccaStankus/locationText ... Added blank placeholder text on focus to text field	2019-10-14 12:35:29 -04:00
Zach Fox	7bd550e37b	DEV-2334: New 'Item Invalidated' language in Inventory	2019-10-14 09:30:44 -07:00
Shannon Romano	8f7f23480f	Merge pull request #16340 from RebeccaStankus/settingsApp ... Moved position of settings app. Something is up with the CLA but this is a valid PR	2019-10-14 08:52:35 -07:00
Shannon Romano	ab3787e477	Merge pull request #16341 from sethalves/boostrapping ... fix typo	2019-10-14 08:50:44 -07:00
Shannon Romano	83875089e4	Merge pull request #16328 from Atlante45/fix/account-settings ... DEV-2376: Don't post account settings after pull	2019-10-14 08:49:22 -07:00
Seth Alves	0a01c3ceab	boostrapping, not even once.	2019-10-13 17:36:32 -07:00
Rebecca Stankus	4ac87ef503	Moved position of settings app	2019-10-11 16:20:37 -07:00
Rebecca Stankus	377ffe9698	Fixed calculation of overlay position	2019-10-11 16:02:55 -07:00
Maia Hansen	db75d03f76	Merge pull request #16332 from highfidelity/Fix-stand-talk-pops ... Fix stand talk pops	2019-10-11 15:51:00 -07:00
Rebecca Stankus	21503137d4	Added blank placeholder text on focus to text field	2019-10-11 14:42:39 -07:00
David Rowe	5292dddc39	Rewrite toolbarTest.js	2019-10-12 10:10:41 +13:00
David Rowe	f944604120	Deprecate Toolbar API's addButton() and removeButton() methods	2019-10-12 10:10:27 +13:00
Sam Gateau	93e266cde5	Merge pull request #16333 from highfidelity/revert-16307-colossal-cave ... Revert "DEV-1811: apply deletion rules to linked entities"	2019-10-11 13:13:55 -07:00
dooglifeSF	0b3823645b	Merge branch 'master' into Fix-stand-talk-pops	2019-10-11 13:08:26 -07:00
Zach Fox	222b1fbd20	Fix bug with debugFTUE === 1	2019-10-11 12:26:12 -07:00
Maia Hansen	330b09d012	Merge pull request #16330 from highfidelity/Fix-erratic-seated-idles-and-fidgets ... Fix erratic seated idles and fidgets.	2019-10-11 11:23:20 -07:00
Brad Hefta-Gaub	51669e1ac3	Revert "DEV-1811: apply deletion rules to linked entities"	2019-10-11 11:06:10 -07:00
dooglifeSF	96510429ba	Fix stand talking pops	2019-10-11 10:44:50 -07:00