Merge branch 'master' into dedicated-server

# Conflicts: # BarotraumaClient/Source/GameSettings.cs # BarotraumaClient/Source/Screens/NetLobbyScreen.cs
2017-06-23 10:21:02 -03:00
parent 3b343899c0 5d5923ab28
commit 1dc255bc2f
16 changed files with 288 additions and 92 deletions
@@ -3,4 +3,14 @@
  <graphicsmode width="1280" height="720" fullscreen="false" vsync="false" />
  <contentpackage path="Data/ContentPackages/Vanilla 0.3.xml" />
  <keymapping Select="E" Use="0" Aim="1" Up="W" Down="S" Left="A" Right="D" Attack="R" Run="LeftShift" Crouch="LeftControl" Chat="Tab" CrewOrders="C" />
+  <gameplay>
+    <jobpreferences>
+      <job name="Engineer" />
+      <job name="Mechanic" />
+      <job name="Captain" />
+      <job name="Security Officer" />
+      <job name="Medical Doctor" />
+      <job name="Assistant" />
+    </jobpreferences>
+  </gameplay>
 </config>