Merge remote-tracking branch 'origin/master' into TCPConnections

# Conflicts: # include/Engine/Network/Client.h # include/Engine/Network/Network.h # include/Engine/Network/Packet.h # include/Engine/Network/Server.h # src/Engine/Network/Client.cpp # src/Engine/Network/Packet.cpp # src/Engine/Network/Server.cpp # src/Tests/HealthSystemTest.cpp
2016-02-10 17:05:07 +01:00
parent 4f2ad3ad00 019e85a425
commit 9645169797
189 changed files with 10536 additions and 1959 deletions
@@ -29,7 +29,7 @@ protected:
    unsigned int m_SaveDataIntervalMs = 1000;
    std::clock_t m_SaveDataTimer;
    unsigned int m_MaxConnections;
-    unsigned int m_TimeoutMs;
+    double m_TimeoutMs;
    void logSentData(int bytesSent);
    void logReceivedData(int bytesReceived);
    void saveToFile();