Commit Graph

156 Commits

Author SHA1 Message Date
Wojtek Figat
fe4e8f3dd2 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-10 12:13:45 +02:00
Wojtek Figat
0c2c643ea8 Follow up #1085 with expendable type description for content items 2023-05-10 10:29:59 +02:00
Menotdan
f3d7ad0aa9 Add better tooltips to all files and folders. 2023-05-07 14:03:27 -04:00
Menotdan
cffc3f7f5d Better formatting for type names. 2023-05-07 13:44:15 -04:00
Menotdan
4c906f4040 Use shorter, relative path for displaying Asset Tooltips. 2023-05-07 13:11:53 -04:00
Wojtek Figat
22239bc2d1 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-05 11:41:32 +02:00
Wojtek Figat
65a68131cc Improve name construction in #1038 2023-05-05 11:38:28 +02:00
Wojtek Figat
71a5d56105 Add support for importing skeleton-only as Skinned Model (eg. from animation file to have skeleton for retargeting) 2023-05-04 15:43:44 +02:00
Wojtek Figat
57052b3b14 Fix marshallers 2023-05-04 14:18:32 +02:00
Wojtek Figat
5a2831d0cb Various improvements 2023-04-29 12:11:17 +02:00
Ruan Lucas
309302c212 improv: set new material instance name to parent material name 2023-04-23 13:27:32 -04:00
Wojtek Figat
67b373c6df Merge remote-tracking branch 'origin/master' into 1.6 2023-04-17 13:18:08 +02:00
Wojtek Figat
414bce38bb DOn't even start drag and drop if content item is detached from UI 2023-04-17 12:54:01 +02:00
Wojtek Figat
2eea7abc27 Add Create collision data action to be performed for each model selected in the Content Window 2023-04-17 12:20:02 +02:00
Wojtek Figat
a25eae5d10 Move dotnet7 native interop, wrappers and marshalers into FlaxEngine.Interop namespace 2023-03-28 13:20:18 +02:00
Wojtek Figat
ed13de2d5b Fix using managed arrays with Variant in dotnet7 2023-03-27 19:41:53 +02:00
Wojtek Figat
4755c42d70 Fix .NET generic class typename to match old mono style without inlined assembly name and ver 2023-03-27 17:30:48 +02:00
Wojtek Figat
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
Wojtek Figat
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
Chandler Cox
4265ba12d7 Fixed the Generic Json Proxy not showing up in the content cm. 2023-03-05 12:04:45 -06:00
87e9046e41 Fix native to managed marshalling of System.Array 2023-02-19 20:33:12 +02:00
Wojtek Figat
ac59cc4633 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-13 10:05:51 +01:00
Wojtek Figat
7a2023ead6 Add option for importing scale tracking to animation asset 2023-02-07 09:39:31 +01:00
Wojciech Figat
798b950046 Merge branch 'dotnet7' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet7 2023-01-24 09:30:38 +01:00
Wojciech Figat
f3366178ea Refactor manually written managed bindings to use C-style exported P/Invoke 2023-01-23 18:14:38 +01:00
3ca0ea2e50 Fix unfreed managed string handles 2023-01-22 17:29:34 +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
50fb39d238 Merge remote-tracking branch 'origin/master' into 1.5 2023-01-15 12:44:45 +01:00
1a1fadcc2f Fix incorrect marshalling of TextureImportEntry fields 2023-01-14 17:50:25 +02:00
Wojciech Figat
0fa58531e8 Merge branch 'fix-missing-scene-animation' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-missing-scene-animation 2023-01-13 12:03:41 +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
dea307179f Merge branch 'dotnet7' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet7
# Conflicts:
#	Source/Engine/Engine/NativeInterop.cs
2023-01-02 11:04:36 +01:00
Wojciech Figat
d3cdca6b33 Merge remote-tracking branch 'origin/1.5' into dotnet7 2023-01-02 10:37:04 +01:00
Wojtek Figat
59568fb5c8 Minor editor tweaks 2023-01-01 23:17:23 +01:00
Chandler Cox
6a46efcf45 Fixed missing the scene animation proxy from the content context menu. 2022-12-30 18:40:11 -06:00
8b80f73641 Implement ManagedHandle replacement for GCHandles
Allows for more controlled management of weak handles, increasing their lifetime for slightly longer than with GCHandles.
2022-12-30 22:14:48 +02: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
25028e1d67 Improve renaming ContentTreeNode as in #849 2022-12-27 19:07:24 +01:00
22b4e25c02 Improve array allocations when marshalling method parameters 2022-12-22 19:54:58 +02:00
96dc279ebd Implement .NET 7 runtime support and bindings generation 2022-11-26 14:37:07 +02:00
Chandler Cox
2dca30305f added shader source and removed unused variables/includes 2022-11-03 08:12:40 -05:00
Chandler Cox
a1e4400994 changed to use attribute to add items to the content context menu, this also allows users to add their own items to the CM 2022-11-02 17:57:40 -05:00
Chandler Cox
050635b2cd changed way that the the new menu is generated. Added category name to proxies 2022-10-30 14:30:32 -05:00
Wojtek Figat
f078499dfb Another adjustment to have position aligned too #796 2022-10-24 16:44:11 +02:00
Chandler Cox
87a0c671f6 Adjusted only the bounds for content items to be floored. 2022-10-24 09:01:40 -05:00
Wojtek Figat
1fb19ee023 Adjust content view items to whole pixels to reduce text aliasing
#794
2022-10-23 22:38:38 +02:00
Chandler Cox
9bd13c8ed5 This adds more spacing between the content items in the content view and allows for resizing better than before. 2022-10-21 20:31:19 -05:00
Wojtek Figat
d44606d205 Merge branch 'content-window-change' of https://github.com/Tryibion/FlaxEngine into Tryibion-content-window-change 2022-10-10 17:56:15 +02:00