Merge remote-tracking branch 'origin/DynamicPacketBuffer' into HUDDesync

# Conflicts:
#	include/Engine/Network/TCPServer.h
#	src/Engine/Network/TCPServer.cpp
This commit is contained in:
stiffly
2016-02-22 17:39:48 +01:00
14 changed files with 263 additions and 50 deletions
+1 -1
View File
@@ -21,7 +21,7 @@ private:
boost::asio::io_service m_IOService;
boost::asio::ip::udp::endpoint m_ReceiverEndpoint;
boost::shared_ptr<boost::asio::ip::udp::socket> m_Socket;
int readBuffer(char* data);
int readBuffer();
PacketID m_SendPacketID = 0;
};