Commit graph

4366 commits

Author SHA1 Message Date
Anthony Thibault
c840670a54
Merge pull request #13519 from hyperlogic/bug-fix/stable-pole-vector-smoothing
Bug fix for unexpected avatar knee shifts for users wearing Vive Trackers.
2018-07-03 21:50:57 -07:00
amantley
3424f412aa
Merge pull request #13437 from amantley/lurchfix
Fix for Avatar Lean in Direction of Movement: Bug 16075 (for RC70)
2018-07-03 19:38:01 +01:00
Anthony J. Thibault
fff4348a0f Bug fix for poleVector smoothing
Needs to occur in sensor space rather then avatar space.
2018-06-29 17:54:21 -07:00
John Conklin II
0a0e1668d5
Merge pull request #13478 from amantley/glowingOrbMaster
The client should render "something" for an avatar even if mesh or identity is not available
2018-06-28 12:12:16 -07:00
John Conklin II
138342ba91
Merge pull request #13485 from zfox23/MS16257_clearOverlay
Implement MS16257: Remove 'clear overlay when moving' setting and code
2018-06-28 09:31:04 -07:00
John Conklin II
0cb8b4dfa1
Merge pull request #13471 from danteruiz/disable-flying-by-default
Disable flying by default
2018-06-27 16:04:16 -07:00
amantley
205cd44a49 removed override keyword from OtherAvatar and MyAvatar destructors, also
added the virtual keyword to the createOrb virtual method in OtherAvatar
2018-06-27 14:31:39 -07:00
Zach Fox
cfc8c0fb09 Implement MS16257: Remove 'clear overlay when moving' setting and code 2018-06-27 14:07:04 -07:00
John Conklin II
b9439d1e6b
Merge pull request #13384 from ctrlaltdavid/21892
Fix entity detaching from head joint not becoming visible
2018-06-27 12:32:52 -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
1804422df0 remove orb in the otherAvatar destructor, and check
_otherAvatarOrbMeshPlaceholder pointer before updating the position
2018-06-27 11:15:42 -07:00
Angus Antley
eba4a27329 added newline to the end of AvatarManager.cpp 2018-06-27 05:59:53 +01:00
amantley
39edc21423 spaced comment fixed 2018-06-26 17:47:36 -07:00
amantley
8b13905d6c final final final coding standards 2018-06-26 17:43:45 -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
Dante Ruiz
3cf36bed55 making small adjustments 2018-06-26 14:57:15 -07:00
Dante Ruiz
1fec900ba6 disable flying by default 2018-06-26 13:31:59 -07:00
amantley
fa1a9d04e0 everything working before trying to move otheravatar to interface 2018-06-26 13:18:26 -07: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
Andrew Meadows
756f34761f don't build AvatarMotionStates until physics enabled 2018-06-25 10:37:54 -07:00
David Rowe
af3861def8 Code review 2018-06-25 16:33:05 +12:00
David Rowe
40fb627504 Merge branch 'master' into 21892 2018-06-25 16:04:44 +12:00
John Conklin II
b7069fff71
Merge pull request #13382 from SamGondelman/particleFix
Fix Particle Entities
2018-06-22 13:27:11 -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 Gondelman
850e2d5cf5
Merge branch 'master' into particleFix 2018-06-21 17:32:24 -07:00
amantley
e4ca6c6303 added the fixes for the lurch that happens when driving or flying 2018-06-21 11:22:26 -07:00
SamGondelman
8f411ad6c8 CR 2018-06-20 16:13:10 -07:00
SamGondelman
8014f61243 loading priorities for avatars and attachments 2018-06-20 12:29:28 -07:00
sabrina-shanman
a8b2da14cf Format numeric constant in strafe crash commit to match coding standards 2018-06-20 08:45:12 -07:00
sabrina-shanman
45fdf3d68f Fix crash when walking sideways 2018-06-19 17:23:00 -07:00
Andrew Meadows
085130e3c9 avatars collide again again 2018-06-18 13:17:32 -07:00
David Rowe
be4b929301 Fix cauterization when reparent entity to a different joint 2018-06-16 16:31:06 +12:00
David Rowe
4dd6ba1d18 Fix Mac crash 2018-06-16 16:29:45 +12:00
David Rowe
249f72758e Fix entity detaching from head joint not becoming visible 2018-06-15 16:36:16 +12: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
Andrew Meadows
d31ee52d79 revert PR-13162 from RC68 2018-06-12 03:51:55 -07:00
Anthony J. Thibault
042f902d2e Merge branch 'master' into scriptedBlendshapesFaceFlags 2018-06-11 17:13:30 -07:00
Anthony J. Thibault
f773aef053 Merge branch 'master' into bug-fix/large-avatar-little-domain-rc68 2018-06-11 11:06:21 -07:00
Anthony J. Thibault
b8379045a8 Fix MyAvatar::isReadyForPhysics() in serverless domains. 2018-06-11 09:53:34 -07:00
Sam Gondelman
be28097279
Merge pull request #13339 from SamGondelman/avatarHash
Possibly fix avatarHash crash
2018-06-11 09:39:40 -07:00
Anthony Thibault
044d142635
Merge pull request #13133 from amantley/nativeCGCode
Center of Gravity Leaning
2018-06-08 17:53:55 -07:00
SamGondelman
a7d75b121f fix avatarHash crash 2018-06-08 11:20:41 -07:00
amantley
913d78841d Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes
synching with upstream master
2018-06-07 16:20:11 -07:00
Anthony J. Thibault
608575cf17 Large avatars should instantly shrink when entering small height domains
Also reduce the fudge factor for safeLanding from an additional 50% of avatar's height to 25%.
2018-06-07 15:31:40 -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
Sam Gateau
a1899e80c0
Merge pull request #13290 from AndrewMeadows/update-queryAACube
update server-side bounding box more correctly for grabbed things
2018-06-06 11:46:09 -07:00
amantley
f21431ca88 added check for the actual face tracker in MyHead.cpp to prevent crash 2018-06-05 16:33:28 -07:00