Stephen Birarda
|
974108734a
|
add a comment for size guard
|
2015-07-23 17:17:59 -07:00 |
|
Stephen Birarda
|
f919d2985b
|
don't attempt to send the avatar billboard if too large
|
2015-07-23 17:17:15 -07:00 |
|
Atlante45
|
8d6ff2d9f9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
|
2015-07-20 14:50:44 -07:00 |
|
Atlante45
|
256c786e28
|
Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers
|
2015-07-17 17:59:19 -07:00 |
|
Stephen Birarda
|
35c8a60f3b
|
seek to correct place for bulk avatar data
|
2015-07-17 15:57:52 -07:00 |
|
Stephen Birarda
|
0f534b9f7b
|
fixes for new read and NLPacketList
|
2015-07-17 15:43:20 -07:00 |
|
Stephen Birarda
|
fe0cdc0529
|
put AvatarHashMap slots back to private
|
2015-07-17 14:35:38 -07:00 |
|
Stephen Birarda
|
eaeaa23f03
|
resolve conflicts on merge with origin/protocol
|
2015-07-17 11:10:30 -07:00 |
|
Stephen Birarda
|
357963b6e0
|
fix reference to packet that is now buffer
|
2015-07-17 11:06:39 -07:00 |
|
Stephen Birarda
|
e5722098f6
|
resolve conflicts on merge with upstream/master
|
2015-07-17 11:06:01 -07:00 |
|
Stephen Birarda
|
7d60b86f52
|
kill the PacketLister (AKA Huffman 1 : PacketListener 0)
|
2015-07-17 09:07:39 -07:00 |
|
Stephen Birarda
|
040c7557da
|
fix double register for Agent avatar packets
|
2015-07-16 17:51:06 -07:00 |
|
Stephen Birarda
|
ce6585ccc8
|
fix AC monitor and AM double register
|
2015-07-16 17:44:43 -07:00 |
|
Atlante45
|
56886e479d
|
Use BulkAvatarData packet type for AvatarMixer upstrea
|
2015-07-16 15:28:53 -07:00 |
|
Ryan Huffman
|
b561014d77
|
Add head-lean reading back into AvatarData
|
2015-07-16 14:11:36 -07:00 |
|
Ryan Huffman
|
3429f0f57c
|
Merge branch 'protocol' of github.com:Atlante45/hifi into protocol
|
2015-07-16 14:06:21 -07:00 |
|
Ryan Huffman
|
f8f47f99c6
|
Temporarily disable body lean in avatar
|
2015-07-16 14:03:36 -07:00 |
|
Atlante45
|
00fbff112f
|
Process avatar data
|
2015-07-16 14:03:11 -07:00 |
|
Atlante45
|
c6f6dbd845
|
Fix QByteArray from rqw data
|
2015-07-16 09:59:15 -07:00 |
|
Stephen Birarda
|
05dde9d8f5
|
resolve conflicts on merge with upstream/master
|
2015-07-15 16:18:47 -07:00 |
|
Ryan Huffman
|
44c99ef89a
|
Replace bytesAvailable with bytesLefToRead
|
2015-07-15 10:44:51 -07:00 |
|
Atlante45
|
fbb6a94579
|
Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol
|
2015-07-14 16:36:28 -07:00 |
|
Ryan Huffman
|
38591a8edb
|
Update avatar billboard loading to use packet.readAll()
|
2015-07-14 15:43:15 -07:00 |
|
David Rowe
|
bfad3ee02a
|
Fix eye directions so that they're correct when avatar leans backwards
|
2015-07-14 14:07:32 -07:00 |
|
Stephen Birarda
|
fa9372875e
|
fix headers in AvatarHashMap
|
2015-07-14 13:54:10 -07:00 |
|
Stephen Birarda
|
0637f589b5
|
add PacketListener to help unregister for packets
|
2015-07-14 13:52:38 -07:00 |
|
Atlante45
|
c80df94b06
|
Update includes for moved files
|
2015-07-13 15:28:55 -07:00 |
|
Stephen Birarda
|
775c1b7310
|
Merge branch 'receive_packets' of https://github.com/huffman/hifi into atp
|
2015-07-13 14:26:23 -07:00 |
|
Stephen Birarda
|
859122db5d
|
update signature of callbacks for avatar packets
|
2015-07-13 13:32:46 -07:00 |
|
Ryan Huffman
|
6a7cd7417c
|
Update AvatarData packet processing to work with NLPacket
|
2015-07-13 12:07:01 -07:00 |
|
Brad Davis
|
29333d0cad
|
Qt5.5 fixes
|
2015-07-12 18:52:15 -07:00 |
|
Ryan Huffman
|
d74ce12098
|
Remove declaration processAvatarMixerDatagram from AvatarHashMap
|
2015-07-10 15:01:21 -07:00 |
|
Ryan Huffman
|
5a862739aa
|
Fix shared ptr call in AvatarHashMap
|
2015-07-10 12:24:17 -07:00 |
|
Ryan Huffman
|
4db3b309b5
|
Update AvatarHashMap to use QSharedPointer<NLPacket>
|
2015-07-10 08:45:54 -07:00 |
|
Ryan Huffman
|
5737b3b770
|
Fix call to size() in AvatarHashMap
|
2015-07-09 15:32:19 -07:00 |
|
Ryan Huffman
|
dd9dea7a97
|
Merge remote-tracking branch 'birarda/protocol' into receive_packets
Conflicts:
interface/src/DatagramProcessor.cpp
interface/src/octree/OctreePacketProcessor.cpp
libraries/entities/src/EntityEditPacketSender.cpp
libraries/networking/src/LimitedNodeList.h
libraries/networking/src/NLPacket.h
|
2015-07-09 14:08:35 -07:00 |
|
Ryan Huffman
|
32b232c87a
|
Update AvatarHashMap to use packet callbacks
|
2015-07-09 09:24:28 -07:00 |
|
Stephen Birarda
|
964041d8d3
|
missed API fixes in AudioClient and AvatarData
|
2015-07-08 16:53:04 -07:00 |
|
Stephen Birarda
|
4d3659b627
|
update packet creation in AvatarData to new API
|
2015-07-08 16:50:35 -07:00 |
|
Ryan Huffman
|
1b5d526444
|
Add new packet processing to AvatarManager
|
2015-07-08 15:06:50 -07:00 |
|
Stephen Birarda
|
74940a2132
|
replace lingering PacketTypes in old format
|
2015-07-08 10:18:13 -07:00 |
|
Atlante45
|
7b5a5a339a
|
Use make_shared/create to make shared pointers
|
2015-07-01 19:46:06 -07:00 |
|
Atlante45
|
47634a48a6
|
Make renderDisplayName const
|
2015-06-18 15:22:49 +02:00 |
|
ZappoMan
|
a0e51469d3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
|
2015-05-28 12:36:34 -07:00 |
|
Ryan Huffman
|
8002014dcd
|
Add <memory> to AvatarData for _ptr
|
2015-05-27 15:13:25 -07:00 |
|
Ryan Huffman
|
21b5e26dc9
|
Move AvatarData typedefs to AvatarData.h
|
2015-05-27 14:52:48 -07:00 |
|
Seth Alves
|
bfa0e9c234
|
recreate PR #4973 with some additional changes -- removed const keyword from qinvokables for avatar getter methods such as getVelocity
|
2015-05-27 14:44:23 -07:00 |
|
Seth Alves
|
ba0467aafe
|
Revert "removed const keyword from Q_INVOKABLE for avatar getter methods such…"
|
2015-05-27 14:10:45 -07:00 |
|
Ryan Huffman
|
389d5556f5
|
Update Avatar*Pointers to use std::*_ptr instead of Q*Pointer
|
2015-05-27 12:36:55 -07:00 |
|
Eric Levin
|
eb0f35e041
|
removed const keyword from qinvokables for avatar getter methods such as getVelocity
|
2015-05-27 11:44:37 -07:00 |
|