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 |
|
Wojtek Figat
|
4e4f4e700b
|
Updates for dev with dotnet on linux
|
2023-01-08 20:27:28 +01:00 |
|
Wojtek Figat
|
5ec9716eac
|
Progress for dotnet7 support on Linux
|
2023-01-08 15:05:36 +01:00 |
|
|
|
5e6fcc9669
|
Prepare Flax.Build project for .NET 7
Add .NET SDK project generator and upgrade Flax.Build project files
|
2022-11-26 13:50:31 +02:00 |
|
Wojtek Figat
|
93c0dd704e
|
Merge branch 'master' into 1.5
# Conflicts:
# Source/Engine/Serialization/Stream.cpp
|
2022-11-21 15:51:57 +01:00 |
|
Wojtek Figat
|
26ff8e62eb
|
Additional change to vscode project
|
2022-11-16 17:55:20 +01:00 |
|
Wojciech Figat
|
e115aa2c4e
|
Merge remote-tracking branch 'origin/master' into 1.5
# Conflicts:
# Source/Engine/Content/JsonAsset.cpp
|
2022-10-19 13:36:46 +02:00 |
|
Wojtek Figat
|
a006fcec40
|
Fix overlapping VC++ and CSharp projects in Visual Studio solution
|
2022-09-12 20:17:52 +02:00 |
|
Crawcik
|
dd8f923bf5
|
VSC dotnet gen & omnisharp flags
|
2022-09-07 16:54:42 +02: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
|
22915489b7
|
Mac progress
|
2021-12-27 17:06:26 +01:00 |
|
Wojtek Figat
|
054def3d13
|
Fix crash in build tool if there is no valid project to pick
|
2021-08-07 16:46:39 +02:00 |
|
GoaLitiuM
|
69a3587f5d
|
Set solution file as default launch solution for Omnisharp
|
2021-03-02 18:40:12 +02:00 |
|
Wojtek Figat
|
08a428416c
|
Fix
|
2021-02-28 16:41:58 +01:00 |
|
Wojtek Figat
|
a0740c162a
|
Fix using bundled mono for VS Code build tasks
|
2021-02-28 15:03:51 +01:00 |
|
Wojtek Figat
|
a293265058
|
Add more files to ignore for watchers in VS Code project
|
2021-02-28 13:22:39 +01:00 |
|
Wojtek Figat
|
706c4bd677
|
Fixes for generated project files on Linux
|
2021-02-24 00:01:38 +01:00 |
|
Wojtek Figat
|
5a9ca6f130
|
Merge remote-tracking branch 'origin/1.1' into linux-editor
# Conflicts:
# Source/Engine/Core/Math/BoundingSphere.cs
# Source/Engine/Debug/DebugDraw.cpp
# Source/Engine/Platform/Win32/Win32Platform.cpp
# Source/Engine/Platform/Win32/Win32Platform.h
|
2021-02-23 22:32:17 +01:00 |
|
Wojtek Figat
|
c8a70ffda6
|
Add passing compiler to the build commands from generated projects
|
2021-02-17 15:58:52 +01:00 |
|
mafiesto4
|
e8dc48690e
|
Improve VS Code project launch tasks file for better debugging
|
2021-02-08 23:43:55 +01: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 |
|
