Skip to content

Commit ee77146

Browse files
CerberusWolfieCerberusWolfie
authored
Merge branch 'master' into TimeTransferUpstream
2 parents ab2aeba + 975c905 commit ee77146

File tree

540 files changed

+5986
-402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

540 files changed

+5986
-402
lines changed

‎.vscode/launch.json

+82-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
55
"version": "0.2.0",
66
"configurations": [
7+
// CLIENT CONFIGS
78
{
89
"name": "Client",
910
"type": "coreclr",
@@ -14,14 +15,56 @@
1415
"stopAtEntry": false
1516
},
1617
{
17-
"name": "Client (Compatibility renderer)",
18+
"name": "Client (Tools)",
19+
"type": "coreclr",
20+
"request": "launch",
21+
"preLaunchTask": "build (Tools)",
22+
"program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
23+
"args": [],
24+
"console": "internalConsole",
25+
"stopAtEntry": false
26+
},
27+
{
28+
"name": "Client (Release)",
29+
"type": "coreclr",
30+
"request": "launch",
31+
"preLaunchTask": "build (Release)",
32+
"program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
33+
"args": [],
34+
"console": "internalConsole",
35+
"stopAtEntry": false
36+
},
37+
// COMPATABILITY RENDERERS
38+
{
39+
"name": "Client (Compatibility Renderer)",
1840
"type": "coreclr",
1941
"request": "launch",
2042
"program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
2143
"args": "--cvar display.compat=true",
2244
"console": "internalConsole",
2345
"stopAtEntry": false
2446
},
47+
{
48+
"name": "Client (Tools) - (Compatability Renderer)",
49+
"type": "coreclr",
50+
"request": "launch",
51+
"preLaunchTask": "build (Tools)",
52+
"program": "${workspaceFolder}/bin/Content.Client/Content.Client.dll",
53+
"args": ["--cvar display.compat=true"],
54+
"console": "internalConsole",
55+
"stopAtEntry": false
56+
},
57+
{
58+
"name": "Client (Release) - (Compatability Renderer)",
59+
"type": "coreclr",
60+
"request": "launch",
61+
"preLaunchTask": "build (Release)",
62+
"program": "${workspaceFolder}/bin/Debug/Content.Client/Content.Client.dll",
63+
"args": ["--cvar display.compat=true"],
64+
"console": "internalConsole",
65+
"stopAtEntry": false
66+
},
67+
// SERVER CONFIGS
2568
{
2669
"name": "Server",
2770
"type": "coreclr",
@@ -31,6 +74,27 @@
3174
"console": "integratedTerminal",
3275
"stopAtEntry": false
3376
},
77+
{
78+
"name": "Server (Tools)",
79+
"type": "coreclr",
80+
"request": "launch",
81+
"preLaunchTask": "build (Tools)",
82+
"program": "${workspaceFolder}/bin/Content.Server/Content.Server.dll",
83+
"args": [],
84+
"console": "internalConsole",
85+
"stopAtEntry": false
86+
},
87+
{
88+
"name": "Server (Release)",
89+
"type": "coreclr",
90+
"request": "launch",
91+
"preLaunchTask": "build (Release)",
92+
"program": "${workspaceFolder}/bin/Content.Server/Content.Server.dll",
93+
"args": [],
94+
"console": "internalConsole",
95+
"stopAtEntry": false
96+
},
97+
// LINTER
3498
{
3599
"name": "YAML Linter",
36100
"type": "coreclr",
@@ -50,6 +114,22 @@
50114
"Client"
51115
],
52116
"preLaunchTask": "build"
117+
},
118+
{
119+
"name": "Server/Client (Tools)",
120+
"configurations": [
121+
"Server (Tools)",
122+
"Client (Tools)"
123+
],
124+
"preLaunchTask": "build (Tools)"
125+
},
126+
{
127+
"name": "Server/Client (Release)",
128+
"configurations": [
129+
"Server (Release)",
130+
"Client (Release)"
131+
],
132+
"preLaunchTask": "build (Release)"
53133
}
54134
]
55-
}
135+
}

‎.vscode/tasks.json

+41-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,46 @@
2121
},
2222
"problemMatcher": "$msCompile"
2323
},
24+
{
25+
"label": "build (Tools)",
26+
"command": "dotnet",
27+
"type": "shell",
28+
"args": [
29+
"build",
30+
"--configuration",
31+
"Tools",
32+
"/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names.
33+
"/consoleloggerparameters:NoSummary" // Do not generate summary otherwise it leads to duplicate errors in Problems panel
34+
],
35+
"group": {
36+
"kind": "build",
37+
"isDefault": false
38+
},
39+
"presentation": {
40+
"reveal": "silent"
41+
},
42+
"problemMatcher": "$msCompile"
43+
},
44+
{
45+
"label": "build (Release)",
46+
"command": "dotnet",
47+
"type": "shell",
48+
"args": [
49+
"build",
50+
"--configuration",
51+
"Release",
52+
"/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names.
53+
"/consoleloggerparameters:NoSummary" // Do not generate summary otherwise it leads to duplicate errors in Problems panel
54+
],
55+
"group": {
56+
"kind": "build",
57+
"isDefault": false
58+
},
59+
"presentation": {
60+
"reveal": "silent"
61+
},
62+
"problemMatcher": "$msCompile"
63+
},
2464
{
2565
"label": "build-yaml-linter",
2666
"command": "dotnet",
@@ -34,4 +74,4 @@
3474
"problemMatcher": "$msCompile"
3575
}
3676
]
37-
}
77+
}

‎Content.Client/Guidebook/Richtext/Box.cs

+3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out
1111
HorizontalExpand = true;
1212
control = this;
1313

14+
if (args.TryGetValue("Margin", out var margin))
15+
Margin = new Thickness(float.Parse(margin));
16+
1417
if (args.TryGetValue("Orientation", out var orientation))
1518
Orientation = Enum.Parse<LayoutOrientation>(orientation);
1619
else

‎Content.Client/Guidebook/Richtext/ColorBox.cs

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
using System.Diagnostics.CodeAnalysis;
2+
using JetBrains.Annotations;
3+
using Robust.Client.Graphics;
4+
using Robust.Client.UserInterface;
5+
using Robust.Client.UserInterface.Controls;
6+
7+
namespace Content.Client.Guidebook.Richtext;
8+
9+
[UsedImplicitly]
10+
public sealed class ColorBox : PanelContainer, IDocumentTag
11+
{
12+
public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out Control? control)
13+
{
14+
HorizontalExpand = true;
15+
VerticalExpand = true;
16+
control = this;
17+
18+
if (args.TryGetValue("Margin", out var margin))
19+
Margin = new Thickness(float.Parse(margin));
20+
21+
if (args.TryGetValue("HorizontalAlignment", out var halign))
22+
HorizontalAlignment = Enum.Parse<HAlignment>(halign);
23+
else
24+
HorizontalAlignment = HAlignment.Stretch;
25+
26+
if (args.TryGetValue("VerticalAlignment", out var valign))
27+
VerticalAlignment = Enum.Parse<VAlignment>(valign);
28+
else
29+
VerticalAlignment = VAlignment.Stretch;
30+
31+
var styleBox = new StyleBoxFlat();
32+
if (args.TryGetValue("Color", out var color))
33+
styleBox.BackgroundColor = Color.FromHex(color);
34+
35+
if (args.TryGetValue("OutlineThickness", out var outlineThickness))
36+
styleBox.BorderThickness = new Thickness(float.Parse(outlineThickness));
37+
else
38+
styleBox.BorderThickness = new Thickness(1);
39+
40+
if (args.TryGetValue("OutlineColor", out var outlineColor))
41+
styleBox.BorderColor = Color.FromHex(outlineColor);
42+
else
43+
styleBox.BorderColor = Color.White;
44+
45+
PanelOverride = styleBox;
46+
47+
return true;
48+
}
49+
}

‎Content.Client/Guidebook/Richtext/Table.cs

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
using System.Diagnostics.CodeAnalysis;
2+
using Content.Client.UserInterface.Controls;
3+
using JetBrains.Annotations;
4+
using Robust.Client.UserInterface;
5+
6+
namespace Content.Client.Guidebook.Richtext;
7+
8+
[UsedImplicitly]
9+
public sealed class Table : TableContainer, IDocumentTag
10+
{
11+
public bool TryParseTag(Dictionary<string, string> args, [NotNullWhen(true)] out Control? control)
12+
{
13+
HorizontalExpand = true;
14+
control = this;
15+
16+
if (!args.TryGetValue("Columns", out var columns) || !int.TryParse(columns, out var columnsCount))
17+
{
18+
Logger.Error("Guidebook tag \"Table\" does not specify required property \"Columns.\"");
19+
control = null;
20+
return false;
21+
}
22+
23+
Columns = columnsCount;
24+
25+
return true;
26+
}
27+
}

0 commit comments

Comments
 (0)