space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

General Bugfixes (#264)

Browse Source 
* Fixed SFML Fonts throwing StreamClosed errors.
Fixed misspelled font name causing chat box to use default font.
Fixed crash when trying to quit the client from inside a round.
Fixed? backslash issue with the resource pack path.
Removed obsolete unused Player_config.xml.

* More path separator fixing.
Fixed the player sprite moonwalking bug.

* Reverted changes of last commit.
This commit is contained in:
Acruid
2017-07-09 16:01:49 -07:00
committed by Pieter-Jan Briers
parent 822070dfdc
commit 001abd663c
7 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SS14.Client.Graphics/Sprite/TextSprite.cs
View File

@@ -1,4 +1,4 @@
using SFML.Graphics;
using SFML.Graphics;
using SFML.System;
using SS14.Client.Graphics.Interface;
@@ -141,9 +141,6 @@ namespace SS14.Client.Graphics.Sprite
{
get
{
// If an exception gets thrown here then curse SFML.
// This weird code is me trying to debug it without avail.
// Because it wouldn't reproduce after changing it.
var a = _textSprite;
var b = a.GetLocalBounds();
var c = b.Width;

6
SS14.Client/ResourceManagment/ResourceManagerZip.cs
View File

@@ -60,7 +60,11 @@ namespace SS14.Client.Resources
{
if (stream != null)
{
_fonts.Add("base_font", new Font(stream));
// SFML font does not cache the manifest stream contents, we have to do it.
var memStream = new MemoryStream();
stream.CopyTo(memStream);
_fonts.Add("base_font", new Font(memStream));
}
}

6
SS14.Client/SS14.Client.csproj
View File

@@ -186,10 +186,6 @@
<SubType>Code</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="player_config.xml">
<SubType>Code</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -444,4 +440,4 @@
<PropertyGroup>
<DefineConstants Condition="Exists('Microsoft.VisualStudio.DebuggerVisualizers.dll') ">$(DefineConstants);VS_DEBUGGERVISUALIZERS_EXISTS</DefineConstants>
</PropertyGroup>
</Project>
</Project>

4
SS14.Client/UserInterface/Components/Chatbox.cs
View File

@@ -1,4 +1,4 @@
using SFML.Graphics;
using SFML.Graphics;
using SFML.System;
using SFML.Window;
using SS14.Client.Graphics;
@@ -182,7 +182,7 @@ namespace SS14.Client.UserInterface.Components
foreach (string content in CheckInboundMessage(message))
{
var label = new Label(content, "CALABRI", _resourceManager)
var label = new Label(content, "CALIBRI", _resourceManager)
{
Position = new Vector2i(5, last_y),
Text =

2
SS14.Client/client_config.toml
View File

@@ -5,7 +5,7 @@
console = 64
[res]
pack = "..\\..\\Resources\\ResourcePack.zip"
pack = "../../Resources/ResourcePack.zip"
password = ""
[display]

16
SS14.Client/player_config.xml
View File

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PlayerConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<DisplayWidth>1280</DisplayWidth>
<DisplayHeight>768</DisplayHeight>
<Fullscreen>false</Fullscreen>
<VSync>true</VSync>
<ResourcePack>..\..\Resources\ResourcePack.zip</ResourcePack>
<PlayerName>Joe Genero</PlayerName>
<ServerAddress>127.0.0.1</ServerAddress>
<MessageLogging>false</MessageLogging>
<SimulateLatency>false</SimulateLatency>
<SimulatedLoss>0.05</SimulatedLoss>
<SimulatedMinimumLatency>0.040</SimulatedMinimumLatency>
<SimulatedRandomLatency>0.010</SimulatedRandomLatency>
</PlayerConfiguration>

4
SS14.Shared/GameObjects/EntitySystemManager.cs
View File

@@ -102,7 +102,9 @@ namespace SS14.Shared.GameObjects
public void Shutdown()
{
foreach (var system in Systems.Values)
// System.Values is modified by RemoveSystem
var values = Systems.Values.ToArray();
foreach (var system in values)
{
RemoveSystem(system);
}