Merge remote-tracking branch 'refs/remotes/barotrauma/master'

Conflicts: Subsurface/Barotrauma.csproj Subsurface/Source/Screens/GameScreen.cs
2016-09-26 17:03:14 -03:00
parent bc5ace4f53 790212a20b
commit 0ef813f189
32 changed files with 2293 additions and 1781 deletions
@@ -148,7 +148,12 @@ namespace Barotrauma

                        textPos.Y += 25;
                    }
-                }  
+                }
+                
+                foreach (HUDProgressBar progressBar in character.HUDProgressBars.Values)
+                {
+                    progressBar.Draw(spriteBatch, cam);
+                }
            }

            if (Screen.Selected == GameMain.EditMapScreen) return;