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

Merge remote-tracking branch 'origin/master' into Menu

Browse Source 
# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/NewMapWSpectatorCam.xml
#	resources/Schema/Types/Entity.xsd
#	src/Game/Game.cpp
This commit is contained in:
Tleety
2016-03-09 11:49:42 +01:00
parent 95f68cc888 00478b4f12
commit 704242597a
29 changed files with 3270 additions and 2225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Game.cpp
+2
View File
@@ -35,6 +35,7 @@
#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 "Game/Systems/MainMenuSystem.h"
#include "Game/Systems/ServerListSystem.h"
@@ -150,6 +151,7 @@ Game::Game(int argc, char* argv[])
m_SystemPipeline->AddSystem<MainMenuSystem>(updateOrderLevel, m_Renderer);
m_SystemPipeline->AddSystem<BoostIconsHUDSystem>(updateOrderLevel);
m_SystemPipeline->AddSystem<ScoreScreenSystem>(updateOrderLevel);
m_SystemPipeline->AddSystem<SpectatorCameraSystem>(updateOrderLevel);
m_SystemPipeline->AddSystem<ServerListSystem>(updateOrderLevel, m_Renderer);
// Populate Octree with collidables
++updateOrderLevel;