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

Merge remote-tracking branch 'origin/Set-Dressing' into dev

Browse Source 
# Conflicts:
#	Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset
#	Content/Levels/Build.umap
This commit is contained in:
MARCEL HARA 2023-05-11 14:19:49 +01:00
commit 62f8aac468
2 changed files with 4 additions and 4 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_Cylinder_004.uasset (Stored with Git LFS)
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:fa241e4a36861c0bf26afb3a46c865bdba22b97be70da7088f61acab0cdcd9fe
size 3408759
oid sha256:64ababceb4703d8b7bd4d3bdcca435b412fd8c95851ec9fde192c2f28759bdc2
size 3469768