v0.3.5.1:

- fixed UI controls not working in launcher
- fixed battery cells not reloading inside batteries
- moloch spawns earlier in tutorial
- fixed wrong updaterversion in launcher (caused the launcher to always show a warning)
This commit is contained in:
Regalis
2016-03-14 18:33:35 +02:00
parent 5120812adf
commit 3402dad741
12 changed files with 46 additions and 16 deletions
+2 -2
View File
@@ -80,7 +80,7 @@ namespace Barotrauma
TitlePosition.X = Math.Min(TitlePosition.X, (float)GameMain.GraphicsWidth / 2.0f);
}
spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied);
spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend);
graphics.Clear(Color.Black);
spriteBatch.Draw(backgroundTexture, CenterPosition, null, Color.White * Math.Min(state / 5.0f, 1.0f), 0.0f,
@@ -104,7 +104,7 @@ namespace Barotrauma
Hull.renderer.RenderBack(spriteBatch, renderTarget, 0.0f);
}
spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.NonPremultiplied);
spriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend);
spriteBatch.Draw(titleTexture,
TitlePosition, null,
+1 -1
View File
@@ -24,7 +24,7 @@ namespace Barotrauma
public static bool WindowActive
{
get { return Instance != null && Instance.IsActive; }
get { return Instance == null || Instance.IsActive; }
}
public static bool DebugDraw;
@@ -276,7 +276,7 @@ namespace Barotrauma.Tutorials
infoBox = CreateInfoFrame("Steer the submarine downwards, heading further into the cavern.");
while (Submarine.Loaded.WorldPosition.Y > 25000.0f)
while (Submarine.Loaded.WorldPosition.Y > 29000.0f)
{
yield return CoroutineStatus.Running;
}
@@ -381,7 +381,7 @@ namespace Barotrauma.Tutorials
if (!divingMaskSelected &&
Character.Controlled.ClosestItem != null && Character.Controlled.ClosestItem.Name == "Diving Suit")
{
infoBox = CreateInfoFrame("The can only be one item in each inventory slot, so you need to take off "
infoBox = CreateInfoFrame("There can only be one item in each inventory slot, so you need to take off "
+"the jumpsuit if you wish to wear a diving suit.");
divingMaskSelected = true;
@@ -133,10 +133,10 @@ namespace Barotrauma.Items.Components
//float gridRate = voltage;
//if (gridRate>minVoltage)
//{
// ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
//}
if (chargeRate > 0.0f)
{
ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
}
//recharge
//if (gridRate >= chargeRate)
+1 -1
View File
@@ -460,7 +460,7 @@ namespace Barotrauma
//Game1.GameScreen.DrawMap(graphics, spriteBatch);
spriteBatch.Begin();
spriteBatch.Begin(0, BlendState.AlphaBlend);
buttonsTab.Draw(spriteBatch);
if (selectedTab>0) menuTabs[selectedTab].Draw(spriteBatch);