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 |
|