Pull request #136 Merge remote-tracking branch 'origin/master' into FixNetworkBugs

# Conflicts: # src/Engine/Network/Client.cpp
2016-02-25 16:07:06 +01:00
parent 059fe5c6c0 fb465ede81
commit eac9a9daf6
4 changed files with 55 additions and 58 deletions
@@ -107,7 +107,6 @@ private:
    void parseDoubleJump(Packet& packet);
    void InterpolateFields(Packet & packet, const ComponentInfo & componentInfo, const EntityID & entityID, const std::string & componentType);
    void parseSnapshot(Packet& packet);
-    void UpdateLocalCapturePointHUD(EntityWrapper capturePointHUD);
    void identifyPacketLoss();
    void hasServerTimedOut();
    EntityID createPlayer();