Andron666
fda80f0b65
# Conflicts: # Config/DefaultEngine.ini # Config/DefaultGame.ini # Content/Blueprints/Lamp/BP_InteriorLamp_CylLamp.uasset # Content/Blueprints/Lamp/BP_streetLamp.uasset # Content/Blueprints/Lamp/BP_streetLamp_Child_6m.uasset # Content/Blueprints/Player/GI.uasset # Content/Blueprints/Player/MathAndConvertFns.uasset # Content/Blueprints/Player/MyPawn.uasset # Content/Blueprints/Player/WalkingPawn.uasset # Content/Blueprints/Player/myGM.uasset # Content/Blueprints/UI/Actors/InfraPoint.uasset # Content/Blueprints/UI/Actors/KPmaker.uasset # Content/Blueprints/UI/Others/FlatData.uasset # Content/Blueprints/UI/Others/clientData.uasset # Content/Blueprints/UI/WBPS/Elements/MenuBtn.uasset # Content/Blueprints/UI/WBPS/KPWidget.uasset # Content/Blueprints/UI/WBPS/Menu/InfoPanel.uasset # Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset # Content/Blueprints/UI/WBPS/Menu/bottomMenu.uasset # Content/Blueprints/UI/WBPS/Menu/flatInfoBig.uasset # Content/Blueprints/UI/WBPS/Menu/floorInfo.uasset # Content/Blueprints/UI/WBPS/Menu/houseInfo.uasset # Content/Blueprints/UI/WBPS/Menu/saveData.uasset # Content/Blueprints/UI/WBPS/Menu/welcomeData.uasset # Content/Blueprints/UI/WBPS/filter/Filter.uasset # Content/Blueprints/UI/WBPS/filter/FlatCard.uasset # Content/Blueprints/UI/WBPS/filter/FlatCardBig.uasset # Content/Blueprints/UI/WBPS/widgetActions.uasset # Content/Maps/Interior/GP2/S02A17.umap # Content/Maps/Interior/GP2/S02F02.umap # Content/Maps/Interior/GP2/S02F03-12.umap # Content/Maps/Interior/GP2/S02F13-16.umap # Content/Maps/Interior/GP2/S02F17-18.umap # Content/Maps/Interior/GP2/S02F19.umap # Content/Maps/Interior/GP2/S02F20.umap # Content/Maps/Interior/L_Test_Room.umap # Content/Maps/Masharov_Buildings.umap # Content/Maps/Masharov_Landscape.umap # Content/Maps/Masharov_Yard.umap # Content/Maps/mainScene.umap # Content/Maps/test1.umap # Content/Materials/Masharov_Interior/Palette/MI_Emissive_2_Mash.uasset # Content/Materials/Masharov_Interior/Palette/MI_Emissive_Mash.uasset # Content/Meshes/Exterior/Main/SM_Masharov_GP3_pos.uasset # Content/Meshes/Interior/Furniture/Kitchen/Modular/SM_Down_Locker_With_Sink.uasset # Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_1.uasset # Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_2.uasset # Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_2_V2.uasset # Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_V2.uasset # Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Torchere_2.uasset # Content/Meshes/Interior/Furniture/Other/SM_Door_Invis.uasset # Masharov.uproject
