Stephen Birarda
ee9f8937e3
fix a silly typo
2014-02-19 18:03:34 -08:00
Jose Carlos
44d5b9b2f8
cosmetic change
2014-02-20 00:22:29 +01:00
Jose Carlos
ee7b5844b8
Minor cosmetic change
2014-02-19 23:24:26 +01:00
Jose Carlos
19cb20f0cd
Added rect around the display name with proper size, paying attention to
...
QFontMetrics data
Fully wired up the message sending and receiving from server
2014-02-15 01:05:21 +01:00
Jose Carlos
04c59b825e
merged from master
2014-02-14 20:52:22 +01:00
Jose Carlos
319d1f6795
Wired up the send of the display data to the servers
...
Added the renderDisplayName in Avatar
2014-02-12 00:54:50 +01:00
Jose Carlos
665971c2ab
Merge remote-tracking branch 'upstream/master' into 19489
2014-02-10 23:56:10 +01:00
Jose Carlos
b42c2a9dbe
Centered text
2014-02-10 23:55:43 +01:00
Andrew Meadows
be1aaee359
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-10 09:05:08 -08:00
Jose Carlos
4aa053befe
Constant size in 3D world billboard text
2014-02-09 23:59:51 +01:00
Jose Carlos
d05fb392e0
Always facing camera billboard
...
TODO: having constant fix size
2014-02-09 23:39:53 +01:00
Andrew Meadows
082b7cf1a9
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
...
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/avatar/Avatar.h
interface/src/avatar/MyAvatar.cpp
2014-02-06 14:37:19 -08:00
Andrew Meadows
802967512a
Splitting rendering of avatars and their collision proxies.
...
Also disabling old hand-avatar interactions and trying to use new stuff.
2014-02-06 14:14:48 -08:00
Stephen Birarda
f92f9ec0c2
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-02-06 09:28:03 -08:00
Andrew Meadows
aa3a1a9a72
Stop rendering our head in first person camera mode.
2014-02-05 15:35:57 -08:00
Stephen Birarda
092c969e75
more repairs to face and skeleton model passing
2014-02-04 15:48:31 -08:00
Stephen Birarda
adaa36a51d
repairs to key-framed URL sending through avatar-mixer
2014-02-04 15:28:27 -08:00
Stephen Birarda
7e3442cbd0
repair to PacketType so interface parses AM packet
2014-02-04 14:57:14 -08:00
Stephen Birarda
e879a7f18d
remove some extra spacing
2014-02-04 13:04:51 -08:00
Stephen Birarda
8bf3b7586b
initial movement of mesh/skeleton URLs out of data-server through avatar-mixer
2014-02-04 13:02:33 -08:00
Andrew Meadows
a5aff81881
Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup
2014-01-31 17:44:13 -08:00
Andrew Meadows
ed93d8db39
Moving headMouse, transmitter, and touchYaw/Pitch stuff into MyAvatar.
2014-01-31 17:42:48 -08:00
Andrew Meadows
a7ffb7df1d
Moved LookAtTargetAvatar stuff from AvatarManager to MyAvatar.
2014-01-31 13:17:12 -08:00
Stephen Birarda
b16d03c42a
remove an unneeded todo
2014-01-31 12:46:03 -08:00
Stephen Birarda
2cc6d22181
fix push bytesRead when creating dummy Avatar packets, closes #1794
2014-01-31 12:44:09 -08:00
Stephen Birarda
4573eaebc6
fix multiple avatar parsing in AvatarManager
2014-01-31 12:02:24 -08:00
Andrew Meadows
1b99bc90cf
Removing AvatarManager::clear() as unecessary during class destruction.
2014-01-30 18:02:04 -08:00
Stephen Birarda
84ef757af4
fix avatar count, HandData crash ( closes #1754 )
2014-01-30 09:45:09 -08:00
Andrew Meadows
82a4b7a4d1
Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions
...
Conflicts:
interface/src/Application.cpp
2014-01-29 13:20:42 -08:00
Stephen Birarda
33edcea5fb
resolve conflicts on merge with upstream master
2014-01-29 12:23:06 -08:00
Andrew Meadows
677341d207
fix for crash bug #1728 .
...
Moving _myAvatr to live in AvatarManager. Application still has a
pointer to it. Unfortunately the order of Application initialization
and destruction matters very much.
2014-01-28 18:04:42 -08:00
Andrew Meadows
714dbf8493
Moving MY_AVATAR_KEY back into AvatarManager.cpp
2014-01-28 14:37:32 -08:00
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
