Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-27 23:10:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
71812 commits 71 branches 59 tags 1.2 GiB
Commit graph

1372 commits

Author SHA1 Message Date
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
Sam Gateau
b92d1061c4
Merge pull request #13920 from AndrewMeadows/dont-bid-for-locked 
don't bid for simulation ownership of locked entities
 2018-09-04 13:26:21 -07:00
Andrew Meadows
727bd6b05a don't bid for simulation ownership of locked things 2018-08-31 13:31:26 -07:00
sabrina-shanman
397b03d5d5 Add threshold parameter to collision pick with minimum of 0 2018-08-27 14:12:24 -07:00
Andrew Meadows
10d0833c19 use DynamicsWorld::numCollisionObjects instead of our own count 2018-08-23 15:57:54 -07:00
Andrew Meadows
777b90bdc0 add 'physics body count' to debug stats 2018-08-23 12:59:28 -07:00
Andrew Meadows
87223946ad add/remove avatars according to workload region 2018-08-23 12:59:28 -07:00
John Conklin II
e6c81cdfba
Merge pull request #13833 from sabrina-shanman/stt_performance 
Performance improvements for Collision Pick API
 2018-08-20 17:34:46 -07:00
Andrew Meadows
3068865a6c fix MyAvatar collision bug at transitions b/w meshes 2018-08-20 11:42:28 -07:00
sabrina-shanman
74f482b361 Revert "Convert entityIntersections/avatarIntersections lists in" 
This reverts commit aa4a6b2eae.
 2018-08-20 10:15:28 -07:00
sabrina-shanman
2933038d04 Rename PhysicsEngine::getCollidingInRegion to contactTest and change it to accept collision flags instead of a MotionState enum 2018-08-17 14:22:42 -07:00
sabrina-shanman
aa4a6b2eae Convert entityIntersections/avatarIntersections lists in 
CollisionPickResult to shared pointers
 2018-08-16 08:59:29 -07:00
sabrina-shanman
61d12923ea Do not copy list of collision pick contact points when filtering them 2018-08-15 11:12:50 -07:00
sabrina-shanman
83ededfd37 Pass collision filter flags into AllContactsCallback for more efficient collision filtering 2018-08-15 11:12:50 -07:00
sabrina-shanman
2576d502ab Remove unused getter for btCollisionWorld in PhysicsEngine 2018-08-13 17:27:57 -07:00
sabrina-shanman
e5cb078133 Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target 2018-08-13 14:51:37 -07:00
sabrina-shanman
ad36e23c34 Return early when colliding MyAvatar is found in AllContactsCallback 2018-08-09 17:00:54 -07:00
sabrina-shanman
6249d1c3aa Initialize btCollisionWorld::ContactResultCallback BEFORE AllContactsCallback variables 2018-08-08 10:32:26 -07:00
Andrew Meadows
49a1d0a18a MyAvatar RigidBody ignores backfacing triangles 2018-08-08 09:11:09 -07:00
sabrina-shanman
4ffe164569 Address Mac/Linux build warnings 2018-08-08 08:56:35 -07:00
sabrina-shanman
870940b3a0 Merge branch 'master' into safe-teleport-target 2018-08-03 18:14:43 -07:00
sabrina-shanman
b7d5804edb Format if..else statements 2018-08-03 12:55:11 -07:00
sabrina-shanman
0b40608650 Fix collision picks not working with MyAvatar 2018-08-03 12:05:58 -07:00
Andrew Meadows
bd6f00e707 eliminate angular dynamics of other-avatars 2018-08-01 11:58:52 -07:00
Andrew Meadows
c939699879 ignore other-avatar angularVelocity in physics simulation 2018-08-01 11:22:58 -07:00
sabrina-shanman
de7d974336 Re-name EntityIntersection to ContactTestResult and remove its default constructor, plus update related variables 2018-07-30 16:45:31 -07:00
sabrina-shanman
41a8deb575 Fix Linux build warnings 2018-07-30 14:51:04 -07:00
John Conklin II
df917688b6
Merge pull request #13707 from AndrewMeadows/fix-ccd 
more correct continuous collision detection for thin objects
 2018-07-27 14:32:41 -07:00
Andrew Meadows
cf04a91a83 use smaller CCD spheres for thin objects 2018-07-27 09:02:19 -07:00
sabrina-shanman
8f993e4740 Change meaning/naming of collision points in CollisionPick API to better match spec and be more clear 2018-07-25 11:45:13 -07:00
sabrina-shanman
5ec277e458 Move bullet references in collision pick API to PhysicsEngine 2018-07-24 15:47:49 -07:00
sabrina-shanman
f33ee55f9e Create CollisionPick API 2018-07-19 10:33:21 -07:00
Andrew Meadows
207aea8712 remove cruft from rendering collision shapes 2018-07-16 10:29:34 -07:00
John Conklin II
8669b529dc
Merge pull request #13592 from luiscuenca/blueScreenFix 
Fix blue screen in VR mode due to NaN values
 2018-07-13 09:12:47 -07:00
luiscuenca
45f8ed010c formatting 2018-07-12 16:03:15 -07:00
luiscuenca
1ab6c7a8ac Proper fix 2018-07-12 14:00:55 -07:00
luiscuenca
ced4e1e0e0 Fix blue screen after player step returns NaN values 2018-07-11 18:02:19 -07:00
Andrew Meadows
8ea18e3359 integrate active kinematic even when grabbed 2018-07-10 11:20:18 -07:00
Andrew Meadows
9171fcbe8b explicit insert/erase into _simpleKinematicEntities 2018-07-10 11:17:13 -07:00
John Conklin II
1bd698a5dc
Merge pull request #13558 from danteruiz/fix-falling-through-floor 
Fix falling through floor
 2018-07-06 13:44:08 -07:00
Dante Ruiz
fdf58ab2b5 fixing edge case 2018-07-06 11:09:59 -07:00
Dante Ruiz
3cc54c5118 another round of small adjustments 2018-07-06 09:11:42 -07:00
Dante Ruiz
6d8fe870e4 some clean up 2018-07-06 09:00:00 -07:00
Dante Ruiz
533164e1e4 some more fixes 2018-07-06 08:55:20 -07:00