GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity
Files
c978ab2b843e4c35956fdfd471d2bb7d943fab5c
FlaxEngine/Source/Editor/Surface
History
Wojtek Figat f045b5b6b6 Merge remote-tracking branch 'origin/master' into 1.12 
# Conflicts:
#	Content/Editor/Camera/M_Camera.flax
#	Content/Editor/CubeTexturePreviewMaterial.flax
#	Content/Editor/DebugMaterials/DDGIDebugProbes.flax
#	Content/Editor/DebugMaterials/SingleColor/Decal.flax
#	Content/Editor/DebugMaterials/SingleColor/Particle.flax
#	Content/Editor/DebugMaterials/SingleColor/Surface.flax
#	Content/Editor/DebugMaterials/SingleColor/SurfaceAdditive.flax
#	Content/Editor/DebugMaterials/SingleColor/Terrain.flax
#	Content/Editor/DefaultFontMaterial.flax
#	Content/Editor/Gizmo/FoliageBrushMaterial.flax
#	Content/Editor/Gizmo/Material.flax
#	Content/Editor/Gizmo/MaterialWire.flax
#	Content/Editor/Gizmo/SelectionOutlineMaterial.flax
#	Content/Editor/Gizmo/VertexColorsPreviewMaterial.flax
#	Content/Editor/Highlight Material.flax
#	Content/Editor/Icons/IconsMaterial.flax
#	Content/Editor/IesProfilePreviewMaterial.flax
#	Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl
#	Content/Editor/Particles/Particle Material Color.flax
#	Content/Editor/Particles/Smoke Material.flax
#	Content/Editor/SpriteMaterial.flax
#	Content/Editor/Terrain/Circle Brush Material.flax
#	Content/Editor/Terrain/Highlight Terrain Material.flax
#	Content/Editor/TexturePreviewMaterial.flax
#	Content/Editor/Wires Debug Material.flax
#	Content/Engine/DefaultDeformableMaterial.flax
#	Content/Engine/DefaultMaterial.flax
#	Content/Engine/DefaultRadialMenu.flax
#	Content/Engine/DefaultTerrainMaterial.flax
#	Content/Engine/SingleColorMaterial.flax
#	Content/Engine/SkyboxMaterial.flax
#	Flax.flaxproj
#	Source/Engine/Graphics/Materials/MaterialShader.h
#	Source/Engine/Graphics/Materials/MaterialShaderFeatures.cpp
#	Source/Engine/Renderer/RenderList.h
#	Source/Shaders/Reflections.shader
#	Source/Shaders/ReflectionsCommon.hlsl
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
2026-02-11 00:20:38 +01:00
..
Archetypes
Merge remote-tracking branch 'origin/master' into 1.12
2026-02-11 00:20:38 +01:00
ContextMenu
Fix more errors in Visject context menu regressions
2025-10-15 14:44:58 +02:00
Elements
Merge remote-tracking branch 'origin/master' into 1.11
2025-09-24 18:18:27 +02:00
GUI
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
Undo
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
AnimationGraphFunctionSurface.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
AnimGraphSurface.cs
fix context menu
2025-06-14 00:54:16 +02:00
AttributesEditor.cs
correctly center buttons
2025-10-12 16:23:54 +02:00
BehaviorTreeSurface.cs
fix context menu
2025-06-14 00:54:16 +02:00
Constants.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
GroupArchetype.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
IFunctionDependantNode.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
IParametersDependantNode.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
ISurfaceContext.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
ISurfaceNodeElement.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
IVisjectSurfaceOwner.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
MaterialFunctionSurface.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
MaterialSurface.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
NodeAlignmentType.cs
add visject node formatting option to straighten node connections
2025-06-28 15:53:32 +02:00
NodeArchetype.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
NodeElementArchetype.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
NodeElementType.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
NodeFactory.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
NodeFlags.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
ParticleEmitterFunctionSurface.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
ParticleEmitterSurface.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
ResizableSurfaceNode.cs
Follow up on #3642 and move node resizing code to shared code
2026-01-30 17:31:59 +01:00
SurfaceComment.cs
Follow up on #3642 and move node resizing code to shared code
2026-01-30 17:31:59 +01:00
SurfaceControl.cs
Fix AutoFocus on ContainerControl to be false by default
2025-07-15 12:33:33 +02:00
SurfaceMeta.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
SurfaceNode.cs
Fix Visject Surface node dependent connection types init on load
2025-11-18 16:41:24 +01:00
SurfaceNodeElementControl.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
SurfaceParameter.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
SurfaceRootControl.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
SurfaceStyle.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
SurfaceUtils.cs
Fix crash on Visual Script missing asset ref after hot-reload in Editor
2025-12-13 02:10:41 +01:00
TransformCoordinateSystem.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
VisjectSurface.Connecting.cs
properly handle connecting to a box that already has a connection
2025-06-14 17:20:28 +02:00
VisjectSurface.Context.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
VisjectSurface.ContextMenu.cs
Merge branch 'moveVisjectConnection' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-moveVisjectConnection
2025-09-22 22:30:26 +02:00
VisjectSurface.CopyPaste.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
VisjectSurface.cs
Merge branch 'moveVisjectConnection' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-moveVisjectConnection
2025-09-22 22:30:26 +02:00
VisjectSurface.DragDrop.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
VisjectSurface.Draw.cs
Merge branch 'moveVisjectConnection' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-moveVisjectConnection
2025-09-22 22:30:26 +02:00
VisjectSurface.Formatting.cs
fix "Straighten Connections" to actually straighten all connections
2025-10-04 14:03:02 +02:00
VisjectSurface.Input.cs
Merge branch 'VisjectMoveNodeSmallerIncrements' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-VisjectMoveNodeSmallerIncrements
2026-02-03 17:44:41 +01:00
VisjectSurface.Parameters.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
VisjectSurface.Serialization.cs
fixes
2025-06-13 22:25:02 +02:00
VisjectSurfaceContext.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
VisjectSurfaceContext.Serialization.cs
Fix Visject Surface node dependent connection types init on load
2025-11-18 16:41:24 +01:00
VisjectSurfaceWindow.cs
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
VisualScriptSurface.cs
fix context menu
2025-06-14 00:54:16 +02:00