Merge remote-tracking branch 'origin/Networking' into Networking

# Conflicts: # include/Engine/Network/Client.h # src/Engine/Network/Client.cpp
2015-12-17 11:24:34 +01:00
parent ba831f8a3c 2cb5441b1c
commit a6a08f48bb
4 changed files with 39 additions and 24 deletions
@@ -3,7 +3,7 @@
 #include <string>

 struct PlayerDefinition {
-    unsigned int EntityID = -1;
+    int EntityID = -1;
    std::string Name = "";
    boost::asio::ip::udp::endpoint Endpoint;
 };