Andrew Meadows
f972bfd024
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
...
Conflicts:
interface/src/avatar/AvatarManager.cpp
2014-01-28 14:30:59 -08:00
Andrew Meadows
167acb8873
Adding avatars back into ParticleCollisionSystem.
...
Had to add Application::_myAvatar to the AvatarManager list so that
particles would properly collide.
2014-01-28 14:16:34 -08:00
Stephen Birarda
2aaa9ce3f6
resolve conflicts on merge with upstream master
2014-01-28 12:30:43 -08:00
Stephen Birarda
4103cc1cde
packet header changes and beginning of conversion to QByteArray
2014-01-28 10:36:08 -08:00
Andrew Meadows
ade02c0259
Bug fix: update ALL avatars in the AvatarManager (rather than just one).
...
Reviewed with Birarda and pushed directly to upstream.
2014-01-28 09:32:58 -08:00
Andrew Meadows
2b5675b077
Fix issue #1684 : particles collide against avatars again.
...
This a quick and dirty fix to resurrect particle-avatar collisions.
We rebuild and pass a list of AvatarData* to the
ParticleCollisionManager every call to update().
2014-01-27 18:01:53 -08:00
Stephen Birarda
10cfd628aa
resolve conflicts on merge with upstream master
2014-01-23 17:52:30 -08:00
Stephen Birarda
2aac064a67
increase debug for Avatar removal from AvatarManager
2014-01-23 17:44:06 -08:00
Stephen Birarda
b495e6251d
add a weak pointer to the avatar mixer that owns the avatar
2014-01-23 17:39:14 -08:00
Stephen Birarda
8d2e9823de
remove notion of owning node from NodeData
2014-01-23 17:06:03 -08:00
Stephen Birarda
820132cb45
cleanup debug and Avatar destructor
2014-01-23 16:47:18 -08:00
Stephen Birarda
2e548fb39c
complete migration of Avatar list to AvatarManager
2014-01-23 14:41:11 -08:00
Stephen Birarda
1f95d0c017
have avatar-mixer report avatar kills to all avatars
2014-01-23 12:47:27 -08:00
Stephen Birarda
a9f1984676
add an AvatarManager that will keep Avatars in Application thread
2014-01-23 11:59:24 -08:00
