Merge remote-tracking branch 'origin/master' into Kill-streak-sounds

# Conflicts: # resources/DefaultConfig.ini
2016-03-03 17:32:04 +01:00
parent b7fac7103d fe36e8b423
commit 20c6caa408
154 changed files with 24530 additions and 1614 deletions
@@ -363,7 +363,7 @@ bool SoundManager::OnPlayerSpawned(const Events::PlayerSpawned &e)
        if (m_TempPleaseDeleteMeASAP) {
            return true;
        }
-        m_CurrentBGMCombo = createSource("Audio/bgm/layer2.wav");
+        m_CurrentBGMCombo = createSource("Audio/BGM/Layer2.wav");
        m_CurrentBGMCombo->Type = SoundType::BGM;
        alSourcei(m_CurrentBGMCombo->ALsource, AL_LOOPING, 1);
        setGain(m_CurrentBGMCombo, 0);