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

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

Browse Source 
# Conflicts:
#	src/Game/Game.cpp
This commit is contained in:
stiffly
2016-01-15 09:52:31 +01:00
parent b80ecc29d8 a8f7d5f6b9
commit e248b37ea8
47 changed files with 837 additions and 797 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Sound/SoundSystem.h
+1 -1
View File
@@ -10,7 +10,7 @@
#include "Core/World.h"
#include "Core/EventBroker.h"
#include "Rendering/RenderQueueFactory.h" // Absolute transform
#include "Core/Transform.h" // Absolute transform
#include "Sound/Sound.h"
#include "Sound/EPlaySoundOnEntity.h"
#include "Sound/EPlaySoundOnPosition.h"