Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 22:49:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
28249 commits 75 branches 59 tags 1.2 GiB
Commit graph

28249 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
8b5a577a5d Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 13:42:14 -07:00
Atlante45
5a5a396b62 Check we have an AM before sending packet 2015-07-15 13:41:35 -07:00
Stephen Birarda
d4680ee1dd fix for no current packet in PacketList 2015-07-15 13:41:28 -07:00
Stephen Birarda
312780a2f6 fix offset for source UUID and verification hash 2015-07-15 13:31:36 -07:00
Stephen Birarda
6b05b7ef31 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-15 13:17:38 -07:00
Stephen Birarda
a79c8ab193 fix check for writing of packet header 2015-07-15 13:17:32 -07:00
Atlante45
501460d489 Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-15 13:14:36 -07:00
Atlante45
2730201a3e erge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 13:14:21 -07:00
Atlante45
f3800cacda Don't unregister packet listeners when no nodelist 2015-07-15 13:10:16 -07:00
Atlante45
aa517adb73 Fix Application inheritance formatting 2015-07-15 13:09:34 -07:00
Stephen Birarda
e90ace6231 fix child assignment UUID, adjust for NLPacket after unpack 2015-07-15 12:37:30 -07:00
Stephen Birarda
c4a97de985 fix verification of source but unverified packets 2015-07-15 12:12:04 -07:00
Atlante45
e744e08577 Missed one connection secret 2015-07-15 11:56:01 -07:00
Stephen Birarda
432048addf use macro for AvatarMixer, show type for unknown 2015-07-15 11:55:50 -07:00
Atlante45
edc14ec6eb Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 11:53:11 -07:00
Atlante45
cee1734006 Remove helper function 2015-07-15 11:48:30 -07:00
Stephen Birarda
0b700d690a fix bad assert for payload size 2015-07-15 11:48:27 -07:00
Stephen Birarda
7631af99e0 fix compile for new data size method 2015-07-15 11:46:31 -07:00
Stephen Birarda
4a90e0f14f resolve conflicts on merge with clement/protcol 2015-07-15 11:45:17 -07:00
Atlante45
0b32a5d935 Write session uuid and connection hash in packet header 2015-07-15 11:42:35 -07:00
Stephen Birarda
8b5026a817 cleanup some warnings 2015-07-15 11:20:55 -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
Atlante45
a7fa0a733b Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-15 10:26:48 -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