Unstable 0.1300.0.4

This commit is contained in:
Markus Isberg
2021-03-30 15:51:49 +03:00
parent 58c50a235d
commit 862221635c
108 changed files with 907 additions and 378 deletions
@@ -4291,7 +4291,7 @@ namespace Barotrauma
if (PlayerInput.IsCtrlDown() && MapEntity.StartMovingPos == Vector2.Zero)
{
cam.MoveCamera((float) deltaTime, allowMove: false);
cam.MoveCamera((float) deltaTime, allowMove: false, allowZoom: GUI.MouseOn == null);
// Save menu
if (PlayerInput.KeyHit(Keys.S))
{
@@ -4330,12 +4330,12 @@ namespace Barotrauma
}
else
{
cam.MoveCamera((float) deltaTime, allowMove: true);
cam.MoveCamera((float) deltaTime, allowMove: true, allowZoom: GUI.MouseOn == null);
}
}
else
{
cam.MoveCamera((float) deltaTime, allowMove: false);
cam.MoveCamera((float) deltaTime, allowMove: false, allowZoom: GUI.MouseOn == null);
}
if (PlayerInput.MidButtonHeld())