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

# Conflicts:
#	include/Engine/Network/Client.h
#	src/Game/Game.cpp
This commit is contained in:
stiffly
2015-12-08 16:15:50 +01:00
7 changed files with 485 additions and 20 deletions
+3
View File
@@ -82,4 +82,7 @@ void Game::NetworkFunction()
if (inputMessage == "c" || inputMessage == "C") {
m_Client.Start(m_EventBroker);
}
if (inputMessage == "s" || inputMessage == "S") {
m_Server.Start();
}
}