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

# Conflicts: # include/Game/Systems/MainMenuSystem.h # src/Engine/GUI/MainMenuSystem.cpp
2016-03-08 17:03:50 +01:00
parent 1d8b5abfde 17e2ebeaa7
commit 280de0e984
8 changed files with 51 additions and 33 deletions
@@ -5,7 +5,7 @@ ServerListSystem::ServerListSystem(SystemParams params, IRenderer* renderer)
    , PureSystem("ServerList")
    , m_Renderer(renderer)
 {
-
+    //Subscribe to OnServerListRecieved
 }

 void ServerListSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cServerList, double dt)
@@ -15,5 +15,6 @@ void ServerListSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper&

 void ServerListSystem::RefreshList()
 {
-
+    //Send out request for a server list.
 }
+