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

1474 commits

Author SHA1 Message Date
Atlante45
bbb00b9d3a Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 14:11:41 -07:00
Stephen Birarda
fbd287472d make NodeData parseData take only packet 2015-07-14 14:09:00 -07:00
Stephen Birarda
0637f589b5 add PacketListener to help unregister for packets 2015-07-14 13:52:38 -07:00
Stephen Birarda
e3b5972344 use initializer list for packetReceiver register call 2015-07-14 11:21:02 -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
Atlante45
81ad0056c3 Fix a few node deref 2015-07-13 15:34:37 -07:00
Atlante45
44c5d4a2bf Couple fixes SharedNodePointer > Node& 2015-07-13 15:29:41 -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
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
Atlante45
957e6394a9 sendPacket function take Node& not a pointer 2015-07-13 11:57:20 -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
Atlante45
6c591131ba Made Animations safe for resource reload 2015-07-10 12:01:51 -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
Stephen Birarda
8e693bfee7 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-09 11:53:27 -07:00
Atlante45
94d2fce1dd Fix sendNackPackets logic 2015-07-09 11:52:57 -07:00
Stephen Birarda
806862fae9 pass existing SharedNodePointer from EntityServer 2015-07-09 11:50:39 -07:00
Stephen Birarda
a49b985dad fix call to packetSent from EntityServer 2015-07-09 11:37:20 -07:00
Stephen Birarda
d3d3b84a20 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-09 11:36:21 -07:00
Stephen Birarda
83cc4380a7 fix for sentPacketHistory dequeue 2015-07-09 11:36:12 -07:00
Atlante45
cc0e0e6a1f Compile fixes in assignment client 2015-07-09 11:35:36 -07:00
Stephen Birarda
7e07754773 fix octreePacketSent call with const NLPacket& 2015-07-09 11:35:12 -07:00
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