Andrew Meadows
0d3e78fdb8
modify extrapolation behavior when bullet enabled
...
Allows Bullet to specify an object as "at rest"
by setting velocity to zero.
Also, moved velocity damping above position integration
to get the same order of operations as Bullet.
2014-12-31 16:32:09 -08:00
Andrew Meadows
9b7e50858a
merge upstream/master into andrew/inertia
...
Conflicts:
libraries/avatars/CMakeLists.txt
libraries/entities/CMakeLists.txt
2014-12-29 09:15:49 -08:00
Sam Gateau
4c670ac17a
merging with upstream master and origin temp0
2014-12-22 10:38:11 -08:00
Sam Gateau
967c6dbc4b
Add the Model library
2014-12-19 16:19:06 -08:00
Stephen Birarda
114e3bb2ff
rename cmake macro to represent actual purpose
2014-12-18 16:51:20 -08:00
Stephen Birarda
4bd3a94794
add missing avatars link to entities
2014-12-18 14:53:52 -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
57f13f3a7c
entities lib now depends on bullet (if exists)
2014-11-05 17:05:26 -08:00
Andrew Meadows
4c3cdf5b7a
move stuff out of shared and into physics library
2014-10-28 13:51:45 -07:00
ZappoMan
32d5eb3cea
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/CMakeLists.txt
interface/CMakeLists.txt
libraries/entities/CMakeLists.txt
libraries/models/src/ModelEditPacketSender.cpp
libraries/models/src/ModelEditPacketSender.h
libraries/models/src/ModelItem.cpp
libraries/models/src/ModelItem.h
libraries/octree/src/OctreeEditPacketSender.cpp
libraries/octree/src/OctreeEditPacketSender.h
libraries/octree/src/OctreePacketData.h
libraries/octree/src/OctreeQuery.cpp
libraries/particles/src/ParticleEditPacketSender.cpp
libraries/particles/src/ParticleEditPacketSender.h
libraries/script-engine/CMakeLists.txt
tests/octree/CMakeLists.txt
2014-08-18 15:16:35 -07:00
ZappoMan
77e1867b11
Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities
...
Conflicts:
assignment-client/src/Agent.cpp
assignment-client/src/Agent.h
examples/editModels.js
interface/src/Application.h
2014-07-31 10:34:23 -07:00
ZappoMan
c4fe36b13d
more Models->Entities renaming
2014-06-26 17:01:07 -07:00
