Commit Graph

46 Commits

Author SHA1 Message Date
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
81ae687238 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-28 16:34:38 +02:00
Wojtek Figat
9572073eda Add CustomArgs to compile and link environment in build tool for customization 2023-05-26 13:43:20 +02:00
Wojtek Figat
cf397e1cc7 Fix var name typo and make improve class lib and platforms tools searching for Mono AOT 2023-04-13 08:27:49 +02:00
Wojtek Figat
68c6a01805 Update Switch platform support 2023-04-11 15:53:53 +02:00
Wojtek Figat
09bd7c696b Add .NET 7 for PlayStation 4 2023-04-05 19:17:22 +02:00
Wojtek Figat
0c4a608b65 Add .NET 7 support to Xbox 2023-04-04 14:46:08 +02: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
17f9219cd0 Add TargetCompiler to Flax.Build toolchains 2023-01-10 11:45:23 +01:00
Wojciech Figat
b2beeb653b Remove unused using statement 2022-12-21 11:04:13 +01:00
c4be764f61 Add nethost module and EngineConfiguration for .NET runtime 2022-11-26 13:50:32 +02: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
7af0dc1b43 Add support for setting C++ version for build module compilation 2022-08-07 16:46:17 +02:00
Wojtek Figat
5c5824bbb7 Add support for the latest Windows 11 SDK (22H2)
#700
2022-07-15 23:32:19 +02:00
Wojtek Figat
528a009b6b Merge branch 'fix_dxcompiler_linkage' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-fix_dxcompiler_linkage 2022-07-15 20:36:56 +02:00
Wojtek Figat
e9c8584656 Format code in Flax.Build 2022-05-23 19:56:13 +02:00
85f88efa95 Enable support for latest Windows SDKs 2022-03-20 18:31:41 +02:00
Wojciech Figat
8c2241c6dc Update copyright year 2022-01-14 13:31:12 +01:00
Wojtek Figat
bbecddfde2 Fix build 2021-11-10 21:04:46 +01:00
Wojtek Figat
a3bb66d09e Fix build with Win11 sdk 2021-11-10 20:40:49 +01:00
Wojtek Figat
13ab912bb4 Add support for Visual Studio 2022 in Flax.Build 2021-11-10 19:12:27 +01:00
Wojtek Figat
4e6fa25877 Add support for using DEPRECATED to mark scripting API as obsolete 2021-10-12 23:48:47 +02:00
Wojtek Figat
48a867ef16 Add PS5 platform defines and types 2021-10-08 16:25:16 +02:00
Wojtek Figat
d9410f9cdd Post merge fixes and cleanup
#571
2021-08-26 17:27:38 +02:00
Wojtek Figat
782d29f427 Merge branch 'xboxone' of git://github.com/honzapatCZ/FlaxEngine into honzapatCZ-xboxone 2021-08-26 12:44:53 +02:00
Zbigniew Skowron
294a4d5477 Added LinkEnvironment.LinkAsConsoleProgram flag. 2021-08-15 20:32:58 +02:00
honzapatCZ
c17d86a134 removal of old XboxOneStuff 2021-07-21 15:10:39 +02:00
GoaLitiuM
f3652697ae Fix building UWP platform with Visual Studio 2019 2021-06-06 17:17:25 +03:00
Wojtek Figat
ace8295ab7 Merge remote-tracking branch 'origin/master' into localization
# Conflicts:
#	Source/Platforms/DotNet/Newtonsoft.Json.dll
#	Source/Platforms/DotNet/Newtonsoft.Json.pdb
#	Source/Platforms/UWP/Binaries/Newtonsoft.Json.dll
#	Source/Platforms/XboxOne/Binaries/Newtonsoft.Json.dll
2021-04-22 16:10:36 +02:00
Wojtek Figat
b2729e35c2 Fixes for UWP build 2021-04-17 19:36:38 +02:00
Wojtek Figat
40c537d114 Merge branch 'master' into 1.2
# Conflicts:
#	Source/Engine/Platform/Network.h
2021-03-22 11:26:36 +01:00
Wojtek Figat
5cad37fa50 Fix packaged editor usage 2021-03-16 22:15:46 +01:00
Wojtek Figat
cc201e198d Add Switch platform 2021-03-09 14:26:30 +01:00
Wojtek Figat
6f12dc8567 Add improved dll import/export attributes injection when building binary modules 2021-02-25 13:02:13 +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
e160d719a9 Add support for C++ scripting on platforms that don't support referencing executable file when linking shared library (eg. Linux) 2021-02-23 22:23:03 +01:00
Ari Vuollet
cd7642eeec Fix building engine with latest Windows platform toolset only 2021-02-20 19:10:04 +02:00
Wojtek Figat
25f61e931e Add support for using other VC++ toolset for Window and add cmd arg for selecting compiler manually 2021-02-17 10:58:58 +01:00
GoaLitiuM
8c6dbf2e30 Disable linker optimizations with incremental linking 2021-01-23 12:40:53 +02:00
GoaLitiuM
d901c11570 Add compile flag for whole program optimization 2021-01-23 12:40:53 +02:00
Wojtek Figat
f073e07de7 Fix error on CI running on Linux machine 2021-01-09 18:37:05 +01:00
Jean-Baptiste Perrier
03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
Wojtek Figat
4c205be617 Fix code style 2020-12-30 11:20:37 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00