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

# Conflicts: # src/Engine/Network/Client.cpp
2015-12-10 17:16:22 +01:00
parent 58952725e9 99543a300d
commit 641a43b2ec
5 changed files with 212 additions and 161 deletions
@@ -10,9 +10,12 @@
 #define MAXCONNECTIONS 8
 #define INPUTSIZE 128
 #define PACKETMODULUS 1000 // How many packets to send before the number resets
+#define PLAYERSPEED 0.2f;

 typedef boost::shared_ptr<boost::asio::ip::udp::socket> socket_ptr;
 typedef boost::shared_ptr<std::string> string_ptr;
 typedef boost::shared_ptr<std::queue<string_ptr>> messageQueue_ptr;

+
+
 #endif