Commit Graph

149 Commits

Author SHA1 Message Date
Wojciech Figat
38fcfee9a4 Merge branch '1.5' into dotnet7 2023-01-23 14:47:12 +01:00
Wojciech Figat
31e27e84a9 Minor fix 2023-01-20 11:48:53 +01:00
Chandler Cox
f110926288 Moved into function in Asset Window. 2023-01-19 16:10:17 -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
5babe8df3f Add refreshing actively opened Layers And Tags asset editor when adding tags from popup
#885
2023-01-16 12:11:04 +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
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
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
Wojciech Figat
3e8e839cd1 Refactor Editor Windows layout serialization of splitter values to prevent invalid state when loading windows 2022-12-27 13:54:53 +01:00
Wojciech Figat
eae38fa0c6 Merge branch 'dotnet7' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-dotnet7 2022-12-19 10:10:34 +01:00
Wojciech Figat
93f0b0e2e8 Fix type usage 2022-12-19 10:10:26 +01:00
551c58db4f Fix incorrect array marshalling in few Editor methods 2022-12-17 15:38:55 +02:00
Chandler Cox
e725533ba7 Changed all search boxes to new class. 2022-12-15 21:18:49 -06:00
Wojtek Figat
2ad6eb0c72 Merge branch 'master' into 1.5 2022-11-22 19:58:53 +01:00
Wojtek Figat
5a6f6d97a7 Minor code adjustments
#810
2022-11-21 18:55:33 +01:00
Wojtek Figat
93c0dd704e Merge branch 'master' into 1.5
# Conflicts:
#	Source/Engine/Serialization/Stream.cpp
2022-11-21 15:51:57 +01:00
Wojtek Figat
e98621b887 Code style fix
#814
2022-11-06 23:05:36 +01:00
Wojtek Figat
735b07f0d7 Merge branch 'actor-CM' of https://github.com/Tryibion/FlaxEngine into Tryibion-actor-CM 2022-11-06 22:22:45 +01:00
Chandler Cox
1af0188a3c changed how actor context menus are created. 2022-10-31 19:18:43 -05:00
Wojciech Figat
77b98f7081 Add Layer and StaticFlags from parent actor after spawnign actor in Prefab Window 2022-10-31 12:21:02 +01:00
Chandler Cox
50414d7fed added deselecting nodes when left clicking in blank area in the scene and prefab tree views 2022-10-29 09:22:39 -05:00
Chandler Cox
40a04bc5d6 Various fixes to prefab tree view. Scrolling like scene view, disable scrolling on renaming, can open CM anywhere in tree panel. 2022-10-29 09:14:08 -05:00
Wojtek Figat
f528ba59ec Code style fix
#766
2022-10-12 19:04:22 +02:00
Cristhofer Marques
0b8a176ff8 Revert "Update SkeletonMaskWindow.cs"
This reverts commit b626d3047d.
2022-10-11 14:05:30 -03:00
Cristhofer Marques
b626d3047d Update SkeletonMaskWindow.cs 2022-10-11 13:08:52 -03:00
Cristhofer Marques
2af285e972 feature added 2022-10-11 11:49:32 -03:00
Wojtek Figat
20ebe3ac85 Fix game ticking in editor during cut-scene rendering at edit time 2022-08-25 19:42:00 +02:00
Wojtek Figat
a545520d6b Add playback speed option for Scene Animation rendering 2022-08-25 19:41:59 +02:00
Wojtek Figat
3b52914416 Add **Nested Animations** for compositing animation clips 2022-07-31 15:53:09 +02:00
Wojtek Figat
1019550d4a Change search boxes in Editor to stick to the top of the panel 2022-07-19 15:37:10 +02:00
Wojtek Figat
9f7f764359 Format code 2022-07-18 22:38:01 +02:00
Wojciech Figat
0d8ebd332e Add Global Illumination sampling option to transparent materials (eg. particles) 2022-07-14 14:28:42 +02:00
Wojciech Figat
85f351663b Add Transparent Lighting Modes for material with option to use non-directional shading 2022-07-14 09:22:32 +02:00
Wojciech Figat
f221bc6361 Minor improvements 2022-07-07 15:34:15 +02:00
Wojciech Figat
02dbd07506 Add utility buttons to check/uncheck all Material Instance parameters overrides in Editor window 2022-07-06 09:29:25 +02:00
Wojtek Figat
1fbdabdcd0 Fixes 2022-06-19 13:07:19 +02:00
Wojtek Figat
a881c90b2e Refactor engine to support double-precision vectors 2022-06-13 00:40:32 +02:00
Wojtek Figat
785f8915b7 Merge remote-tracking branch 'origin/gi' into large-worlds
# Conflicts:
#	Source/Engine/Core/Math/Vector3.h
2022-05-21 19:45:13 +02:00
Wojtek Figat
782c3a0e3e Add Find references utility for graph parameters and methods 2022-05-09 18:10:47 +02:00
Wojtek Figat
8b1e0df222 Add **Content Search** window to searching Visual Scripts and other assets 2022-05-08 19:42:34 +02:00
Wojtek Figat
90906baae2 Various improvements for Editor 2022-05-06 17:14:25 +02:00
Wojciech Figat
551459022d Merge remote-tracking branch 'origin/master' into gi
# Conflicts:
#	Source/Editor/Windows/Assets/VisualScriptWindow.cs
2022-05-02 10:38:14 +02:00
Wojtek Figat
2935b85543 Add preserving existing value of the Visual Script parameter when changing its type 2022-05-01 21:34:21 +02:00
Wojtek Figat
26d4ebd3d5 Fixes for Visual Scripting in Editor 2022-05-01 21:11:15 +02:00
Wojtek Figat
74b23d0e00 Add support for array of Visual Script objects 2022-05-01 20:42:05 +02:00
Wojciech Figat
8428f28239 Various improvements for SDF rendering 2022-04-29 17:11:39 +02:00
Wojtek Figat
158c29e598 Add **Dictionaries to Visual Scripting** 2022-04-27 22:47:54 +02:00
Wojciech Figat
cad9bad950 Merge remote-tracking branch 'origin/master' into gi 2022-04-21 12:57:08 +02:00