(99feac023) Unstable 0.9.704.0

This commit is contained in:
Joonas Rikkonen
2020-02-07 20:47:03 +02:00
parent 590619459b
commit 6754b9d5a2
104 changed files with 2224 additions and 1091 deletions
@@ -11,6 +11,12 @@ namespace Barotrauma
{
base.ControlInput(cam);
cam.OffsetAmount = 0;
if (Character.Controlled?.Inventory != null)
{
Character.Controlled.Inventory.ToggleInventory(true);
}
//if this is used, we need to implement syncing this inventory with the server
/*Character.DisableControls = true;
if (Character.Controlled != null)
@@ -19,7 +25,7 @@ namespace Barotrauma
{
Character.Controlled.SelectedConstruction = null;
}
}*/
}*/
}
protected override void CalculateBackgroundFrame()