(19b26d13b) Merge branch 'dev' into human-ai

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:08:39 +03:00
parent 454dda56c7
commit 616efac2bf
14 changed files with 150 additions and 134 deletions
@@ -1971,7 +1971,7 @@
<Content Include="$(MSBuildThisFileDirectory)serversettings.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="$(MSBuildThisFileDirectory)Content\Items\Alien\alienbutton.ogg">
<None Include="$(MSBuildThisFileDirectory)Content\Items\Alien\AlienButton.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)Content\Items\Alien\AlienCoil1.ogg">
@@ -1980,7 +1980,7 @@
<None Include="$(MSBuildThisFileDirectory)Content\Items\Alien\AlienCoil2.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)Content\Items\Alien\alienpump.ogg">
<None Include="$(MSBuildThisFileDirectory)Content\Items\Alien\AlienPump.ogg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)Content\Items\Alien\AlienTurret1.ogg">