Commit graph

1415 commits

Author SHA1 Message Date
Seth Alves
0846eb8ec6 attempt to allow position edits in releaseGrab entity-method 2019-01-30 14:43:11 -08:00
luiscuenca
70d0ebfbec Optimization 2019-01-28 18:39:16 -07:00
luiscuenca
a6dce5dd84 Merge branch 'master' into multiSphereAvatar04 2019-01-28 17:48:22 -07:00
luiscuenca
fced9e2814 Review fixes 2019-01-28 17:43:51 -07:00
Shannon Romano
607ce00713
Merge pull request #14766 from AndrewMeadows/grab-it
case 20701: fixes for grab
2019-01-28 15:57:36 -08:00
luiscuenca
f54f9e5bfd Merge branch 'master' into multiSphereAvatar04 2019-01-25 13:54:01 -07:00
luiscuenca
df4be641eb More fixes 2019-01-25 13:42:18 -07:00
Andrew Meadows
c9ef439a7f fix more grab bugs 2019-01-25 08:46:24 -08:00
Andrew Meadows
aff1244e09 make method protected because we can 2019-01-23 23:19:48 -08:00
Andrew Meadows
b73187aed9 fix typo in comment 2019-01-23 23:19:33 -08:00
Andrew Meadows
d948168727 computeMotionType() returns KINEMATIC for things with grab 2019-01-23 21:30:15 -08:00
luiscuenca
a947c894c2 Suggested changes 2019-01-23 17:23:36 -07:00
raveenajain
3f2aa56187 feedback changes 2019-01-21 13:24:07 -08:00
raveenajain
d2e37d0c90 my and other avater changes, if setting toggled can pass through other avatar 2019-01-18 16:50:44 -08:00
luiscuenca
67cc5bd7f2 Fix warnings and wrong shapes position for myAvatar 2019-01-16 10:52:34 -07:00
luiscuenca
a7f143dbce Merge branch 'master' into multiSphereAvatar04
# Resolved Conflicts:
#	interface/src/avatar/MyAvatar.h
#	interface/src/avatar/OtherAvatar.cpp
2019-01-15 18:27:04 -07:00
luiscuenca
71e7023a3e Refactor and optimizations 2019-01-15 18:07:50 -07:00
luiscuenca
19701ef333 Fix scale and add rayTest 2019-01-11 15:36:07 -07:00
luiscuenca
95fca826a5 Add fit AABox for avatar and implement multisphere on shapeManager 2019-01-09 17:49:19 -07:00
John Conklin II
e4abb66199
Merge pull request #14627 from AndrewMeadows/fewer-avatar-entity-updates
case 20304: please don't flood the avatar-mixer with unnecessary AvatarEntity udpates
2019-01-09 14:55:23 -08:00
luiscuenca
39dc25ea92 Merge branch 'master' into multiSphereAvatar04
# Conflicts:
#	interface/src/avatar/OtherAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
2019-01-08 15:41:33 -07:00
luiscuenca
f19201fc92 Other avatar detailed collisions on motion state 2019-01-08 14:09:13 -07:00
Andrew Meadows
13a3982b5a fix ZoneEntityItem::contains() for model shapes 2019-01-04 12:38:32 -08:00
Andrew Meadows
a8325b5c00 add ZoneEntityItem::contains() and support for shapes 2019-01-04 12:37:23 -08:00
Andrew Meadows
65a7e15f5d don't send AvatarEntity updates when not necessary 2019-01-03 17:57:11 -08:00
Seth Alves
9bf9e379a3 fix far-grab initial rotation and entity-method call 2019-01-03 08:17:52 -08:00
Seth Alves
78aff6e95c grab js api; send grab information through trait system 2019-01-03 08:17:52 -08:00
luiscuenca
bd21d0589a Merge branch 'master' into otherAvatarMotionStates01 2018-12-30 10:55:05 -07:00
luiscuenca
4a8bbd79fe other avatars motion states 2018-12-30 10:53:28 -07:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays 2018-12-06 11:29:06 -08:00
SamGondelman
e282d51883 CR 2018-11-26 01:15:07 -05:00
SamGondelman
079d1dcbd6 convert clientOnly to entityHost and add local entities 2018-11-14 11:25:37 -08:00
John Conklin II
0370c60398
Merge pull request #14358 from AndrewMeadows/fix-capsuleY
Case 18436: consistent handling of CapsuleShape dimensions
2018-11-12 15:25:42 -08:00
Andrew Meadows
91f6a5057a correct capsule height when building btCapsuleShape 2018-11-06 12:54:56 -08:00
Andrew Meadows
228847b507 only look in _activeStaticBodies when body is static 2018-11-05 11:44:58 -08:00
Andrew Meadows
9e7b68fead find and remove dangling pointers from _activeStaticBodies on remove 2018-11-05 11:19:15 -08:00
Andrew Meadows
c6cde2d412 don't assign null Shape to RigidBody already in physics simulation 2018-11-05 11:19:15 -08:00
Jeff Clinton
67fe43ebb1
Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars
Small avatars now have a minimum jump height of 0.25 meters
2018-10-24 17:08:28 -07:00
Anthony Thibault
ef74014075 Small avatars now have a minimum jump height of 0.25 meters
This should improve the quality of the jump animation and improve the mobility of small avatars.
2018-10-19 13:55:56 -07:00
Andrew Meadows
bb51079284 move some bid-prep logic from EntityMotionState to EntityItem 2018-10-18 10:33:02 -07:00
unknown
4313a34ff3 Allow avatar to fly when its scale is very small 2018-10-08 15:35:07 -07:00
Andrew Meadows
c3478dc018 remove expired avatarEntities from their avatars 2018-10-05 13:48:35 -07:00
luiscuenca
012cd207b3 No data sent during basic transit 2018-09-24 11:39:10 -07:00
John Conklin II
49e578ebef
Merge pull request #13998 from AndrewMeadows/dont-zero-kinematic
don't zero kinematic velocities when releasing simulation ownership
2018-09-14 15:18:06 -07:00
John Conklin II
65ef04ae75
Merge pull request #13937 from luiscuenca/stt_teleport_wip
Safe Teleport Target
2018-09-14 15:11:18 -07:00
Andrew Meadows
9390687e2d remove redundant EntityMotionState::updateSendVelocities() call 2018-09-14 10:37:55 -07:00
Andrew Meadows
9073e1ade3 don't zero kinematic velocity at end of sim ownership 2018-09-14 10:37:17 -07:00
sabrina-shanman
f3d86cfc7d Fix crash when teleporting into avatars with bubble active 2018-09-13 10:51:53 -07:00
luiscuenca
fa3c6932c6 Merge branch 'stt_collision-group' of https://github.com/sabrina-shanman/hifi into stt_teleport_wip 2018-09-12 11:47:18 -07:00
sabrina-shanman
87b5605d69 Add normalOnPick to CollisionPickResult 2018-09-12 10:36:00 -07:00