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
@@ -130,13 +130,13 @@ namespace Barotrauma.Items.Components
        public InputType PickKey
        {
            get;
-            private set;
+            protected set;
        }

        public InputType SelectKey
        {
            get;
-            private set;
+            protected set;
        }

        [HasDefaultValue(false, false)]