Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
5,240 Commits 15 Branches 23 Tags
cf397e1cc740dcdca424ffd3d64324ddd42e67f7
Commit Graph

249 Commits

Author SHA1 Message Date
mafiesto4 510fc443e8 Refactor CoreCLR runtime into explicit dotnet api instead of mocking mono api 
Required by platforms that will use mono under the hood for .Net 7
New `USE_CSHARP` define for C# ability
Engine doesn't use `mono_*` apis directly but via MCore/MClass/MMethod/ apis
 2023-03-27 17:29:42 +02:00
mafiesto4 eed2cdfe04 Progress on dotnet7 runtime hosting with mono 2023-03-22 17:59:46 +01:00
mafiesto4 74758f5380 Merge remote-tracking branch 'origin/master' into 1.6 
# Conflicts:
#	Source/Tools/Flax.Build/Build/Builder.Projects.cs
#	Source/Tools/Flax.Build/Build/Plugins/NetworkingPlugin.cs
 2023-03-14 11:52:41 +01:00
mafiesto4 dadb9207b9 Fix Json asset cooking to properly serialize whole asset data even if modified at runtime 2023-03-13 16:00:27 +01:00
mafiesto4 95748744a4 Add logging missing asset type on failed load 2023-03-13 14:23:23 +01:00
mafiesto4 987e680908 Fix warning on Asset::WaitForLoaded` when loading failed before 2023-03-03 17:43:55 +01:00
mafiesto4 0cf40729fa Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-19 15:04:02 +01:00
mafiesto4 ec8df18ee4 Remove not important warning 2023-02-17 02:17:25 +01:00
mafiesto4 7dc83b5472 Fix compilation warning 2023-02-16 22:59:31 +01:00
mafiesto4 969053a240 Add JsonAsset.Save to fix saving new tag 
#885
 2023-02-16 14:32:52 +01:00
mafiesto4 30fa911832 Merge remote-tracking branch 'origin/master' into dotnet7 
# Conflicts:
#	README.md
 2023-02-16 09:54:22 +01:00
mafiesto4 ab3e4afb53 Merge branch 'fix_thread_join' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-fix_thread_join 2023-02-15 15:33:44 +01:00
mafiesto4 cb83de4769 Fix compilation issues with various C++ scripting cases 2023-02-13 16:05:14 +01:00
mafiesto4 ac59cc4633 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-13 10:05:51 +01:00
mafiesto4 82823d6945 Various improvements and fixes 2023-02-09 20:05:46 +01:00
mafiesto4 0270772463 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-06 10:02:13 +01:00
mafiesto4 0709288eac Revert Depth Offset (wrong impl, can be done later) 2023-01-31 14:22:37 +01:00
mafiesto4 c39d1283f8 Add sort order for custom model drawing 2023-01-31 09:29:04 +01:00
mafiesto4 a219a3d2eb Add **Depth Offset to materials** 2023-01-29 22:09:51 +01:00
GoaLitiuM 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
mafiesto4 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
mafiesto4 f127bbebe1 Refactor enum flags with __underlying_type and new EnumHasAnyFlags/EnumHasAllFlags 
Fixes #832
Closes #886
 2023-01-15 12:44:39 +01:00
mafiesto4 59ba9102a6 Merge branch 'dotnet7' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet7 2023-01-12 15:15:40 +01:00
mafiesto4 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
mafiesto4 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
mafiesto4 9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
GoaLitiuM 9f76e9e230 Hide types in unloaded scripting assemblies 2023-01-09 15:20:24 +02:00
mafiesto4 d3cdca6b33 Merge remote-tracking branch 'origin/1.5' into dotnet7 2023-01-02 10:37:04 +01:00
mafiesto4 e48b642101 Minor code cleanup 2023-01-02 10:36:57 +01:00
mafiesto4 4afa59a783 Fix missing scripting and serialization extensions for SceneReference usage in scripts 2023-01-01 19:15:59 +01:00
mafiesto4 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
mafiesto4 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
mafiesto4 0e1da59f0c Fix loading materials when using Null renderer 
Regression from dbcb333ba9
 2022-12-29 23:35:47 +01:00
mafiesto4 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
mafiesto4 8918c71312 Update old header usage 2022-12-22 19:31:01 +01:00
mafiesto4 9a5c105db9 Merge branch '1.5' into dotnet7 2022-12-21 10:35:58 +01:00
mafiesto4 c38eda5799 Fixes for compilation 2022-12-14 14:04:14 +01:00
mafiesto4 d4601ecb44 Add memory usage query for various asset types 2022-12-09 15:48:43 +01:00
mafiesto4 ed700cb070 Add **Assets profiler** to Editor 2022-12-09 15:46:01 +01:00
mafiesto4 7f0c73606c Improve naming various GPU resources 2022-12-09 11:27:41 +01:00
mafiesto4 df82a0f5d0 Add **GPU Memory profiler** to Editor 2022-12-08 16:30:37 +01:00
mafiesto4 df45ac46b1 Optimize various debug views performance 2022-12-03 12:23:39 +01:00
mafiesto4 0f19fc64fd Add SceneReference to C++ scripting API 2022-12-02 10:05:07 +01:00
GoaLitiuM 2227642c13 Fix JsonAsset instantiation after script reload 2022-11-27 14:47:02 +02:00
mafiesto4 835a230323 Refactor material shaders to use separate constant buffer (slot 1) for shared per-view constants 2022-11-27 12:06:31 +01:00
GoaLitiuM 96dc279ebd Implement .NET 7 runtime support and bindings generation 2022-11-26 14:37:07 +02:00
mafiesto4 dbcb333ba9 Fix crash when using material in PostFx global graphics settings (asset loaded before GPU init) 2022-11-24 09:58:46 +01:00
mafiesto4 93c0dd704e Merge branch 'master' into 1.5 
# Conflicts:
#	Source/Engine/Serialization/Stream.cpp
 2022-11-21 15:51:57 +01:00
mafiesto4 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