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 |
|
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 |
|
Dante Ruiz
|
09627dd3d9
|
first pass on trying to fix falling through floor
|
2018-07-06 08:28:43 -07:00 |
|
luiscuenca
|
b2e02e20cc
|
Fix inaccurate delta rotation axis
|
2018-07-05 11:47:10 -07:00 |
|
Andrew Meadows
|
ff6c309d8b
|
add comment
|
2018-07-02 15:20:51 -07:00 |
|
Andrew Meadows
|
9c32a38fb6
|
fix deactivation slow-spinning kinematics
|
2018-07-02 15:04:11 -07:00 |
|
Andrew Meadows
|
5e2a08b3c2
|
handle deactivation of avatar entities differently
|
2018-06-25 10:37:54 -07:00 |
|
Sam Gondelman
|
850e2d5cf5
|
Merge branch 'master' into particleFix
|
2018-06-21 17:32:24 -07:00 |
|
John Conklin II
|
4088035b3b
|
Merge pull request #13411 from sabrina-shanman/crash-delete-cube
Fix crash when deleting objects in serverless mode
|
2018-06-21 14:39:07 -07:00 |
|
SamGondelman
|
8f411ad6c8
|
CR
|
2018-06-20 16:13:10 -07:00 |
|
sabrina-shanman
|
59833d8f28
|
Do not use boolean for variable definitions. Use bool instead.
|
2018-06-20 15:54:19 -07:00 |
|
Andrew Meadows
|
4424a8df11
|
Merge pull request #13303 from highfidelity/workload
workload project part 1
|
2018-06-20 15:39:01 -07:00 |
|
sabrina-shanman
|
c039d20304
|
Fix objects snapping back when selected
|
2018-06-20 13:55:38 -07:00 |
|
Andrew Meadows
|
44c3620b6e
|
remove cruft
|
2018-06-18 17:45:58 -07:00 |
|
sabrina-shanman
|
67c605c10a
|
Do not use ownership tracking in serverless mode in PhysicalEntitySimulation
|
2018-06-18 16:12:38 -07:00 |
|
John Conklin II
|
9ace80c709
|
Merge pull request #13407 from AndrewMeadows/0.69.0-colliding-avatars
RC69: avatars collide again (again)
|
2018-06-18 15:21:47 -07:00 |
|
Andrew Meadows
|
a18ba36dd2
|
merge 'master' into 'workload'
|
2018-06-18 13:40:08 -07:00 |
|
Andrew Meadows
|
085130e3c9
|
avatars collide again again
|
2018-06-18 13:17:32 -07:00 |
|
Andrew Meadows
|
6d422e4678
|
Merge 'master' into 'workload'
|
2018-06-18 10:30:13 -07:00 |
|
John Conklin II
|
87d26a9d86
|
Merge pull request #13304 from sabrina-shanman/btghostraytest
Use optimized Bullet raytest function in CharacterGhostObject::rayTest()
|
2018-06-18 10:22:17 -07:00 |
|
Andrew Meadows
|
670e07bbf5
|
fix crash for computing inertia for btBvhTriangleMeshShape
|
2018-06-15 14:31:51 -07:00 |
|
Andrew Meadows
|
93ac70ead4
|
avoid crash in inertia calculation of btBvhTriangleMeshShape
|
2018-06-15 10:28:12 -07:00 |
|
sabrina-shanman
|
baf0df05cd
|
Remove unnecessary 'this->' in rayTest parent function call
|
2018-06-14 13:16:46 -07:00 |
|
Clement
|
920263ef49
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2018-06-12 17:00:25 -07:00 |
|
Andrew Meadows
|
d31ee52d79
|
revert PR-13162 from RC68
|
2018-06-12 03:51:55 -07:00 |
|
sabrina-shanman
|
d4d8f36e44
|
Change CharacterGhostObject to use base btGhostObject class instead of btPairCachingGhostObject
|
2018-06-11 15:40:39 -07:00 |
|
Seth Alves
|
a2399ea1f6
|
keep small masses from introducing NaN into bullet's calculations
|
2018-06-08 16:07:01 -07:00 |
|
sabrina-shanman
|
9ac1443b83
|
Use optimized Bullet raytest function in CharacterGhostObject::rayTest()
|
2018-06-05 11:17:17 -07:00 |
|