Commit Graph

4180 Commits

Author SHA1 Message Date
Wojciech Figat
8e354cc36e Merge branch 'visject-cm-search-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-visject-cm-search-fix 2023-01-13 12:01:20 +01:00
Wojciech Figat
26c7d3dadc Merge branch 'auto-save-popup' of https://github.com/Tryibion/FlaxEngine into Tryibion-auto-save-popup 2023-01-13 11:39:07 +01:00
Wojciech Figat
986fa13585 Reuse texture sampling code for procedural sampling node #872 2023-01-13 11:37:53 +01:00
Wojciech Figat
2d44ae3a4d Merge branch 'stochastic-sampling-node' of https://github.com/Swiggies/FlaxEngine into Swiggies-stochastic-sampling-node 2023-01-13 10:40:16 +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
Wojciech Figat
e2aa6b8970 Fix default value in viewport options 2023-01-09 22:40:54 +01:00
9f76e9e230 Hide types in unloaded scripting assemblies 2023-01-09 15:20:24 +02:00
Chandler Cox
0cd562c528 Fix in visject cm sometimes not populating all options once search box is cleared. 2023-01-08 16:04:55 -06:00
Wojciech Figat
a6050e6f27 Add managed memory allocations profiling with dotnet7 2023-01-06 09:18:11 +01:00
Wojciech Figat
ccd919d4d6 Fix default value in viewport options 2023-01-04 14:29:00 +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
Wojciech Figat
9acb597d5d Adjust scripting types visibility in editor 2023-01-02 10:36:24 +01:00
Wojtek Figat
59568fb5c8 Minor editor tweaks 2023-01-01 23:17:23 +01:00
Wojtek Figat
bc7bf72660 Fix case when child context menu is already hidden and changed to other from code 2023-01-01 21:42:35 +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
Wojtek Figat
9554636971 Add bigger input value boxes to Visject Surface 2023-01-01 18:30:15 +01:00
Wojtek Figat
f246fc018d Fixes for 2df3574cfa 2023-01-01 16:54:01 +01:00
Wojtek Figat
2df3574cfa Refactor new tags system to use uint for tag index (0 is invalid tag) 2023-01-01 16:39:34 +01:00
Wojtek Figat
b73bd519be Add navmesh update on terrain sculpt undo/redo and deffer navmesh update when sculpting action ends to prevent stalls 2022-12-31 14:43:50 +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
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
Chandler Cox
7c3d5d739a small fix 2022-12-29 21:11:40 -06:00
Chandler Cox
cf908fcfeb changed to change it in property UI 2022-12-29 21:11:39 -06:00
Chandler Cox
f52e76fe30 Always capitalize the first letter of a property name label 2022-12-29 21:11:39 -06:00
Wojtek Figat
7184566b4b Merge branch 'master' into 1.5 2022-12-29 23:04:18 +01:00
Chandler Cox
79562dc502 Renamed some variables to more match what they do/are. 2022-12-29 12:14:26 -06:00
Wojciech Figat
45286468c9 Remove old Mono files when cooking game to the same output folder with dotnet7 2022-12-29 11:21:03 +01:00
Chandler Cox
0633ed6819 Small cleanup 2022-12-29 00:47:30 -06:00
Chandler Cox
6c3864983f small cleanup 2022-12-29 00:45:58 -06:00
Chandler Cox
dc6f6e2b93 Clean up 2022-12-29 00:32:57 -06:00
Chandler Cox
63343d4224 2nd pass on viewport sizing CM. Added add menu and apply and delete. 2022-12-29 00:31:19 -06:00
Chandler Cox
ca07c18b93 Fist pass on game viewport resizing menu 2022-12-28 15:53:17 -06:00
Chandler Cox
b225b5a6e6 Simplified setting bounds 2022-12-28 15:53:17 -06:00
Chandler Cox
45564c940f Moved function 2022-12-28 15:53:17 -06:00
Chandler Cox
69d391d985 changed default 2022-12-28 15:53:16 -06:00
Chandler Cox
c38da8cabf Added resizing to the game viewport. 2022-12-28 15:53:16 -06:00
Wojtek Figat
ae7352831b Merge branch 'CM-close-Fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-CM-close-Fix 2022-12-28 22:27:15 +01:00
Chandler Cox
4eb2ac854e Fixed more CMs that shouldnt close 2022-12-28 13:00:58 -06:00
Chandler Cox
0220c8ced1 fixed skylight to use skylight icon 2022-12-28 12:53:08 -06:00
Wojtek Figat
c35a267cd3 Merge branch 'CM-closing-fix' of https://github.com/Tryibion/FlaxEngine into Tryibion-CM-closing-fix 2022-12-28 19:22:50 +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
6e403abf75 Merge branch 'patch-1' of https://github.com/Withaust/FlaxEngine into Withaust-patch-1 2022-12-28 17:27:32 +01:00
Wojtek Figat
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
Wiktor Kocielski
163abb107c GPUResource Name property glu e generation fix
This fixes the issue when compiling the editor in the `Release`
2022-12-28 16:23:54 +03:00
Chandler Cox
bdbf931046 Added CM button in ParticleEmitterPreview 2022-12-27 23:08:16 -06:00