(9c0250ef1) Merge branch 'dev' into human-ai

2019-05-16 05:14:40 +03:00
parent 2ae54a01a5
commit 7f72f72ca7
27 changed files with 348 additions and 343 deletions
@@ -74,14 +74,11 @@
  <Character file="Content/Characters/Hammerhead/Hammerhead.xml" />
  <Outpost file="Content/Map/Outposts/Outpost.sub" />
  <Submarine file="Submarines/Orca.sub" />
-  <Submarine file="Submarines/Berilia.sub" />
  <Submarine file="Submarines/Typhon.sub" />
  <Submarine file="Submarines/Selkie.sub" />
  <Submarine file="Submarines/Bunyip.sub" />
  <Submarine file="Submarines/Humpback.sub" />
  <Submarine file="Submarines/Dugong.sub" />
-  <Submarine file="Submarines/Remora.sub" />
-  <Submarine file="Submarines/RemoraDrone.sub" />
  <Submarine file="Submarines/Venture.sub" />
  <Text file="Content/Texts/EnglishVanilla.xml" />
  <UIStyle file="Content/UI/style.xml"/>