GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity
4,622 Commits 14 Branches 0 Tags
3df10d1d0aaaf6aba2255132b2524d0b4ea5c899
Commit Graph

57 Commits

Author SHA1 Message Date
Wojciech Figat
3df10d1d0a Add configuration-specific C# libs references to generates csproj file 2023-01-11 16:25:47 +01:00
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
Wojciech Figat
0b8d4850f0 Use manual pdb file loading for debug symbols in C# 2023-01-04 09:56:58 +01:00
Wojciech Figat
26f8e5aa9e Use embedded debug information for C# dll to have proper stack trace information on game scripts exceptions 2023-01-03 18:38:44 +01:00
Wojciech Figat
da08b18ec5 Fix VisualStudioInstance.GetInstances() to be sorted from newest to oldest 
(cherry picked from commit 6eaecc8793)
 2022-12-29 22:23:37 +01:00
Wojciech Figat
b2beeb653b Remove unused using statement 2022-12-21 11:04:13 +01:00
Wojciech Figat
2fee75517d Updates for vs2022 2022-12-20 18:23:20 +01:00
Wojciech Figat
580f4120dc Update nunit for Unit Tests running with .net7 2022-12-20 18:21:45 +01:00
Wojciech Figat
f874a0ad57 Update csprojects to the latest NetCore7 2022-12-19 17:39:39 +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
6eaecc8793 Fix VisualStudioInstance.GetInstances() to be sorted from newest to oldest 2022-12-17 12:58:58 +01:00
Ari Vuollet
4e4fb91a6f Prevent optimizing C#-projects in Development builds for better debugging 2022-11-29 21:18:42 +02:00
Ari Vuollet
55e287c890 Disable self-contained Flax.Build binaries and other build script fixes 2022-11-29 19:38:12 +02:00
Ari Vuollet
bf190810dd Fix building VC++-projects 2022-11-27 15:49:39 +02:00
Ari Vuollet
76ee695a59 Cleanup and minor fixes 2022-11-27 14:45:55 +02:00
Ari Vuollet
fe943ca010 Temporary fix to build errors in VC++ projects 2022-11-26 13:55:19 +02:00
Ari Vuollet
cb09fb570d Change build scripts to call build tool with dotnet 2022-11-26 13:50:32 +02:00
Ari Vuollet
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
Wojtek Figat
93fe79c0ac Update to .Net Framework 4.5.2 2022-07-13 21:19:47 +02:00
Wojtek Figat
e9c8584656 Format code in Flax.Build 2022-05-23 19:56:13 +02:00
Wojciech Figat
abb0a3f0cc Remove a test log 2022-01-14 21:40:44 +01:00
Wojciech Figat
34224eb015 Test change 2022-01-14 21:05:02 +01:00
Wojciech Figat
de93770789 Test 2022-01-14 20:27:57 +01:00
Wojciech Figat
d15b0c9548 Test 2022-01-14 19:35:46 +01:00
Wojciech Figat
992333fd64 Add tests to CI 2022-01-14 14:20:41 +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
2d0633c05a Finish XCode project generation 2021-12-28 17:06:24 +01:00
Wojtek Figat
22915489b7 Mac progress 2021-12-27 17:06:26 +01:00
Wojtek Figat
e296e94d2c Progress on XCode project generation 2021-12-27 16:43:20 +01:00
Wojtek Figat
7ef316f4f9 Mac impl progress 2021-12-27 16:00:26 +01:00
Wojciech Figat
d017dd14ca Add Mac platform 2021-12-27 14:04:16 +01:00
Wojtek Figat
13ab912bb4 Add support for Visual Studio 2022 in Flax.Build 2021-11-10 19:12:27 +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
Wojtek Figat
5cad37fa50 Fix packaged editor usage 2021-03-16 22:15:46 +01: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