Commit Graph

36 Commits

Author SHA1 Message Date
Wojtek Figat
859c420d76 Update year in copyright note 2024-02-26 19:00:48 +01:00
22e5afdb6f Fix Visual Studio project GUIDs getting randomized during regeneration 2023-09-27 20:17:19 +03:00
0c00dc20a2 Always generate additional Visual Studio solution files for all platforms 2023-09-27 19:43:59 +03:00
bff18a5564 Add -genproject -rider option for generating Rider compatible solution files 2023-09-27 19:43:56 +03:00
Andrew Spiering
ab7ca683bb Addressing Feedback
* use a better method of getting Editor binary folder
2023-09-22 02:59:38 -07:00
Andrew Spiering
017967d5f8 Fixing non-windows platforms csproj files
* Seems there was a hardcoded path ? for the prebuilt binaries for the FlaxEngine dll
2023-09-22 02:13:49 -07:00
Wojtek Figat
38671e0e01 Merge branch 'default_configurations_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-default_configurations_fix 2023-09-21 11:28:59 +02:00
Wojtek Figat
d94c0d3323 Fix C#-only game projects to reference precompiled DLLs instead of FlaxEngine.csproj 2023-09-21 11:26:04 +02:00
ed51791b58 Prevent generating VS configurations for Win32 and engine projects 2023-09-21 01:00:04 +03:00
bf6daed6d2 Fix Intellisense errors with referenced binary module structures 2023-06-28 15:57:25 +03:00
Wojtek Figat
5f019dc79f Improve Visual Studio solution generation with nested C# project cross-references to properly place projects in group folders 2023-06-16 13:45:54 +02:00
Wojtek Figat
7c39e5726d Improve csproj project files generation 2023-04-12 14:00:24 +02:00
Wojtek Figat
d7e24f0168 Fix missing dotnet hosting components for not yet supported platforms during projects generation stage 2023-02-19 15:16:34 +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
Wojciech Figat
edac611444 Fix generated plugin projects that use both C++ and C# scripting 2022-12-21 11:04:41 +01:00
Wojciech Figat
f874a0ad57 Update csprojects to the latest NetCore7 2022-12-19 17:39:39 +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
84bd7da620 Revert part of 5b212bb8bc #743 2022-11-16 17:54:18 +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
Crawcik
5b212bb8bc Fixing mac/linux csharp binaries referencing 2022-09-24 17:52:59 +02:00
Wojtek Figat
a006fcec40 Fix overlapping VC++ and CSharp projects in Visual Studio solution 2022-09-12 20:17:52 +02:00
Wojciech Figat
1907504ff6 Fixes 2022-01-29 15:26:41 +01:00
Wojciech Figat
8c2241c6dc Update copyright year 2022-01-14 13:31:12 +01:00
Wojtek Figat
13ab912bb4 Add support for Visual Studio 2022 in Flax.Build 2021-11-10 19:12:27 +01:00
Wojtek Figat
e6ba2402b7 Add TryGetToolchain to build platform
#631
2021-09-28 20:06:26 +02:00
Wojtek Figat
ac1eb8d58d Merge branch 'master' into 1.2 2021-04-13 09:52:03 +02:00
Wojtek Figat
9a90b2fa42 Add check for null ref 2021-04-08 13:10:03 +02:00
Wojtek Figat
f8d6f8ffb5 Fix using references to projects outside the main project
#397
2021-03-30 22:07:40 +02:00
GoaLitiuM
8ccb4f5857 Support generating multiple project formats at once 2021-03-02 17:35:52 +02:00
Wojtek Figat
07f7fee4a8 Fix collecting binary modules for targets with Modular linkage 2021-02-22 17:18:03 +01:00
Jean-Baptiste Perrier
03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
Wojtek Figat
70d0c0ea8a Fix generating project files without host platform tools 2020-12-22 00:08:24 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00