(a21f15055) Merge branch 'dev' into human-ai

This commit is contained in:
Joonas Rikkonen
2019-05-16 05:27:17 +03:00
parent 78b1d8ef8d
commit 8621d9927e
21 changed files with 207 additions and 248 deletions
@@ -88,7 +88,7 @@ namespace Barotrauma
public override bool Equals(object obj)
{
if (obj is KeyOrMouse keyOrMouse )
if (obj is KeyOrMouse keyOrMouse)
{
if (MouseButton.HasValue)
{