Andrew Meadows
03b8badd81
EntityItem stores density rather than mass.
2015-01-14 15:00:57 -08:00
Stephen Birarda
51bba4884f
resolve conflicts on merge with upstream master
2015-01-05 14:40:48 -08:00
ZappoMan
4ea9bbc309
first major pass at voxelEctomy
2014-12-30 18:08:58 -08:00
Stephen Birarda
c7a5f3c86c
resolve conflicts and merge with upstream master
2014-12-29 10:59:42 -07:00
ZappoMan
72cced12a6
guards for NULL collisions, possible fix to fountain crash
2014-12-23 11:30:32 -08:00
Stephen Birarda
6fd55e6f42
make Audio class use DependencyManager
2014-12-16 12:31:01 -08:00
ZappoMan
3c09ca71cb
move emit of collisions to after done moving entities, so that callbacks can delete entities
2014-12-08 18:09:49 -08:00
ZappoMan
efbe8ce757
Merge branch 'master' of https://github.com/highfidelity/hifi into entityCollisions
2014-12-08 14:15:20 -08:00
ZappoMan
0592b74a06
make collision callbacks work
2014-12-08 14:15:03 -08:00
ZappoMan
27bc394bed
repair collision info mismatch
2014-12-08 10:52:53 -08:00
Andrew Meadows
7d96ad5836
cleanup of EntitySimulation API
...
* remove EntityItem::_simulationState (only useful to EntitySimulation)
* move code from SimpleEntitySimuation to EntitySimulation
* EntitySimulation now maintans many QSets of entities
* cleanup and clarify use of EnityTree::updateEntity()
* reduced cost of polling for entity expiries
* changed "UpdateFlags" to "DirtyFlags" and clarified what they're for
2014-12-05 18:08:53 -08:00
Andrew Meadows
0814949e4c
moving EntityCollisionSystem back to entities lib
2014-12-02 11:05:17 -08:00
Andrew Meadows
dd3a7b9b9d
EntitySimulation takes EntityItem* rather than ID
2014-11-26 12:12:43 -08:00
Atlante45
ae3bcc8f06
No more .f
2014-11-19 16:53:39 -08:00
ZappoMan
c7d544cd58
wire up collision signals
2014-10-13 14:36:06 -07:00
ZappoMan
48071bbdb3
don't collide with entities with unknown IDs
2014-10-08 11:48:30 -07:00
ZappoMan
7bea4b3123
also honor ignore collisions for voxels and avatars
2014-09-26 15:12:59 -07:00
ZappoMan
bbd476d564
handled multiple collisions correctly, and don't collide if fully enclosed
2014-09-26 14:55:05 -07:00
ZappoMan
2d81d7c554
add support for ignore collisions and collisions will/wont move entities
2014-09-26 11:43:56 -07:00
ZappoMan
2f0a9b517f
make sphere entities use sphere shape for better collisions
2014-09-25 14:49:52 -07:00
ZappoMan
9cd76983a2
swith to using shape collider instead of spheres
2014-09-25 14:35:20 -07:00
ZappoMan
9cc1fe35db
only do collisions on entities moving toward each other
2014-09-24 18:22:28 -07:00
ZappoMan
2cfa14d5ad
changed to only collide with moving entities
2014-09-24 18:06:08 -07:00
ZappoMan
4b52fddffd
collions with voxels and avatars
2014-09-24 17:37:56 -07:00
ZappoMan
8d9a923add
fix the collision last edited behavior correctly, delete collision sound code
2014-09-24 16:04:39 -07:00
ZappoMan
10865944f0
removed some debug
2014-09-24 15:44:09 -07:00
ZappoMan
f43ba4a68b
first cut at getting entities to collide
2014-09-24 15:28:04 -07:00