playerJump is only done for local player.

2x jump now only plays for local player
WIP fixing pull request
2016-03-12 17:51:06 +01:00 · 2016-03-12 15:31:44 +01:00 · 2016-03-12 15:14:36 +01:00 · 2016-03-12 14:26:09 +01:00 · 2016-03-11 21:04:33 +01:00 · 2016-03-11 20:28:09 +01:00
27 changed files with 23490 additions and 7488 deletions
@@ -23,6 +23,7 @@ public:

 private:
    void renderText(std::string text, Font* font, TextJob::AlignmentEnum alignment, glm::vec4 color, glm::mat4 modelMatrix, glm::mat4 projectionMatrix, glm::mat4 viewMatrix);
+	std::string parseColors(std::string text, std::map<int, glm::vec4>& colorChanges, glm::vec4 originalColor);

    Font* font;
    GLuint VAO, VBO;
@@ -0,0 +1,16 @@
+#ifndef Events_ChangeBGM_h__
+#define Events_ChangeBGM_h__
+
+#include <string>
+#include "../Engine/Core/EventBroker.h"
+
+namespace Events
+{
+
+struct ChangeBGM : Event
+{
+    std::string FilePath = "";
+};
+
+}
+#endif // Events_ChangeBGM_h__
@@ -0,0 +1,17 @@
+#ifndef Events_PlayAnnouncerVoice_h__
+#define Events_PlayAnnouncerVoice_h__
+
+#include <string>
+#include "../Engine/Core/EventBroker.h"
+
+namespace Events
+{
+
+struct PlayAnonuncerVoice : public Event
+{
+    std::string FilePath = "";
+};
+
+}
+
+#endif
@@ -12,7 +12,8 @@ namespace Events
 // Sound behavior is thereby specified in the SoundEmitter component.
 struct PlaySoundOnEntity : public Event
 {
-    EntityID EmitterID = 0;
+    EntityWrapper Emitter = EntityWrapper::Invalid;
+    float Gain = 1.f;
    std::string FilePath = "";
 };

@@ -0,0 +1,16 @@
+#ifndef Events_SetAnnouncerGain_h__
+#define Events_SetAnnouncerGain_h__
+
+#include "../Engine/Core/EventBroker.h"
+
+namespace Events
+{
+
+struct  SetAnnouncerGain : public Event
+{
+    float Gain = 1;
+};
+
+}
+
+#endif // 
@@ -9,32 +9,35 @@
 #include "OpenAL/al.h"
 #include "OpenAL/alc.h"

-#include "imgui/imgui.h"
-
-#include "Core/World.h"
-#include "Core/EventBroker.h"
+#include "../Engine/Core/World.h"
+#include "../Engine/Core/EventBroker.h"
 #include "../Engine/Core/ResourceManager.h"
 #include "../Engine/Core/ConfigFile.h"
-#include "Core/Transform.h" // Absolute transform
-#include "Sound/Sound.h"
+#include "../Engine/Core/Transform.h"
+#include "../Engine/Sound/Sound.h"
 #include "../Engine/Sound/EPlayQueueOnEntity.h"
-#include "Sound/EPlaySoundOnEntity.h"
-#include "Sound/EPlaySoundOnPosition.h"
-#include "Sound/EPlayBackgroundMusic.h"
-#include "Sound/EPauseSound.h"
-#include "Sound/EContinueSound.h"
-#include "Sound/EStopSound.h"
-#include "Sound/ESetBGMGain.h"
-#include "Sound/ESetSFXGain.h"
-#include "Core/EPause.h"
-#include "Core/EComponentAttached.h"
+#include "../Engine/Sound/EPlaySoundOnEntity.h"
+#include "../Engine/Sound/EPlaySoundOnPosition.h"
+#include "../Engine/Sound/EPlayBackgroundMusic.h"
+#include "../Engine/Sound/EPlayAnnouncerVoice.h"
+#include "../Engine/Sound/EPauseSound.h"
+#include "../Engine/Sound/EContinueSound.h"
+#include "../Engine/Sound/EStopSound.h"
+#include "../Engine/Sound/ESetBGMGain.h"
+#include "../Engine/Sound/ESetSFXGain.h"
+#include "../Engine/Sound/ESetAnnouncerGain.h"
+#include "../Engine/Sound/EChangeBGM.h"
+#include "../Engine/Core/EPause.h"
+#include "../Engine/Core/EComponentAttached.h"
 #include "../Core/EPlayerSpawned.h"

+
 typedef std::pair<ALuint, std::vector<ALuint>> QueuedBuffers;

 enum class SoundType {
    SFX,
-    BGM
+    BGM,
+    Announcer
 };

 struct Source
@@ -43,6 +46,7 @@ struct Source
    Sound* SoundResource = nullptr;
    ALuint ALsource;
    SoundType Type;
+    float Duration;
 };

 class SoundManager
@@ -74,14 +78,20 @@ private:
    ALenum getSourceState(ALuint source);
    void setGain(Source* source, float gain);
    void setSoundProperties(Source* source, ComponentWrapper* soundComponent);
+    float getDurationSeconds(Source* source);
+    float getTimeOffsetSeconds(Source* source);

    // Specific logic
    void playSound(Source* source);
-    // Need to be the same format (sample rate etc)
+    // Needs to be the same format (sample rate etc)
    void playQueue(QueuedBuffers qb);
    void stopSound(Source* source);
    Source* createSource(std::string filePath);
    std::unordered_map<EntityID, Source*> m_Sources;
+    void matchBGMLoop();
+    Source* m_CurrentBGM = nullptr;
+    Source* m_CurrentBGMCombo = nullptr;
+    bool m_DrumLoopHasBeenStarted = false;

    // Logic
    World* m_World = nullptr;
@@ -93,6 +103,7 @@ private:

    float m_BGMVolumeChannel = 1.0f;
    float m_SFXVolumeChannel = 1.0f;
+    float m_AnnouncerVolumeChannel = 1.0f;
    EntityWrapper m_LocalPlayer = EntityWrapper();
    
    // Events
@@ -102,6 +113,8 @@ private:
    bool OnPlaySoundOnPosition(const Events::PlaySoundOnPosition &e);
    EventRelay<SoundManager, Events::PlayBackgroundMusic> m_EPlayBackgroundMusic;
    bool OnPlayBackgroundMusic(const Events::PlayBackgroundMusic &e);
+    EventRelay<SoundManager, Events::PlayAnonuncerVoice> m_EPlayAnnouncerVoice;
+    bool OnPlayAnnouncerVoice(const Events::PlayAnonuncerVoice& e);
    EventRelay<SoundManager, Events::PauseSound> m_EPauseSound;
    bool OnPauseSound(const Events::PauseSound &e);
    EventRelay<SoundManager, Events::StopSound> m_EStopSound;
@@ -112,6 +125,8 @@ private:
    bool OnSetBGMGain(const Events::SetBGMGain &e);
    EventRelay<SoundManager, Events::SetSFXGain> m_ESetSFXGain; 
    bool OnSetSFXGain(const Events::SetSFXGain &e);
+    EventRelay<SoundManager, Events::SetAnnouncerGain> m_ESetAnnouncerGain;
+    bool OnSetAnnouncerGain(const Events::SetAnnouncerGain& e);
    EventRelay<SoundManager, Events::ComponentAttached> m_EComponentAttached;
    bool OnComponentAttached(const Events::ComponentAttached &e);
    EventRelay<SoundManager, Events::Pause> m_EPause;
@@ -122,6 +137,8 @@ private:
    bool OnPlayerSpawned(const Events::PlayerSpawned &e);
    EventRelay<SoundManager, Events::PlayQueueOnEntity> m_EPlayQueueOnEntity;
    bool OnPlayQueueOnEntity(const Events::PlayQueueOnEntity &e);
+    EventRelay<SoundManager, Events::ChangeBGM> m_EChangeBGM;
+    bool OnChangeBGM(const Events::ChangeBGM &e);


 };
@@ -33,7 +33,7 @@ private:
    // Used to track afterimages for sprint effect.
    float m_SprintEffectTimer;
    // The logic for making the sound play when player is moving
-    void playerStep(double dt);
+    void playerStep(double dt, EntityWrapper player);
    // Spawn a hexagon at origin of an Entity
    void spawnHexagon(EntityWrapper target);

@@ -2,6 +2,7 @@
 #define Systems_SoundSystem_h__

 #include <random>
+#include <chrono>

 #include "../Engine/Core/System.h"
 #include "../Engine/Core/ResourceManager.h"
@@ -20,9 +21,10 @@
 #include "../Engine/Collision/ETrigger.h"
 #include "../Engine/Sound/EPlaySoundOnEntity.h"
 #include "../Engine/Sound/EPlayBackgroundMusic.h"
+#include "../Engine/Sound/EPlayAnnouncerVoice.h"
 #include "../Game/Events/EDoubleJump.h"
 #include "../Game/Events/EDashAbility.h"
-
+#include "../Engine/Sound/EChangeBGM.h"

 class SoundSystem : public PureSystem, ImpureSystem
 {
@@ -33,14 +35,10 @@ public:
 private:
    std::string m_Announcer = "";
    // Logic for playing a sound when a player jumps
-    void playerJumps();
-    
-    // Temporary solution for play test.
-    bool m_DrumsIsPlaying = false;
-    double m_DrumTimer = 0.0;
-    bool drumTimer(double dt);
+    void playerJumps(EntityWrapper player);

-    std::default_random_engine generator;
+    std::default_random_engine m_RandomGenerator;
+    std::uniform_int_distribution<int> m_RandIntDistribution;

    EventRelay<SoundSystem, Events::PlayerSpawned> m_EPlayerSpawned;
    bool OnPlayerSpawned(const Events::PlayerSpawned &e);
@@ -48,10 +46,6 @@ private:
    bool OnInputCommand(const Events::InputCommand &e);
    EventRelay<SoundSystem, Events::DoubleJump> m_EDoubleJump;
    bool OnDoubleJump(const Events::DoubleJump &e);
-    EventRelay<SoundSystem, Events::DashAbility> m_EDashAbility;
-    bool OnDashAbility(const Events::DashAbility &e);
-    EventRelay<SoundSystem, Events::TriggerTouch> m_ETriggerTouch;
-    bool OnTriggerTouch(const Events::TriggerTouch &e);
    EventRelay<SoundSystem, Events::Captured> m_ECaptured;
    bool OnCaptured(const Events::Captured &e);
    EventRelay<SoundSystem, Events::PlayerDamage> m_EPlayerDamage;
@@ -5,6 +5,7 @@
 #include "Collision/Collision.h"
 #include "Core/EPlayerDamage.h"
 #include "Sound/EPlaySoundOnEntity.h"
+#include "Sound/EPlaySoundOnEntity.h"

 class DefenderWeaponBehaviour : public WeaponBehaviour<DefenderWeaponBehaviour>
 {
@@ -39,6 +39,7 @@ ResourceLoading=true
 [Sound]
 BGMVolume=1.0
 SFXVolume=1.0
+AnnouncerVolume=1.0
 Announcer=female

 [SSAO]
@@ -4,7 +4,7 @@
 	<Gain>1.0</Gain>
 	<Pitch>1.0</Pitch>
 	<Loop>false</Loop>
-	<MaxDistance>20.0</MaxDistance>
-	<RollOffFactor>1.0</RollOffFactor>
+	<MaxDistance>220.0</MaxDistance>
+	<RollOffFactor>10</RollOffFactor>
 	<ReferenceDistance>1.0</ReferenceDistance>
 </SoundEmitter>
@@ -2,21 +2,26 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">

  <Components>
-    <c:NetworkComponent/>
    <c:AmmoPickup/>
-    <c:Model>
-      <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
-    </c:Model>
+    <c:Trigger/>
    <c:RaptorCopter>
      <Speed>8</Speed>
      <Axis X="0" Y="0.100000001" Z="0"/>
    </c:RaptorCopter>
+    <c:Model>
+      <Resource>Models/Props/PickUps/AmmoPickUp.mesh</Resource>
+    </c:Model>
+    <c:NetworkComponent/>
+    <c:PointLight>
+      <Color A="1" B="1" G="0.0823529437" R="1"/>
+      <Radius>1.5</Radius>
+      <Intensity>3</Intensity>
+    </c:PointLight>
    <c:Transform>
-      <Position X="0" Y="2.36784196" Z="0"/>
+      <Position X="0" Y="2.36784196" Z="-0.0281207096"/>
+      <Orientation X="0" Y="18843.5469" Z="0"/>
      <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-      <Orientation X="0" Y="18717.9453" Z="0"/>
    </c:Transform>
-    <c:Trigger/>
  </Components>

  <Children/>
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="Origin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="0" Y="14.8518229" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="Anchor1">
+      <Components>
+        <c:RaptorCopter>
+          <Speed>0.30000001192092896</Speed>
+          <Axis X="0" Y="1" Z="0"/>
+        </c:RaptorCopter>
+        <c:FloatingEffect>
+          <Period>30</Period>
+          <Time>1125.9779108477385</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>3.5</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="-0" Y="-0.711852849" Z="-0"/>
+          <Orientation X="0" Y="455.182343" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/CrystalsLayer1.mesh</Resource>
+              <Color A="1" B="2" G="0.784313738" R="0"/>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Anchor2">
+      <Components>
+        <c:RaptorCopter>
+          <Speed>0.5</Speed>
+          <Axis X="0" Y="1" Z="0"/>
+        </c:RaptorCopter>
+        <c:FloatingEffect>
+          <Period>20</Period>
+          <Time>1231.9108979534806</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>3</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="-0" Y="-1.69476664" Z="-0"/>
+          <Orientation X="0" Y="752.229553" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/CrystalsLayer2.mesh</Resource>
+              <Color A="1" B="2" G="0.784313738" R="0"/>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Anchor0">
+      <Components>
+        <c:RaptorCopter>
+          <Speed>0.10000000149011612</Speed>
+          <Axis X="0" Y="-1" Z="0"/>
+        </c:RaptorCopter>
+        <c:FloatingEffect>
+          <Period>10</Period>
+          <Time>1278.4275441408811</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>0.5</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="-0" Y="-0.417467505" Z="-0"/>
+          <Orientation X="0" Y="-147.27742" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/CenterCrystal.mesh</Resource>
+              <Color A="1" B="2" G="0.784313738" R="0"/>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="LightOrigin1">
+          <Components>
+            <c:RaptorCopter>
+              <Speed>1</Speed>
+              <Axis X="0.400000006" Y="1" Z="0"/>
+            </c:RaptorCopter>
+            <c:Transform>
+              <Orientation X="330.00589" Y="825.014587" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity>
+              <Components>
+                <c:PointLight>
+                  <Color A="1" B="1" G="0.588235319" R="0"/>
+                  <Radius>4.5</Radius>
+                  <Falloff>0.5</Falloff>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="1.1234858" Y="0.720658064" Z="3.40589333"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity>
+              <Components>
+                <c:PointLight>
+                  <Color A="1" B="1" G="0.588235319" R="0"/>
+                  <Radius>4.5</Radius>
+                  <Falloff>0.5</Falloff>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="0.4723185" Y="0" Z="-4.12240839"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity>
+              <Components>
+                <c:PointLight>
+                  <Color A="1" B="1" G="0.588235319" R="0"/>
+                  <Radius>4.5</Radius>
+                  <Falloff>0.5</Falloff>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="-2.91954184" Y="1.54033804" Z="-0.0577439293"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity>
+              <Components>
+                <c:PointLight>
+                  <Color A="1" B="1" G="0.588235319" R="0"/>
+                  <Radius>4.5</Radius>
+                  <Falloff>0.5</Falloff>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="1.48998797" Y="-3.06706786" Z="-1.78805089"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="Origin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="0" Y="14.8518229" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="Anchor1">
+      <Components>
+        <c:RaptorCopter>
+          <Speed>0.30000001192092896</Speed>
+          <Axis X="0" Y="1" Z="0"/>
+        </c:RaptorCopter>
+        <c:FloatingEffect>
+          <Period>30</Period>
+          <Time>1816.9423460293749</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>3.5</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="-0" Y="-1.38488328" Z="-0"/>
+          <Orientation X="0" Y="662.475891" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/CrystalsLayer1.mesh</Resource>
+              <Color A="1" B="0" G="0.235294119" R="1.09803927"/>
+              <Shadow>false</Shadow>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Anchor2">
+      <Components>
+        <c:RaptorCopter>
+          <Speed>0.5</Speed>
+          <Axis X="0" Y="1" Z="0"/>
+        </c:RaptorCopter>
+        <c:FloatingEffect>
+          <Period>20</Period>
+          <Time>1922.875333135117</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>3</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="0" Y="2.35616231" Z="0"/>
+          <Orientation X="0" Y="1097.71094" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/CrystalsLayer2.mesh</Resource>
+              <Color A="1" B="0" G="0.235294119" R="1.09803927"/>
+              <Shadow>false</Shadow>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Anchor0">
+      <Components>
+        <c:RaptorCopter>
+          <Speed>0.10000000149011612</Speed>
+          <Axis X="0" Y="-1" Z="0"/>
+        </c:RaptorCopter>
+        <c:FloatingEffect>
+          <Period>10</Period>
+          <Time>1969.3919793225175</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>0.5</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="-0" Y="-0.186382934" Z="-0"/>
+          <Orientation X="0" Y="-216.374603" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/CenterCrystal.mesh</Resource>
+              <Color A="1" B="0" G="0.235294119" R="1.09803927"/>
+              <Shadow>false</Shadow>
+            </c:Model>
+            <c:Transform>
+              <Position X="-0" Y="-0" Z="-0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="LightOrigin1">
+          <Components>
+            <c:RaptorCopter>
+              <Speed>1</Speed>
+              <Axis X="0.400000006" Y="1" Z="0"/>
+            </c:RaptorCopter>
+            <c:Transform>
+              <Orientation X="606.394653" Y="1515.97461" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity>
+              <Components>
+                <c:PointLight>
+                  <Color A="1" B="0" G="0" R="1"/>
+                  <Radius>4.5</Radius>
+                  <Falloff>0.5</Falloff>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="1.1234858" Y="0.720658064" Z="3.40589333"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity>
+              <Components>
+                <c:PointLight>
+                  <Color A="1" B="0" G="0" R="1"/>
+                  <Radius>4.5</Radius>
+                  <Falloff>0.5</Falloff>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="0.4723185" Y="0" Z="-4.12240839"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity>
+              <Components>
+                <c:PointLight>
+                  <Color A="1" B="0" G="0" R="1"/>
+                  <Radius>4.5</Radius>
+                  <Falloff>0.5</Falloff>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="-2.91954184" Y="1.54033804" Z="-0.0577439293"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity>
+              <Components>
+                <c:PointLight>
+                  <Color A="1" B="0" G="0" R="1"/>
+                  <Radius>4.5</Radius>
+                  <Falloff>0.5</Falloff>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="1.48998797" Y="-3.06706786" Z="-1.78805089"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<Entity name="Origin" xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">
+
+  <Components>
+    <c:Transform>
+      <Position X="0" Y="14.8518229" Z="0"/>
+    </c:Transform>
+  </Components>
+
+  <Children>
+    <Entity name="Anchor1">
+      <Components>
+        <c:RaptorCopter>
+          <Speed>0.30000001192092896</Speed>
+          <Axis X="0" Y="1" Z="0"/>
+        </c:RaptorCopter>
+        <c:FloatingEffect>
+          <Period>30</Period>
+          <Time>1622.3711487379048</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>3.5</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="0" Y="1.66753078" Z="0"/>
+          <Orientation X="0" Y="604.103943" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/CrystalsLayer1.mesh</Resource>
+              <Shadow>false</Shadow>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Anchor2">
+      <Components>
+        <c:RaptorCopter>
+          <Speed>0.5</Speed>
+          <Axis X="0" Y="1" Z="0"/>
+        </c:RaptorCopter>
+        <c:FloatingEffect>
+          <Period>20</Period>
+          <Time>1728.3041358436469</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>3</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="0" Y="1.5237397" Z="0"/>
+          <Orientation X="0" Y="1000.42615" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/CrystalsLayer2.mesh</Resource>
+              <Shadow>false</Shadow>
+            </c:Model>
+            <c:Transform/>
+          </Components>
+          <Children/>
+        </Entity>
+      </Children>
+    </Entity>
+    <Entity name="Anchor0">
+      <Components>
+        <c:RaptorCopter>
+          <Speed>0.10000000149011612</Speed>
+          <Axis X="0" Y="-1" Z="0"/>
+        </c:RaptorCopter>
+        <c:FloatingEffect>
+          <Period>10</Period>
+          <Time>1774.8207820310474</Time>
+          <Axis X="0" Y="1" Z="0"/>
+          <Amplitude>0.5</Amplitude>
+        </c:FloatingEffect>
+        <c:Transform>
+          <Position X="0" Y="0.0561612286" Z="0"/>
+          <Orientation X="0" Y="-196.917053" Z="0"/>
+        </c:Transform>
+      </Components>
+      <Children>
+        <Entity>
+          <Components>
+            <c:Model>
+              <Resource>Models/Props/CapturePoint/CenterCrystal.mesh</Resource>
+              <Shadow>false</Shadow>
+              <Transparent>true</Transparent>
+            </c:Model>
+            <c:Transform>
+              <Position X="-0" Y="-0" Z="-0"/>
+            </c:Transform>
+          </Components>
+          <Children/>
+        </Entity>
+        <Entity name="LightOrigin1">
+          <Components>
+            <c:RaptorCopter>
+              <Speed>1</Speed>
+              <Axis X="0.400000006" Y="1" Z="0"/>
+            </c:RaptorCopter>
+            <c:Transform>
+              <Orientation X="528.564453" Y="1321.40454" Z="0"/>
+            </c:Transform>
+          </Components>
+          <Children>
+            <Entity>
+              <Components>
+                <c:PointLight>
+                  <Radius>4.5</Radius>
+                  <Falloff>0.5</Falloff>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="1.1234858" Y="0.720658064" Z="3.40589333"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity>
+              <Components>
+                <c:PointLight>
+                  <Radius>4.5</Radius>
+                  <Falloff>0.5</Falloff>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="0.4723185" Y="0" Z="-4.12240839"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity>
+              <Components>
+                <c:PointLight>
+                  <Radius>4.5</Radius>
+                  <Falloff>0.5</Falloff>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="-2.91954184" Y="1.54033804" Z="-0.0577439293"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity>
+              <Components>
+                <c:PointLight>
+                  <Radius>4.5</Radius>
+                  <Falloff>0.5</Falloff>
+                </c:PointLight>
+                <c:Transform>
+                  <Position X="1.48998797" Y="-3.06706786" Z="-1.78805089"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+          </Children>
+        </Entity>
+      </Children>
+    </Entity>
+  </Children>
+
+</Entity>
@@ -2,21 +2,26 @@
 <Entity xmlns:c="components" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Types/Entity.xsd">

  <Components>
-    <c:NetworkComponent/>
    <c:HealthPickup/>
-    <c:Model>
-      <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
-    </c:Model>
+    <c:Trigger/>
    <c:RaptorCopter>
      <Speed>8</Speed>
      <Axis X="0" Y="0.100000001" Z="0"/>
    </c:RaptorCopter>
+    <c:Model>
+      <Resource>Models/Props/PickUps/HealthPickUp.mesh</Resource>
+    </c:Model>
+    <c:NetworkComponent/>
+    <c:PointLight>
+      <Color A="1" B="0" G="1" R="1"/>
+      <Radius>1.5</Radius>
+      <Intensity>3</Intensity>
+    </c:PointLight>
    <c:Transform>
-      <Position X="0" Y="2.36784196" Z="0"/>
+      <Position X="0" Y="2.36800003" Z="0"/>
+      <Orientation X="0" Y="19005.3867" Z="0"/>
      <Scale X="0.600000024" Y="0.600000024" Z="0.600000024"/>
-      <Orientation X="0" Y="18767.0273" Z="0"/>
    </c:Transform>
-    <c:Trigger/>
  </Components>

  <Children/>
@@ -70,7 +70,7 @@ void Packet::WriteString(const std::string& str)
    size_t sizeOfString = str.size() + 1;
    if (m_Offset + sizeOfString > m_MaxPacketSize) {
        if (m_MaxPacketSize >= 32000) {
-            LOG_WARNING("Package::WriteString(): New size is huge %i bytes\n", m_MaxPacketSize*2);
+            //LOG_WARNING("Package::WriteString(): New size is huge %i bytes\n", m_MaxPacketSize*2);
        }
        resizeData();
    }
@@ -85,7 +85,7 @@ void Packet::WriteData(char * data, int sizeOfData)

    if (m_Offset + sizeOfData > m_MaxPacketSize) {
        if (m_MaxPacketSize >= 32000) {
-            LOG_WARNING("Package::WriteData(): New size is huge %i bytes\n", m_MaxPacketSize*2);
+            //LOG_WARNING("Package::WriteData(): New size is huge %i bytes\n", m_MaxPacketSize*2);
        }
        while (m_Offset + sizeOfData > m_MaxPacketSize) {
            resizeData();
@@ -7,23 +7,23 @@ TextPass::TextPass()

 void TextPass::Initialize()
 {
-    glGenVertexArrays(1, &VAO);
-    glGenBuffers(1, &VBO);
-    glBindVertexArray(VAO);
-    glBindBuffer(GL_ARRAY_BUFFER, VBO);
-    glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * 6 * 4, NULL, GL_DYNAMIC_DRAW);
-    glEnableVertexAttribArray(0);
-    glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), 0);
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
-    glBindVertexArray(0);
+	glGenVertexArrays(1, &VAO);
+	glGenBuffers(1, &VBO);
+	glBindVertexArray(VAO);
+	glBindBuffer(GL_ARRAY_BUFFER, VBO);
+	glBufferData(GL_ARRAY_BUFFER, sizeof(GLfloat) * 6 * 4, NULL, GL_DYNAMIC_DRAW);
+	glEnableVertexAttribArray(0);
+	glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, 4 * sizeof(GLfloat), 0);
+	glBindBuffer(GL_ARRAY_BUFFER, 0);
+	glBindVertexArray(0);

-    m_TextProgram = ResourceManager::Load<ShaderProgram>("#TextProgram");
-    m_TextProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Text.vert.glsl")));
-    m_TextProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Text.frag.glsl")));
-    m_TextProgram->Compile();
-    m_TextProgram->BindFragDataLocation(0, "sceneColor");
-    m_TextProgram->BindFragDataLocation(1, "bloomColor");
-    m_TextProgram->Link();
+	m_TextProgram = ResourceManager::Load<ShaderProgram>("#TextProgram");
+	m_TextProgram->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/Text.vert.glsl")));
+	m_TextProgram->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Text.frag.glsl")));
+	m_TextProgram->Compile();
+	m_TextProgram->BindFragDataLocation(0, "sceneColor");
+	m_TextProgram->BindFragDataLocation(1, "bloomColor");
+	m_TextProgram->Link();
 }

 void TextPass::Update()
@@ -33,81 +33,180 @@ void TextPass::Update()

 void TextPass::Draw(RenderScene& scene, FrameBuffer& frameBuffer)
 {
-    GLERROR("Derp1");
-    TextPassState* state = new TextPassState(frameBuffer.GetHandle());
-    for (auto &job : scene.Jobs.Text) {
-        auto textJob = std::dynamic_pointer_cast<TextJob>(job);
-        if (textJob) {
+	GLERROR("Derp1");
+	TextPassState* state = new TextPassState(frameBuffer.GetHandle());
+	for (auto &job : scene.Jobs.Text) {
+		auto textJob = std::dynamic_pointer_cast<TextJob>(job);
+		if (textJob) {

-            renderText(textJob->Content, textJob->Resource, textJob->Alignment, textJob->Color, textJob->Matrix, scene.Camera->ProjectionMatrix(), scene.Camera->ViewMatrix());
-        }
-    }
-    GLERROR("Derp2");
-    delete state;
+			renderText(textJob->Content, textJob->Resource, textJob->Alignment, textJob->Color, textJob->Matrix, scene.Camera->ProjectionMatrix(), scene.Camera->ViewMatrix());
+		}
+	}
+	GLERROR("Derp2");
+	delete state;
+}
+
+std::string TextPass::parseColors(std::string text, std::map<int, glm::vec4>& colorChanges, glm::vec4 originalColor)
+{
+	std::string parsedString = text;
+	glm::vec4 newColor = originalColor;
+	bool colorChange = false;
+
+	for (std::string::const_iterator c = parsedString.begin(); c != parsedString.end(); c++) {
+		if (*c == char(92)) { // Backlash
+			if ((c + 1) != parsedString.end()) {
+				if (*(c + 1) == char('C')) { // C for Color 
+					if ((c + 7) != parsedString.end()) {
+						bool hasCorrectFormat = true;
+
+						for (std::string::const_iterator colorC = c + 2; colorC != c + 8; colorC++) {
+							if (*colorC < '0' || *colorC > 'F') {
+								hasCorrectFormat = false;
+								break;
+							}
+						}
+
+						if (hasCorrectFormat == true) {
+							colorChange = true;
+
+							std::array<int, 3> hexToInt = {
+								std::stoi(std::string(c + 2, c + 4), 0, 16),
+								std::stoi(std::string(c + 4, c + 6), 0, 16),
+								std::stoi(std::string(c + 6, c + 8), 0, 16)
+							};
+
+							newColor = glm::vec4(
+								float(hexToInt[0]) / 255.f,
+								float(hexToInt[1]) / 255.f,
+								float(hexToInt[2]) / 255.f,
+								newColor.a);
+
+							parsedString.erase(c, (c + 8));
+						}
+					}
+				}
+
+				if (*(c + 1) == char('A')) { // A for Alpha
+					if ((c + 3) != parsedString.end()) {
+						bool hasCorrectFormat = true;
+
+						for (std::string::const_iterator colorC = c + 2; colorC != c + 4; colorC++) {
+							if (*colorC < '0' || *colorC > 'F') {
+								hasCorrectFormat = false;
+								break;
+							}
+						}
+
+						if (hasCorrectFormat == true) {
+							colorChange = true;
+
+							int hexToInt = std::stoi(std::string(c + 2, c + 4), 0, 16);
+
+							newColor = glm::vec4(
+								newColor.r,
+								newColor.g,
+								newColor.b,
+								float(hexToInt) / 255.f);
+
+							parsedString.erase(c, (c + 4));
+						}
+					}
+				}
+
+				if ((*(c + 1) >= '1' && *(c + 1) <= '9') || *(c + 1) == 'B' || *(c + 1) == 'E' || *(c + 1) == 'F') { // Icons
+					if (*(c + 1) >= '1' && *(c + 1) <= '9') {
+						parsedString.replace(c, (c + 2), 1, (*(c + 1) - 48));
+					}
+					else {
+						parsedString.replace(c, (c + 2), 1, (*(c + 1) - 55));
+					}
+				}
+
+				if (colorChange) {
+					colorChanges[c - parsedString.begin()] = newColor;
+				}
+			}
+		}
+	}
+
+
+
+	return parsedString;
 }

 void TextPass::renderText(std::string text, Font* font, TextJob::AlignmentEnum alignment, glm::vec4 color, glm::mat4 modelMatrix, glm::mat4 projectionMatrix, glm::mat4 viewMatrix)
 {
-    GLfloat penX = 0;
-    GLfloat penY = 0;
-    GLfloat scale = 1.0/font->FontSize;
+	GLfloat penX = 0;
+	GLfloat penY = 0;
+	GLfloat scale = 1.0 / font->FontSize;

-    GLfloat stringWidth = 0.f;
+	GLfloat stringWidth = 0.f;

-    for (std::string::const_iterator c = text.begin(); c != text.end(); c++) {
-        Font::Character ch = font->m_Characters[*c];
-        stringWidth += (ch.Advance >> 6) * scale;
-    }
+	std::map<int, glm::vec4> colorChanges;
+	std::string parsedText = parseColors(text, colorChanges, color);

-    if(alignment == TextJob::AlignmentEnum::Center) {
-        penX = -stringWidth/2.f;
-    } else if (alignment == TextJob::AlignmentEnum::Right) {
-        penX = -stringWidth;
-    } else {
-        penX = 0;
-    }	
-    
-    
+	for (std::string::const_iterator c = parsedText.begin(); c != parsedText.end(); c++) {
+		Font::Character ch = font->m_Characters[*c];
+		stringWidth += (ch.Advance >> 6) * scale;
+	}

-    m_TextProgram->Bind();
-    glUniform4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "textColor"), 1, glm::value_ptr(color));
-    glUniformMatrix4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "M"), 1, GL_FALSE, glm::value_ptr(modelMatrix));
-    glUniformMatrix4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "V"), 1, GL_FALSE, glm::value_ptr(viewMatrix));
-    glUniformMatrix4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "P"), 1, GL_FALSE, glm::value_ptr(projectionMatrix));
-    glActiveTexture(GL_TEXTURE0);
-    glBindVertexArray(VAO);
+	if (alignment == TextJob::AlignmentEnum::Center) {
+		penX = -stringWidth / 2.f;
+	}
+	else if (alignment == TextJob::AlignmentEnum::Right) {
+		penX = -stringWidth;
+	}
+	else {
+		penX = 0;
+	}


-    for (std::string::const_iterator c = text.begin(); c != text.end(); c++) {
-        Font::Character ch = font->m_Characters[*c];

-        GLfloat xpos = penX + ch.Bearing.x * scale;
-        GLfloat ypos = penY - (ch.Size.y - ch.Bearing.y) * scale;
+	m_TextProgram->Bind();
+	glUniform4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "textColor"), 1, glm::value_ptr(color));
+	glUniformMatrix4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "M"), 1, GL_FALSE, glm::value_ptr(modelMatrix));
+	glUniformMatrix4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "V"), 1, GL_FALSE, glm::value_ptr(viewMatrix));
+	glUniformMatrix4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "P"), 1, GL_FALSE, glm::value_ptr(projectionMatrix));
+	glActiveTexture(GL_TEXTURE0);
+	glBindVertexArray(VAO);

-        GLfloat w = ch.Size.x * scale;
-        GLfloat h = ch.Size.y * scale;

-        GLfloat vertices[6][4] = {
-            { xpos, ypos + h, 0.0, 0.0 },
-            { xpos, ypos, 0.0, 1.0 },
-            { xpos + w, ypos, 1.0, 1.0 },
+	for (std::string::const_iterator c = parsedText.begin(); c != parsedText.end(); c++) {

-            { xpos, ypos + h, 0.0, 0.0 },
-            { xpos + w, ypos, 1.0, 1.0 },
-            { xpos + w, ypos + h, 1.0, 0.0 }
-        };
+		auto it = colorChanges.find(c - parsedText.begin());
+		if (it != colorChanges.end()) {
+			glUniform4fv(glGetUniformLocation(m_TextProgram->GetHandle(), "textColor"), 1, glm::value_ptr(it->second));
+		}

-        glBindTexture(GL_TEXTURE_2D, ch.TextureID);
+		Font::Character ch = font->m_Characters[*c];

-        glBindBuffer(GL_ARRAY_BUFFER, VBO);
-        glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertices), vertices);
-        glBindBuffer(GL_ARRAY_BUFFER, 0);
-        glDrawArrays(GL_TRIANGLES, 0, 6);
-        penX += (ch.Advance >> 6) * scale; // Bitshift by 6 to get value in pixels (2^6 = 64)
-    }
-    glBindVertexArray(0);
-    glBindTexture(GL_TEXTURE_2D, 0);
+		GLfloat xpos = penX + ch.Bearing.x * scale;
+		GLfloat ypos = penY - (ch.Size.y - ch.Bearing.y) * scale;

-    GLERROR("Text rendering Error");
+		GLfloat w = ch.Size.x * scale;
+		GLfloat h = ch.Size.y * scale;
+
+		GLfloat vertices[6][4] = {
+			{ xpos, ypos + h, 0.0, 0.0 },
+			{ xpos, ypos, 0.0, 1.0 },
+			{ xpos + w, ypos, 1.0, 1.0 },
+
+			{ xpos, ypos + h, 0.0, 0.0 },
+			{ xpos + w, ypos, 1.0, 1.0 },
+			{ xpos + w, ypos + h, 1.0, 0.0 }
+		};
+
+		glBindTexture(GL_TEXTURE_2D, ch.TextureID);
+
+		glBindBuffer(GL_ARRAY_BUFFER, VBO);
+		glBufferSubData(GL_ARRAY_BUFFER, 0, sizeof(vertices), vertices);
+		glBindBuffer(GL_ARRAY_BUFFER, 0);
+		glDrawArrays(GL_TRIANGLES, 0, 6);
+		penX += (ch.Advance >> 6) * scale; // Bitshift by 6 to get value in pixels (2^6 = 64)
+	}
+	glBindVertexArray(0);
+	glBindTexture(GL_TEXTURE_2D, 0);
+
+	GLERROR("Text rendering Error");
 }

@@ -7,6 +7,7 @@ SoundManager::SoundManager(World* world, EventBroker* eventBroker)
    m_World = world;
    m_BGMVolumeChannel = config->Get<float>("Sound.BGMVolume", 1.f);
    m_SFXVolumeChannel = config->Get<float>("Sound.SFXVolume", 1.f);
+    m_AnnouncerVolumeChannel = config->Get<float>("Sound.AnnouncerVolume", 1.f);

    initOpenAL();
    alSpeedOfSound(340.29f);
@@ -16,16 +17,23 @@ SoundManager::SoundManager(World* world, EventBroker* eventBroker)
    EVENT_SUBSCRIBE_MEMBER(m_EPlaySoundOnEntity, &SoundManager::OnPlaySoundOnEntity);
    EVENT_SUBSCRIBE_MEMBER(m_EPlaySoundOnPosition, &SoundManager::OnPlaySoundOnPosition);
    EVENT_SUBSCRIBE_MEMBER(m_EPlayBackgroundMusic, &SoundManager::OnPlayBackgroundMusic);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayAnnouncerVoice, &SoundManager::OnPlayAnnouncerVoice);
    EVENT_SUBSCRIBE_MEMBER(m_EStopSound, &SoundManager::OnStopSound);
    EVENT_SUBSCRIBE_MEMBER(m_EPauseSound, &SoundManager::OnPauseSound);
    EVENT_SUBSCRIBE_MEMBER(m_EContinueSound, &SoundManager::OnContinueSound);
    EVENT_SUBSCRIBE_MEMBER(m_ESetBGMGain, &SoundManager::OnSetBGMGain);
    EVENT_SUBSCRIBE_MEMBER(m_ESetSFXGain, &SoundManager::OnSetSFXGain);
+    EVENT_SUBSCRIBE_MEMBER(m_ESetAnnouncerGain, &SoundManager::OnSetAnnouncerGain);
    EVENT_SUBSCRIBE_MEMBER(m_EPause, &SoundManager::OnPause);
    EVENT_SUBSCRIBE_MEMBER(m_EResume, &SoundManager::OnResume);
    EVENT_SUBSCRIBE_MEMBER(m_EComponentAttached, &SoundManager::OnComponentAttached);
    EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &SoundManager::OnPlayerSpawned);
    EVENT_SUBSCRIBE_MEMBER(m_EPlayQueueOnEntity, &SoundManager::OnPlayQueueOnEntity);
+    EVENT_SUBSCRIBE_MEMBER(m_EChangeBGM, &SoundManager::OnChangeBGM);
+
+    Events::ChangeBGM e;
+    e.FilePath = "Audio/bgm/MenuMusic.wav";
+    m_EventBroker->Publish(e);
 }

 SoundManager::~SoundManager()
@@ -56,13 +64,11 @@ void SoundManager::stopEmitters()
 void SoundManager::Update(double dt)
 {
    m_EventBroker->Process<SoundManager>();
-    deleteInactiveEmitters(); // can be optimized with "EEntityDeleted"
+    deleteInactiveEmitters();
    updateEmitters(dt);
    updateListener(dt);
-
-    // Editor debug info
-    ImGui::SliderFloat("BGM", &m_BGMVolumeChannel, 0.0f, 1.0f, "%.3f", 1.0f);
-    ImGui::SliderFloat("SFX", &m_SFXVolumeChannel, 0.0f, 1.0f, "%.3f", 1.0f);
+    if (m_DrumLoopHasBeenStarted)
+        matchBGMLoop();
 }

 void SoundManager::deleteInactiveEmitters()
@@ -117,7 +123,7 @@ void SoundManager::updateEmitters(double dt)
        // Calculate velocity
        glm::vec3 velocity = glm::vec3(nextPos - previousPos) / (float)dt;
        setSourcePos(it->second->ALsource, nextPos);
-        setSourceVel(it->second->ALsource, velocity);
+        //setSourceVel(it->second->ALsource, glm::vec3(0));  

        auto emitter = m_World->GetComponent(it->first, "SoundEmitter");
        setSoundProperties(it->second, &emitter);
@@ -166,9 +172,34 @@ Source* SoundManager::createSource(std::string filePath)
    Source* source = new Source();
    source->ALsource = alSource;
    source->SoundResource = ResourceManager::Load<Sound>(filePath);
+    source->Duration = getDurationSeconds(source);
    return source;
 }

+void SoundManager::matchBGMLoop()
+{
+    if (m_CurrentBGMCombo == nullptr)
+        return;
+    auto cCapturePoints = m_World->GetComponents("CapturePoint");
+    for (auto it = cCapturePoints->begin(); it != cCapturePoints->end(); it++) {
+        float timeCaptured = (float)(double)(*it)["CaptureTimer"];
+        float maxTimer = (float)(double)(*it)["CapturePointMaxTimer"];
+        int capturePointIndex = (int)(*it)["CapturePointNumber"];
+
+        if (capturePointIndex == 0) { // Home for red team
+            if (timeCaptured < 0 && glm::abs(timeCaptured) < maxTimer) {
+                float gain = glm::abs(timeCaptured) / maxTimer;
+                setGain(m_CurrentBGMCombo, gain);
+            }
+        } else if (capturePointIndex == 4) { // Home for blue team
+            if (timeCaptured > 0 && timeCaptured < maxTimer) {
+                float gain = timeCaptured / maxTimer;
+                setGain(m_CurrentBGMCombo, gain);
+            }
+        }
+    }
+}
+
 void SoundManager::playSound(Source* source)
 {
    alSourcei(source->ALsource, AL_BUFFER, source->SoundResource->Buffer());
@@ -192,10 +223,12 @@ bool SoundManager::OnPlaySoundOnEntity(const Events::PlaySoundOnEntity & e)
 {
    Source* source = createSource(e.FilePath);
    source->Type = SoundType::SFX;
-    EntityID child = m_World->CreateEntity(e.EmitterID);
+    EntityID child = m_World->CreateEntity(e.Emitter.ID);
    m_World->AttachComponent(child, "Transform");
-    m_World->AttachComponent(child, "SoundEmitter");
+    auto cEmitter = m_World->AttachComponent(child, "SoundEmitter");
+    (double&)(float)cEmitter["Gain"] = e.Gain;
    m_Sources[child] = source;
+    setGain(source, cEmitter["Gain"]);
    playSound(source);
    return false;
 }
@@ -242,7 +275,7 @@ bool SoundManager::OnPlayBackgroundMusic(const Events::PlayBackgroundMusic & e)
    auto listenerComponents = m_World->GetComponents("Listener");
    for (auto it = listenerComponents->begin(); it != listenerComponents->end(); it++) {
        if ((*it).EntityID != m_LocalPlayer.ID) {
-            break;
+            continue;
        }
        auto emitterChild = m_World->CreateEntity((*it).EntityID);
        auto emitter = m_World->AttachComponent(emitterChild, "SoundEmitter");
@@ -258,6 +291,28 @@ bool SoundManager::OnPlayBackgroundMusic(const Events::PlayBackgroundMusic & e)
    return true;
 }

+
+bool SoundManager::OnPlayAnnouncerVoice(const Events::PlayAnonuncerVoice& e)
+{
+    auto listenerComponents = m_World->GetComponents("Listener");
+    for (auto it = listenerComponents->begin(); it != listenerComponents->end(); it++) {
+        if ((*it).EntityID != m_LocalPlayer.ID) {
+            continue;
+        }
+        auto emitterChild = m_World->CreateEntity((*it).EntityID);
+        auto emitter = m_World->AttachComponent(emitterChild, "SoundEmitter");
+        (bool&)emitter["Loop"] = false;
+        (std::string&)emitter["FilePath"] = e.FilePath;
+        m_World->AttachComponent(emitterChild, "Transform");
+        Source* source = createSource(e.FilePath);
+        source->Type = SoundType::Announcer;
+        setSoundProperties(source, &emitter);
+        m_Sources[emitterChild] = source;
+        playSound(source);
+    }
+    return true;
+}
+
 bool SoundManager::OnSetBGMGain(const Events::SetBGMGain & e)
 {
    m_BGMVolumeChannel = e.Gain;
@@ -270,6 +325,13 @@ bool SoundManager::OnSetSFXGain(const Events::SetSFXGain & e)
    return true;
 }

+
+bool SoundManager::OnSetAnnouncerGain(const Events::SetAnnouncerGain& e)
+{
+    m_AnnouncerVolumeChannel = e.Gain;
+    return true;
+}
+
 bool SoundManager::OnComponentAttached(const Events::ComponentAttached & e)
 {
    if (e.Component.Info.Name == "SoundEmitter") {
@@ -301,12 +363,20 @@ bool SoundManager::OnPlayerSpawned(const Events::PlayerSpawned &e)
 {
    if (e.PlayerID == -1) { // Local player
        m_LocalPlayer = e.Player;
+        if (m_DrumLoopHasBeenStarted) {
+            return true;
+        }
+        m_CurrentBGMCombo = createSource("Audio/BGM/Layer2.wav");
+        m_CurrentBGMCombo->Type = SoundType::BGM;
+        alSourcei(m_CurrentBGMCombo->ALsource, AL_LOOPING, 1);
+        setGain(m_CurrentBGMCombo, 0);
+        playSound(m_CurrentBGMCombo);
+        m_DrumLoopHasBeenStarted = true;
        return true;
    }
    return false;
 }

-
 bool SoundManager::OnPlayQueueOnEntity(const Events::PlayQueueOnEntity &e)
 {
    Source* source = createSource(*e.FilePaths.begin());
@@ -321,6 +391,18 @@ bool SoundManager::OnPlayQueueOnEntity(const Events::PlayQueueOnEntity &e)
    return true;
 }

+bool SoundManager::OnChangeBGM(const Events::ChangeBGM &e)
+{
+    if (m_CurrentBGM != nullptr) {
+        stopSound(m_CurrentBGM);
+    }
+    m_CurrentBGM = createSource(e.FilePath);
+    m_CurrentBGM->Type = SoundType::BGM;
+    alSourcei(m_CurrentBGM->ALsource, AL_LOOPING, 1);
+    playSound(m_CurrentBGM);
+    return true;
+}
+
 ALenum SoundManager::getSourceState(ALuint source)
 {
    ALenum state;
@@ -335,15 +417,49 @@ void SoundManager::setGain(Source * source, float gain)

 void SoundManager::setSoundProperties(Source* source, ComponentWrapper* soundComponent)
 {
-    float gain = (source->Type == SoundType::SFX) ? m_SFXVolumeChannel : m_BGMVolumeChannel;
+    float gain;
+    switch (source->Type) {
+    case SoundType::SFX: 
+        gain = m_SFXVolumeChannel; 
+        break;
+    case SoundType::BGM: 
+        gain = m_BGMVolumeChannel;
+        break;
+    case SoundType::Announcer: 
+        gain = m_AnnouncerVolumeChannel; 
+        break;
+    default:
+        gain = 1.f;
+        break;
+    }
    alSourcef(source->ALsource, AL_GAIN, (float)(double)(*soundComponent)["Gain"] * gain);
    alSourcef(source->ALsource, AL_PITCH, (float)(double)(*soundComponent)["Pitch"]);
-    alSourcei(source->ALsource, AL_LOOPING, (int)(bool)(*soundComponent)["Loop"]); // YOLO
+    alSourcei(source->ALsource, AL_LOOPING, (int)(bool)(*soundComponent)["Loop"]);
    alSourcef(source->ALsource, AL_MAX_DISTANCE, (float)(double)(*soundComponent)["MaxDistance"]);
    alSourcef(source->ALsource, AL_ROLLOFF_FACTOR, (float)(double)(*soundComponent)["RollOffFactor"]);
    alSourcef(source->ALsource, AL_REFERENCE_DISTANCE, (float)(double)(*soundComponent)["ReferenceDistance"]);
 }

+float SoundManager::getDurationSeconds(Source* source)
+{
+    ALuint buffer = source->SoundResource->Buffer();
+    ALint sizeBytes, channels, bits, frequenzy;
+    alGetBufferi(buffer, AL_SIZE, &sizeBytes);
+    alGetBufferi(buffer, AL_CHANNELS, &channels);
+    alGetBufferi(buffer, AL_BITS, &bits);
+    alGetBufferi(buffer, AL_FREQUENCY, &frequenzy);
+    float sampleLength = (float)sizeBytes * 8 / (channels * bits);
+    return (sampleLength / frequenzy);
+}
+
+
+float SoundManager::getTimeOffsetSeconds(Source* source)
+{
+    float time;
+    alGetSourcef(source->ALsource, AL_SEC_OFFSET, &time);
+    return time;
+}
+
 void SoundManager::initOpenAL()
 {
    // Initialize OpenAL
@@ -223,7 +223,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");
@@ -274,10 +274,9 @@ void PlayerMovementSystem::updateMovementControllers(double dt)

            // TODO: Animations
        }
-
+        playerStep(dt, player);
        controller->Reset();
    }
-    playerStep(dt);
 }


@@ -313,12 +312,12 @@ void PlayerMovementSystem::updateVelocity(EntityWrapper player, double dt)
    position += velocity * (float)dt;
 }

-void PlayerMovementSystem::playerStep(double dt)
+void PlayerMovementSystem::playerStep(double dt, EntityWrapper player)
 {
-    if (!m_LocalPlayer.Valid()) {
+    // Position of the local player, used see how far a player has moved.
+    if(!IsClient) {
        return;
    }
-    // Position of the local player, used see how far a player has moved.
    glm::vec3 pos = (glm::vec3)m_World->GetComponent(m_LocalPlayer.ID, "Transform")["Position"];
    // Used to see if a player is airborne.
    bool grounded = (bool)m_World->GetComponent(m_LocalPlayer.ID, "Physics")["IsOnGround"];
@@ -329,8 +328,8 @@ void PlayerMovementSystem::playerStep(double dt)
        // Player moved a step's distance
        // Create footstep sound
        Events::PlaySoundOnEntity e;
-        e.EmitterID = m_LocalPlayer.ID;
-        e.FilePath = m_LeftFoot ? "Audio/footstep/footstep2.wav" : "Audio/footstep/footstep3.wav";
+        e.Emitter = m_LocalPlayer;
+        e.FilePath = m_LeftFoot ? "Audio/Footstep/Footstep2.wav" : "Audio/Footstep/Footstep3.wav";
        m_LeftFoot = !m_LeftFoot;
        m_EventBroker->Publish(e);
        m_DistanceMoved = 0.f;
@@ -6,45 +6,33 @@ SoundSystem::SoundSystem(SystemParams params)
 {
    ConfigFile* config = ResourceManager::Load<ConfigFile>("Config.ini");
    m_Announcer = ResourceManager::Load<ConfigFile>("Config.ini")->Get<std::string>("Sound.Announcer", "female");
-    if (IsClient) {
-        EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &SoundSystem::OnPlayerSpawned);
-        EVENT_SUBSCRIBE_MEMBER(m_InputCommand, &SoundSystem::OnInputCommand);
-        EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &SoundSystem::OnDoubleJump);
-        EVENT_SUBSCRIBE_MEMBER(m_EDashAbility, &SoundSystem::OnDashAbility);
-        EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &SoundSystem::OnPlayerDamage);
-        EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &SoundSystem::OnCaptured);
-        EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &SoundSystem::OnTriggerTouch);
-        EVENT_SUBSCRIBE_MEMBER(m_EPlayerDeath, &SoundSystem::OnPlayerDeath);
-    }
+    unsigned seed = std::chrono::system_clock::now().time_since_epoch().count();
+    m_RandomGenerator = std::default_random_engine(seed);
+    m_RandIntDistribution = std::uniform_int_distribution<int>(1, 12);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &SoundSystem::OnPlayerSpawned);
+    EVENT_SUBSCRIBE_MEMBER(m_InputCommand, &SoundSystem::OnInputCommand);
+    EVENT_SUBSCRIBE_MEMBER(m_EDoubleJump, &SoundSystem::OnDoubleJump);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerDamage, &SoundSystem::OnPlayerDamage);
+    EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &SoundSystem::OnCaptured);
+    EVENT_SUBSCRIBE_MEMBER(m_EPlayerDeath, &SoundSystem::OnPlayerDeath);
 }

 void SoundSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& cComponent, double dt)
 { }

 void SoundSystem::Update(double dt)
-{
-    if (!IsClient) {
-        return;
-    }
-
-    // Temp for play test.
-    if (m_DrumsIsPlaying) {
-        m_DrumsIsPlaying = !drumTimer(dt);
-    }
-}
+{ }

 bool SoundSystem::OnPlayerSpawned(const Events::PlayerSpawned &e)
 {
    if (e.PlayerID == -1) { // Local player
        m_World->AttachComponent(e.Player.ID, "Listener");
-        Events::PlaySoundOnEntity go;
-        go.EmitterID = LocalPlayer.ID;
-        go.FilePath = "Audio/announcer/" + m_Announcer + "/go.wav";
+        Events::PlayAnonuncerVoice go;
+        go.FilePath = "Audio/Announcer/" + m_Announcer + "/Go.wav";
        m_EventBroker->Publish(go);
-        // TEMP: starts bgm
        {
-            Events::PlayBackgroundMusic ev;
-            ev.FilePath = "Audio/bgm/ambient.wav";
+            Events::ChangeBGM ev;
+            ev.FilePath = "Audio/BGM/Layer1.wav";
            m_EventBroker->Publish(ev);
        }
    }
@@ -54,82 +42,67 @@ bool SoundSystem::OnPlayerSpawned(const Events::PlayerSpawned &e)
 bool SoundSystem::OnInputCommand(const Events::InputCommand & e)
 {
    if (e.Command == "Jump" && e.Value > 0) {
-        if (e.PlayerID == -1) { // local player
-            playerJumps();
-            return true;
-        }
+        if (e.PlayerID == -1) {
+            playerJumps(LocalPlayer);
+        } 
+        return true;
    }
-
    return false;
 }

-void SoundSystem::playerJumps()
+void SoundSystem::playerJumps(EntityWrapper player)
 {
-    if (!LocalPlayer.Valid()) {
+    if (!IsClient) { // Only play for clients
        return;
    }
-
-    bool grounded = (bool)m_World->GetComponent(LocalPlayer.ID, "Physics")["IsOnGround"];
+    if(!player.HasComponent("Physics")) {
+        return;
+    }
+    bool grounded = (bool)player["Physics"]["IsOnGround"];
    if (grounded) {
        Events::PlaySoundOnEntity e;
-        e.EmitterID = LocalPlayer.ID;
-        e.FilePath = "Audio/jump/jump1.wav";
+        e.Emitter = player;
+        e.FilePath = "Audio/Jump/Jump1.wav";
        m_EventBroker->Publish(e);
    }
 }

-bool SoundSystem::drumTimer(double dt)
-{
-    m_DrumTimer += dt;
-    if (m_DrumTimer > 15) {
-        m_DrumTimer = 0.0;
-        return true;
-    } else {
-        return false;
-    }
-}
-
 bool SoundSystem::OnCaptured(const Events::Captured & e)
 {
-    if (!LocalPlayer.Valid()) {
+    if (!IsClient) { // Only play for clients
        return false;
    }
    int homeTeam = (int)m_World->GetComponent(e.CapturePointTakenID, "Team")["Team"];
    int team = (int)m_World->GetComponent(LocalPlayer.ID, "Team")["Team"];
-    Events::PlaySoundOnEntity ev;
+    Events::PlayAnonuncerVoice ev;
    if (team == homeTeam) {
-        ev.FilePath = "Audio/announcer/" + m_Announcer + "/objective_achieved.wav";
+        ev.FilePath = "Audio/Announcer/" + m_Announcer + "/ObjectiveAchieved.wav";
    } else {
-        ev.FilePath = "Audio/announcer/" + m_Announcer + "/objective_failed.wav"; // have not been tested
+        ev.FilePath = "Audio/Announcer/" + m_Announcer + "/ObjectiveFailed.wav";
    }
-    ev.EmitterID = LocalPlayer.ID;
    m_EventBroker->Publish(ev);
-    // Temp for play test.
-    m_DrumsIsPlaying = false;
    return false;
 }

-// Testing purposes atm...
 bool SoundSystem::OnPlayerDamage(const Events::PlayerDamage & e)
 {
    if (!IsClient) { // Only play for clients
        return false;
    }
-    if (LocalPlayer.ID = e.Victim.ID) { // You're local player was the one who took dmg
+    if (!e.Victim.Valid() || !e.Inflictor.Valid()) {
+        return false;
+    }
+    auto victimTeam = m_World->GetComponent(e.Victim.ID, "Team");
+    auto inflictorTeam = m_World->GetComponent(e.Inflictor.ID, "Team");
+    if ((int)victimTeam["Team"] == (int)inflictorTeam["Team"]) {
+        // Victim and inflictor are the same team, should not play "hurt" sound.
        return false;
    }
-    std::uniform_int_distribution<int> dist(1, 12);
-    int rand = dist(generator);
    std::vector<std::string> paths;
-    paths.push_back("Audio/hurt/hurt" + std::to_string(rand) + ".wav");
+    paths.push_back("Audio/Hurt/Hurt" + std::to_string(m_RandIntDistribution(m_RandomGenerator)) + ".wav");

-    //     // Breathe
-    //     int ammountOfbreaths = (static_cast<int>(e.Damage) / 10) + 2; // TEMP: Idk something stupid like this shit
-    //     for (int i = 0; i < ammountOfbreaths; i++) {
-    //         paths.push_back("Audio/exhausted/breath.wav");
-    //     }
    Events::PlayQueueOnEntity ev;
-    ev.Emitter = LocalPlayer;
+    ev.Emitter = e.Victim;
    ev.FilePaths = paths;
    m_EventBroker->Publish(ev);
    return false;
@@ -137,7 +110,7 @@ bool SoundSystem::OnPlayerDamage(const Events::PlayerDamage & e)

 bool SoundSystem::OnPlayerDeath(const Events::PlayerDeath & e)
 {
-    if (e.Player.ID != LocalPlayer.ID) {
+    if (!e.Player.Valid()) {
        return false;
    }
    if (!IsClient) {
@@ -146,8 +119,9 @@ bool SoundSystem::OnPlayerDeath(const Events::PlayerDeath & e)
    // The local player is dead. The local player might be invalid?
    // Play the sound from the listener.
    // TODO: We might want to hear other players die.
-    Events::PlayBackgroundMusic ev;
-    ev.FilePath = "Audio/die/die2.wav";
+    Events::PlaySoundOnEntity ev;
+    ev.Emitter = e.Player;
+    ev.FilePath = "Audio/Die/Die2.wav";
    m_EventBroker->Publish(ev);
    return false;
 }
@@ -155,43 +129,25 @@ bool SoundSystem::OnPlayerDeath(const Events::PlayerDeath & e)
 bool SoundSystem::OnPlayerHealthPickup(const Events::PlayerHealthPickup & e)
 {
    Events::PlaySoundOnEntity ev;
-    ev.EmitterID = LocalPlayer.ID;
-    ev.FilePath = "Audio/pickup/pickup2.wav";
+    ev.Emitter = LocalPlayer;
+    ev.FilePath = "Audio/Pickup/Pickup2.wav";
    m_EventBroker->Publish(ev);
    return false;
 }

-bool SoundSystem::OnTriggerTouch(const Events::TriggerTouch & e)
-{
-    // Temp for play test.
-    if (m_DrumsIsPlaying) {
-        return false;
-    }
-    if (m_World->HasComponent(e.Trigger.ID, "CapturePoint")) {
-        Events::PlaySoundOnEntity ev; // should be BGM
-        ev.EmitterID = LocalPlayer.ID;
-        ev.FilePath = "Audio/bgm/drumstest.wav";
-        m_EventBroker->Publish(ev);
-        // Temp for play test.
-        m_DrumsIsPlaying = true;
-    }
-    return false;
-}
-
 bool SoundSystem::OnDoubleJump(const Events::DoubleJump & e)
 {
-    Events::PlaySoundOnEntity ev;
-    ev.EmitterID = LocalPlayer.ID;
-    ev.FilePath = "Audio/jump/jump2.wav";
-    m_EventBroker->Publish(ev);
-    return false;
-}
-
-bool SoundSystem::OnDashAbility(const Events::DashAbility &e)
-{
-    Events::PlaySoundOnEntity ev;
-    ev.EmitterID = LocalPlayer.ID;
-    ev.FilePath = "Audio/jump/dash1.wav";
-    m_EventBroker->Publish(ev);
+    if (!m_World->ValidEntity(e.entityID)) {
+        return false;
+    }
+    if (!IsClient) {
+        return false;
+    }
+    if (e.entityID == LocalPlayer.ID) {
+        Events::PlaySoundOnEntity ev;
+        ev.Emitter = EntityWrapper(m_World, e.entityID);
+        ev.FilePath = "Audio/Jump/Jump2.wav";
+        m_EventBroker->Publish(ev);
+    }
    return false;
 }
@@ -158,7 +158,7 @@ void AssaultWeaponBehaviour::OnReload(ComponentWrapper cWeapon, WeaponInfo& wi)

    // Sound
    Events::PlaySoundOnEntity e;
-    e.EmitterID = wi.Player.ID;
+    e.Emitter = wi.Player;
    e.FilePath = "Audio/weapon/Assault/AssaultWeaponReload.wav";
    m_EventBroker->Publish(e);
 }
@@ -234,7 +234,7 @@ void AssaultWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi
        if (hitMarkerSpawner.Valid()) {
            SpawnerSystem::Spawn(hitMarkerSpawner, hitMarkerSpawner);
            Events::PlaySoundOnEntity e;
-            e.EmitterID = wi.Player.ID;
+            e.Emitter = wi.Player;
            e.FilePath = "Audio/weapon/hitclick.wav";
            m_EventBroker->Publish(e);
        }
@@ -253,7 +253,7 @@ void AssaultWeaponBehaviour::fireBullet(ComponentWrapper cWeapon, WeaponInfo& wi

    // Sound
    Events::PlaySoundOnEntity e;
-    e.EmitterID = wi.Player.ID;
+    e.Emitter = wi.Player;
    e.FilePath = "Audio/weapon/Assault/AssaultWeaponFire.wav";
    m_EventBroker->Publish(e);
 }
@@ -31,7 +31,7 @@ void DefenderWeaponBehaviour::UpdateWeapon(ComponentWrapper cWeapon, WeaponInfo&
            magAmmo += 1;
            reloadTimer = reloadTime;
            Events::PlaySoundOnEntity e;
-            e.EmitterID = wi.Player.ID;
+            e.Emitter = wi.Player;
            e.FilePath = "Audio/weapon/Zoom.wav";
            m_EventBroker->Publish(e);
        } else {
@@ -232,6 +232,13 @@ void DefenderWeaponBehaviour::fireShell(ComponentWrapper cWeapon, WeaponInfo& wi
    }
    if (weaponModelEntity.Valid()) {
        EntityWrapper spawner = weaponModelEntity.FirstChildByName("WeaponMuzzle");
+        Events::PlaySoundOnEntity e;
+        e.Emitter = weaponModelEntity;
+        e.FilePath = "Audio/weapon/Shotgun/ShotgunFire.wav";
+        e.Gain = 1.f;
+        if (IsClient) {
+            m_EventBroker->Publish(e);
+        }
        for (auto& angles : pelletAngles) {
            glm::vec3 direction = Transform::AbsoluteOrientation(spawner) * glm::quat(glm::vec3(angles, 0.f)) * glm::vec3(0, 0, -1);
            float distance = traceRayDistance(Transform::AbsolutePosition(spawner), direction);
@@ -250,7 +257,7 @@ void DefenderWeaponBehaviour::fireShell(ComponentWrapper cWeapon, WeaponInfo& wi

    // Sound
    Events::PlaySoundOnEntity e;
-    e.EmitterID = wi.Player.ID;
+    e.Emitter = wi.Player;
    e.FilePath = "Audio/weapon/Blast.wav";
    m_EventBroker->Publish(e);
 }
Author	SHA1	Message	Date
stiffly	8e9ddc7b9d	playerJump is only done for local player.	2016-03-12 17:51:06 +01:00
stiffly	cc10e5500b	2x jump now only plays for local player	2016-03-12 15:31:44 +01:00
stiffly	9bac141a6b	WIP fixing pull request	2016-03-12 15:14:36 +01:00
stiffly	9942747d41	WIP pull request fixes	2016-03-12 14:26:09 +01:00
stiffly	28d576bfc0	Now the bgm should loop again.	2016-03-11 21:04:33 +01:00
stiffly	66d0f9fa47	Added menu music	2016-03-11 20:28:09 +01:00
stiffly	157a54e845	Merge remote-tracking branch 'origin/master' into Kill-streak-sounds	2016-03-11 18:19:22 +01:00
Tleety	7759af2c5a	Log remove	2016-03-11 15:52:47 +01:00
antc13	ac096bbf77	Merge branch 'master' of https://github.com/teamfisk/TacticalZ # Conflicts: # resources/Schema/Entities/CP_Rocky2.xml	2016-03-11 15:46:39 +01:00
antc13	81634578d9	Updated CP_Rocky2, added a point light to pickups and created 3 different versions of the Floating Crystals above Capture Points.	2016-03-11 15:43:20 +01:00
Tobias Dahl	2f61171d16	Merge pull request #185 from teamfisk/TextColor Text that handles color, alpha and icon parsing	2016-03-11 15:25:06 +01:00
Tobias Dahl	aa16a15693	Merge pull request #205 from teamfisk/Menu Menu	2016-03-11 15:23:13 +01:00
stiffly	e444a86ec5	Merge remote-tracking branch 'origin/master' into Kill-streak-sounds	2016-03-10 10:36:20 +01:00
FakeShemp	981dc3467e	Baggu fixed again +Bonus document formatted	2016-03-09 22:11:17 +01:00
FakeShemp	42af029a26	fix baggu	2016-03-09 21:25:51 +01:00
FakeShemp	2e5dfc609a	support headshot icons	2016-03-09 19:51:57 +01:00
FakeShemp	ba6d2b758d	Add killstreak icon	2016-03-09 12:34:09 +01:00
FakeShemp	12dd1d21de	Text now handles color, alpha and icon parsing	2016-03-09 12:11:26 +01:00
stiffly	e0de91cce3	WIP	2016-03-09 09:57:32 +01:00
stiffly	ec3ed1f46f	Merge remote-tracking branch 'origin/master' into Kill-streak-sounds # Conflicts: # include/Game/Systems/Weapon/DefenderWeaponBehaviour.h	2016-03-08 10:39:52 +01:00
stiffly	16124b7aa7	Crash fix	2016-03-04 03:31:51 +01:00
stiffly	a7c57da2c9	WIP	2016-03-04 03:03:38 +01:00
stiffly	1227a795d7	WIP	2016-03-03 21:23:53 +01:00
stiffly	1cc92f4800	Merge remote-tracking branch 'origin/master' into Kill-streak-sounds	2016-03-03 20:25:43 +01:00
stiffly	3613d66d32	The EPlaySoundOnEntity event now has support to set the gain on the sound. It now also uses EntityWrapper instead of EntityID.	2016-03-03 20:24:48 +01:00
stiffly	20c6caa408	Merge remote-tracking branch 'origin/master' into Kill-streak-sounds # Conflicts: # resources/DefaultConfig.ini	2016-03-03 17:32:04 +01:00
stiffly	b7fac7103d	More reasonable distance to hear sounds by other players. Modeified by rolloff factor.	2016-03-02 11:26:06 +01:00
stiffly	d3ffb9768b	Sets velocity to 0, does not make use of doppler effect atm	2016-03-01 14:48:07 +01:00
stiffly	2c56b03b2b	Merge remote-tracking branch 'origin/master' into Kill-streak-sounds	2016-02-29 16:41:46 +01:00
stiffly	4fd578c764	Removed logic that's no longer needed.	2016-02-29 16:26:09 +01:00
stiffly	67dffafe5a	Drumloop will now play when a team is about to win	2016-02-26 16:44:08 +01:00
stiffly	7dbb9e452b	Added a announcer volume channel.	2016-02-24 15:08:39 +01:00
stiffly	cf3d1b5b00	Changed the default reference distance for emitters. Should be heard all over the map	2016-02-24 14:19:38 +01:00
stiffly	9783f9c650	Added an event to change the background music.	2016-02-24 14:18:42 +01:00
stiffly	f72dea3852	Added a system that will handle BGM. Created specific logic for sounds to loop like Petter wants.	2016-02-24 11:51:06 +01:00