Merge branch 'Networking' of github.com:teamfisk/TacticalZ into Networking

# Conflicts:
#	include/Game/Game.h
This commit is contained in:
Jocke
2015-12-08 11:11:12 +01:00
13 changed files with 350 additions and 133 deletions
+3 -1
View File
@@ -8,6 +8,7 @@
#include "Core/InputManager.h"
#include "GUI/Frame.h"
#include "Core/World.h"
#include "Rendering/RenderQueueFactory.h"
// Network
#include <boost/thread.hpp>
#include "Network/Client.h"
@@ -29,7 +30,8 @@ private:
InputManager* m_InputManager;
GUI::Frame* m_FrameStack;
World* m_World;
// Network viriables
RenderQueueFactory* m_RenderQueueFactory;
// Network variables
boost::thread m_NetworkThread;
Client m_Client;