Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 16:30:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
28117 commits 76 branches 59 tags 1.2 GiB
Commit graph

1419 commits

Author SHA1 Message Date
Ryan Huffman
921ee02414 Update EntityServer to use only 1 packet callback for all packet types 2015-07-14 14:25:09 -07:00
Ryan Huffman
f7c1eaf967 Update AssignmentFactory to use peekPrimitive 2015-07-14 14:24:08 -07:00
Ryan Huffman
1af01c9003 Fix style issue in AssignmentClientMonitor 2015-07-14 14:23:53 -07:00
Ryan Huffman
5cb8c1541a Update Agent to use peekPrimitive 2015-07-14 14:23:31 -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
821c16cbc4 resolve conflicts on merge with uptream/master 2015-07-14 09:52:20 -07:00
Ryan Huffman
b45af742ef Remove datagram processing from OctreeServer 2015-07-14 09:37:09 -07:00
Ryan Huffman
c1f026802a Merge branch 'atp' of github.com:birarda/hifi into receive_packets 2015-07-13 16:21:39 -07:00
Stephen Birarda
1c9f43e5aa compile fixes for AC status packet 2015-07-13 16:03:05 -07:00
Stephen Birarda
8d38cd5670 use a specific packet type for AC child status 2015-07-13 15:58:44 -07:00
Ryan Huffman
4668914fe2 Merge branch 'atp' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/octree/OctreeServerDatagramProcessor.cpp
 2015-07-13 15:48:52 -07:00
Stephen Birarda
49ee35a41c remove call to processNodeData 2015-07-13 15:39:35 -07:00
Stephen Birarda
9d4f9aa21e final fixes to get ACs building again 2015-07-13 15:38:45 -07:00
Stephen Birarda
f06636d45e repairs for other ThreadedAssignment subclasses 2015-07-13 15:16:55 -07:00
Ryan Huffman
a4ff18d9ec Remove OctreeServerDatagramProcessor 2015-07-13 15:03:10 -07:00
Stephen Birarda
26be492475 use same listener for many packets in AudioMixer 2015-07-13 14:46:56 -07:00
Stephen Birarda
d242f5d5d9 repair AudioMixerClientData parseData 2015-07-13 14:35:03 -07:00
Stephen Birarda
601e8d6e68 fix AssignmentClientChildData parseData override 2015-07-13 14:28:46 -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
Ryan Huffman
9de6828b03 Remove readPendingDatagram from AudioMixer 2015-07-13 14:24:06 -07:00
Ryan Huffman
591c5d4b60 Fix EntityServer compilation errors 2015-07-13 12:06:43 -07:00
Ryan Huffman
9a977149a4 Update AvatarMixer to use packetReceiver 2015-07-13 12:06:32 -07:00
Ryan Huffman
cdbcaf0f7f Fix AudioMixer compilation errors 2015-07-13 12:06:12 -07:00
Stephen Birarda
264f39fa59 resolve conflicts on merge with upstream/master 2015-07-13 11:25:24 -07:00
Ryan Huffman
582de14917 Fix compilation errors in AssignmentClientMonitor 2015-07-13 09:25:57 -07:00
Ryan Huffman
879b880254 Fix non-ref var to PacketReceiver 2015-07-13 08:30:13 -07:00
Ryan Huffman
ed3b8afbd9 Update AssignmentClientMonitor to use PacketReceiver 2015-07-10 18:09:08 -07:00
Ryan Huffman
c86e481d4f Update OctreeServer packet receive handling 2015-07-10 17:28:27 -07:00
Ryan Huffman
28f6c4021b Fix compilation errors in EntityServer 2015-07-10 17:27:56 -07:00
Ryan Huffman
bfb878210f Fix compilation errors in AudioMixer 2015-07-10 17:27:45 -07:00
Ryan Huffman
8c04aafe67 Update Agent to use PacketReceiver 2015-07-10 17:08:07 -07:00
Ryan Huffman
e0d165bdd8 Fix packet type in AssignmentClient for StopNode 2015-07-10 16:48:28 -07:00
Ryan Huffman
cc7bfd90f1 Move audio packet handling to listener in Agent 2015-07-10 16:27:42 -07:00
Ryan Huffman
910836fa5a Remove readPendingDatagrams from AudioMixer 2015-07-10 16:14:40 -07:00
Ryan Huffman
0d920c7b7c Update method name in AssignmentClient 2015-07-10 16:14:23 -07:00
Ryan Huffman
5c831efe64 Remove avatar packet processing from Agent 2015-07-10 16:13:57 -07:00
Ryan Huffman
1fb4c13b3c Update AssignmentClient to use PacketReceiver 2015-07-10 15:51:12 -07:00
Ryan Huffman
74afbd7de7 Fix AudioMixer packetReceiver calls 2015-07-10 14:22:46 -07:00
Ryan Huffman
09f978207b Add packet handling to OctreeServer 2015-07-10 12:23:58 -07:00
Ryan Huffman
1ee7a83927 Add EntityServer packet handling 2015-07-10 12:23:35 -07:00
Ryan Huffman
99121a3a20 Fix AudioMixer not using PacketReceiver correctly 2015-07-10 12:22:53 -07:00
Ryan Huffman
c841867044 Update AudioMixer to use PacketReceiver 2015-07-10 09:37:24 -07:00
Seth Alves
2dc4922da3 bring over code from entity-level-locking branch 2015-07-09 15:23:05 -07:00
Atlante45
c77310019d Some .get() cleanup 2015-07-09 14:03:32 -07:00
Atlante45
f90f3a05be Fail in Packet::create if size is invalid 2015-07-09 13:11:43 -07:00
Atlante45
e1fc242967 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-09 12:45:46 -07:00
Stephen Birarda
14b73ae00f remove qtimespan that isn't used anymore 2015-07-09 12:45:32 -07:00
Atlante45
2b6d79e030 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-09 12:33:23 -07:00
Atlante45
e4051f9e30 Remove unnecessary .get() 2015-07-09 12:32:18 -07:00
Stephen Birarda
a38cb56c1c fix an accidental comment add 2015-07-09 11:56:24 -07:00