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

Browse Source

# Conflicts:
#	Source/Editor/Scripting/CodeEditors/VisualStudioCodeEditor.cpp
#	Source/Tools/Flax.Build/Deps/Dependencies/OpenAL.cs

...

This commit is contained in:

Wojtek Figat

2023-04-22 18:59:41 +02:00

parent 644eb35b97 73ff053470

commit 390460907d

51 changed files with 1397 additions and 673 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

Source/Platforms/Windows/Binaries/ThirdParty/x64/OpenAL32.dll (Stored with Git LFS) vendored

Binary file not shown.

BIN

Source/Platforms/Windows/Binaries/ThirdParty/x64/OpenAL32.lib (Stored with Git LFS) vendored

Binary file not shown.