Commit Graph

87 Commits

Author SHA1 Message Date
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
Wojtek Figat
4e4f4e700b Updates for dev with dotnet on linux 2023-01-08 20:27:28 +01:00
Wojtek Figat
c53af39c92 Merge remote-tracking branch 'origin/1.5' into dotnet7 2023-01-08 15:05:56 +01:00
Wojtek Figat
58844622a0 Simplify managed method invoke generation for AOT vs JIT platforms 2023-01-08 13:50:45 +01:00
Wojtek Figat
63d3c9b1e0 Fix build on Linux 2023-01-04 19:00:06 +01:00
Wojciech Figat
af7b53814d Merge remote-tracking branch 'origin/1.5' into dotnet7
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/TAA.flax
2022-12-30 09:24:10 +01:00
Wojtek Figat
418aeb281c Add warning to UWP build tool 2022-12-29 23:03:37 +01:00
Wojtek Figat
4b79bcb8d2 Add VS2022 support for building for UWP platform 2022-12-29 23:02:54 +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
Crawcik
19d9cd282d Linux include paths fix 2022-09-07 16:53:30 +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
cc59a2b5fe Fix Android build with NDK 25 2022-08-03 18:09:52 +02:00
Wojtek Figat
41aefb1bda Attempt to fix test build 2022-07-27 09:38:30 +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
047821f7d2 Fix missing strip tool for Android build 2022-07-14 00:13:05 +02:00
Wojtek Figat
dda8912332 Use custom version of android_native_app_glue 2022-07-13 23:41:00 +02:00
Wojtek Figat
e9c8584656 Format code in Flax.Build 2022-05-23 19:56:13 +02:00
Wojtek Figat
b70bce1746 Add support for generic types in Scripting API with Template flag 2022-05-23 19:43:34 +02:00
85f88efa95 Enable support for latest Windows SDKs 2022-03-20 18:31:41 +02:00
Wojtek Figat
aed6f0403d Fix dylibs list
#693
2022-03-04 23:20:45 +01:00
Wojtek Figat
09c995d67b Fix for macOS dylib path
#693
2022-03-04 23:14:36 +01:00
Wojciech Figat
9d90b02c9a Fix missing include for Xbox Live services on GDK platforms 2022-01-21 16:24:41 +01:00
Wojciech Figat
8c2241c6dc Update copyright year 2022-01-14 13:31:12 +01:00
Wojciech Figat
f3d05cd98e Add option to throw exception in build tool process utility 2022-01-10 14:36:19 +01:00
Wojtek Figat
dc9e928894 Fix release build linking 2022-01-10 09:34:56 +01:00
Wojtek Figat
959446df20 Fix for Mac 2022-01-09 20:09:00 +01:00
Wojtek Figat
7471a819e1 Add Vulkan support for Mac (via MoltenVK) 2022-01-05 10:25:46 +01:00
Wojtek Figat
ca62cd2661 Mac impl progress 2022-01-03 13:59:52 +01:00
Wojtek Figat
6b851fc9a9 Fix dylib usage on Mac with rpath and install_name 2021-12-31 14:16:27 +01:00
Wojtek Figat
5a3138fd7b Use objective c++ instead of c++ on Mac 2021-12-30 13:03:00 +01:00
Wojtek Figat
e361ab811a Mac support progress 2021-12-29 19:43:53 +01:00
Wojtek Figat
0dbbdc9149 Change Mac platform impl to inherit from Unix base 2021-12-29 17:01:58 +01:00
Wojtek Figat
378ddc66c7 Mac impl progress 2021-12-28 18:45:40 +01:00
Wojtek Figat
a1ef7ddcf7 Mac support progress 2021-12-28 17:07:18 +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
6f9f2ccdc0 Dont sue xd 2021-12-16 18:56:18 +01:00
Wojtek Figat
9ed7541ae7 Fix GDK platform build with VS 2022 installed 2021-11-21 19:02:34 +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
5dbbfed654 PS5 support progress 2021-10-20 15:35:12 +02: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