GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity
5,162 Commits 14 Branches 0 Tags
dfca248ebd6b671d6ca4ffa74ab7d972381dda6d
Commit Graph

236 Commits

Author SHA1 Message Date
Wojtek Figat
a25eae5d10 Move dotnet7 native interop, wrappers and marshalers into FlaxEngine.Interop namespace 2023-03-28 13:20:18 +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
eed2cdfe04 Progress on dotnet7 runtime hosting with mono 2023-03-22 17:59:46 +01:00
Wojtek Figat
0cf40729fa Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-19 15:04:02 +01:00
Wojtek Figat
969053a240 Add JsonAsset.Save to fix saving new tag 
#885
 2023-02-16 14:32:52 +01:00
Wojtek Figat
30fa911832 Merge remote-tracking branch 'origin/master' into dotnet7 
# Conflicts:
#	README.md
 2023-02-16 09:54:22 +01:00
Wojtek Figat
45a0b25ee4 Fix after merge 2023-02-13 10:52:11 +01:00
Wojtek Figat
ac59cc4633 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-13 10:05:51 +01:00
Chandler Cox
b4cce7db00 Fix issue with different lengths of text for scale properties. 2023-02-12 20:51:03 -06:00
Wojtek Figat
45866e6771 Minor code cleanup #930 2023-02-09 09:47:27 +01:00
Wojtek Figat
73ac1c5d43 Merge branch 'scale-lock' of https://github.com/Tryibion/FlaxEngine into Tryibion-scale-lock 2023-02-09 09:42:16 +01:00
Wojtek Figat
78001b8298 Merge branch 'center-set-type' of https://github.com/Tryibion/FlaxEngine into Tryibion-center-set-type 2023-02-09 09:39:40 +01:00
Wojtek Figat
7fae0d9fb6 Fix to ignore warning due to missing NDA consoles packages 2023-02-08 23:41:24 +01:00
Wojtek Figat
d09dfd1f61 Add **Canvas Scaler** control for resolution-independent UI 
#448 #525
 2023-02-08 19:51:16 +01:00
Wojtek Figat
9a84811f35 Fix editor values comparison in properties panel to match serializer rules 2023-02-06 13:44:45 +01:00
Wojtek Figat
0270772463 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-06 10:02:13 +01:00
Chandler Cox
d5d5fb698f Small name changes 2023-02-05 20:17:21 -06:00
Chandler Cox
0f38fdda30 Remove unused include. 2023-02-05 15:12:04 -06:00
Chandler Cox
e4afc49ac6 Added saving the users choice in the properties window and adding link and unlink to the scale context menu. 2023-02-05 15:07:12 -06:00
Chandler Cox
b113bdb774 Changed to use enum for simplification 2023-02-04 22:28:34 -06:00
Chandler Cox
03f299bc3b Added apply across actors. 2023-02-04 22:20:18 -06:00
Chandler Cox
9c591b3c08 Add scale lock button 2023-02-04 21:56:18 -06:00
Chandler Cox
a061347f5a Centers the "Set Type" Button context menu for UI Controls in the editor. 2023-02-03 19:22:25 -06:00
Chandler Cox
db46d50eff Fixed sized for tag header drop panel and add tag button to match with other sizing. 2023-01-27 08:28:47 -06:00
Wojtek Figat
adfe3ad165 Add SortOrder to drawable object types for transparency sorting override 2023-01-26 18:37:40 +01:00
Wojtek Figat
e779c3ca17 Merge commit '997baa3b774ac4dea739e15a55070519b0863afc' into dotnet7 2023-01-25 20:13:34 +01:00
Wojtek Figat
e57481de7d Adjustments to the new group panels #903 2023-01-24 23:18:12 +01:00
Wojtek Figat
6931161dce Merge branch 'add-arrow-to-groups' of https://github.com/Tryibion/FlaxEngine into Tryibion-add-arrow-to-groups 2023-01-24 19:41:37 +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
Wojciech Figat
38fcfee9a4 Merge branch '1.5' into dotnet7 2023-01-23 14:47:12 +01:00
Chandler Cox
66fd5e716c various fixes and improvements. size changes for headers, deactivate containement for collections. 2023-01-21 13:35:51 -06:00
Chandler Cox
634eb0973b fix header text position 2023-01-21 11:37:31 -06:00
Chandler Cox
a91990138b Added arrow as default to groups 2023-01-21 10:32:37 -06:00
Wojciech Figat
66d5850a76 Asset update 2023-01-20 12:02:40 +01:00
Chandler Cox
5d601621cf small fix 2023-01-20 02:14:05 -06:00
Chandler Cox
56c9be6f8c fixes 2023-01-20 01:55:09 -06:00
Chandler Cox
64dcfa21b8 small fixes 2023-01-20 01:22:36 -06:00
Chandler Cox
6c1ce82e5c Small cleanup 2023-01-20 00:56:46 -06:00
Chandler Cox
efe11d0105 Added selecting text box when tag add drop panel open 2023-01-20 00:55:54 -06:00
Chandler Cox
85df496657 Better tag picker 2023-01-20 00:51:46 -06: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
Wojciech Figat
4395bfd661 Improve Tags editor to display short tag names in tree for better readability of nested tags 
#885
 2023-01-16 13:33:21 +01:00
Wojciech Figat
5babe8df3f Add refreshing actively opened Layers And Tags asset editor when adding tags from popup 
#885
 2023-01-16 12:11:04 +01:00
Wojtek Figat
eff24ed836 Add support for editing path to the asset within AssetRefEditor 2023-01-15 23:05:58 +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
d3cdca6b33 Merge remote-tracking branch 'origin/1.5' into dotnet7 2023-01-02 10:37:04 +01:00
Wojtek Figat
f246fc018d Fixes for 2df3574cfa 2023-01-01 16:54:01 +01:00