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

# Conflicts:
#	src/Game/Game.cpp

src/Engine/Network/Client.cpp

@@ -196,7 +196,7 @@ void Client::ParseEventMessage(Package& package)
         // Sett Player name
         m_PlayerDefinitions[Id].Name = command.erase(0, 7);
     } else {
-        LOG_INFO("%i: Event message: %s", m_PacketID, command);
+        LOG_INFO("%i: Event message: %s", m_PacketID, command.c_str());
     }
 }
 
@@ -241,7 +241,7 @@ int Client::Receive(char* data, size_t length)
         0, error);
 
     if (error) {
-        LOG_ERROR("ReadFromServer: %s", error.message());
+        //LOG_ERROR("Receive: %s", error.message().c_str());
     }
 
     return bytesReceived;
@@ -313,7 +313,7 @@ bool Client::OnInputCommand(const Events::InputCommand & e)
             }
         }
     }
-    if (e.Command == "Sprint") { // Connect for now
+    if (e.Command == "ConnectToServer") { // Connect for now
         Connect();
     }
     return false;

src/Engine/Network/Server.cpp

@@ -64,7 +64,7 @@ void Server::ReadFromClients()
                 Package package(readBuffer, bytesRead);
                 ParseMessageType(package);
             } catch (const std::exception& err) {
-                LOG_ERROR("%i: Read from client crashed %s", m_PacketID, err.what());
+                //LOG_ERROR("%i: Read from client crashed %s", m_PacketID, err.what());
             }
 
         }
@@ -96,7 +96,7 @@ void Server::ParseMessageType(Package& package)
     // Read packet ID 
     m_PreviousPacketID = m_PacketID;    // Set previous packet id
     m_PacketID = package.PopFrontPrimitive<int>(); //Read new packet id
-    IdentifyPacketLoss();
+    //IdentifyPacketLoss();
     switch (static_cast<MessageType>(messageType)) {
     case MessageType::Connect:
         ParseConnect(package);