Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1

Browse Source

# Conflicts:
#	Content/Maps/Masharov_Buildings.umap

...

This commit is contained in:

PC-G04

2024-06-27 15:35:54 +05:00

parent 7bec32c5cf 0e4fd390a3

commit d71487240d

6 changed files with 1 additions and 1 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

Content/Blueprints/Player/GI.uasset

BIN

Binary file not shown.

Content/Blueprints/UI/WBPS/Menu/bottomMenu.uasset

BIN

Binary file not shown.

Content/Maps/mainScene.umap

BIN

Binary file not shown.

Content/Meshes/Exterior/Main/New/SM_Roof_GP1.uasset

BIN

Binary file not shown.

Content/Meshes/Yard/M_Yard_Grass_Inst_Facade_hide.uasset

BIN

Binary file not shown.