Merge branch 'master' of https://github.com/Regalis11/Barotrauma

Barotrauma/BarotraumaShared/Content/Items/Door/doors.xml

@@ -12,7 +12,7 @@
       <WeldedSprite texture ="door.png" sourcerect="99,0,32,188" depth="0.0" origin="0.5,0.5"/>
       <BrokenSprite texture ="door.png" sourcerect="133,0,58,208" depth="0.051" origin="0.5,0.0" scale="true"/>
       <sound file="door.ogg" type="OnUse" range="500.0"/>
-      <sound file="Content/Items/Tools/Crowbar.ogg" type="OnPicked" range="2000.0"/>
+      <sound file="Content/Items/Tools/crowbar.ogg" type="OnPicked" range="2000.0"/>
     </Door>
 
     <AiTarget sightrange="500.0"/>
@@ -159,4 +159,4 @@
       <output name="proximity_sensor"/>
     </ConnectionPanel>
   </Item> 
-</Items>
+</Items>

Barotrauma/BarotraumaShared/Content/watershader.fx

@@ -48,8 +48,9 @@ float4 main(float4 position : SV_Position, float4 color : COLOR0, float2 texCoor
 float4 main2(float4 position : SV_Position, float4 color : COLOR0, float2 texCoord : TEXCOORD0) : COLOR0
 {	
 	float4 losColor = tex2D(LosSampler, texCoord);
+    float4 sample = tex2D(TextureSampler, texCoord);
 	
-	float4 outColor = float4(losColor.x, losColor.y, losColor.z, color.w);
+	float4 outColor = float4(sample.x, sample.y, sample.z, losColor.x);
 		
     return outColor;
 }
@@ -69,4 +70,4 @@ technique LosShader
     {
         PixelShader = compile ps_4_0_level_9_1 main2();
     }
-}
+}