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

Use engine font instead of SS14-specific font in a few places. (#4206)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2023-08-01 20:32:31 +02:00
committed by GitHub
parent 6cd4a37a8f
commit 34d65a7960
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE-NOTES.md
View File

@@ -18,7 +18,7 @@ Don't change the format without looking at the script!
### Bugfixes
*None yet*
* Fix certain debug commands and tools crashing on non-SS14 RobustToolbox games due to a missing font.
### Other

2
Robust.Client/Debugging/DebugPhysicsSystem.cs
View File

@@ -218,7 +218,7 @@ namespace Robust.Client.Debugging
_debugPhysicsSystem = system;
_lookup = lookup;
_physicsSystem = physicsSystem;
_font = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
_font = new VectorFont(cache.GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"), 10);
}
private void DrawWorld(DrawingHandleWorld worldHandle, OverlayDrawArgs args)

2
Robust.Client/GameStates/NetEntityOverlay.cs
View File

@@ -41,7 +41,7 @@ namespace Robust.Client.GameStates
{
IoCManager.InjectDependencies(this);
var cache = IoCManager.Resolve<IResourceCache>();
_font = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
_font = new VectorFont(cache.GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"), 10);
_lineHeight = _font.GetLineHeight(1);
_gameStateManager.GameStateApplied += HandleGameStateApplied;

2
Robust.Client/GameStates/NetGraphOverlay.cs
View File

@@ -53,7 +53,7 @@ namespace Robust.Client.GameStates
{
IoCManager.InjectDependencies(this);
var cache = IoCManager.Resolve<IResourceCache>();
_font = new VectorFont(cache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
_font = new VectorFont(cache.GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"), 10);
_gameStateManager.GameStateApplied += HandleGameStateApplied;
}

2
Robust.Client/Profiling/LiveProfileViewControl.cs
View File

@@ -24,7 +24,7 @@ public sealed class LiveProfileViewControl : Control
{
IoCManager.InjectDependencies(this);
if (!_resourceCache.TryGetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf", out var font))
if (!_resourceCache.TryGetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf", out var font))
return;
_font = font.MakeDefault();

2
Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs
View File

@@ -88,7 +88,7 @@ namespace Robust.Client.ViewVariables.Instances
var stringified = PrettyPrint.PrintUserFacingWithType(obj, out var typeStringified);
if (typeStringified != "")
{
//var smallFont = new VectorFont(_resourceCache.GetResource<FontResource>("/Fonts/CALIBRI.TTF"), 10);
//var smallFont = new VectorFont(_resourceCache.GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"), 10);
// Custom ToString() implementation.
var headBox = new BoxContainer
{

2
Robust.Client/ViewVariables/ViewVariablesInstance.cs
View File

@@ -121,7 +121,7 @@ namespace Robust.Client.ViewVariables
}
//var smallFont =
// new VectorFont(IoCManager.Resolve<IResourceCache>().GetResource<FontResource>("/Fonts/CALIBRI.TTF"),
// new VectorFont(IoCManager.Resolve<IResourceCache>().GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"),
// 10);
// Custom ToString() implementation.

2
Robust.Client/ViewVariables/ViewVariablesPropertyControl.cs
View File

@@ -57,7 +57,7 @@ namespace Robust.Client.ViewVariables
};
VBox.AddChild(BottomContainer);
//var smallFont = new VectorFont(_resourceCache.GetResource<FontResource>("/Fonts/CALIBRI.TTF"), 10);
//var smallFont = new VectorFont(_resourceCache.GetResource<FontResource>("/EngineFonts/NotoSans/NotoSans-Regular.ttf"), 10);
_bottomLabel = new Label
{