(73987cc6a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-26 11:14:32 +03:00
parent ee1672408f
commit 9d9349c96e
3 changed files with 11 additions and 2 deletions
@@ -364,9 +364,18 @@
    <Content Include="$(MSBuildThisFileDirectory)Content\Items\Assemblies\airlock doors.xml">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Content\Items\Assemblies\AutoDoor.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Content\Items\Assemblies\AutoHatch.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
    <Content Include="$(MSBuildThisFileDirectory)Content\Items\Assemblies\Automatic Bilge Pump.xml">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Content\Items\Assemblies\WindowedAutoDoor.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
    <Content Include="$(MSBuildThisFileDirectory)Content\Items\Door\door2.png">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
@@ -2191,7 +2200,7 @@
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
    <None Include="$(MSBuildThisFileDirectory)Submarines\Berilia.sub">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
    </None>
    <None Include="$(MSBuildThisFileDirectory)Submarines\Dugong_Tutorial.sub">
      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
@@ -3350,7 +3359,7 @@
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
    <None Include="$(MSBuildThisFileDirectory)Submarines\Remora.sub">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
    </None>
    <None Include="$(MSBuildThisFileDirectory)Submarines\RemoraDrone.sub">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>