- opengl blur shader

- the "heal" console command cancels stun
- the camera shakes when the sub hits something only if controlled character is inside the sub

Subsurface/Barotrauma.csproj

@@ -987,9 +987,6 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Content\blurshader.xnb">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="Content\blurshader.xnb">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

Subsurface/Source/Camera.cs

@@ -210,7 +210,7 @@ namespace Barotrauma
 
             shakeTargetPosition = Rand.Vector(Shake);
             shakePosition = Vector2.Lerp(shakePosition, shakeTargetPosition, 0.5f);
-            Shake = MathHelper.Lerp(Shake, 0.0f, 0.03f);
+            Shake = MathHelper.Lerp(Shake, 0.0f, deltaTime*2.0f);
 
             Translate(moveCam+shakePosition);
         }

Subsurface/Source/DebugConsole.cs

@@ -332,6 +332,7 @@ namespace Barotrauma
                         Character.Controlled.AddDamage(CauseOfDeath.Damage, -Character.Controlled.MaxHealth, null);
                         Character.Controlled.Oxygen = 100.0f;
                         Character.Controlled.Bleeding = 0.0f;
+                        Character.Controlled.AnimController.StunTimer = 0.0f;
                     }
                     break;
                 case "revive":

Subsurface/Source/Map/SubmarineBody.cs

@@ -485,7 +485,11 @@ namespace Barotrauma
             Vector2 lastContactPoint = worldPoints[0];
 
             SoundPlayer.PlayDamageSound(DamageSoundType.StructureBlunt, impact * 10.0f, ConvertUnits.ToDisplayUnits(lastContactPoint));
-            GameMain.GameScreen.Cam.Shake = impact * 2.0f;
+
+            if (Character.Controlled != null && Character.Controlled.Submarine == submarine)
+            {
+                GameMain.GameScreen.Cam.Shake = impact * 2.0f;
+            }
 
             Vector2 impulse = direction * impact * 0.5f;
 

Subsurface/Source/Screens/GameScreen.cs

@@ -36,7 +36,12 @@ namespace Barotrauma
                         
             BackgroundCreatureManager = new BackgroundCreatureManager("Content/BackgroundSprites/BackgroundCreaturePrefabs.xml");
 
+#if LINUX
+            var blurEffect = content.Load<Effect>("blurshader_opengl");
+#else
             var blurEffect = content.Load<Effect>("blurshader");
+#endif
+
 
             lightBlur = new BlurEffect(blurEffect, 0.001f, 0.001f);