howard-stearns
dc7a9f253c
kill agents in avatar mixer when they stop being avatars
2016-10-05 13:06:11 -07:00
Ryan Huffman
5e8c8f84b5
Handle edge cases of AVATAR_SELF_ID being used with entities
2016-09-13 16:34:05 -07:00
Seth Alves
1a9f43cb67
fix AvatarActionHold's idea of where the controllers are when the avatar has been scaled
2016-09-01 12:17:34 -07:00
Seth Alves
39f52b3682
start on faux avatar joint that represent hand controllers
2016-08-25 10:58:23 -07:00
Anthony J. Thibault
c6ea64926c
Sensor space entity support
...
You can do this by parenting an entity to an avatar's -2 joint index.
This will mean that the entity will follow the avatar as it moves in the world, but
will not follow the avatar's position as it moves in sensor space. Essentially, this
gives you the ability to place objects in the user's physical room.
WebTablets now are located in this feature and no longer jitter.
2016-08-23 10:13:06 -07:00
Andrew Meadows
7280992806
add mutex lock around AvatarData joint data
2016-07-23 10:30:44 -07:00
Seth Alves
4e70e8ed42
js call to ray-pick against avatars
2016-06-28 09:55:49 -07:00
Seth Alves
f070708b4a
_avatarEntityData is accessed by more than one thread.
2016-06-08 15:53:54 -07:00
Anthony J. Thibault
9aad38b2c2
merge fix
2016-05-23 10:39:39 -07:00
Anthony J. Thibault
a1c32f8c44
Merge branch 'master' into tony/improved-avatar-mixer-precision
2016-05-23 10:24:52 -07:00
Anthony J. Thibault
b95ba8141c
AvatarData packet overhaul, uses a structure instead of raw memcpy
2016-05-19 20:26:00 -07:00
Anthony J. Thibault
13a057513a
Removed jointIndices transmission experiment
2016-05-19 16:46:17 -07:00
Seth Alves
419c744bd4
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-19 09:49:18 -07:00
Anthony J. Thibault
de1204c42d
Enable transmission of jointIndices
2016-05-18 18:19:28 -07:00
Anthony J. Thibault
135fa8c2aa
Moved jointIndices transmission behind #ifdef
2016-05-18 15:41:21 -07:00
Anthony J. Thibault
c48fce4f5a
WIP commit, socket errors when AvatarIdentity is larger then MTU
2016-05-18 15:24:10 -07:00
Anthony J. Thibault
b48134e30c
WIP commit testing for joint mapping transmission
2016-05-18 11:40:45 -07:00
Seth Alves
3380b2a668
Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3
2016-05-17 19:10:33 -07:00
Andrew Meadows
c64612c42b
namechange keyboardMotor --> actionMotor
2016-05-17 14:46:50 -07:00
Stephen Birarda
2cf943b2b1
remove billboard code from AvatarData
2016-05-12 16:41:44 -07:00
Seth Alves
1e849956c9
get rid of _avatarEntityChangedTime
2016-05-10 14:48:19 -07:00
Seth Alves
0e6d9a1eec
avatar mixer can relay "client-only" entities between interfaces -- the entity server wont know about them.
2016-05-07 14:48:31 -07:00
Brad Hefta-Gaub
691ee87c73
fix to default avatar model
2016-03-22 11:32:38 -07:00
Anthony J. Thibault
7cab8f63fb
Merge branch 'master' of github.com:highfidelity/hifi into tony/no-locks-no-problem
2016-03-21 16:03:33 -07:00
Anthony J. Thibault
ce47f83288
Prevent deadlock if idle is called during rendering
...
This extraordinary event can occur if a MessageBox is popped up by the opengl driver.
* removed AvatarData::avatarLock
* removed AvatarUpdate
This code was left over from an earlier avatar threading experiment.
Removed AvatarData avatarLock and AvatarUpdate class
2016-03-21 15:11:15 -07:00
Brad Hefta-Gaub
492e71345a
Revert "Revert "Fix ModelBlender crash""
...
This reverts commit f274cdcc7f
2016-03-21 11:42:25 -07:00
Brad Hefta-Gaub
f274cdcc7f
Revert "Fix ModelBlender crash"
2016-03-21 10:47:31 -07:00
Brad Hefta-Gaub
7483b8546b
remove FaceModel, make Model support shared_from_this() so we can ave shared and weak pointers to it
2016-03-17 17:05:35 -07:00
Anthony J. Thibault
807d31743c
Removed Hand, HandData & PalmData
...
Instead, we just store two controller::Poses in MyAvatar.
Existing behavior and scripting APIs have been preserved.
The hand controller debug drawing is slightly different, but still works.
2016-03-10 19:33:31 -08:00
Anthony J. Thibault
072172b1a2
SpatiallyNestable: now with velocity support!
...
Moved velocity and angularVelocity into the SpatiallyNestable base class.
Entity velocity and angularVelocity properties are now relative to their parent, similar to the way position and orientation work for entities.
MyAvatar rig animations now use SpatiallyNestable to convert velocity into local frame to drive the animation state machine.
2016-02-08 19:43:23 -08:00
Brad Davis
664100b9b1
Attachment dialog
2016-01-26 21:55:40 -08:00
Seth Alves
09dd3e2a56
merge from upstream, respond to code review
2016-01-19 14:38:22 -08:00
Anthony J. Thibault
7bef1ebdac
Merge remote-tracking branch 'upstream/master' into tony/soft-avatar-attachment-script
2016-01-07 16:14:52 -08:00
Anthony J. Thibault
031f59b7b5
Support for adding soft attachments from script.
...
Also, bug fixes for setting MyAvatar.attachmentData property.
2016-01-07 16:12:36 -08:00
Andrew Meadows
6eb177091b
overhaul of MotionState cleanup
...
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
2016-01-07 10:19:46 -08:00
Anthony Thibault
95f821d61a
Merge pull request #6732 from sethalves/set-model-entity-joints
...
hook up a way for scripts to set model-entity joint state
2016-01-05 17:31:18 -08:00
Andrew Meadows
9ab5ef358a
remove dangling whitespace
2016-01-05 16:44:36 -08:00
Seth Alves
b222c12857
unmangle merge
2016-01-05 12:21:50 -08:00
Seth Alves
96f506a98d
code review
2016-01-05 07:27:27 -08:00
Seth Alves
ce1b8ae6f0
Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting
2016-01-04 19:35:36 -08:00
Anthony J. Thibault
1618e0a92f
Network, Preferences and UI support for soft attachments
...
Added an isSoft field to the AttachmentData which is edited
by the Attachment Dialog Menu, sent over the network via
AvatarData identity packets and saved in the Interface.ini preferences.
AvatarData and AvatarBulkData version number has been bumped.
Changed Avatar attachment collections to use smart pointers to models
instead of raw ones. Removed _unusedAttachmentModels.
I don't think the caching was worth the added code complexity.
2015-12-18 13:32:09 -08:00
Seth Alves
9e5116bf4f
Merge branch 'dejitter-hold-action' of github.com:sethalves/hifi into near-grab-via-parenting
2015-12-16 15:56:31 -08:00
Andrew Meadows
c3823de353
setClampedTargetScale()-->setTargetScaleVerbose()
2015-12-15 18:18:08 -08:00
Andrew Meadows
33634cdaa1
properly delete departing avatars
2015-12-15 18:18:08 -08:00
Seth Alves
c74f8bca49
location getters also return a success boolean so that callers can know if the value they are receiving is bad due to lack of information about an object's parent
2015-12-14 09:13:36 -08:00
Seth Alves
0bf276efa5
adjust method names to fit convention
2015-12-07 14:37:35 -08:00
Seth Alves
f99812a903
adjust method names to fit convention
2015-12-07 14:31:08 -08:00
Seth Alves
fff4e3e831
make SpatiallyNestable setters take values by reference
2015-12-06 12:01:30 -08:00
Ryan Huffman
89c412c324
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-12-04 11:38:28 -08:00
Seth Alves
0595ef0938
merge from upstream
2015-12-02 09:30:19 -08:00
