Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Merge branch 'dev' into Collisions

Browse Source 
# Conflicts:
#	Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_004.uasset
#	Content/Levels/Build.umap
This commit is contained in:
Rowland Rowland 2023-04-27 17:51:21 +01:00
commit c61d8ed9e3
8 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_004.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_005.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_021.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_001.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_020.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Blueprints/Combat_UI/CombatCharacter.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Dialogue/SM_Merchant_Blueprint.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

4
Content/Levels/Build.umap
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:27e816d312fe15c3120d3ba984b37fc00919e51f79387e3e30c320b0ea526c20
size 3469983
oid sha256:a0ed2bd7421a1a47279c538157de1d31a5ba596027e96809f533401451099457
size 3500025