Merge remote-tracking branch 'origin/master' into 1.12

Browse Source

# Conflicts:
#	Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
#	Source/Editor/GUI/Dialogs/ColorSelector.cs

...

This commit is contained in:

Wojciech Figat

2026-03-24 23:41:58 +01:00

parent ce5dd6bc16 e8134803c4

commit f3c957481c

36 changed files with 725 additions and 431 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Content/Editor/HSWheel.flax

LFS

BIN

Binary file not shown.