(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test

2019-04-04 11:10:29 +03:00
parent b08a31a68f
commit cc122f2bbf
52 changed files with 601 additions and 786 deletions
@@ -52,7 +52,7 @@ namespace Barotrauma
            damageEffect.Parameters["aMultiplier"].SetValue(50.0f);
            damageEffect.Parameters["cMultiplier"].SetValue(200.0f);

-            distortTexture = TextureLoader.FromFile("Content/Effects/distortnormals.png");
+            distortTexture = TextureLoader.FromFile("Content/Effects/distortnormals.png", preMultiplyAlpha: false);
            postProcessEffect.Parameters["xDistortTexture"].SetValue(distortTexture);
        }