Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 01:00:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
82052 commits 75 branches 59 tags 1.2 GiB
Commit graph

1523 commits

Author SHA1 Message Date
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
SamGondelman
e102ad073e allow flying in HMD if you would otherwise fall forever 2019-02-25 11:49:38 -08:00
Andrew Meadows
304f993391 remove enforcement of MOTION_TYPE_STATIC for mesh shapes 2019-02-15 16:50:45 -08:00
Andrew Meadows
7446fa9e7e allow mesh shapes to use MOTION_TYPE_KINEMATIC 2019-02-15 15:00:09 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping 
Case 20242: FST materialMapping supports our material JSON format
 2019-02-15 11:21:51 -08:00
Andrew Meadows
ba91bab224 remove cruft 2019-02-13 10:05:32 -08:00
Andrew Meadows
d4c52e4b1c fix implicit cast warning for Visual Studio 2019-02-12 15:37:09 -08:00
Andrew Meadows
8bdac589b8 use RingBuffer for gradual garbage collection 2019-02-12 15:37:09 -08:00
Andrew Meadows
c9b142531b add more tracing details in PrePhysics 2019-02-12 15:37:09 -08:00
Andrew Meadows
a3567dea3a clean HashKey API, reduce dependency tree 2019-02-12 15:37:09 -08:00
Andrew Meadows
17ab0cb92e more robust ShapeManager garbage collector 2019-02-12 15:37:09 -08:00
SamGondelman
77a8ddb3f0 Merge remote-tracking branch 'upstream/master' into materialMapping 2019-02-11 16:35:05 -08:00
SamGondelman
f7a487a020 move materialcache et al to material-networking library 2019-02-08 10:28:07 -08:00
Jeff Clinton
54109deab9
Merge pull request #14825 from SamGondelman/fall 
Case 20829: Always fall when flying is not allowed
 2019-02-07 14:39:46 -08:00
Shannon Romano
6fd480e51d
Merge pull request #14795 from AndrewMeadows/myAvatar-vs-backfacing-triangles-2 
case 17773: reduce likelihood MyAvatar will get stuck in mesh geometry when flying around
 2019-02-06 15:52:31 -08:00
SamGondelman
5553752d81 fall when flying not allowed 2019-01-30 18:04:44 -08:00
Seth Alves
f33e5ba5ae cleanup 2019-01-30 14:47:38 -08:00
Seth Alves
0846eb8ec6 attempt to allow position edits in releaseGrab entity-method 2019-01-30 14:43:11 -08:00
Andrew Meadows
e372cb668a enable CCD for MyAvatar's RigidBody 2019-01-29 11:11:54 -08:00
Andrew Meadows
fb5ef95a5b disable bf triangle collisions for flying MyAvatar 2019-01-29 11:00:18 -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