Commit Graph

106 Commits

Author SHA1 Message Date
Wojtek Figat
716e643f2a Fix applying prefab changes to nesting prefab instances
#1256
2023-09-10 21:07:41 +02:00
Wojtek Figat
8f7da81621 Merge remote-tracking branch 'origin/master' into 1.6
# Conflicts:
#	Flax.flaxproj
#	Source/Editor/Content/Items/AssetItem.cs
2023-06-13 15:41:07 +02:00
Wojtek Figat
37bf4bb34f Unify all GetActorsTree usages in Editor 2023-06-12 18:25:44 +02:00
Wojtek Figat
f552dd0c28 Merge remote-tracking branch 'origin/master' into 1.6 2023-06-10 23:29:22 +02:00
Ruan Lucas
dae05e0549 improv: copy old curve point data to new curve point 2023-05-31 20:11:05 -04:00
Wojtek Figat
1dd8aa3db8 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-12 18:43:03 +02:00
Wojtek Figat
1af69421fa Fix actor scene tree dragging regression from d813078e91
#1104
2023-05-12 18:41:58 +02:00
Wojtek Figat
5a66e90b56 Merge remote-tracking branch 'origin/master' into 1.6
# Conflicts:
#	.github/workflows/tests.yml
#	Source/Engine/Content/JsonAsset.cs
2023-05-07 19:46:29 +02:00
Wojtek Figat
bcbbd98898 Merge branch 'ensure-prefab-staticflags' of https://github.com/Tryibion/FlaxEngine into Tryibion-ensure-prefab-staticflags 2023-05-07 10:46:20 +02:00
Wojtek Figat
3a3e8e2ad5 Fix actors spawning in prefab editor 2023-05-05 14:18:32 +02:00
Wojtek Figat
22239bc2d1 Merge remote-tracking branch 'origin/master' into 1.6 2023-05-05 11:41:32 +02:00
Chandler Cox
144287ba1c Add Unload all but this scene option to scene context menu to unload all of the active scenes except for the selected one. 2023-05-03 20:38:55 -05:00
Wojtek Figat
390460907d Merge remote-tracking branch 'origin/master' into 1.6
# Conflicts:
#	Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
#	Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs
2023-04-22 18:59:41 +02:00
Chandler Cox
be204fd2f5 Ensure prefab actors static flags match parent flags or keeps it's own. 2023-04-19 14:05:51 -05:00
Chandler Cox
3792aa1984 Add select actor on script drop, Fix dragging asset into scene tree between nodes. 2023-04-17 17:31:21 -05:00
Wojtek Figat
67b373c6df Merge remote-tracking branch 'origin/master' into 1.6 2023-04-17 13:18:08 +02:00
Chandler Cox
62a335fab0 Fix bug of re-parenting actors if children and parent actors are selected 2023-04-14 13:34:43 -05:00
Chandler Cox
d813078e91 Made it so the visuals of dragging an actor will only show between the nodes and on the node. 2023-04-14 12:55:40 -05: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
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
e6b0cd69ae Small bug fix 2023-03-03 13:34:24 -06:00
Chandler Cox
70e9410da0 Changed color of tangents when editing a spline to help the user know where the tangents are. 2023-03-03 13:25:53 -06: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
9a5c105db9 Merge branch '1.5' into dotnet7 2022-12-21 10:35:58 +01:00
Wojciech Figat
93f0b0e2e8 Fix type usage 2022-12-19 10:10:26 +01:00
Wojciech Figat
359e7d68d4 Add simplified collider for in-built primitive meshes 2022-12-12 11:22:15 +01:00
Chandler Cox
ad0aadbf29 Changed location of renaming box for ActorTreeNodes to start at the label for better UX. 2022-12-08 16:06:39 -06:00
Wojtek Figat
93c0dd704e Merge branch 'master' into 1.5
# Conflicts:
#	Source/Engine/Serialization/Stream.cpp
2022-11-21 15:51:57 +01:00
Wojciech Figat
996d38b61d Add scripts dragging support to scene tree for reparenting 2022-11-04 12:49:46 +01: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
b0f4f8d636 Code style fix 2022-10-12 18:55:24 +02:00
Chandler Cox
95e60ea68e Added scene panel to seperate the tree from the search bar and made the tree not able to scroll when renaming 2022-10-10 15:38:30 -05:00
Wojtek Figat
9f7f764359 Format code 2022-07-18 22:38:01 +02:00
Wojtek Figat
9ff0ad4734 Fix order of Large Worlds Real using 2022-07-18 20:20:12 +02:00
Wojtek Figat
63c9cdfc31 Fix snapping object to the group in Editor to skip trigger volumes
#522
2022-07-18 20:14:40 +02:00
Wojtek Figat
9ba117cde3 Refactor OrientedBoundingBox to use Transform for transformation instead of Matrix (for large worlds) 2022-06-16 10:51:59 +02:00
Wojtek Figat
a881c90b2e Refactor engine to support double-precision vectors 2022-06-13 00:40:32 +02:00
Wojciech Figat
8c2241c6dc Update copyright year 2022-01-14 13:31:12 +01:00
Wojciech Figat
7dd97a2d9f Add decals spawning in editor for drag&drop 2022-01-10 17:47:10 +01:00
Wojtek Figat
6f9f2ccdc0 Dont sue xd 2021-12-16 18:56:18 +01:00
Wojciech Figat
141022caf8 Add tooltips to actors in scene tree and to properties General panel header
#182
2021-12-09 17:10:34 +01:00
Wojciech Figat
822d8c947e Fix navmesh update when adding/removing navmesh bounds volume
#159
2021-12-09 17:03:53 +01:00
Wojciech Figat
983d5dee31 Fix tree node navigation with key arrows to be more usable for deep hierarchies 2021-12-07 18:23:03 +01:00
Wojtek Figat
74f813ed3e Optimize UI in Editor 2021-11-27 13:07:09 +01:00
Wojtek Figat
d8775a3ae5 Add Ragdoll Editor utilities for easier ragdoll setup and editing 2021-11-04 16:23:04 +01:00
Wojtek Figat
6dfedd219b Minor improvements and fixes for Editor 2021-11-04 15:59:06 +01:00