misc UI stuff, gamesession additions, limbs don't have individual health anymore, background music

This commit is contained in:
Regalis
2015-06-09 18:18:34 +03:00
parent d3896383fd
commit d7fde606e9
50 changed files with 595 additions and 282 deletions
+3 -4
View File
@@ -117,7 +117,7 @@ namespace Subsurface
public override void Update(float deltaTime)
{
base.Update(deltaTime);
scrollBar.Update(deltaTime);
}
@@ -188,7 +188,7 @@ namespace Subsurface
public override void Draw(SpriteBatch spriteBatch)
{
base.Draw(spriteBatch);
GUI.DrawRectangle(spriteBatch, rect, color*alpha, true);
int x = rect.X, y = rect.Y;
@@ -206,7 +206,6 @@ namespace Subsurface
}
}
for (int i = 0; i < children.Count; i++ )
{
GUIComponent child = children[i];
@@ -232,7 +231,7 @@ namespace Subsurface
if (CheckSelected() != selected.UserData) selected = null;
}
}
else if (child.Rect.Contains(PlayerInput.GetMouseState.Position) && enabled)
else if (enabled && (MouseOn==this || ( MouseOn!=null && this.IsParentOf(MouseOn))) && child.Rect.Contains(PlayerInput.GetMouseState.Position))
{
child.State = ComponentState.Hover;
if (PlayerInput.LeftButtonClicked())