Fixed blendmaps

Merge remote-tracking branch 'origin/gui' into deffered_rendering Conflicts: vs11/Returngeance/Returngeance.vcxproj.filters
2014-05-28 22:08:50 +02:00
parent 761b8e21e1 cc42b94000
commit eb37cc2296
21 changed files with 932 additions and 1201 deletions
@@ -196,6 +196,8 @@
    <ClInclude Include="..\..\src\GUI\Frame.h" />
    <ClInclude Include="..\..\src\EventBroker.h" />
    <ClInclude Include="..\..\src\GUI\GameFrame.h" />
+    <ClInclude Include="..\..\src\GUI\HealthOverlay.h" />
+    <ClInclude Include="..\..\src\GUI\PlayerHUD.h" />
    <ClInclude Include="..\..\src\GUI\WorldFrame.h" />
    <ClInclude Include="..\..\src\GUI\TextureFrame.h" />
    <ClInclude Include="..\..\src\GUI\Viewport.h" />
@@ -472,6 +472,12 @@
    <ClInclude Include="..\..\src\GUI\GameFrame.h">
      <Filter>GUI</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\src\GUI\HealthOverlay.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\GUI\PlayerHUD.h">
+      <Filter>GUI</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\src\Components\BlendMap.h">
      <Filter>Rendering\Components</Filter>
    </ClInclude>