 Andrew
|
9d0a428317
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Fortis
# Conflicts:
# Content/Blueprints/Managers/BP_Controller.uasset
# Content/Freestyle/Maps/FreestyleMainScene.umap
# Content/Freestyle/Maps/Freestyle_Developer.umap
# Content/Freestyle/Meshes/MainBuilding/S01/Fixed/SM_Fasad_S01_base.uasset
# Content/Freestyle/Meshes/MainBuilding/S02/SM_Fasad_S02_base.uasset
# Content/Freestyle/Meshes/MainBuilding/S03/SM_Fasad_S03_base.uasset
# Content/Freestyle/Meshes/MainBuilding/S04/SM_Fasad_S04_base.uasset
# Content/Freestyle/Meshes/MainBuilding/S05/SM_Fasad_S05_base.uasset
# Content/Otrada/Maps/Otrada_MainScene.umap
# Content/Taktika/Assets/Exterior/MAF/21_SwingRainbow/SM_MAF_SwingRainbow.uasset
# Content/Taktika/Maps/TKT_MainScene.umap
# Content/Taktika/Maps/TKT_OutsideBuildings.umap
# Content/Tradicio/Maps/Tradicio_MainBuiding.umap
# Content/Tradicio/Maps/Tradicio_MainScene.umap
|
2022-09-06 19:17:39 +05:00 |
|
EgorSuv