|
|
f99a244b8e
|
Merge remote-tracking branch 'origin/master' into sdl_platform
# Conflicts:
# Source/Editor/Windows/GameWindow.cs
|
2025-10-18 02:19:30 +03: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 |
|
Wojtek Figat
|
c635d93b3c
|
Fix more errors in Visject context menu regressions
|
2025-10-15 14:44:58 +02:00 |
|
Wojtek Figat
|
09fa3ce4be
|
Minor changes
|
2025-10-14 15:07:40 +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 |
|
Wojtek Figat
|
efa963be68
|
Fix editor error when prefab asset is unloaded
|
2025-10-13 21:45:31 +02:00 |
|
Wojtek Figat
|
2d5fdfef2f
|
Merge branch 'ColorValueBoxDisplayAlpha' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ColorValueBoxDisplayAlpha
|
2025-10-13 20:51:13 +02:00 |
|
Wojtek Figat
|
a2ee2ec6ac
|
Merge branch 'NicerOldNewEditorWarnings' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-NicerOldNewEditorWarnings
|
2025-10-13 20:50:13 +02:00 |
|
Wojtek Figat
|
18364d2a8b
|
Merge remote-tracking branch 'origin/1.11'
|
2025-10-12 21:50:19 +02:00 |
|
Saas
|
5a9eedfadb
|
make old/ new editor dialog boxes nicer to read
|
2025-10-12 20:14:43 +02:00 |
|
Saas
|
be7871c292
|
use Render2D based solution rather than shader for alpha grid
https://github.com/FlaxEngine/FlaxEngine/pull/3281#issuecomment-3218049398
|
2025-10-12 16:50:31 +02:00 |
|
Wojtek Figat
|
d426c5b0d9
|
Merge remote-tracking branch 'origin/master' into 1.11
# Conflicts:
# Source/Engine/Physics/Colliders/Collider.h
|
2025-10-11 00:16:10 +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
|
361fc3ecfb
|
Add stencil buffer usage with object layer information
#3080 #967
|
2025-10-07 18:07:23 +02:00 |
|
Saas
|
e9f83f77bb
|
fix "Straighten Connections" to actually straighten all connections
|
2025-10-04 14:03:02 +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
|
a2170ffd8a
|
Merge branch 'StrokeMyEgo' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-StrokeMyEgo
|
2025-10-03 22:22:07 +02:00 |
|
Wojtek Figat
|
4f1f77fb32
|
Simplify code of EditorViewport to access editor instance
|
2025-10-03 22:21:11 +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
|
60c19303f6
|
Fix duplicating splines with parents
#3531
|
2025-10-02 23:31:03 +02:00 |
|
Wojtek Figat
|
028b5fedec
|
Use right-click only on GPUTextureEditor context menu
|
2025-09-30 23:37:15 +02:00 |
|
Wojtek Figat
|
9cc2c1da40
|
Fix terrain exporting to properly calculate size and sample positions
#3534
|
2025-09-30 22:58:08 +02:00 |
|
Wojtek Figat
|
93219793d5
|
Merge remote-tracking branch 'origin/master' into 1.11
|
2025-09-30 18:26:14 +02:00 |
|
Wojtek Figat
|
7c87ade12b
|
Merge branch 'visjectPanOnNode' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-visjectPanOnNode
|
2025-09-30 15:51:17 +02:00 |
|
Wojtek Figat
|
2a5898c1de
|
Fix regression from #3342 to use existing time as unscaled to match previous content
|
2025-09-30 15:45:24 +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
|
7060cb5696
|
Fix UI Brush editing in prefab regression from a471861e92
#3694
|
2025-09-23 17:20:18 +02:00 |
|
Wojtek Figat
|
284aeca51a
|
Merge branch 'audio-events' of https://github.com/Tryibion/FlaxEngine into Tryibion-audio-events
|
2025-09-23 17:07:18 +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
|
d1a99c9396
|
Merge branch 'moveVisjectConnection' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-moveVisjectConnection
# Conflicts:
# Source/Editor/Surface/VisjectSurface.cs
|
2025-09-22 22:30:26 +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 |
|
Wojtek Figat
|
a86661a855
|
Merge branch 'commandSuggestionImprovements' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-commandSuggestionImprovements
|
2025-09-22 18:06:55 +02:00 |
|
Wojtek Figat
|
e9a7b1c8eb
|
Fix using enums as Scene Animation Event parameters
#3554
|
2025-09-22 10:22:32 +02:00 |
|
Wojtek Figat
|
1186833b2d
|
Merge branch 'NoClearSearchboxesWhenStuffHappens' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-NoClearSearchboxesWhenStuffHappens
|
2025-09-21 21:06:16 +02:00 |
|
Wojtek Figat
|
62fd8ac967
|
Merge branch 'fix-dup&remove' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-dup&remove
|
2025-09-21 21:02:17 +02:00 |
|
Wojtek Figat
|
87e2b76ffa
|
Merge branch 'LessCreateScriptItems' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-LessCreateScriptItems
|
2025-09-21 21:01:33 +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 |
|
Saas
|
2604d58687
|
no more Linq
|
2025-09-18 17:37:04 +02:00 |
|
Chandler Cox
|
01d1d634c2
|
Fix other missing duplicate.
|
2025-09-16 17:43:55 -05:00 |
|
Chandler Cox
|
c7e403661d
|
Dont allow remove and duplicate options for non-resizing collections.
|
2025-09-16 17:42:24 -05:00 |
|
Saas
|
1196db6d17
|
check if control is control meant for gui editor use
|
2025-09-16 22:54:57 +02:00 |
|
Saas
|
553a007508
|
Revert "hide TrackLabel control in editor"
This reverts commit 364a523375.
|
2025-09-16 22:14:22 +02:00 |
|
Saas
|
de2ee36529
|
fix naming lol
|
2025-09-16 22:07:42 +02:00 |
|
Saas
|
eea44ac897
|
remove search query highlights showing on create new script item
|
2025-09-16 22:06:49 +02:00 |
|
Saas
|
c124713e99
|
remove create new script items when searchbox is cleared
|
2025-09-16 22:05:28 +02:00 |
|
Saas
|
364a523375
|
hide TrackLabel control in editor
|
2025-09-16 22:04:24 +02:00 |
|