Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 12:07:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69267 commits 25 branches 0 tags 1.1 GiB
Commit graph

1318 commits

Author SHA1 Message Date
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
Andrew Meadows
4329ea5240 Merge master' into 'workload' 2018-06-04 16:11:25 -07:00
Andrew Meadows
db3520b332 also update queryAACube for 'Held' things 2018-06-01 16:38:57 -07:00
Andrew Meadows
7e44b9b3ae motionState needs correct region when adding to physics 2018-05-31 10:23:49 -07:00
Andrew Meadows
62df4999ef declare method const 2018-05-31 10:22:22 -07:00
Andrew Meadows
c2f5d19ddb add TODO about optimizing character ray tracing 2018-05-31 10:21:14 -07:00
Andrew Meadows
003e444246 Merge branch 'master' into 'workload' 2018-05-30 16:04:13 -07:00
Andrew Meadows
bc57003cfb activate body before disconnecting action from entity 2018-05-29 17:56:41 -07:00
Andrew Meadows
5d3502ed88 activate body when removing action 2018-05-29 17:56:41 -07:00
Andrew Meadows
1612d90cd3 minor DynamicsWorld optimizations and track global steps count therein 2018-05-25 08:31:09 -07:00
Andrew Meadows
ed62a2fc37 _lastKinematicStep now mutable, avoids explicit const_cast 2018-05-25 08:31:09 -07:00
samcake
559d436dfa Fixing the merge conflicts 2018-05-24 16:57:10 -07:00
Andrew Meadows
31dd59d212 double bits in collision groups 2018-05-24 11:28:52 -07:00
Andrew Meadows
84a2e5e443 fix yeild behavior for owned things outside of R1 2018-05-18 11:23:56 -07:00
Andrew Meadows
a9c193b672 merge 'workload-014' into 'workload' 2018-05-18 10:12:04 -07:00
Andrew Meadows
a23126a6b2 Merge 'master' into 'workload' 2018-05-18 07:38:02 -07:00
Andrew Meadows
00e360aff0 reduce sim ownership priority when releasing grab 2018-05-17 17:25:07 -07:00
Andrew Meadows
2cf6e9007b remove unsused data member 2018-05-16 13:57:51 -07:00
Sam Gateau
523d57d948
Merge pull request #13162 from AndrewMeadows/avatar-collisions 
avatars collide again
 2018-05-16 09:25:05 -07:00
Andrew Meadows
c7c4324b3c Merge 'master' into 'workload' 2018-05-15 10:22:50 -07:00
John Conklin II
c57b0a957d
Merge pull request #13138 from AndrewMeadows/avoid-div-by-zero 
avoid div by zero when measuring RigidBody effective acceleration
 2018-05-14 13:41:08 -07:00
Andrew Meadows
6de175e794 avatars collide again 2018-05-11 17:01:48 -07:00
Seth Alves
85a6e2555f don't assert when unserializing a 'spring' action 2018-05-11 13:55:29 -07:00
John Conklin II
4129664368
Merge pull request #13145 from highfidelity/stable 
Merge RC67 stable into master
 2018-05-10 17:07:20 -07:00
Andrew Meadows
b8d34f4b8f more correct variable name 2018-05-09 12:13:27 -07:00
Andrew Meadows
f454dac709 avoid div by zero when measuring acceleration 2018-05-09 12:04:44 -07:00
Seth Alves
db03265a6b when in serverless mode, short-circuit simulation ownership bids 2018-05-09 10:53:46 -07:00
Clement
da9fb9c751 Fix non self-sufficient headers 2018-05-04 16:26:41 -07:00
Andrew Meadows
b1fcb43246 send ownership removal packet when dynamic object leaves bullet 2018-05-03 16:23:13 -07:00