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
|
a7e428a21c
|
Merge branch 'master' into 1.5
# Conflicts:
# Content/Shaders/GI/DDGI.flax
# Content/Shaders/GI/GlobalSurfaceAtlas.flax
# Content/Shaders/TAA.flax
# Content/Shaders/VolumetricFog.flax
# Source/Editor/CustomEditors/Editors/ActorTagEditor.cs
# Source/Engine/Core/Config/GraphicsSettings.cpp
# Source/Engine/Engine/PostProcessEffect.cs
# Source/Engine/Graphics/GPUResourcesCollection.cpp
# Source/Engine/Graphics/GPUResourcesCollection.h
# Source/Engine/Graphics/PostProcessBase.h
# Source/FlaxEngine.Gen.cs
|
2023-01-10 15:37:55 +01:00 |
|
Wojciech Figat
|
9626e9bbb6
|
Update copyright year
|
2023-01-10 15:29:37 +01:00 |
|
Wojciech Figat
|
e7f40a4c0e
|
Fix unit test if running under .net 4.6.2 unit test agent
|
2023-01-10 14:33:51 +01:00 |
|
Wojciech Figat
|
580f4120dc
|
Update nunit for Unit Tests running with .net7
|
2022-12-20 18:21:45 +01:00 |
|
Wojtek Figat
|
8c971cd11e
|
Add custom floats formatting to prevent scientific notation
|
2022-05-18 22:29:31 +02:00 |
|