Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 17:53:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
28228 commits 76 branches 59 tags 1.2 GiB
Commit graph

28228 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
2d86e807b0 Move PACKET_WRITE_ERROR to Packet class 2015-07-15 15:00:59 -07:00
Ryan Huffman
12d5ec89d1 Merge branch 'packet-tests' of github.com:birarda/hifi into receive_packets 
Conflicts:
	libraries/networking/src/udt/Packet.h
 2015-07-15 11:04:32 -07:00
Stephen Birarda
f0e07d424d Merge branch 'atp' into packet-tests 2015-07-15 11:02:52 -07:00
Stephen Birarda
ca3285b0e4 add a comment for getPayloadCapacity() 2015-07-15 11:02:42 -07:00
Stephen Birarda
95f401fa0f add comments to Packet methods 2015-07-15 11:00:33 -07:00
Stephen Birarda
b115bd1a55 resolve conflicts on merge with huffman/receive_packets 2015-07-15 10:52:07 -07:00
Ryan Huffman
3b8a335c8c Fix bytesLeftToRead 2015-07-15 10:51:40 -07:00
Ryan Huffman
44c99ef89a Replace bytesAvailable with bytesLefToRead 2015-07-15 10:44:51 -07:00
Stephen Birarda
e127c5c06d rename Packet methods for clarity 2015-07-15 10:40:40 -07:00
Stephen Birarda
7d313c4a2b remove extra debugs in PacketReceiver 2015-07-15 10:13:57 -07:00
Ryan Huffman
9018dedcd6 Merge branch 'protocol' of github.com:Atlante45/hifi into receive_packets 2015-07-15 09:37:31 -07:00
Stephen Birarda
9204f004c0 remove an extra line 2015-07-14 21:15:39 -07:00
Stephen Birarda
e00dc8bfaa remove an Xcode vim accidentalism 2015-07-14 21:15:22 -07:00
Stephen Birarda
ccc2649d26 fix packing of domain list header 2015-07-14 21:14:15 -07:00
Stephen Birarda
89c44ded38 repairs for domain-server PacketList sending 2015-07-14 21:01:26 -07:00
Stephen Birarda
0327a8d477 fix bytesAvailable, don't double seek in Packet 2015-07-14 20:47:16 -07:00
Stephen Birarda
c210b0db1c don't double seek in Packet::writeData 2015-07-14 20:18:28 -07:00
Atlante45
e3b7b20f36 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 19:18:36 -07:00
Stephen Birarda
a5ca1f7125 fix variable setup in Packet constructor 2015-07-14 19:15:18 -07:00
Atlante45
c6faf6e84a Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 18:59:57 -07:00
Stephen Birarda
88f419dfd7 repairs to packet sending/receiving 2015-07-14 18:59:33 -07:00
Atlante45
1db1180869 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 17:30:55 -07:00
Stephen Birarda
3858e6933f open packets for reading and writing 2015-07-14 17:30:01 -07:00
Stephen Birarda
3bf93063d7 remove the OctreeServerDatagramProcessor 2015-07-14 17:22:42 -07:00
Atlante45
58afe849b0 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 17:22:03 -07:00
Stephen Birarda
2bec2f0590 make model depend on octree for ViewFrustum 2015-07-14 17:21:46 -07:00
Atlante45
e608abeba1 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 17:18:36 -07:00
Stephen Birarda
1450036b59 move EntityEditPacketSender method to slot 2015-07-14 17:18:28 -07:00
Stephen Birarda
c154e6cc74 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-14 17:16:42 -07:00
Atlante45
12f9b84c7f Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 17:16:16 -07:00
Stephen Birarda
5163354dd7 more cleanup for PacketReceiver error message 2015-07-14 17:15:18 -07:00
Stephen Birarda
aa696ca8d3 fix listener for AudioStreamStats, more verbose debug 2015-07-14 17:14:27 -07:00
Atlante45
02e1eaf452 Merge fixes 2015-07-14 17:08:36 -07:00
Atlante45
bfb9166b8e Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 17:07:47 -07:00
Stephen Birarda
bc309e5b59 put back Q_ASSERT instead of assert 2015-07-14 17:06:13 -07:00
Stephen Birarda
3cb4be6c02 fix order of setup at startup 2015-07-14 17:04:45 -07:00
Atlante45
3abde577e2 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 16:58:26 -07:00
Ryan Huffman
c61cbeee26 Merge pull request #6 from birarda/atp 
fix ::get<NodeList> in DS code, make processSTUNResponse a slot
 2015-07-14 16:51:33 -07:00
Stephen Birarda
251387159a go back to Q_ASSERT for methodIndex 2015-07-14 16:48:55 -07:00
Stephen Birarda
15ca129005 fix for registration of methods with typedef 2015-07-14 16:46:17 -07:00
Atlante45
f0a2e921b7 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-14 16:45:01 -07:00
Atlante45
85cc29a475 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 16:44:45 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Stephen Birarda
b1650c0d8c fix ::get<NodeList> in DS code, make processSTUNResponse a slot 2015-07-14 16:36:05 -07:00
Ryan Huffman
7d55d5be08 Merge pull request #5 from huffman/receive_packets 
Receive packets
 2015-07-14 16:24:23 -07:00
Ryan Huffman
c6ffda12f9 Merge branch 'atp' of github.com:birarda/hifi into receive_packets 2015-07-14 16:21:57 -07:00
Stephen Birarda
e596733c8b fix for stats grab from iterator 2015-07-14 16:21:34 -07:00
Ryan Huffman
cb9e12f76a Fix using typeof when should be using sizeof 2015-07-14 16:20:36 -07:00
Ryan Huffman
ede9217483 Merge branch 'atp' of github.com:birarda/hifi into receive_packets 2015-07-14 16:15:01 -07:00
Stephen Birarda
e4849d29ec re-use iterator when checking _octreeServerSceneStats 2015-07-14 16:14:43 -07:00