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

2019-05-07 16:22:40 +03:00
parent 6c196186b3
commit cc46d452fa
9 changed files with 6 additions and 0 deletions
--- a/Barotrauma/BarotraumaShared/SharedContent.projitems
+++ b/Barotrauma/BarotraumaShared/SharedContent.projitems
@@ -361,6 +361,12 @@
    <Content Include="$(MSBuildThisFileDirectory)Content\Effects\waterbump.png">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Content\Fonts\NotoSans\NotoSansCJKsc-Bold.otf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)Content\Fonts\NotoSans\NotoSansCJKsc-Medium.otf">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
    <Content Include="$(MSBuildThisFileDirectory)Content\Fonts\NotoSans\NotoSansTC-Bold.otf">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </Content>
--- a/Barotrauma/BarotraumaShared/Submarines/Bunyip.sub
+++ b/Barotrauma/BarotraumaShared/Submarines/Bunyip.sub
--- a/Barotrauma/BarotraumaShared/Submarines/Dugong.sub
+++ b/Barotrauma/BarotraumaShared/Submarines/Dugong.sub
--- a/Barotrauma/BarotraumaShared/Submarines/Orca.sub
+++ b/Barotrauma/BarotraumaShared/Submarines/Orca.sub
--- a/Barotrauma/BarotraumaShared/Submarines/Remora.sub
+++ b/Barotrauma/BarotraumaShared/Submarines/Remora.sub
--- a/Barotrauma/BarotraumaShared/Submarines/RemoraDrone.sub
+++ b/Barotrauma/BarotraumaShared/Submarines/RemoraDrone.sub
--- a/Barotrauma/BarotraumaShared/Submarines/Selkie.sub
+++ b/Barotrauma/BarotraumaShared/Submarines/Selkie.sub
--- a/Barotrauma/BarotraumaShared/Submarines/Typhon.sub
+++ b/Barotrauma/BarotraumaShared/Submarines/Typhon.sub
--- a/Barotrauma/BarotraumaShared/Submarines/Venture.sub
+++ b/Barotrauma/BarotraumaShared/Submarines/Venture.sub