Merge branch 'Music-integration' into dev

Browse Source

# Conflicts:
#	Content/Levels/Build.umap

...

This commit is contained in:

Philip W 2023-05-14 21:14:10 +01:00

parent 027a48bbec 7fefd2cec4

commit ac0752154d

5 changed files with 12 additions and 6 deletions

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

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

BIN

Content/Assets/Objects/Stalegtite/Stalegtite.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Levels/Build.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/Music/Ambiance.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Music/Ambiance_Cue.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Music/Wind_and_Rope_Cue.uasset (Stored with Git LFS)

Binary file not shown.