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 |
|
|
|
0084bc051c
|
Merge branch 'master' into sdl_platform
|
2026-02-10 23:05:19 +02:00 |
|
Wojtek Figat
|
4a7f1a5fde
|
Fix various issues
|
2026-02-06 10:37:52 +01:00 |
|
Wojtek Figat
|
5d0fdc8313
|
Add info about skinned model skeleton size
|
2026-02-06 09:28:06 +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
|
21e2c830e5
|
Refactor Animation editor to use cloned asset for live preview of nested animations editing
#3773
|
2026-02-03 16:32:22 +01:00 |
|
Wojtek Figat
|
f725f4c0b9
|
Add saving viewport icons scale (global) within Editor window layout
#3820
|
2026-02-03 13:24:13 +01: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
|
a18ca9a4ad
|
Merge branch 'DirtyEditorSettingsStar' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-DirtyEditorSettingsStar
|
2026-01-12 21:30:00 +01:00 |
|
Wojtek Figat
|
14d1b7dd24
|
Fix name collision on new Focused event in control
|
2026-01-07 23:22:45 +01:00 |
|
Wojtek Figat
|
b2f2537338
|
Update version and year
|
2026-01-07 23:17:40 +01:00 |
|
|
|
0ac3ab2329
|
Merge remote-tracking branch 'origin/master' into sdl_platform
|
2025-11-19 18:30:08 +02:00 |
|
Wojtek Figat
|
dfb1fb91a5
|
Fix ability to override material instance hidden parameters
#3802
|
2025-11-18 21:29:51 +01:00 |
|
Wojtek Figat
|
91ee9f5e05
|
Refactor Mesh SDF generation on GPU to use raytracing for more precise results
|
2025-11-13 22:05:23 +01:00 |
|
|
|
466f9a4797
|
Merge remote-tracking branch 'origin/master' into sdl_platform
|
2025-11-11 21:40:06 +02:00 |
|
Wojtek Figat
|
c7997e0c2f
|
Fix potential error on missing reference object
|
2025-11-10 21:50:11 +01:00 |
|
Wojtek Figat
|
97ae13759e
|
Merge remote-tracking branch 'origin/master'
|
2025-11-09 23:22:37 +01:00 |
|
Wojtek Figat
|
35acc668c9
|
Merge branch 'ContentNavigationScrollbarColors' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ContentNavigationScrollbarColors
|
2025-11-07 21:42:10 +01:00 |
|
Wojtek Figat
|
3a5bb81d39
|
Add a new splash screen quote
|
2025-11-06 21:00:29 +01:00 |
|
Saas
|
93f12b73d8
|
less code is more better
|
2025-10-31 23:16:37 +01:00 |
|
Saas
|
594c0fb8e7
|
add comment around asset from which asset reference graph originates
|
2025-10-31 19:23:42 +01:00 |
|
Wojtek Figat
|
1f592ba1a1
|
Fix game viewport scaling when using custom aspect or resolution to simulate actual logic
#3699
|
2025-10-30 23:36:51 +01:00 |
|
|
|
c61ecc0545
|
Merge branch 'master' into sdl_platform
|
2025-10-30 22:42:29 +02:00 |
|
Wojtek Figat
|
755702b65a
|
Improve #3747 to check for loaded levels in drag drop validation
|
2025-10-25 22:52:41 +02:00 |
|
Chandler Cox
|
e4bb8001b2
|
Fix not having undo for items dragged into scene tree into empty space.
|
2025-10-18 18:23:33 -05:00 |
|
|
|
f99a244b8e
|
Merge remote-tracking branch 'origin/master' into sdl_platform
# Conflicts:
# Source/Editor/Windows/GameWindow.cs
|
2025-10-18 02:19:30 +03:00 |
|
Saas
|
5ec2476aec
|
add "*" to editor settings window title when settings are dirty
|
2025-10-16 21:05:10 +02:00 |
|
Wojtek Figat
|
d93c32db9c
|
Merge remote-tracking branch 'origin/1.11'
# Conflicts:
# Source/Tools/Flax.Build/Deps/Downloader.cs
|
2025-10-16 14:07:49 +02:00 |
|
|
|
668a4dbb4d
|
Merge remote-tracking branch 'origin/master' into sdl_platform
|
2025-10-14 01:09:26 +03:00 |
|
Wojtek Figat
|
e1b3429b4c
|
Fix regression on game window defocus
|
2025-10-13 21:50:19 +02:00 |
|
Saas
|
df28b0d977
|
fix Content Panel navigation bar scroll bar colors
Same concept as in #2581
|
2025-10-13 11:31:53 +02:00 |
|
Wojtek Figat
|
18364d2a8b
|
Merge remote-tracking branch 'origin/1.11'
|
2025-10-12 21:50:19 +02:00 |
|
Wojtek Figat
|
20f576783b
|
Merge branch 'IndustryStandardSettingsShortcut' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-IndustryStandardSettingsShortcut
|
2025-10-10 08:31:32 +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
|
da5c8555e5
|
add myself to list of Flax authors lol
Mafi said I should do this :)
|
2025-10-03 21:16:28 +02:00 |
|
Saas
|
c4c7ee941f
|
add industry standard shortcut for editor settings
|
2025-10-03 14:46:43 +02:00 |
|
Wojtek Figat
|
93219793d5
|
Merge remote-tracking branch 'origin/master' into 1.11
|
2025-09-30 18:26:14 +02:00 |
|
Wojtek Figat
|
537d8b57ca
|
Revert "Merge branch 'NoClearSearchboxesWhenStuffHappens' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-NoClearSearchboxesWhenStuffHappens"
This reverts commit 1186833b2d, reversing
changes made to bb180b0f59.
#3687 #3701
|
2025-09-26 22:25:49 +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
|
a86661a855
|
Merge branch 'commandSuggestionImprovements' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-commandSuggestionImprovements
|
2025-09-22 18:06:55 +02:00 |
|
Saas
|
7183a3306e
|
fix typo
|
2025-09-19 16:57:50 +02:00 |
|
Saas
|
fd191f7ffb
|
don't clear content panel folder- and scene tree search box on script reload and enter/ exit play
|
2025-09-18 23:24:10 +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 |
|
|
|
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
|
3b19e1b40c
|
Fix collision data memory preview text
|
2025-09-04 21:47:51 +02: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
|
d47ac95681
|
Modernize the code to use unified scene access #3513
|
2025-08-28 23:48:25 +02:00 |
|
