sabrina-shanman
7b14c00540
Merge branch 'master' into instancing
2019-11-05 10:22:24 -08:00
HifiExperiments
bae2ba7bae
merge with master
2019-11-02 01:08:56 -07:00
Sabrina Shanman
05ac16536e
Merge pull request #16436 from highfidelity/master
...
Merge master into instancing
2019-10-31 17:39:15 -07:00
Anthony Thibault
f99bb3ec77
Merge pull request #16400 from hyperlogic/feature/arkit-blendshapes
...
Extended avatar blendshape support for ARKit compatiblity
2019-10-31 12:33:50 -07:00
Sabrina Shanman
e8b963b59a
Merge pull request #16425 from highfidelity/master
...
Merge master into instancing
2019-10-30 09:16:04 -07:00
luiscuenca
ab6631fae3
Fix look at update and allow to release control
2019-10-28 17:51:29 -07:00
Anthony J. Thibault
8cf58f2034
Fix for unused avatar transit warnings on mac and linux
...
This was introduced by PR #16403
https://github.com/highfidelity/hifi/pull/16403
2019-10-25 13:56:12 -07:00
Sabrina Shanman
c5884fd585
Merge pull request #16405 from highfidelity/master
...
Merge master into instancing
2019-10-25 10:28:57 -07:00
Sabrina Shanman
e74de214e2
Merge pull request #16404 from highfidelity/master
...
Merge master into instancing
2019-10-25 09:55:44 -07:00
Anthony J. Thibault
a67904212d
Remove AvatarTransit log spam
2019-10-24 15:52:44 -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
luiscuenca
bb0849d3a0
Move changes to Head and remove leftover code
2019-10-23 14:23:29 -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
Sabrina Shanman
5d91d22314
Merge pull request #16379 from highfidelity/master
...
Merge master into instancing
2019-10-18 10:24:35 -07:00
luiscuenca
33ea63c708
Fix warnings and update controls
2019-10-17 15:06:12 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode
2019-10-17 13:26:42 -07:00
luiscuenca
9f0e82e1e6
Improve eye's look at and blinking. Fix look at update
2019-10-16 15:29:28 -07:00
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
luiscuenca
505813b3c3
Fix blink async and other is talking bug
2019-10-14 10:44:55 -07:00
Brad Hefta-Gaub
51669e1ac3
Revert "DEV-1811: apply deletion rules to linked entities"
2019-10-11 11:06:10 -07:00
Maia Hansen
07b916f0b7
Merge pull request #16307 from AndrewMeadows/colossal-cave
...
DEV-1811: apply deletion rules to linked entities
2019-10-10 13:24:43 -07:00
luiscuenca
fc018257e1
Select avatar to look using API. Blink when look at change
2019-10-09 12:20:35 -07:00
Sam Gateau
abaf0262a7
Merge branch 'master' of https://github.com/highfidelity/hifi into instancing
2019-10-08 18:55:51 -07:00
David Rowe
f224832d27
Merge branch 'master' into DOC-111
2019-10-08 20:44:13 +13:00
Sam Gateau
521ce3936b
I changed names! Renaming the Geometry to NetworkModel, the GeometryResource to ModelResource, i think there is no need for the 2, only one would be enough in my opinion...
2019-10-07 15:19:23 -07:00
Andrew Meadows
8ab70225d9
apply delete rules down linked hierarchy
2019-10-07 14:38:36 -07:00
Sam Gateau
c7ca431296
Merge branch 'master' of github.com:highfidelity/hifi into instancing
2019-10-04 10:00:41 -07:00
luiscuenca
f7a5895cf3
Apply same random factors to both eyes blink
2019-10-03 14:42:58 -07:00
Sam Gateau
dcfc3cddd2
Merge branch 'master' of https://github.com/highfidelity/hifi into instancing
2019-10-01 19:50:33 -07:00
Anthony J. Thibault
1068637d39
Fix for avatars that are stuck in idle pose for observers
...
The problem can occur because the default constructor for the NetworkAnimState does not initialize the blendTime member.
This can cause the avatar to remain stuck in an idle pose for observers when blendTime happens to be randomly initialzied to a large negative floating point value.
To fix this we explicitly initialize it to FLT_MAX.
Additionally, a debug print has been added to help diagnose this issue if it occurs again.
2019-10-01 14:28:10 -07:00
Sam Gateau
1d19671e88
Merge branch 'master' of github.com:highfidelity/hifi into instancing
2019-10-01 11:27:16 -07:00
David Rowe
605d272392
Merge branch 'master' into DOC-111
2019-09-20 10:25:21 +12:00
David Rowe
9d9317c50d
Miscellaneous fixes and typos
2019-09-20 10:19:45 +12:00
David Rowe
d5e08d19e3
Fix JSDoc for miscellaneous white space issues
2019-09-20 08:17:24 +12:00
Seth Alves
a288c0a52d
remove old/unused eyetracker code.
2019-09-17 09:43:21 -07:00
Seth Alves
5c570d28a0
remove old/unused eyetracker code
2019-09-17 09:43:20 -07:00
Seth Alves
b64ff70d6c
add show-lookat-targets DebugDraw. remove old/unused eyetracker code.
2019-09-17 09:43:19 -07:00
sabrina-shanman
b944db3e79
std::vector-ize joints and materials in hfm::Model
2019-09-11 16:54:07 -07:00
HifiExperiments
97b9179144
merge with master
2019-09-05 00:46:56 -07:00
luiscuenca
3da2a6038d
Const ajustments
2019-08-29 16:27:54 -07:00
luiscuenca
265b6f57a1
Try to mitigate the effect of background mic noise when simulating talking
2019-08-29 15:19:17 -07:00
Anthony Thibault
2b74e2a7fa
Merge pull request #16066 from hyperlogic/bug-fix/sit-bug-fixes
...
Avatar sitting bug fixes
2019-08-20 11:09:25 -07:00
Simon Walton
150b4e45d4
More robust handling of the avatar verify-failed property
2019-08-16 17:30:28 -07:00
Anthony J. Thibault
381f7c6bc4
Avatar sitting bug fixes
...
* Added seatedToIdle transition, to make transition quicker to better match the capsule physics.
* Made switching into and out of instantly set animVar for the animation graph, previously it was delayed by 100 ms.
* Created "isNotSeated" anim var for exiting the seated state.
* MyAvatar::beginSit & MyAvatar::endSit no longer calls goToPosition, instead MyAvatar::slamPosition is called.
* MyAvatar::slamPosition will cause the AvatarTransit class to NOT play the teleport anticipation/reaction animation.
Note: This does not prevent other clients from interpolating the position when entering the seat, but it prevents the teleport reaction animation from playing.
* Disable leg IK in HMD mode while seated.
2019-08-16 10:57:03 -07:00
Sabrina Shanman
0728df8a8f
Merge pull request #16025 from sabrina-shanman/picks_debug
...
(BUGZ-1059) Improve debug API for picks/pointers
2019-08-07 12:01:26 -07:00
