Commit Graph

284 Commits

Author SHA1 Message Date
Wojtek Figat
0270772463 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-06 10:02:13 +01:00
Wojtek Figat
0709288eac Revert Depth Offset (wrong impl, can be done later) 2023-01-31 14:22:37 +01:00
Wojtek Figat
c39d1283f8 Add sort order for custom model drawing 2023-01-31 09:29:04 +01:00
Wojtek Figat
a219a3d2eb Add **Depth Offset to materials** 2023-01-29 22:09:51 +01:00
b0bc1fa310 Fix error when joining exited threads
The internal thread handles were cleared prematurely when attempting to join them. The handles should be also cleared when trying to kill already exited threads.
2023-01-29 21:30:01 +02:00
Wojciech Figat
7b20bc38a4 Merge branch '1.5' into dotnet7
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
2023-01-17 11:52:52 +01:00
Wojtek Figat
f127bbebe1 Refactor enum flags with __underlying_type and new EnumHasAnyFlags/EnumHasAllFlags
Fixes #832
Closes #886
2023-01-15 12:44:39 +01:00
Wojciech Figat
59ba9102a6 Merge branch 'dotnet7' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet7 2023-01-12 15:15:40 +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
9f76e9e230 Hide types in unloaded scripting assemblies 2023-01-09 15:20:24 +02:00
Wojciech Figat
d3cdca6b33 Merge remote-tracking branch 'origin/1.5' into dotnet7 2023-01-02 10:37:04 +01:00
Wojciech Figat
e48b642101 Minor code cleanup 2023-01-02 10:36:57 +01:00
Wojtek Figat
4afa59a783 Fix missing scripting and serialization extensions for SceneReference usage in scripts 2023-01-01 19:15:59 +01:00
Wojtek Figat
084fe6f063 Add UseAssetImportPathRelative to Editor options and use it by default to store imported asset path relative to the project folder 2023-01-01 18:55:09 +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
0e1da59f0c Fix loading materials when using Null renderer
Regression from dbcb333ba9
2022-12-29 23:35:47 +01:00
Wojtek Figat
c48a81a068 Merge branch '1.5' into dotnet7
# Conflicts:
#	Source/Editor/Managed/ManagedEditor.Internal.cpp
#	Source/Engine/Core/Config/LayersAndTagsSettings.cs
2022-12-28 18:49:14 +01:00
Wojtek Figat
8918c71312 Update old header usage 2022-12-22 19:31:01 +01:00
Wojciech Figat
9a5c105db9 Merge branch '1.5' into dotnet7 2022-12-21 10:35:58 +01:00
Wojciech Figat
c38eda5799 Fixes for compilation 2022-12-14 14:04:14 +01:00
Wojciech Figat
d4601ecb44 Add memory usage query for various asset types 2022-12-09 15:48:43 +01:00
Wojciech Figat
ed700cb070 Add **Assets profiler** to Editor 2022-12-09 15:46:01 +01:00
Wojciech Figat
7f0c73606c Improve naming various GPU resources 2022-12-09 11:27:41 +01:00
Wojciech Figat
df82a0f5d0 Add **GPU Memory profiler** to Editor 2022-12-08 16:30:37 +01:00
Wojtek Figat
df45ac46b1 Optimize various debug views performance 2022-12-03 12:23:39 +01:00
Wojciech Figat
0f19fc64fd Add SceneReference to C++ scripting API 2022-12-02 10:05:07 +01:00
2227642c13 Fix JsonAsset instantiation after script reload 2022-11-27 14:47:02 +02:00
Wojtek Figat
835a230323 Refactor material shaders to use separate constant buffer (slot 1) for shared per-view constants 2022-11-27 12:06:31 +01:00
96dc279ebd Implement .NET 7 runtime support and bindings generation 2022-11-26 14:37:07 +02:00
Wojtek Figat
dbcb333ba9 Fix crash when using material in PostFx global graphics settings (asset loaded before GPU init) 2022-11-24 09:58:46 +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
Wojciech Figat
0c9001e3d1 Fixes 2022-11-03 08:53:09 +01:00
Preben Eriksen
1d9f5e8cfe PE: Fixed - flax storage crash , happened quit often on my system. 2022-10-31 16:07:43 +01:00
Wojtek Figat
00be6ffb89 Merge branch 'master' into 1.5 2022-10-29 20:45:51 +02:00
Wojtek Figat
c41248f402 Optimize asset registry paths check to use StringUtils::CompareIgnoreCase instead of String::ToLowerToLower
#765
2022-10-29 11:42:06 +02:00
Wojtek Figat
eb52d333ae Refactor scene rendering to use batched culling for main view and shadow projections 2022-10-28 17:53:21 +02:00
Wojciech Figat
cd4d15e0e2 Minor improvements 2022-10-25 15:07:04 +02:00
Wojtek Figat
42d1f40b9c Optimize some code by manual inlining 2022-10-21 18:36:29 +02:00
Wojciech Figat
32e052a87b Refactor native Stream serialization to new API 2022-10-20 17:28:12 +02:00
Wojciech Figat
ff34c7cc9b Refactor raw data ReadSttream and WriteStream to have easier to use API with more features 2022-10-12 11:22:20 +02:00
Preben Eriksen
7cae9b4ce5 Fixed - Windows, launcher use a uppercase D:\ , if you try to start your project from VS/Shortcut and use a lowercase d:\ it would ruin your project as it assign new asset IDs without remapping. 2022-09-24 13:46:55 +02:00
Wojtek Figat
0e523204d5 Fix custom json asset usage for game settings if loaded before game scripting module is loaded 2022-09-14 21:13:58 +02:00
Wojciech Figat
66b452e90c Fix crash on shutdown due to custom JsonAsset C++ instance 2022-09-14 17:58:57 +02:00
Wojciech Figat
de1437102e Fix crash on shutdown due to custom JsonAsset C++ instance 2022-09-13 12:55:14 +02:00
Wojciech Figat
439f74c540 Fix comparison operators on object reference types 2022-09-12 14:48:48 +02:00
Wojciech Figat
4fa9b4a741 Fix comparison operators on object reference types 2022-09-09 15:29:17 +02:00
Wojciech Figat
7559cb4d99 Add support for editing JsonAsset data at runtime (eg. modify game settings on the fly) 2022-09-07 11:52:46 +02:00
Wojciech Figat
0b15c369d6 Fix FlaxStorage refs counting to be atomic 2022-08-16 12:36:44 +02:00