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

# Conflicts: # include/Engine/Network/Client.h # include/Engine/Network/MessageType.h # include/Engine/Network/Server.h # include/Engine/Network/TCPServer.h # src/Engine/Network/Client.cpp # src/Engine/Network/TCPServer.cpp
2016-02-25 15:13:11 +01:00
parent 508d8a6f00 da1c7b3093
commit f66fa7a183
60 changed files with 1006 additions and 257 deletions
@@ -43,5 +43,5 @@ private:
    bool PlayerMovementSystem::OnDoubleJump(Events::DoubleJump & e);

    void updateMovementControllers(double dt);
-    void updateVelocity(double dt);
+    void updateVelocity(EntityWrapper player, double dt);
 };