Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-14 00:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
29060 commits 25 branches 0 tags 1.1 GiB
Commit graph

724 commits

Author SHA1 Message Date
Stephen Birarda
8a2bb55231 add back a removed comment from jurisdiction map 2015-07-17 14:00:02 -07:00
Atlante45
d1c66751c4 emove unused method 2015-07-16 16:08:58 -07:00
Stephen Birarda
1bb3e1789a remove more PacketHeader methods 2015-07-16 16:05:27 -07:00
Stephen Birarda
61653bd88d remove old PacketHeader methods 2015-07-16 16:04:12 -07:00
Atlante45
b4121eb464 Remove unnecessary move 2015-07-16 13:14:17 -07:00
Stephen Birarda
05dd49a4c5 seek back after track of octree packet 2015-07-16 13:02:20 -07:00
Stephen Birarda
60ae02e4e9 some formatting changes in entities 2015-07-16 12:38:39 -07:00
Stephen Birarda
8921f59e23 fix entity packet send from interface client 2015-07-16 12:09:35 -07:00
Stephen Birarda
336967e580 fix edit packet sending from client 2015-07-16 11:17:49 -07:00
Stephen Birarda
039ef0750c set jurisdiction listener object name for thread identification 2015-07-15 18:52:59 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
Stephen Birarda
b115bd1a55 resolve conflicts on merge with huffman/receive_packets 2015-07-15 10:52:07 -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
0327a8d477 fix bytesAvailable, don't double seek in Packet 2015-07-14 20:47:16 -07:00
ZappoMan
bc251de43c delete dead code 2015-07-14 16:49:22 -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
bd345cdccd Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	libraries/networking/src/PacketReceiver.cpp
 2015-07-14 15:59:16 -07:00
Stephen Birarda
ca47165d72 compare bytesAvailable to 0 2015-07-14 15:42:28 -07:00
Ryan Huffman
47f3aad437 Update use of sendingNode->getUUID() to use packet->getSourceID instead 2015-07-14 15:23:41 -07:00
Ryan Huffman
56b5c9acff Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/entities/EntityServer.cpp
	domain-server/src/DomainServer.cpp
 2015-07-14 14:53:45 -07:00
Stephen Birarda
fbd287472d make NodeData parseData take only packet 2015-07-14 14:09:00 -07:00
Ryan Huffman
0edc909818 Merge branch 'protocol' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	interface/src/Application.cpp
	libraries/networking/src/Packet.cpp
 2015-07-14 10:21:31 -07:00
Stephen Birarda
9d4f9aa21e final fixes to get ACs building again 2015-07-13 15:38:45 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
Stephen Birarda
f06636d45e repairs for other ThreadedAssignment subclasses 2015-07-13 15:16:55 -07:00
Stephen Birarda
ede39515d8 update parseData for new network API 2015-07-13 14:26:10 -07:00
Stephen Birarda
d990420565 repairs to octree packet receiving in interface 2015-07-13 13:10:57 -07:00
Atlante45
957e6394a9 sendPacket function take Node& not a pointer 2015-07-13 11:57:20 -07:00
Stephen Birarda
3d62162812 cleanup octree networking code to use new API 2015-07-13 09:40:26 -07:00
Atlante45
c77310019d Some .get() cleanup 2015-07-09 14:03:32 -07:00
Stephen Birarda
c903d284bb fix for arguments that are now const NLPacket& 2015-07-09 11:32:00 -07:00
Atlante45
d4e01742e5 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-08 18:40:18 -07:00
Atlante45
e2718d5c94 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-08 18:26:36 -07:00
Stephen Birarda
f37d3c9bd6 fix primitive type writing in OctreeSceneStats 2015-07-08 16:44:45 -07:00
Stephen Birarda
480cb80f4f fix primitive writing in OctreeEditPacketSender 2015-07-08 16:42:43 -07:00
Stephen Birarda
c162d53908 fix writes in JurisdictionMap 2015-07-08 16:38:17 -07:00
Stephen Birarda
9f4e4f1948 fix templated write/read and various write calls 2015-07-08 16:36:09 -07:00
Stephen Birarda
ecb6309932 fix HEADER_LENGTH in Octree 2015-07-08 15:02:57 -07:00
Stephen Birarda
07c8bb24b4 fix query packet send in OctreeHeadlessViewer 2015-07-08 15:02:02 -07:00
Stephen Birarda
1597491894 add back missing underscore 2015-07-08 14:58:27 -07:00
Stephen Birarda
3dbe7f7827 fix writes for templated API in OctreeSceneStats 2015-07-08 14:57:45 -07:00
Stephen Birarda
9fb43b71d4 use std::unordered_maps in OctreeEditPacketSender 2015-07-08 14:52:14 -07:00
Stephen Birarda
822dd46228 use getType instead of readType in OctreeEditPacketSender 2015-07-08 14:32:20 -07:00
Stephen Birarda
948e8f7163 actually return packet from initialize packet 2015-07-08 14:27:16 -07:00
Stephen Birarda
b983f662ee use templated write for sequence number in OctreeEditPacketSender 2015-07-08 14:24:32 -07:00
Stephen Birarda
d8b03189e3 fixes for writes with new API 2015-07-08 14:21:26 -07:00
Stephen Birarda
1081e627fa Merge remote-tracking branch 'clement/protocol' into atp 2015-07-08 14:12:50 -07:00
Stephen Birarda
fa71c781f4 cleanup edit message memory management in octree packet sending 2015-07-08 14:12:04 -07:00
Atlante45
7329ad6334 Templated read/write in Packet 2015-07-08 13:45:12 -07:00