Merged linux changes, water effect using a BasicEffect and a simpler pixel shader, multi-colored wires

2015-09-08 21:55:27 +03:00
parent 7eae6fb026
commit ea15397725
18 changed files with 221 additions and 197 deletions
--- a/Subsurface/Subsurface.csproj
+++ b/Subsurface/Subsurface.csproj
@@ -943,6 +943,9 @@
    <None Include="Content\Sounds\Water\WaterAmbience.ogg">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
+    <None Include="Content\watershader.mgfx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>