Wojtek Figat
|
eab7794e3b
|
Merge remote-tracking branch 'origin/master' into 1.12
# Conflicts:
# Source/Engine/Content/Storage/FlaxStorage.cpp
# global.json
|
2026-03-26 23:44:33 +01:00 |
|
Wojtek Figat
|
c12553812c
|
Update Terrain scripting API
|
2026-03-25 22:31:36 +01:00 |
|
Wojtek Figat
|
8356009526
|
Add button to hide direction gizmo
#3857
|
2026-03-25 17:41:29 +01:00 |
|
Wojtek Figat
|
0cbb2f0525
|
Add smooth viewport orientation movement to Direction Gizmo
#3857
|
2026-03-25 17:39:03 +01:00 |
|
Wojtek Figat
|
9b5dbe858c
|
Merge branch 'direction-gizmo' of https://github.com/Tryibion/FlaxEngine into Tryibion-direction-gizmo
|
2026-03-25 17:24:57 +01:00 |
|
Wojtek Figat
|
f3c957481c
|
Merge remote-tracking branch 'origin/master' into 1.12
# Conflicts:
# Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
# Source/Editor/GUI/Dialogs/ColorSelector.cs
|
2026-03-24 23:41:58 +01:00 |
|
Wojtek Figat
|
f0f1c57ff1
|
Add scrolling scene tree hierarchy to the newly spawned actor after drag and drop
|
2026-03-24 19:43:37 +01:00 |
|
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
|
62e492452d
|
Add UI editor grid toggle
|
2026-03-12 09:26:23 +01:00 |
|
Wojtek Figat
|
2a2f046f30
|
Don't snap vertices in camera projection icon for better quality #3875
|
2026-03-10 21:13:36 +01:00 |
|
Wojtek Figat
|
73b4b0dcee
|
Merge branch 'NewOrthoPerspectiveToggle' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-NewOrthoPerspectiveToggle
|
2026-03-10 20:02:30 +01:00 |
|
Wojtek Figat
|
cc69e5d966
|
Minor fixes
|
2026-02-12 16:22:51 +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 |
|
|
|
0084bc051c
|
Merge branch 'master' into sdl_platform
|
2026-02-10 23:05:19 +02:00 |
|
Wojtek Figat
|
0f383d2fc6
|
Move transform gizmo visibility to the base class
#3692
|
2026-02-03 16:46:46 +01:00 |
|
Wojtek Figat
|
07f21a1520
|
Merge branch 'PressGToGameModeAndPToNavigate' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-PressGToGameModeAndPToNavigate
# Conflicts:
# Source/Engine/Graphics/Enums.h
|
2026-02-03 16:39:57 +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 |
|
Chandler Cox
|
7c44767d4d
|
Fix viewport rubberban selector.
|
2026-01-30 12:07:36 -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
|
b834dddb11
|
**Refactor sRGB import option on textures** to actually handle image contents with gamma
|
2026-01-12 15:50:24 +01:00 |
|
Wojtek Figat
|
27896b6410
|
Add view flag to hide particles drawing
#3840
|
2026-01-11 22:06:30 +01:00 |
|
Saas
|
564c9ff0ca
|
improve orthographic/ perspective viewport cam toggle
|
2025-12-19 19:00:55 +01:00 |
|
Chandler Cox
|
2c5cc7fcc0
|
Fix double drawing.
|
2025-12-16 17:32:35 -06:00 |
|
Chandler Cox
|
d671f57952
|
Change to container control for anchoring.
|
2025-12-15 21:41:45 -06:00 |
|
Chandler Cox
|
56e6df261d
|
Add hovering and selecting.
|
2025-12-15 21:22:11 -06:00 |
|
Chandler Cox
|
88b02105b3
|
Add direction gizmo.
|
2025-12-15 20:36:35 -06:00 |
|
Saas
|
e47fc5a54a
|
Merge branch 'master' into PressGToGameModeAndPToNavigate
|
2025-12-11 21:04:00 +01:00 |
|
Saas
|
26e24769be
|
actually set things to the right thing
How the hell did this happen??
|
2025-12-11 20:44:40 +01:00 |
|
|
|
c61ecc0545
|
Merge branch 'master' into sdl_platform
|
2025-10-30 22:42:29 +02:00 |
|
Chandler Cox
|
c1439c646e
|
Fix default for prefab canvas size index being 0 instead of -1.
|
2025-10-25 11:34:48 -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 |
|
|
|
668a4dbb4d
|
Merge remote-tracking branch 'origin/master' into sdl_platform
|
2025-10-14 01:09:26 +03:00 |
|
Wojtek Figat
|
efa963be68
|
Fix editor error when prefab asset is unloaded
|
2025-10-13 21:45:31 +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 |
|
Wojtek Figat
|
4f1f77fb32
|
Simplify code of EditorViewport to access editor instance
|
2025-10-03 22:21:11 +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
|
2f7e84253a
|
Merge branch 'ViewportIconsMoreCustomization' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ViewportIconsMoreCustomization
|
2025-09-22 18:10:33 +02:00 |
|
Saas
|
13dd80d429
|
add changing and caching Debug ViewMode for Game View
|
2025-09-21 16:57:38 +02:00 |
|
Saas
|
6e9902a966
|
use DefaultGame ViewFlag and some fixes
|
2025-09-21 16:49:07 +02:00 |
|
Saas
|
fd1e0a4e80
|
add game view to "View" menu, add keyboard new keyboard shortcuts to menu and extra options for view flags and view layers
|
2025-09-20 16:12:04 +02:00 |
|
Saas
|
b130b81863
|
add game view and show/ hiding navigation similar to unreal engine
|
2025-09-20 15:08:03 +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 |
|
Wojtek Figat
|
9e1f488f22
|
Fix prefab window to use UI Mode for empty UI Control prefab
#3574
|
2025-09-13 14:41:11 +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
|
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
|
9fafb47abb
|
Fix debug drawing wheeled vehicle in prefab viewport
#3591
|
2025-08-29 21:03:44 +02:00 |
|
