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

Browse Source

# 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

...

This commit is contained in:

Wojciech Figat

2026-03-13 08:09:16 +01:00

parent 3cfa110a48 b41d25cbce

commit 45a8d82a83

152 changed files with 3784 additions and 434 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/Fonts/Inconsolata-Regular.flax

LFS

BIN

Binary file not shown.

Content/Editor/Fonts/NotoSansSC-Regular.flax

LFS

BIN

Binary file not shown.

Content/Editor/Fonts/Roboto-Regular.flax

LFS

BIN

Binary file not shown.

Content/Editor/Fonts/SegMDL2.flax

LFS

BIN

Binary file not shown.

Content/Editor/Fonts/Segoe Media Center Regular.flax

LFS

BIN

Binary file not shown.

Content/Shaders/GlobalSignDistanceField.flax

LFS

BIN

Binary file not shown.