Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev

Browse Source

# Conflicts:
#	Content/Levels/Build.umap

...

This commit is contained in:

Phoebe Harris-Wilson 2023-05-04 17:48:46 +01:00

parent 4c68c5e7ee c542a23f0e

commit 8a7dc816ca

15 changed files with 45 additions and 0 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/Characters/Boss/Boss.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Characters/Boss/BossCharacter_low_BossCharacterBack_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Characters/Boss/BossCharacter_low_BossCharacterBody_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Characters/Boss/BossCharacter_low_BossCharacterHead_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Characters/Boss/BossCharacter_low_BossCharacterMat_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Characters/Boss/BossCharacter_low_BossCharacterMat_Emissive.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Characters/Boss/BossCharacter_low_BossCharacterMat_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Characters/Boss/BossCharacter_low_BossCharacterMat_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Characters/Boss/M_Boss.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/General_Dressing/M_Statue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/General_Dressing/Statue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/General_Dressing/Statue_low.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/General_Dressing/Statue_low_StatueMat_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/General_Dressing/Statue_low_StatueMat_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/General_Dressing/Statue_low_StatueMat_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.