Stephen Birarda
|
659f6742c6
|
Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp
|
2015-07-09 11:21:36 -07:00 |
|
Stephen Birarda
|
922d6413d5
|
change some const unique_ptr to const NLPacket
|
2015-07-09 11:21:27 -07:00 |
|
Atlante45
|
297d38d4eb
|
Merge branch 'atp' of https://github.com/birarda/hifi into protocol
|
2015-07-09 11:20:25 -07:00 |
|
Atlante45
|
605b004514
|
Assigment client compile fixes
|
2015-07-09 11:19:36 -07:00 |
|
Stephen Birarda
|
885068bd6b
|
create billboard and identity packets of the right size
|
2015-07-09 11:15:45 -07:00 |
|
Stephen Birarda
|
da3502eb6c
|
resolve conflicts on merge with upstream/master
|
2015-07-08 18:41:48 -07:00 |
|
Stephen Birarda
|
5dc09692b4
|
more packet creation fixes for entitites
|
2015-07-08 18:13:06 -07:00 |
|
Stephen Birarda
|
04b3ca3efd
|
fix a bad replacement in AvatarMixer
|
2015-07-08 10:43:05 -07:00 |
|
Stephen Birarda
|
74940a2132
|
replace lingering PacketTypes in old format
|
2015-07-08 10:18:13 -07:00 |
|
Andrew Meadows
|
a0a1b01ea9
|
coalesce dupe action data members: _id and _type
|
2015-07-07 17:50:08 -07:00 |
|
Andrew Meadows
|
e9df8cacc7
|
make some arguments const, cleanup some #includes
|
2015-07-07 17:50:08 -07:00 |
|
Andrew Meadows
|
77bd7b2821
|
some ObjectAction methods should be const
|
2015-07-07 17:50:08 -07:00 |
|
Stephen Birarda
|
6c6143f21e
|
remove NetworkPacket and replace with NodePacketPair
|
2015-07-07 16:56:05 -07:00 |
|
Stephen Birarda
|
ff487ee092
|
move the AudioClient mix packet
|
2015-07-07 16:30:50 -07:00 |
|
Stephen Birarda
|
2a69a89696
|
Merge remote-tracking branch 'huffman/atp' into atp
|
2015-07-07 16:27:18 -07:00 |
|
Ryan Huffman
|
60538d4a82
|
Merge branch 'atp' of github.com:birarda/hifi into atp
Conflicts:
libraries/audio-client/src/AudioIOStats.cpp
|
2015-07-07 16:26:22 -07:00 |
|
Ryan Huffman
|
3690ecc28f
|
Add std::move to sendPacket calls
|
2015-07-07 16:24:11 -07:00 |
|
Stephen Birarda
|
631c745784
|
allow equal for piggyback check in OctreeSendThread
|
2015-07-07 16:21:14 -07:00 |
|
Stephen Birarda
|
6a76f858d8
|
close of PacketList not required to count last packet
|
2015-07-07 16:17:15 -07:00 |
|
Stephen Birarda
|
1f68ad892a
|
replace PacketList usage with NLPacketList
|
2015-07-07 16:14:57 -07:00 |
|
Stephen Birarda
|
56880e8858
|
return fixes for NAK PacketLists
|
2015-07-07 15:33:03 -07:00 |
|
Stephen Birarda
|
ff18a05507
|
CR fixes for octree classes
|
2015-07-07 15:21:10 -07:00 |
|
Stephen Birarda
|
2944746629
|
add a TODO for reading NAK fix
|
2015-07-07 15:15:15 -07:00 |
|
Stephen Birarda
|
c8a03ebff8
|
cleanup NAK packets in OctreeInboundPacketProcessor
|
2015-07-07 15:14:27 -07:00 |
|
Stephen Birarda
|
adacf3fd89
|
CR fixes in AvatarMixer
|
2015-07-07 15:03:49 -07:00 |
|
Stephen Birarda
|
ffa6edc904
|
fix spaces created by xcode find/replace
|
2015-07-07 15:01:19 -07:00 |
|
Stephen Birarda
|
f6cd67f75e
|
repairs to stats packet in AudioMixerClientData
|
2015-07-07 14:57:39 -07:00 |
|
Stephen Birarda
|
171ebf5437
|
fix for mix packet sizes in audio
|
2015-07-07 14:51:21 -07:00 |
|
Stephen Birarda
|
6760b048b6
|
fix for initialization of mute packet
|
2015-07-07 14:50:37 -07:00 |
|
Stephen Birarda
|
e7fee26d1a
|
give specific packet size for audio env packet
|
2015-07-07 14:50:05 -07:00 |
|
Stephen Birarda
|
abfda21814
|
CR fixes in AssignmentClientMonitor
|
2015-07-07 14:47:36 -07:00 |
|
Stephen Birarda
|
e953b36f58
|
handle stats + data packet combination in OctreeSendThread
|
2015-07-07 12:56:20 -07:00 |
|
Stephen Birarda
|
01b1c46237
|
more networking API changes in octree classes
|
2015-07-07 12:31:22 -07:00 |
|
Stephen Birarda
|
fca23cc69b
|
make SentPacketHistory use NLPacket
|
2015-07-07 12:14:40 -07:00 |
|
Stephen Birarda
|
74924bc5f1
|
initial changes to OctreeQueryNode for new APIs
|
2015-07-07 12:08:01 -07:00 |
|
Stephen Birarda
|
474b82e3bf
|
fix nack packet sending in OctreeInboundPacketProcessor
|
2015-07-07 11:28:57 -07:00 |
|
Stephen Birarda
|
9a31b22243
|
use NLPacket and sendPacket for audio stream stats
|
2015-07-06 17:48:21 -07:00 |
|
Stephen Birarda
|
61c4e6d72e
|
some network API reworking in AvatarMixer
|
2015-07-06 17:37:41 -07:00 |
|
Stephen Birarda
|
269bea65fb
|
fix AssignmentClientMonitor and AudioMixer to use NLPacket
|
2015-07-06 17:20:08 -07:00 |
|
Stephen Birarda
|
37fd954066
|
remove used of PacketPayload in AudioMixer
|
2015-07-06 17:15:01 -07:00 |
|
Stephen Birarda
|
9a521fee47
|
change audio environment packet creation
|
2015-07-06 16:53:53 -07:00 |
|
Stephen Birarda
|
672c5a8414
|
use new packet creation for client audio
|
2015-07-06 16:49:48 -07:00 |
|
Stephen Birarda
|
5a57e9861c
|
packet API changes in AssignmentClientMonitor
|
2015-07-06 16:38:33 -07:00 |
|
ZappoMan
|
29a7584ee6
|
remove dead code
|
2015-07-03 11:29:59 -07:00 |
|
Stephen Birarda
|
b3c3e5a6c8
|
more PacketType to PacketType::Value replacements
|
2015-07-02 16:49:19 -07:00 |
|
Stephen Birarda
|
0d64e82fe2
|
replace PacketType declarations with PacketType::Value
|
2015-07-02 16:38:52 -07:00 |
|
Brad Hefta-Gaub
|
2a03f62bf2
|
Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership
Actions over wire and improved simulation ownership
|
2015-07-02 14:57:27 -07:00 |
|
Seth Alves
|
246861221c
|
rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready.
|
2015-07-01 20:17:21 -07:00 |
|
ZappoMan
|
24b4614703
|
add more detailed edit timing to entity server
|
2015-07-01 16:11:08 -07:00 |
|
ZappoMan
|
ce613d59fd
|
add inbound edit packet queue depth to entity server
|
2015-07-01 14:46:37 -07:00 |
|