vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better UI scaling, quest tweaking, contentpackage hash bugfix, misc bugfixes

Browse Source
This commit is contained in:
Regalis
2015-07-30 23:28:15 +03:00
parent c7dd6e55f0
commit 23d847a4ac
29 changed files with 287 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Items/Components/Holdable/Holdable.cs
+1 -1
View File
@@ -204,7 +204,7 @@ namespace Subsurface.Items.Components
AnimController ac = picker.AnimController;
item.sprite.Depth = picker.AnimController.GetLimb(LimbType.RightHand).sprite.Depth + 0.01f;
//item.sprite.Depth = picker.AnimController.GetLimb(LimbType.RightHand).sprite.Depth + 0.01f;
ac.HoldItem(deltaTime, cam, item, handlePos, holdPos, aimPos, holdAngle);
}
Subsurface/Items/Components/Label.cs
-2
View File
@@ -24,8 +24,6 @@ namespace Subsurface.Items.Components
}
}
public Label(Item item, XElement element)
: base(item, element)
{
Subsurface/Items/Components/Machines/Radar.cs
+3 -8
View File
@@ -59,9 +59,7 @@ namespace Subsurface.Items.Components
else
{
pingState = 0.0f;
}
}
}
public override bool Use(float deltaTime, Character character = null)
@@ -84,7 +82,7 @@ namespace Subsurface.Items.Components
int radius = GuiFrame.Rect.Height / 2 - 10;
DrawRadar(spriteBatch, new Rectangle((int)GuiFrame.Center.X - radius, (int)GuiFrame.Center.Y - radius, radius * 2, radius * 2));
voltage = 0.0f;
//voltage = 0.0f;
}
private void DrawRadar(SpriteBatch spriteBatch, Rectangle rect)
@@ -198,8 +196,6 @@ namespace Subsurface.Items.Components
quest.RadarLabel,
quest.RadarPosition, displayScale, center, (rect.Width * 0.55f));
}
}
}
@@ -218,8 +214,7 @@ namespace Subsurface.Items.Components
GUI.DrawRectangle(spriteBatch, new Rectangle((int)markerPos.X, (int)markerPos.Y, 5, 5), Color.LightGreen);
spriteBatch.DrawString(GUI.SmallFont, label, new Vector2(markerPos.X + 10, markerPos.Y), Color.LightGreen);
spriteBatch.DrawString(GUI.SmallFont, (int)(dist / 80.0f) + " m", new Vector2(markerPos.X + 10, markerPos.Y + 15), Color.LightGreen);
spriteBatch.DrawString(GUI.SmallFont, (int)(dist / 80.0f) + " m", new Vector2(markerPos.X + 10, markerPos.Y + 15), Color.LightGreen);
}
}
Subsurface/Items/Components/Machines/Steering.cs
-1
View File
@@ -47,7 +47,6 @@ namespace Subsurface.Items.Components
{
if (float.IsNaN(value.X) || float.IsNaN(value.Y))
{
targetVelocity = Vector2.Zero;
return;
}
targetVelocity.X = MathHelper.Clamp(value.X, -100.0f, 100.0f);
Subsurface/Items/Components/Signal/Connection.cs
+1 -1
View File
@@ -459,7 +459,7 @@ namespace Subsurface.Items.Components
if (Wires[i]!=null)
{
Wires[i].Item.body.Enabled = false;
Wires[i].Connect(this, false);
Wires[i].Connect(this, false, true);
}
}
Subsurface/Items/Components/Signal/ConnectionPanel.cs
+5
View File
@@ -91,6 +91,11 @@ namespace Subsurface.Items.Components
}
}
public override void Remove()
{
base.Remove();
}
public override void FillNetworkData(Networking.NetworkEventType type, Lidgren.Network.NetOutgoingMessage message)
{
foreach (Connection c in connections)
Subsurface/Items/Components/Signal/Wire.cs
+2 -3
View File
@@ -61,7 +61,7 @@ namespace Subsurface.Items.Components
if (connection == connections[1]) connections[1] = null;
}
public void Connect(Connection newConnection, bool addNode = true)
public void Connect(Connection newConnection, bool addNode = true, bool loading = false)
{
for (int i = 0; i < 2; i++)
{
@@ -85,7 +85,6 @@ namespace Subsurface.Items.Components
Nodes.Add(newConnection.Item.Position);
}
break;
}
@@ -110,7 +109,7 @@ namespace Subsurface.Items.Components
CleanNodes();
}
Item.NewComponentEvent(this, true);
if (!loading) Item.NewComponentEvent(this, true);
}
public override void Equip(Character character)