Commit Graph

11 Commits

Author SHA1 Message Date
Wojciech Figat
eebc4951de Merge branch '1.5' into dotnet7
# Conflicts:
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit-agent.exe
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.agent.addins
#	Source/Platforms/DotNet/NUnit/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.dll
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe.config
#	Source/Platforms/DotNet/NUnit/testcentric.engine.metadata.dll
#	Source/Tools/Flax.Build/Deps/Downloader.cs
#	Source/Tools/Flax.Stats/CodeFrame.cs
#	Source/Tools/Flax.Stats/CodeFrameNode.cs
#	Source/Tools/Flax.Stats/Flax.Stats.Build.cs
#	Source/Tools/Flax.Stats/Languages.cs
#	Source/Tools/Flax.Stats/Program.cs
#	Source/Tools/Flax.Stats/TaskType.cs
#	Source/Tools/Flax.Stats/Tools.cs
#	Source/Tools/FlaxEngine.Tests/TestEditorUtils.cs
2023-01-10 15:49:44 +01:00
Wojciech Figat
9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
e03a819176 Replace usage of Utils.ExtractArrayFromList with Span 2022-12-22 19:54:59 +02:00
Wojciech Figat
f781fd8ab6 Add horizontal alignment tags for rich text box 2022-08-05 15:29:37 +02:00
Wojciech Figat
142d81065a Add text block alignment options for rich text box (and valign tag) 2022-08-04 13:52:25 +02:00
Wojciech Figat
3089cc3b59 Add img tag to rich text box 2022-08-04 12:43:16 +02:00
Wojciech Figat
4923d63a94 Add size tag 2022-08-03 15:41:25 +02:00
Wojciech Figat
6f18a8a3ff Add font tag 2022-08-03 14:39:00 +02:00
Wojciech Figat
8f895e54cd Improve rich text layout for lines with different fonts in line to match baseline 2022-08-03 12:58:23 +02:00
Wojciech Figat
ad37b8361b Add more tags to Rich Text Box 2022-08-03 12:57:22 +02:00
Wojciech Figat
64609f823c Add **HTML tags processing in Rich Text Box** 2022-08-03 10:16:13 +02:00