Commit graph

1253 commits

Author SHA1 Message Date
David Rowe
e426d70437 Improve variable name 2017-05-11 18:37:23 +12:00
David Rowe
98b943269b Sum of blendshapes is used sent through avatar mixer 2017-05-11 18:17:35 +12:00
David Rowe
21f9594f81 Sum of blendshapes is used for recording 2017-05-11 18:17:12 +12:00
David Rowe
3b06b03e01 Rename blendshapes variables in preparation for repurposing 2017-05-11 16:46:36 +12:00
Seth Alves
960bab6e4e Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire 2017-05-04 16:42:57 -07:00
Brad Davis
2d0bbf70ae Migrate core avatar rendering functionality to library 2017-05-04 14:08:59 -07:00
Seth Alves
69944cc76d add a way to get a SpatiallyNestable's name without knowing what its type is 2017-05-03 21:32:49 -07:00
Brad Davis
425405f72d Merge pull request #10245 from AndrewMeadows/avatar-renderer-002
more cleanup in preparation for moving Avatar class to lib
2017-05-02 10:37:22 -07:00
Brad Davis
5e1bc0d908 Remove faceshift 2017-04-28 16:34:54 -07:00
Andrew Meadows
75b563d598 restore rendering of avatar receive stats 2017-04-27 13:16:50 -07:00
ZappoMan
bc2f893294 format and spelling changes 2017-04-26 21:47:54 -07:00
ZappoMan
c0df82ff69 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-26 18:49:24 -07:00
ZappoMan
834a447d62 remove debugging code 2017-04-26 18:36:44 -07:00
ZappoMan
1f9e07b828 more logging 2017-04-26 16:40:13 -07:00
humbletim
f8bbd9174c Merge remote-tracking branch 'upstream/master' into 21281 2017-04-26 18:26:15 -04:00
ZappoMan
7154a11192 add some more logging 2017-04-26 14:03:36 -07:00
Andrew Meadows
4511156d7b cache avatar identity info forever 2017-04-26 12:50:48 -07:00
ZappoMan
517bbc795f interface/ 2017-04-26 11:29:42 -07:00
ZappoMan
5164aa4056 hacking 2017-04-25 18:21:09 -07:00
ZappoMan
382645ddd0 more cleanup 2017-04-24 18:01:54 -07:00
ZappoMan
aa955ee360 Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL 2017-04-24 17:36:30 -07:00
ZappoMan
c9aad6b762 new approach to the tpose fix, as well as other improvements 2017-04-24 17:36:05 -07:00
humbletim
28b3eef7aa add getJointTranslations() methods 2017-04-24 19:22:02 -04:00
ZappoMan
088cdae320 CR feedback 2017-04-21 11:14:47 -07:00
ZappoMan
f133713d0e CR feedback 2017-04-21 10:21:34 -07:00
ZappoMan
fbc699d6b2 handle overflow case 2017-04-21 09:30:00 -07:00
ZappoMan
c03182546b some cleanup 2017-04-21 09:11:51 -07:00
ZappoMan
125b3d5f4e ignore old identity packets 2017-04-21 07:51:17 -07:00
ZappoMan
c197979354 add more logging 2017-04-20 18:36:00 -07:00
ZappoMan
e89b6c5d2c some initial debugging on tpose avatars 2017-04-20 17:26:31 -07:00
kunalgosar
ffdbc12968 copy into new vector 2017-04-18 12:20:03 -07:00
kunalgosar
06c5fa0585 correctly resizing blendshapes vector 2017-04-18 11:44:59 -07:00
kunalgosar
d215856b23 cleanup to blendshapes 2017-04-18 11:44:59 -07:00
kunalgosar
0a295fc258 setBlendshapes will presist 2017-04-18 11:44:59 -07:00
Zach Fox
e13000410e Whoops 2017-04-17 11:02:27 -07:00
Andrew Meadows
e364b8d33e avatar-mixer resends to avoid stale avatar 2017-04-13 13:35:59 -07:00
Zach Fox
6569de697d Merge pull request #10187 from zfox23/fix/getAvatar_Fix
Fix FB3999; Fix crashes caused by getAvatar() design bug
2017-04-11 11:17:48 -07:00
Stephen Birarda
db6fc40277 fix ScriptAvatar promotion of AvatarData 2017-04-10 22:15:45 -07:00
Stephen Birarda
84a5807ff1 return ScriptAvatarData raw pointer from getAvatar 2017-04-10 22:15:45 -07:00
Zach Fox
16be0ca70c Birarda's CR changes 2017-04-10 22:15:44 -07:00
Zach Fox
5edd5d2b30 It's working...it's workinggit add -A! 2017-04-10 22:15:44 -07:00
Zach Fox
a16e261735 Checkpoint before a number of confusing changes 2017-04-10 22:15:44 -07:00
Zach Fox
297da90118 Semicolons lol 2017-04-10 22:15:44 -07:00
Zach Fox
bc75ff4462 Checkpoint 2017-04-10 22:15:44 -07:00
Zach Fox
177445c371 Does this work? 2017-04-10 22:15:44 -07:00
Stephen Birarda
4ed22ad7ac move audio loudness to AvatarData, change AvatarData to ScriptOwnership 2017-04-10 22:15:44 -07:00
Zach Fox
1ed53113a9 Commit for birarda - testing QSharedPointer instead; doesn't work right now 2017-04-10 22:15:44 -07:00
Zach Fox
6ddd7a612c Initial pass at fix looks promising 2017-04-10 22:15:44 -07:00
Andrew Meadows
662c34c266 fix avatar scale animation and avatar render debug 2017-04-07 11:06:16 -07:00
Zach Fox
8a96969471 Merge pull request #9873 from highfidelity/PAL_v2
PAL v2.0
2017-03-31 17:00:41 -07:00