Commit graph

873 commits

Author SHA1 Message Date
Andrew Meadows
ffc3123467 Merge pull request #7658 from sethalves/grab-fixes
Grab fixes
2016-05-09 15:30:37 -07:00
Brad Hefta-Gaub
2c0204b0d6 Merge pull request #7821 from Atlante45/fix/collision-sound
Fix avatar/entity collision sound
2016-05-09 14:24:19 -07:00
Seth Alves
f80333ee9e fix indentation, move an early exit to earlier 2016-05-06 10:06:51 -07:00
Seth Alves
71738d4841 Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-06 09:59:17 -07:00
Atlante45
f65b15803a Fix potential iterator invalidation 2016-05-05 15:04:39 -07:00
Atlante45
bc6544a3c5 Fix MyAvatar's velocity change 2016-05-05 14:55:28 -07:00
Seth Alves
0c794cac5d Merge branch 'master' of github.com:highfidelity/hifi into grab-fixes 2016-05-05 10:13:07 -07:00
Andrew Meadows
3202a723b8 remove warning about unused variable 2016-05-05 08:54:09 -07:00
Seth Alves
d76b8f2335 action->locallyAddedButNotYetReceived is unneeded with isMine available 2016-05-05 06:44:52 -07:00
Andrew Meadows
be9a572fb0 fix grab motion glitch on long-ping connections 2016-05-04 16:50:42 -07:00
Seth Alves
9db839bc13 don't allow someone else to delete an action that I own. reset dynamic property when releasing and entity, even if refCount isn't 0 2016-05-04 15:01:00 -07:00
Seth Alves
b6918f59a6 remove extra qualification 2016-05-04 11:33:41 -07:00
Seth Alves
44beca1687 try having all spring derived actions agree on a target 2016-05-04 11:29:17 -07:00
Brad Hefta-Gaub
04dab65b59 Merge pull request #7727 from ZappoMan/supportLargeClockSkew
support for larger than 35 minute clock skew
2016-04-23 08:42:38 -07:00
Andrew Meadows
2bd83764e7 remove some debug cruft 2016-04-22 09:38:43 -07:00
Andrew Meadows
872622c6f7 fix acceleration of for server-side kinematics 2016-04-22 09:38:43 -07:00
Andrew Meadows
a3c66d8c91 reduce number of updates for fast-moving objects 2016-04-22 09:38:43 -07:00
Andrew Meadows
a79f49a5cd don't stop slow kinematic objs when sending updates 2016-04-22 09:38:43 -07:00
Andrew Meadows
afcf6d68a7 move deactivation thresholds to shared header 2016-04-22 09:38:43 -07:00
Andrew Meadows
ad045bc439 remove second-order term from kinematic motion 2016-04-22 09:38:43 -07:00
Andrew Meadows
8cbec06616 fix bug where kinematic objs pop on first step 2016-04-22 09:38:43 -07:00
Andrew Meadows
3639ffe53e optimize kinematic motion math 2016-04-22 09:38:43 -07:00
Andrew Meadows
771727890c more finely grained Bullet profiling 2016-04-22 09:38:43 -07:00
Brad Hefta-Gaub
5244274ae4 fix warning 2016-04-20 19:06:31 -07:00
Brad Hefta-Gaub
31f9d592e0 support for larger than 35 minute clock skew 2016-04-20 18:42:00 -07:00
Anthony J. Thibault
0b7a5c4df8 CharacterController: leak fix for btRigidBody and it's shape 2016-04-15 15:05:54 -07:00
Andrew Meadows
bb59860cfe update Aabb's of static objects when they move 2016-04-14 11:18:10 -07:00
Andrew Meadows
dcf28937cf cleanup cached Physics::sessionUUID 2016-04-14 11:18:10 -07:00
Seth Alves
43f735dd21 avoid loop where bullet moves an entity and then an entity tells bullet that it has moved. 2016-04-09 22:18:43 -07:00
Seth Alves
af05b97c1e put back accidently deleted line. cleanups 2016-04-04 17:31:59 -07:00
Seth Alves
d814d7b35d merge from upstream 2016-04-04 16:32:49 -07:00
Seth Alves
69bb0ebd74 Revert "faster kinematic motion for entities" 2016-04-04 16:11:54 -07:00
Seth Alves
b8587e0711 update collision shapes of entities which are children of avatars 2016-04-04 16:06:53 -07:00
Andrew Meadows
7ea81f3937 add and fix comments 2016-04-03 19:15:01 -07:00
Andrew Meadows
20914df330 fix warning about signed/unsigned comparison 2016-04-01 13:31:14 -07:00
Andrew Meadows
25fbf926df CollisionWorld only updates _active_ Aabbs
we manually set/clear active state of static objects
  that need their Aabbs updated
also fixing a bug when starting kinematic motion
2016-04-01 13:14:03 -07:00
Andrew Meadows
3f52d237ed adding Bullet profiler instances for better stats 2016-04-01 13:14:03 -07:00
Andrew Meadows
ac5c055a1e don't verify simulated bit when adding to delete list 2016-03-24 21:12:22 -07:00
Andrew Meadows
ecfe198e35 patch btCompoundShape memory leak 2016-03-23 14:39:49 -07:00
Andrew Meadows
119ef24d5d cleanup ShapeManager API and fix bitrot in tests 2016-03-23 14:39:49 -07:00
Anthony J. Thibault
4a78300607 MyAvatar: Allow user to raise hands directly overhead.
Previously we were using a infinitely tall vertical cylinder
to push hand IK targets out of the body, this had the
side-effect of preventing the hands from being raised over
the head.  Now, we collide against the same 3d capsule
used by the physics system for avatar collisions.
2016-03-10 10:20:17 -08:00
Andrew Meadows
4ae94c0611 fine tuning for when to make simulation bid 2016-03-09 13:06:34 -08:00
Andrew Meadows
9157ff6eda more correct notion of desired simulation priority 2016-03-09 11:02:50 -08:00
Andrew Meadows
99a1310711 change properties at 127 priority, grab at 128 2016-03-08 22:17:44 -08:00
Seth Alves
dcb720a832 fix polyvox hull when registration changes. 2016-03-06 14:09:45 -08:00
Seth Alves
59804a0f54 cleanups 2016-03-06 12:59:41 -08:00
Seth Alves
5241dc5394 this seems to be working now. more cleanups to come 2016-03-06 12:59:33 -08:00
Andrew Meadows
b4edfe2390 no expiry for simulation ownership 2016-02-25 12:07:20 -08:00
Anthony J. Thibault
73ac47724a Rig: Prevent the hand IK targets from entering the body.
Use a 2d circle/circle intersection test to keep the hands outside of the body.
2016-02-17 16:23:18 -08:00
Andrew Meadows
2b91a31919 check for nullptr to avoid crashes 2016-02-11 13:53:01 -08:00