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
|
3fed38793e
|
merge andrew/origin/inertia to andrew/local/inertia
|
2015-01-15 17:55:51 -08:00 |
|
Andrew Meadows
|
250fd98fee
|
support for simple kinematic motion
|
2015-01-15 17:51:01 -08:00 |
|
Andrew Meadows
|
ff171a5782
|
Bullet is now required dependency
|
2015-01-15 10:27:43 -08:00 |
|
Andrew Meadows
|
03b8badd81
|
EntityItem stores density rather than mass.
|
2015-01-14 15:00:57 -08:00 |
|
Andrew Meadows
|
dcca5d532a
|
fix for glitchy physics updates
The main problem was: ObjectMotionState::_sentPosition and friends
were not being updated when the EntityServer update arrives.
|
2015-01-13 14:00:37 -08:00 |
|
Andrew Meadows
|
d2bd95703a
|
use degrees/sec for EntityItem angular velocity
|
2015-01-07 14:04:22 -08:00 |
|
Andrew Meadows
|
6f72d4ad81
|
easier to read Bullet to GLM conversions and back
|
2014-12-30 13:15:57 -08:00 |
|
Andrew Meadows
|
5e2246625b
|
fix layout to abide by the coding standard
|
2014-12-30 12:09:22 -08:00 |
|
Andrew Meadows
|
a97b8b0ea9
|
fix memory leak of EntityMotionState's
|
2014-12-29 16:33:41 -08:00 |
|
Andrew Meadows
|
8de309a7a9
|
more correct _created and _lastEdited
|
2014-12-17 12:38:26 -08:00 |
|
Andrew Meadows
|
b3731e9530
|
hack for "reliable" packet send when objects stop moving
|
2014-12-15 14:36:27 -08:00 |
|
Andrew Meadows
|
fd8e3f6169
|
add moved entities to lists for sorting
and also for outgoing packet updates
|
2014-12-12 13:28:12 -08:00 |
|
Andrew Meadows
|
ad7641c7e0
|
repairs to build when Bullet not found
|
2014-12-11 16:05:45 -08:00 |
|
Andrew Meadows
|
4977bfb708
|
ObjectMotionState puts self on outgoing queue
|
2014-12-11 12:40:43 -08:00 |
|
Andrew Meadows
|
572ceb75a4
|
clarification of what outgoing flags are about
|
2014-12-11 12:07:53 -08:00 |
|
Andrew Meadows
|
11f1ad1d7f
|
move worldOffset into ObjectMotionState
add more methods for getting/clearing incoming/outgoing flags
|
2014-12-11 10:52:34 -08:00 |
|
Andrew Meadows
|
ab75150175
|
moved position/velocity send history to base class
|
2014-12-10 17:00:23 -08:00 |
|
Andrew Meadows
|
b0cc3a8509
|
add logic for when to update moving entity
|
2014-12-08 17:18:07 -08:00 |
|
Andrew Meadows
|
85e7c6166b
|
support for spherical entities
|
2014-12-03 12:10:26 -08:00 |
|
Andrew Meadows
|
919214b7cb
|
split ShapeInfo into shared and physics parts
|
2014-12-02 10:44:40 -08:00 |
|
Andrew Meadows
|
1df6c32a4e
|
moving Shape* back into shared lib
removing dependency of entities lib on physics lib
physics lib now depends on entities lib
|
2014-12-01 16:03:14 -08:00 |
|
Andrew Meadows
|
01b76af9d0
|
moved EntityMotionState.* to CustomMotionState.*
|
2014-11-06 10:58:04 -08:00 |
|
Andrew Meadows
|
1097e7f1f2
|
stubbery for EntityMotionState
|
2014-11-05 16:35:06 -08:00 |
|