Andrew Meadows
|
b4da2ddd52
|
fix physics crash on disconnect from domainserver
|
2015-02-05 09:13:32 -08:00 |
|
Andrew Meadows
|
58bb137c4d
|
bulletRotationStep --> computeBulletRotationStep
|
2015-01-27 17:37:12 -08:00 |
|
Andrew Meadows
|
23bd3f90d9
|
Bullet-style rotation integration for kinematics
and for dead reckoning after wire-transfer
|
2015-01-27 17:27:15 -08:00 |
|
Andrew Meadows
|
d1cf6559c5
|
merge upstream/master into andrew/isentropic
Conflicts:
libraries/physics/src/ObjectMotionState.cpp
|
2015-01-27 16:24:11 -08:00 |
|
Andrew Meadows
|
d5c0c200de
|
optimization for when physics engine doesn't step
|
2015-01-27 15:54:32 -08:00 |
|
Andrew Meadows
|
aebdd3b335
|
fix bad extrapolation of rapidly spinning objects
|
2015-01-27 15:53:37 -08:00 |
|
ZappoMan
|
23892ab1e7
|
fixed comments
|
2015-01-27 11:38:14 -08:00 |
|
ZappoMan
|
94e04e2d7d
|
removed extra whitespace
|
2015-01-27 11:34:46 -08:00 |
|
ZappoMan
|
b1586d4f90
|
move debug into ifdef
|
2015-01-27 11:29:17 -08:00 |
|
ZappoMan
|
45dbff67f8
|
more hacking
|
2015-01-27 11:15:33 -08:00 |
|
ZappoMan
|
83d1cc911a
|
hacking
|
2015-01-26 19:38:24 -08:00 |
|
ZappoMan
|
81185cfe56
|
removed some debugging
|
2015-01-26 12:46:22 -08:00 |
|
ZappoMan
|
08fbcbaf40
|
tweaks for debugging
|
2015-01-26 12:38:02 -08:00 |
|
ZappoMan
|
a1ec44b8e0
|
add developer menu item to disable sending physics updates
|
2015-01-26 12:05:57 -08:00 |
|
ZappoMan
|
73b9c06ec0
|
added some debugging
|
2015-01-26 11:13:30 -08:00 |
|
ZappoMan
|
f85774c687
|
adding some debugging
|
2015-01-26 09:45:33 -08:00 |
|
ZappoMan
|
9cc61e90f7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fixGlitches
Conflicts:
libraries/entities/src/EntityItem.cpp
|
2015-01-23 15:01:35 -08:00 |
|
Andrew Meadows
|
1ad5f9c7db
|
merge upstream/master into andrew/isentropic
Conflicts:
libraries/physics/src/ObjectMotionState.cpp
|
2015-01-23 14:04:26 -08:00 |
|
ZappoMan
|
c01d2d657c
|
added comment
|
2015-01-23 13:55:12 -08:00 |
|
Andrew Meadows
|
b34189115d
|
Merge branch andrew/isentropic
|
2015-01-23 13:21:45 -08:00 |
|
Andrew Meadows
|
f2bcdfa2b4
|
update _lastSimulated for kinematic motion
|
2015-01-23 13:10:41 -08:00 |
|
Andrew Meadows
|
eefd32b42b
|
remove KinematicController classes
|
2015-01-23 11:04:02 -08:00 |
|
Andrew Meadows
|
d173afaa70
|
add support for non-physical kinematic movement
|
2015-01-23 11:01:46 -08:00 |
|
Andrew Meadows
|
355759d3d4
|
Merge pull request #4152 from ZappoMan/fixGlitches
Fix glitches in bullets and multiple viewers
|
2015-01-22 13:49:00 -08:00 |
|
ZappoMan
|
d34764bd55
|
fix whitespace diff
|
2015-01-22 13:33:59 -08:00 |
|
ZappoMan
|
6a9a6968f2
|
debugging stutter
|
2015-01-22 13:32:57 -08:00 |
|
ZappoMan
|
c6ad1462e6
|
debugging stutter
|
2015-01-22 13:31:59 -08:00 |
|
ZappoMan
|
838a549abe
|
debugging stutter
|
2015-01-22 13:31:09 -08:00 |
|
ZappoMan
|
14c7dc8eb9
|
debugging stutter
|
2015-01-22 13:13:18 -08:00 |
|
Andrew Meadows
|
3997b916c1
|
remove ground collision hack for physics testing
|
2015-01-22 09:17:51 -08:00 |
|
Andrew Meadows
|
77c4362991
|
fix typo
|
2015-01-21 18:14:24 -08:00 |
|
Andrew Meadows
|
b2e79a0157
|
don't process results when no simulation
|
2015-01-21 18:06:19 -08:00 |
|
Andrew Meadows
|
2751fab2c3
|
don't send collision events for inactive pairs
also throttle collision events to 30/sec
|
2015-01-21 18:02:13 -08:00 |
|
Andrew Meadows
|
1c38b08e8f
|
remane emitEntityCollision... to entityCollision...
|
2015-01-21 14:07:23 -08:00 |
|
Andrew Meadows
|
6840daa0b5
|
removing tabs from formatting
|
2015-01-21 11:55:28 -08:00 |
|
Andrew Meadows
|
e49c76656f
|
merge upstream/master into andrew/isentropic
Conflicts:
libraries/physics/src/PhysicsEngine.cpp
|
2015-01-21 11:35:36 -08:00 |
|
Andrew Meadows
|
86583f3f3f
|
physics collisions emit script collision events
|
2015-01-21 11:27:32 -08:00 |
|
Andrew Meadows
|
790d07d346
|
track known contacts and generate collision events
|
2015-01-20 14:18:10 -08:00 |
|
Andrew Meadows
|
5da38834e2
|
introduce notion of NumSteps vs NumSubsteps
|
2015-01-20 11:16:40 -08:00 |
|
Andrew Meadows
|
0154c613d0
|
change FrameCount to NumSubsteps for more accuracy
|
2015-01-20 11:02:48 -08:00 |
|
Andrew Meadows
|
549e3fac5f
|
store backpointer to MotionState in btRigidBody
|
2015-01-20 10:45:58 -08:00 |
|
Andrew Meadows
|
e4f29412d5
|
cheaper failure adding entity to physics engine
|
2015-01-19 18:11:14 -08:00 |
|
Andrew Meadows
|
171fead347
|
remove log about failure to add to physics engine
|
2015-01-19 15:55:53 -08:00 |
|
Andrew Meadows
|
840acecbe6
|
merge upstream/master into andrew/bispinor
Conflicts:
libraries/physics/src/EntityMotionState.cpp
|
2015-01-16 15:22:06 -08:00 |
|
Andrew Meadows
|
d5efc375d9
|
Merge pull request #4128 from ZappoMan/master
fix double targets and freezing bullets
|
2015-01-16 14:37:22 -08:00 |
|
Andrew Meadows
|
d5119b3532
|
merge upstream/master into andrew/bispinor
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/physics/src/EntityMotionState.h
libraries/physics/src/ObjectMotionState.cpp
libraries/physics/src/PhysicsEngine.cpp
libraries/physics/src/PhysicsEngine.h
|
2015-01-16 14:36:27 -08:00 |
|
ZappoMan
|
9a60896a40
|
fix double targets and freezing bullets
|
2015-01-16 14:24:50 -08:00 |
|
Andrew Meadows
|
7c9419aa4e
|
fix non-bullet build
|
2015-01-16 10:34:52 -08:00 |
|
Andrew Meadows
|
2427fa68cd
|
remove unnecessary Bullet #include
|
2015-01-16 10:06:39 -08:00 |
|
Andrew Meadows
|
3fed38793e
|
merge andrew/origin/inertia to andrew/local/inertia
|
2015-01-15 17:55:51 -08:00 |
|