Merge branch 'master' into Respawning

# Conflicts: # src/Game/Game.cpp # src/Game/Systems/PlayerSpawnSystem.cpp # src/Game/Systems/SoundSystem.cpp
2016-02-11 16:15:47 +01:00
parent 8eea0c8395 38a3e88999
commit 97b915f130
126 changed files with 2545 additions and 1062 deletions
@@ -52,6 +52,7 @@
    </Entity>
    <Entity name="DirectionalLight">
      <Components>
+        <c:SceneLight/>
        <c:DirectionalLight/>
        <c:Model>
          <Resource>sModels/Widgets/Lights/DirectionalLightWidget.mesh</Resource>
@@ -65,9 +66,6 @@
    </Entity>
    <Entity name="ObstacleCourse">
      <Components>
-        <c:AABB>
-          <Size X="50" Y="50" Z="50"/>
-        </c:AABB>
        <c:Collidable/>
        <c:Model>
          <Resource>Models/Test/ObstacleCourse.mesh</Resource>