Wojtek Figat
|
45a8d82a83
|
Merge remote-tracking branch 'origin/master' into 1.12
# Conflicts:
# Content/Shaders/GI/DDGI.flax
# Content/Shaders/GUI.flax
# Flax.flaxproj
# Source/Editor/Windows/AboutDialog.cs
# Source/Engine/Serialization/Stream.cpp
# Source/Shaders/GUICommon.hlsl
|
2026-03-13 08:09:16 +01:00 |
|
Wojtek Figat
|
0d133cfbdc
|
Minor fixes to #3870
|
2026-03-10 22:22:02 +01:00 |
|
Wojtek Figat
|
337fea0f69
|
Merge branch 'codeeditor_fixes' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-codeeditor_fixes
|
2026-03-10 22:09:28 +01:00 |
|
Wojtek Figat
|
90ffc4e5f9
|
Merge branch 'script-recycle' of https://github.com/Tryibion/FlaxEngine into Tryibion-script-recycle
|
2026-03-10 14:13:25 +01:00 |
|
Wojtek Figat
|
37a39e750f
|
Attempt to fix Linux headless Test run with SDL
|
2026-03-10 11:25:22 +01:00 |
|
Chandler Cox
|
83bbb4f6ba
|
Add recycle bin to script deleting.
|
2026-03-06 19:39:49 -06:00 |
|
Wojtek Figat
|
7ff4ce18ff
|
Add web platform icons to editor atlas
|
2026-02-17 13:21:00 +01:00 |
|
Wojtek Figat
|
c4d20f06ee
|
Move GetDisplayServer to LinuxPlatform (add support for custom platform scripting api)
#2800
|
2026-02-12 09:24:11 +01:00 |
|
Wojtek Figat
|
273b110db4
|
Code style formatting and minor tweaks
#2800
|
2026-02-11 17:15:15 +01:00 |
|
Wojtek Figat
|
ee22b9dc25
|
Merge branch 'sdl_platform' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-sdl_platform
# Conflicts:
# Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
# Source/Editor/Modules/UIModule.cs
|
2026-02-11 14:08:57 +01:00 |
|
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 |
|
|
|
f870fc3ae2
|
Merge remote-tracking branch 'origin/master' into sdl_platform
# Conflicts:
# Source/Editor/Viewport/MainEditorGizmoViewport.cs
|
2026-02-03 17:39:43 +02:00 |
|
Wojtek Figat
|
9fc9382e58
|
Refactor navmesh building to support updating all scenes automatically without specifying one
#3744
|
2026-01-30 13:11:56 +01:00 |
|
Chandler Cox
|
a7016d1186
|
Fix issue with tabs not collapsing panel 1 if no tabs on panel 1
|
2026-01-26 21:56:30 -06:00 |
|
Wojtek Figat
|
610c76578b
|
Merge remote-tracking branch 'origin/master' into 1.12
# Conflicts:
# Flax.flaxproj
|
2026-01-13 14:29:44 +01:00 |
|
Wojtek Figat
|
e721fbd89f
|
Add editor status message about amount of selected actors
|
2026-01-13 14:21:32 +01:00 |
|
Wojtek Figat
|
e21cb9154a
|
Adjust #3677 to evaluate product local path in lazy
|
2026-01-11 22:11:16 +01:00 |
|
Wojtek Figat
|
af124ce163
|
Merge branch 'QuickOpenProductLocalFolder' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-QuickOpenProductLocalFolder
|
2026-01-11 22:09:43 +01:00 |
|
|
|
71b222e0b0
|
Fix Editor project file generation to use custom code editor arguments
|
2025-12-18 23:52:21 +02:00 |
|
|
|
5921f60af2
|
Get code editor name through CodeEditingManager
|
2025-12-18 23:52:21 +02:00 |
|
|
|
39269583c3
|
Fix default code editor not using Visual Studio as fallback editor
|
2025-12-18 23:52:21 +02:00 |
|
|
|
cba3899c62
|
Fix invalid code editor when selected editor is not detected
|
2025-12-18 23:52:21 +02:00 |
|
|
|
3e91ba3fb2
|
Merge remote-tracking branch 'origin/master' into sdl_platform
|
2025-12-15 19:03:05 +02:00 |
|
Chandler Cox
|
1bf6612002
|
Fix exception thrown when reloading open windows.
|
2025-11-25 17:26:57 -06:00 |
|
|
|
0ac3ab2329
|
Merge remote-tracking branch 'origin/master' into sdl_platform
|
2025-11-19 18:30:08 +02:00 |
|
Wojtek Figat
|
5ec860015d
|
Add minor adjustments
|
2025-11-06 21:00:16 +01:00 |
|
|
|
668a4dbb4d
|
Merge remote-tracking branch 'origin/master' into sdl_platform
|
2025-10-14 01:09:26 +03:00 |
|
Wojtek Figat
|
18364d2a8b
|
Merge remote-tracking branch 'origin/1.11'
|
2025-10-12 21:50:19 +02:00 |
|
Wojtek Figat
|
823ed247d2
|
Merge remote-tracking branch 'origin/master' into 1.11
# Conflicts:
# Source/Engine/Level/Actors/Sky.cpp
|
2025-10-03 22:37:32 +02:00 |
|
Saas
|
c4c7ee941f
|
add industry standard shortcut for editor settings
|
2025-10-03 14:46:43 +02:00 |
|
Wojtek Figat
|
60c19303f6
|
Fix duplicating splines with parents
#3531
|
2025-10-02 23:31:03 +02:00 |
|
Wojtek Figat
|
87e2c4c4d5
|
Merge remote-tracking branch 'origin/master' into 1.11
# Conflicts:
# Content/Editor/DebugMaterials/DDGIDebugProbes.flax
# Source/Editor/Windows/OutputLogWindow.cs
# Source/Engine/Level/Actor.cpp
|
2025-09-24 18:18:27 +02:00 |
|
Wojtek Figat
|
3fcc9ed01f
|
Merge branch 'feature/create_project' of https://github.com/IceReaper/FlaxEngine into IceReaper-feature/create_project
|
2025-09-22 22:32:43 +02:00 |
|
Wojtek Figat
|
9749487e24
|
Move prefab and game UI size context menu to shared UI Module
#3571
|
2025-09-14 23:59:40 +02:00 |
|
Wojtek Figat
|
55968a8ddc
|
Merge branch 'prefab-viewport-scaling' of https://github.com/Tryibion/FlaxEngine into Tryibion-prefab-viewport-scaling
|
2025-09-14 23:11:59 +02:00 |
|
Saas
|
215467ae42
|
add ribbon menu buttons to quick open product local folder
|
2025-09-14 18:14:38 +02:00 |
|
|
|
f0dea9d528
|
Add support for Visual Studio 2026 and v145 MSVC toolset
|
2025-09-10 20:05:56 +03:00 |
|
|
|
1d8f221f1b
|
Merge remote-tracking branch 'origin/1.11' into sdl_platform_1.11
# Conflicts:
# Source/Engine/Platform/Windows/WindowsPlatform.cpp
# Source/Tools/Flax.Build/Build/ProjectTarget.cs
# Source/Tools/Flax.Build/Configuration.cs
|
2025-09-07 19:31:16 +03:00 |
|
|
|
b443b74d18
|
Merge branch 'master' into sdl_platform
# Conflicts:
# Source/Editor/GUI/Docking/DockHintWindow.cs
# Source/Editor/Options/InterfaceOptions.cs
|
2025-09-07 19:02:09 +03:00 |
|
Wojtek Figat
|
c57e128ff1
|
Merge remote-tracking branch 'origin/master' into 1.11
# Conflicts:
# Source/Engine/Level/Scene/SceneRendering.cpp
# Source/Engine/Physics/Colliders/Collider.cpp
# Source/Engine/Physics/Colliders/Collider.h
|
2025-09-02 22:23:45 +02:00 |
|
Wojtek Figat
|
1042ad4e7d
|
Fix object ids remapping inside nested prefabs
#3255
|
2025-09-02 21:41:36 +02:00 |
|
Wojtek Figat
|
f3d375e356
|
Fix prefab root name and transform being changed when applying local changes of sub-object
#3235
|
2025-08-28 22:26:50 +02:00 |
|
|
|
aab0d772a4
|
Implement client-side window decorations for Editor windows
|
2025-07-03 22:02:36 +03:00 |
|
Chandler Cox
|
53d4ea51af
|
Add prefab UI viewport scaling.
|
2025-06-27 21:18:53 -05:00 |
|
Wojtek Figat
|
d3a50cdacb
|
Optimize Actor::DestroyChildren
|
2025-06-20 09:05:25 +02:00 |
|
|
|
4654117d5e
|
Merge remote-tracking branch 'origin/master' into sdl_platform
|
2025-06-16 17:09:22 +03:00 |
|
Wojtek Figat
|
90b6293bc2
|
Add OnPlayEnding to editor modules and windows
#3514
|
2025-06-16 14:56:35 +02:00 |
|
|
|
6ff260d052
|
Merge remote-tracking branch 'origin/master' into sdl_platform
|
2025-06-16 14:09:29 +03:00 |
|
Wojtek Figat
|
496856d12e
|
Add shader header proxy for easy .hlsl files creation within Editor
|
2025-06-04 00:12:43 +02:00 |
|
|
|
b1fd86e6b5
|
Merge remote-tracking branch 'origin/master' into sdl_platform
|
2025-06-02 18:15:16 +03:00 |
|
