Commit graph

257 commits

Author SHA1 Message Date
David Rowe
e4f13c97f7 Fix JSDoc for MyAvatar.getLeftPalmRotation and getRightPalmRotation 2018-07-14 14:01:08 +12:00
Alexander Ivash
3ac44376b2 bind Settings page to a backend 2018-07-06 21:00:53 +03:00
Anthony Thibault
f56c0a3a3f
Merge pull request #13502 from luiscuenca/eyelidFix
Fix closed eyelids when head is tilted down
2018-07-05 08:50:22 -07:00
luiscuenca
f770bcd389 Better eyePitch computation 2018-06-29 17:15:03 -07:00
luiscuenca
24d03ace4c Changes from CR and decreased looking at angle to mitigate freaky eyes 2018-06-29 14:34:17 -07:00
luiscuenca
2264425f9f Fix eyelid behaviour 2018-06-28 16:41:39 -07:00
amantley
99ff5f9140 made the Avatar destructor virtual to ensure that MyAvatar and OtherAvatar cleanup correctly 2018-06-27 11:59:53 -07:00
amantley
8b13905d6c final final final coding standards 2018-06-26 17:43:45 -07:00
amantley
ea76def2b5 more white space errors 2018-06-26 17:18:35 -07:00
amantley
1fcaf16b0c removed editor auto format errors 2018-06-26 17:07:55 -07:00
amantley
a89c2ea734 removed crust 2018-06-26 16:40:51 -07:00
amantley
46c70d948f Moved OtherAvatar class to interface project. This allows AvatarManager to create and delete the orb overlay that is drawn when an avatar is present in a domain but for some reason the geometry is not loaded. OtherAvatar has new members orbMeshPlaceholder and orbMeshPlaceholderID for a spherical orb that is drawn 2018-06-26 15:11:58 -07:00
amantley
fa1a9d04e0 everything working before trying to move otheravatar to interface 2018-06-26 13:18:26 -07:00
Angus Antley
232dc21c7b add orb code added to otheravatar.cpp 2018-06-26 06:38:09 +01:00
Angus Antley
b8dea4b869 adding changes to add the orb when an avatar is processed by the avatar mixer
and when a new model is being loaded for an avatar.  The orb is removed
when the geometry has loaded.
2018-06-26 06:27:18 +01:00
John Conklin II
0e2675e0d8
Merge pull request #13392 from roxanneskelly/roxie-bugfixes
Remove debug logging message spam for avatar entities that have scripts
2018-06-25 10:42:43 -07:00
Sam Gondelman
44a7d04b2a
Merge pull request #13426 from SamGondelman/avatarPriority
Highest loading priorities for avatars and attachments
2018-06-22 11:22:10 -07:00
Sam Gateau
dea3f91c0b
Merge pull request #13421 from AndrewMeadows/fix-mac-nan-crash
fix crash on Mac when watching someone else turn with HMD
2018-06-21 11:55:39 -07:00
Andrew Meadows
4424a8df11
Merge pull request #13303 from highfidelity/workload
workload project part 1
2018-06-20 15:39:01 -07:00
SamGondelman
8014f61243 loading priorities for avatars and attachments 2018-06-20 12:29:28 -07:00
Andrew Meadows
17a0dd574a remove debug cruft 2018-06-19 14:36:57 -07:00
Andrew Meadows
b557717dab to avoid NaN: don not rely on glm::angle(quat) UYKWYAD 2018-06-19 14:27:27 -07:00
Andrew Meadows
085130e3c9 avatars collide again again 2018-06-18 13:17:32 -07:00
Andrew Meadows
6d422e4678 Merge 'master' into 'workload' 2018-06-18 10:30:13 -07:00
Roxanne Skelly
5bc7694ed6 Merge branch 'master' of https://github.com/highfidelity/hifi into roxie-bugfixes 2018-06-15 16:46:09 -07:00
Roxanne Skelly
f6c624dcc3 Remove logging messages for behaviors that are expected.
Attached entities with scripts are now being sold on the marketplace
(rWatch) and are now being worn by various users.  Because of this, it's
now common for the 'removing entity scripts' case to be hit in code for
every update, which causes debug log messages every 60 seconds for each
entity entity with a script.

Repro: Have an avatar wear rWatch.  With a second instance of interface,
turn on verbose logging while the first avatar is local.  See debug logging
60 times a second.

Fix: Given attached entities with scripts are happening, it's not an
exceptional case and should probably not be logged.
2018-06-15 16:31:09 -07:00
John Conklin II
0ba97fa83b
Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags
Scripted Blendshapes and Procedural Face Movement Flags
2018-06-13 10:32:59 -07:00
Clement
920263ef49 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-06-12 17:00:25 -07:00
amantley
b1c578ecaa fixed white space in head.cpp 2018-06-07 22:13:53 -07:00
amantley
913d78841d Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes
synching with upstream master
2018-06-07 16:20:11 -07:00
amantley
67fc7b90b5 fixed get and set semi nibble to deal with 16 bits 2018-06-07 15:43:21 -07:00
amantley
836c3da858 cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement 2018-06-07 15:11:57 -07:00
amantley
97831e61f0 removed stray comments 2018-06-07 12:54:46 -07:00
amantley
6a11ddc349 removed print statements and removed the setting of procedural head variables in avatarData.cpp 2018-06-06 17:50:50 -07:00
amantley
dca93ca61f fixed setatone16 function to return the correct result for additional flags 2018-06-06 16:44:12 -07:00
amantley
0c879d85b5 added print statements and removed summed coeff from avatarData.cpp 2018-06-05 17:33:32 -07:00
amantley
5132466ca0 kept the transient coeff. and sending the blendshapes accross the
network. and removed procedural updates to face from myhead.cpp
2018-06-05 13:32:45 -07:00
Andrew Meadows
4329ea5240 Merge master' into 'workload' 2018-06-04 16:11:25 -07:00
amantley
01848fafe0 made all changes except those to AvatarData toByteArray function also to do: verify that transientBlendshapes are set to 0 in headData simulate when there are blendshapes from script but no face tracker present 2018-06-01 11:37:11 -07:00
amantley
3bda5bf6a0 added MyAvatar.hasProceduralBlinkFaceMovement and MyAvatar.hasProceduralEyeFaceMovement properties to MyAvatar.h and cpp and HeadData.h 2018-05-31 17:58:37 -07:00
samcake
386c0f9ab2 Re review adjustments 2018-05-31 12:16:57 -07:00
Sam Gateau
513acc529e INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine 2018-05-30 23:31:54 -07:00
Andrew Meadows
003e444246 Merge branch 'master' into 'workload' 2018-05-30 16:04:13 -07:00
samcake
2e9076c71e Clean up and trying to get ready for merge 2018-05-30 11:14:49 -07:00
samcake
873cabe284 Cleaning the code 2018-05-29 17:46:25 -07:00
Sam Gateau
678effdb48 Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey 2018-05-26 23:28:59 -07:00
samcake
221b513b19 Oh boy 2018-05-25 16:33:34 -07:00
Sam Gateau
aa49595a23 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-24 18:19:55 -07:00
Sam Gateau
b8b337dbe4 There and back again... 2018-05-24 01:18:36 -07:00
Sam Gateau
13d02011f3 There and back again... 2018-05-24 00:53:29 -07:00