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

292 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 d2a0438b71 Fix error on control reorder while it got remove before 2023-03-13 20:06:45 +01:00
mafiesto4 0112f70c05 Merge remote-tracking branch 'origin/master' into dotnet7 2023-03-01 19:50:22 +01:00
Tryibion 037ad94ae7 Small Fix 2023-02-22 17:37:03 -06:00
Tryibion 34aff4a2b6 Added a change cursor boolean to TextBoxBase and made it so the cursor changes to default when hovering over the cancel button. 2023-02-22 17:34:33 -06:00
mafiesto4 0cf40729fa Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-19 15:04:02 +01:00
mafiesto4 8327866205 Expose ScrollSpeedWheel and ScrollSpeedClick for scroll bar editing 
#946
 2023-02-18 17:05:41 +01:00
PrecisionRender f0061e07b4 Update scroll speed to feel less sluggish 2023-02-18 09:29:01 -06:00
mafiesto4 2f97db306a Merge branch 'context_menu_focus_fixes' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-context_menu_focus_fixes 2023-02-17 20:27:47 +01:00
mafiesto4 ac59cc4633 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-13 10:05:51 +01:00
GoaLitiuM e3a96fa724 Fix tooltip not hiding after clicking on TreeNode 2023-02-12 14:32:28 +02:00
mafiesto4 9c98d9d01e Fix focus when using CanvasScaler 2023-02-10 16:31:06 +01:00
mafiesto4 c99525131a Fix build d09dfd1f61 2023-02-08 23:31:23 +01:00
mafiesto4 d09dfd1f61 Add **Canvas Scaler** control for resolution-independent UI 
#448 #525
 2023-02-08 19:51:16 +01:00
mafiesto4 0366de36ce Add BlurScaleWithSize to BlurPanel for resolution-independent blur 2023-02-07 14:13:02 +01:00
mafiesto4 0270772463 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-06 10:02:13 +01:00
Tryibion 2592841793 Code style cleanup 2023-02-01 18:28:00 -06:00
Tryibion b862126209 Changed to only show ibeam when editing 2023-02-01 18:25:40 -06:00
Tryibion ade0450c0e Add cursor to change to Ibeam in text boxes. 2023-02-01 09:32:58 -06:00
mafiesto4 adfe3ad165 Add SortOrder to drawable object types for transparency sorting override 2023-01-26 18:37:40 +01:00
mafiesto4 e779c3ca17 Merge commit '997baa3b774ac4dea739e15a55070519b0863afc' into dotnet7 2023-01-25 20:13:34 +01:00
mafiesto4 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
mafiesto4 c1e0d70646 Fix name overlap 2023-01-24 19:14:18 +01:00
Tryibion 66fd5e716c various fixes and improvements. size changes for headers, deactivate containement for collections. 2023-01-21 13:35:51 -06: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 fc65e5a7a6 Fix leftover UI control state when it gets disabled/hidden/reparented 2023-01-16 15:08:57 +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 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
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 8762e8ad15 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/Utilities/Utils.cs
 2022-12-28 16:59:11 +01:00
mafiesto4 6b0ead59d2 Fix code style 2022-12-27 20:24:01 +01:00
mafiesto4 1d359d9ed2 Merge branch 'add-button-hover-events' of https://github.com/Tryibion/FlaxEngine into Tryibion-add-button-hover-events 2022-12-27 20:23:04 +01:00
mafiesto4 cb6590e7ef Format code 2022-12-27 18:50:08 +01:00
GoaLitiuM e03a819176 Replace usage of Utils.ExtractArrayFromList with Span 2022-12-22 19:54:59 +02:00
Tryibion a468053f46 Added hover begin and end event to button 2022-12-15 21:09:34 -06:00
Tryibion 1a3bcc5d27 Changed default to true. 2022-12-08 16:21:10 -06:00
Tryibion f81740f28c Merge branch 'click-to-submit-text' of https://github.com/Tryibion/FlaxEngine into click-to-submit-text 2022-12-08 08:33:09 -06:00
Tryibion eab775b9a2 Added RstoreTextFromStart function and changed the calls. Renamed bool. 2022-12-08 08:02:57 -06:00
Tryibion 9b82860154 Allows user to left click to end editing text and right click to change text back to its original and end editing. 2022-12-08 08:02:57 -06:00
Tryibion 93a0facd93 Allows user to left click to end editing text and right click to change text back to its original and end editing. 2022-11-29 21:30:17 -06:00
mafiesto4 8e52e2fb10 Merge branch 'master' into 1.5 2022-11-27 12:11:50 +01:00
mafiesto4 e713273942 Fix textbox defocus on edit end 
#789
 2022-11-24 21:54:54 +01:00
mafiesto4 76c1045444 Code cleanup after #823 2022-11-23 19:18:30 +01:00
mafiesto4 b581bf7bac Merge branch 'Better-Actor-Toolbox' of https://github.com/Tryibion/FlaxEngine into Tryibion-Better-Actor-Toolbox 2022-11-23 19:02:26 +01:00
mafiesto4 2ad6eb0c72 Merge branch 'master' into 1.5 2022-11-22 19:58:53 +01:00
mafiesto4 c5d1897acf Rename CanScrollMultilineText to IsMultilineScrollable to match the other properties naming 
#818
 2022-11-21 16:10:53 +01:00