Merge branch 'master' into Movement

# Conflicts: # include/Engine/Network/Client.h # resources/DefaultConfig.ini # resources/Schema/Entities/OverwatchCamera.xml # resources/Schema/Types/Entity.xsd
2016-03-13 22:22:36 +01:00
parent d587c9a692 77bb7a0f5c
commit a715f7fe86
47 changed files with 13403 additions and 10818 deletions
@@ -10,31 +10,32 @@
 #include <boost/asio.hpp>
 #include <boost/shared_array.hpp>

-#include "Network/Network.h"
-#include "Network/MessageType.h"
-#include "Network/PlayerDefinition.h"
-#include "Network/UDPClient.h"
-#include "Network/TCPClient.h"
-#include "Network/SnapshotDefinitions.h"
 #include "Network/EKillDeath.h"
 #include "Core/World.h"
 #include "Core/EntityFile.h"
 #include "Core/EventBroker.h"
 #include "Core/ConfigFile.h"
 #include "Core/EPlayerDeath.h"
-#include "Input/EInputCommand.h"
 #include "Core/EPlayerDamage.h"
-#include "../Game/Events/EDoubleJump.h"
-#include "Network/EInterpolate.h"
-#include "Network/SnapshotFilter.h"
 #include "Core/EPlayerSpawned.h"
 #include "Core/EAmmoPickup.h"
-#include "Network/ESearchForServers.h"
-#include "../Game/Events/EDashAbility.h"
+#include "Game/Events/EDoubleJump.h"
+#include "Game/Events/EDashAbility.h"
+#include "Game/Events/EReset.h"
+#include "Input/EInputCommand.h"
+#include "imgui/imgui.h"
+#include "Network/Network.h"
+#include "Network/MessageType.h"
+#include "Network/PlayerDefinition.h"
+#include "Network/UDPClient.h"
+#include "Network/TCPClient.h"
+#include "Network/SnapshotDefinitions.h"
 #include "Network/EDisplayServerlist.h"
 #include "Network/EConnectRequest.h"
 #include "Network/EPlayerDisconnected.h"
-#include "Game/Events/EReset.h"
+#include "Network/ESearchForServers.h"
+#include "Network/EInterpolate.h"
+#include "Network/SnapshotFilter.h"

 class Client : public Network
 {