Merge remote-tracking branch 'origin/FriendlyHost/Join' into Menu

# Conflicts:
#	include/Game/Systems/MainMenuSystem.h
#	src/Engine/GUI/MainMenuSystem.cpp
This commit is contained in:
Tleety
2016-03-08 17:03:50 +01:00
8 changed files with 51 additions and 33 deletions
+5
View File
@@ -7,6 +7,8 @@
#include "Core/Event.h"
#include "Systems/SpawnerSystem.h"
#include "Network/ESearchForServers.h"
class ServerListSystem : public PureSystem
{
public:
@@ -17,6 +19,9 @@ public:
private:
IRenderer* m_Renderer;
//EventRelay<ServerListSystem, Events::SomeEventLol> m_EServerListRecieved;
//bool OnServerListRecieved(const Events::SomeEventLol& e)
};
#endif