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

Browse Source

# Conflicts:
#	Flax.flaxproj

...

This commit is contained in:

Wojtek Figat

2024-03-19 20:23:34 +01:00

parent 83e8f8cb94 292694d89c

commit 6b35c0a161

82 changed files with 2434 additions and 1379 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

BIN

Content/Shaders/DebugDraw.flax (Stored with Git LFS)

Binary file not shown.