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 |
|
Wojciech Figat
|
84a68c5977
|
Update Newtonsoft.Json to 13.0.2 and .Net 7
|
2022-12-17 13:38:30 +01:00 |
|
Wojciech Figat
|
8c2241c6dc
|
Update copyright year
|
2022-01-14 13:31:12 +01:00 |
|
Wojtek Figat
|
e361ab811a
|
Mac support progress
|
2021-12-29 19:43:53 +01:00 |
|
Wojtek Figat
|
e8b680c78b
|
Add ps5 changes
|
2021-11-21 19:02:37 +01:00 |
|
Wojtek Figat
|
eb24c29f7e
|
Add support for OnSerializing, OnSerialized, OnDeserializing and OnDeserialized callbacks for C# types serialization with Json
|
2021-04-08 10:02:08 +02:00 |
|
Jean-Baptiste Perrier
|
03eb39afe6
|
Bumping all copyright headers to 2021.
|
2021-01-02 14:28:49 +01:00 |
|
Wojtek Figat
|
6fb9eee74c
|
You're breathtaking!
|
2020-12-07 23:40:54 +01:00 |
|