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

Merge branch 'master' into Dirtybit

Browse Source 
# Conflicts:
#	include/Engine/Sound/SoundManager.h
This commit is contained in:
sippeangelo
2016-03-13 00:58:45 +01:00
parent 993e56ec59 7ea90bede7
commit 95f9065037
28 changed files with 378 additions and 26566 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Game.cpp
+4 -2
View File
@@ -53,7 +53,7 @@ Game::Game(int argc, char* argv[])
ResourceManager::RegisterType<RawModel>("RawModel");
ResourceManager::RegisterType<Texture>("Texture");
ResourceManager::RegisterType<TextureSprite>("TextureSprite");
ResourceManager::RegisterType<PNG>("Png");
ResourceManager::RegisterType<PNG>("PNG");
ResourceManager::RegisterType<ShaderProgram>("ShaderProgram");
ResourceManager::RegisterType<EntityFile>("EntityFile");
ResourceManager::RegisterType<EntityXMLFile>("EntityXMLFile");
@@ -224,7 +224,9 @@ void Game::Tick()
m_EventBroker->Swap();
PerformanceTimer::StartTimerAndStopPrevious("SoundManager");
m_SoundManager->Update(dt);
if (m_IsClient) {
m_SoundManager->Update(dt);
}
// Update network
PerformanceTimer::StartTimerAndStopPrevious("Network");