Merge remote-tracking branch 'origin/Sound+Particles'

2014-06-05 05:22:33 +02:00
parent c7a37e1b9b 16e4129d70
commit 8f1f87512f
15 changed files with 211 additions and 82 deletions
@@ -650,6 +650,8 @@
    <ClInclude Include="..\..\src\Components\DamageModel.h">
      <Filter>Rendering\Components</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\src\Events\OnDead.h" />
+    <ClInclude Include="..\..\src\Systems\WallSystem.h" />
  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\src\Shaders\Fragment2.glsl">