(1762f02b3) Merge branch 'dev' into human-ai

2019-05-16 05:08:22 +03:00
parent 4797f6b0d3
commit 454dda56c7
91 changed files with 1138 additions and 744 deletions
@@ -215,7 +215,7 @@
  </ItemGroup>
  <ItemGroup>
    <None Include="packages.config" />
-  </ItemGroup>  
+  </ItemGroup>
  <ItemGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|x64'">
    <None Include="Launch_BarotraumaServer">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -229,6 +229,9 @@
    <None Include="DedicatedServer.bin.x86_64">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
+    <None Include="DedicatedServer.bin.osx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
  </ItemGroup>
  <Import Project="..\BarotraumaShared\SharedCode.projitems" Label="Shared" />
  <Import Project="..\BarotraumaShared\SharedContent.projitems" Label="Shared" />