Commit Graph

42 Commits

Author SHA1 Message Date
847a28d133 Fix running VC++-project build commands with Rider on Linux 2023-02-03 22:37:31 +02:00
Wojtek Figat
a853850116 Merge branch 'vscode_fixes' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-vscode_fixes 2023-01-23 20:34:35 +01:00
Wojciech Figat
99ce5cd4d4 Fix for Visual Studio projects when using vs2022 2023-01-16 13:33:36 +01:00
20d8c9f4ee Generate omnisharp.json file for VS Code solutions 2023-01-14 19:25:36 +02: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
da08b18ec5 Fix VisualStudioInstance.GetInstances() to be sorted from newest to oldest
(cherry picked from commit 6eaecc8793)
2022-12-29 22:23:37 +01: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
Wojtek Figat
cf3ac7a26e Merge remote-tracking branch 'origin/master' into linux-editor
# Conflicts:
#	Source/Engine/Core/Math/Color.cs
#	Source/Engine/Navigation/Navigation.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
2021-02-23 22:29:07 +01:00
Wojtek Figat
3387da92ed Optimize 2021-02-23 18:17:18 +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
1a0c12191d Add IgnoreMissingDocumentationWarnings option into generated csproj files 2020-12-30 00:05:05 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00