Commit graph

1483 commits

Author SHA1 Message Date
HifiExperiments
97b9179144 merge with master 2019-09-05 00:46:56 -07:00
luiscuenca
02e730a4d9
fix size_t warning 2019-08-14 08:08:32 -07:00
luiscuenca
1570c59a45
Allow collapsing of all multi spheres 2019-08-13 16:06:44 -07:00
luiscuenca
6e4d1bde8e
Fix code and warnings 2019-07-24 13:16:53 -07:00
luiscuenca
9cec979552
Add sit API to MyAvatar 2019-07-23 14:20:54 -07:00
SamGondelman
60600779c9 merge with master 2019-07-12 11:01:17 -07:00
Andrew Meadows
520c62f6f6 wait for objects added to physics before stop SafeLanding 2019-07-09 15:51:56 -07:00
David Rowe
2d6d3eb4fe Doc review 2019-06-28 17:05:36 +12:00
SamGondelman
9c1b139d5f merge with master 2019-06-25 23:46:39 -07:00
Sam Gondelman
e4847cc4ae
Merge branch 'master' into proceduralMesh 2019-06-24 10:16:45 -07:00
David Rowe
4c8f281383 Typos etc. 2019-06-22 14:16:17 +12:00
David Rowe
b2b7a6ae99 Merge branch 'master' into DOC-79 2019-06-22 12:11:22 +12:00
SamGondelman
f2e3218ec0 possible fix for do_setPipeline crash and other mac fixes 2019-06-19 16:34:38 -07:00
David Rowe
72fdbc0aa8 Entity information and manipulation 2019-06-19 10:18:48 +12:00
SamGondelman
88003c37d7 fix physics assert 2019-06-10 17:12:56 -07:00
Sam Gondelman
16a56dc1ec
Merge branch 'master' into proceduralMesh 2019-06-04 09:56:25 -07:00
Andrew Meadows
351f9991eb removeOwnershipData() last minute before EntityMotionState delete 2019-05-30 10:16:53 -07:00
Andrew Meadows
a6a877d930 clear _entitiesToDeleteLater on shutdown 2019-05-24 16:17:55 -07:00
Andrew Meadows
5988f8cce6 avoid calling removeOwnershipData() from multiple threads 2019-05-24 16:12:21 -07:00
SamGondelman
283cc18269 Merge remote-tracking branch 'upstream/master' into proceduralMesh 2019-05-16 16:33:16 -07:00
SamGondelman
da254c2ccc (¬‿¬) 2019-05-15 23:48:04 -07:00
Roxanne Skelly
0ac597d76e BUGZ-87 - loading/physics stuck when entering domain
A race condition was occurring when multiple entities using
the same models were handed over to physics around the same time.
The first model is passed to a worker thread to turn it into a shape
and subsequent models note they are the same and don't create a shape
or worker thread.

The physics system was ignoring these, never marking them as ready
for physics.
2019-05-14 16:14:44 -07:00
Andrew Meadows
5a257eb137 avoid crash for RenderableModelEntityItem with invalid model 2019-05-14 09:48:06 -07:00
Andrew Meadows
f60dbda25e clear all HARD flags when reinserting object in PhysicsEngine 2019-05-08 14:48:49 -07:00
Andrew Meadows
72c6cad581 cleanup _deadWorker in dtor, more correct _nextOrphanExpiry 2019-05-07 15:15:53 -07:00
Andrew Meadows
81f960a4bd remove from _physicalObjects list after transaction 2019-05-06 17:37:35 -07:00
Andrew Meadows
bef053584b don't forget to clear _activeStaticBodies 2019-05-06 17:37:35 -07:00
Andrew Meadows
d6a20a4abd fix inverted logic typo 2019-05-06 17:37:35 -07:00
Andrew Meadows
53ad41e5ee include <chrono> in ShapeManager.h 2019-05-06 17:37:35 -07:00
Andrew Meadows
f6916edac4 cleanup and removing some accidental C++-20-isms 2019-05-06 17:37:35 -07:00
Andrew Meadows
e770bd6142 build CollisionShapes and load RigidBodies even when not yet stepping 2019-05-06 17:37:35 -07:00
Andrew Meadows
6e27b4d1c5 remove bodies of deleted entities 2019-05-06 17:37:35 -07:00
Andrew Meadows
a0841c937c fix logic around updating off-thread shapes 2019-05-06 17:37:35 -07:00
Andrew Meadows
915cbb69df split work out of EntityTree::update(), call it preUpdate() 2019-05-06 17:37:35 -07:00
Andrew Meadows
3eed8218ca overhaul of MotionState and shape creations 2019-05-06 17:37:35 -07:00
Andrew Meadows
3c8c68d187 track EntityItem adds to physcis with pending shape 2019-05-06 17:35:57 -07:00
Andrew Meadows
deee159892 unravel physics-vs-entities lib dependencies part 1 2019-05-06 17:35:57 -07:00
Andrew Meadows
8445eaf310 protect against orphaned off-thread-assembled shapes 2019-05-06 17:35:57 -07:00
Andrew Meadows
fbd4db5505 build StaticMeshShapes outside of mainloop 2019-05-06 17:35:57 -07:00
Saracen
3dde53f743 Friendlier and more understandable naming. 2019-04-11 03:57:34 +01:00
Saracen
eb8e912808 Added missing checks to ground and takeoff state. 2019-04-11 03:29:58 +01:00
Saracen
bce80130bd Allow players to disable automatic falling to flight threshold. 2019-04-09 21:07:17 +01:00
Anthony Thibault
b8b7798ad9
Merge pull request #15296 from luiscuenca/kdopsRotOffsetFix
Add joint rotation offset to the avatar multi-sphere shapes
2019-04-05 15:55:34 -07:00
Anthony Thibault
0e2c5ea3c2
Merge pull request #15291 from luiscuenca/multiSpheresMixFix
Fix avatar multi-sphere bad scaling on some avatars
2019-04-05 15:55:13 -07:00
Andrew Meadows
1860e61a30 more correct collision group during grabs 2019-04-03 07:42:56 -07:00
luiscuenca
a7c36c9505 Merge branch 'master' into kdopsRotOffsetFix 2019-03-29 10:29:30 -07:00
luiscuenca
bea45e67cb Fix multisphere scale, desyncronize visualization and support joint scaling 2019-03-28 17:38:17 -07:00
Shannon Romano
c0240d2431
Merge pull request #14932 from AndrewMeadows/allow-kinematic-mesh
Case 21227: don't enforce MOTION_TYPE_STATIC on mesh shapes
2019-03-11 15:33:32 -07:00
luiscuenca
79b7a3d28d Apply kdop computation after reading the joint rotation offsets 2019-03-04 13:15:15 -07:00
Dante Ruiz
d33400f6ad fix GCC compiler warning 2019-02-28 15:25:15 -08:00