BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into TeamPickCamera

Browse Source 
# Conflicts:
#	src/Game/Game.cpp
This commit is contained in:
William Moberg
2016-03-04 05:58:49 +01:00
parent 06614aa907 eec40b6519
commit 2ecc53ecca
36 changed files with 12339 additions and 1565 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Game.cpp
+2
View File
@@ -34,6 +34,7 @@
#include "Game/Systems/KillFeedSystem.h"
#include "Game/Systems/BoostSystem.h"
#include "Game/Systems/BoostIconsHUDSystem.h"
#include "Game/Systems/ScoreScreenSystem.h"
#include "Game/Systems/SpectatorCameraSystem.h"
#include "GUI/ButtonSystem.h"
#include "GUI/MainMenuSystem.h"
@@ -156,6 +157,7 @@ Game::Game(int argc, char* argv[])
m_SystemPipeline->AddSystem<ButtonSystem>(updateOrderLevel, m_Renderer);
m_SystemPipeline->AddSystem<MainMenuSystem>(updateOrderLevel, m_Renderer);
m_SystemPipeline->AddSystem<BoostIconsHUDSystem>(updateOrderLevel);
m_SystemPipeline->AddSystem<ScoreScreenSystem>(updateOrderLevel);
m_SystemPipeline->AddSystem<SpectatorCameraSystem>(updateOrderLevel);
// Populate Octree with collidables
++updateOrderLevel;