EgorSuv/Fortis
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	Content/Taktika/Assets/Interior/WindowsDoors/SM_ApartDoorR_001.uasset
#	Content/Taktika/Maps/Interior/TKT_S01F05+_Interior.umap
This commit is contained in:
PC-G06
2022-06-01 14:00:21 +05:00
parent 97bf1b0c40 dee2c8a283
commit 3b7c0dddbf
134 changed files with 143 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content/AssetPacks/ModularCity/Material/Glass/Glass_inst.uasset
BIN
View File
Binary file not shown.
Content/AssetPacks/ModularCity/Meshes/Road_Signs/MI_RoadSigns.uasset
BIN
View File
Binary file not shown.
Content/AssetPacks/ModularCity/Meshes/Road_Signs/RoadSigns.uasset
BIN
View File
Binary file not shown.
Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_BusStop_Sign.uasset
BIN
View File
Binary file not shown.
Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_CrossWalk_Sign.uasset
BIN
View File
Binary file not shown.
Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_Parking_Sign.uasset
BIN
View File
Binary file not shown.
Content/AssetPacks/ModularCity/Meshes/Road_Signs/SM_StopProhibited_Sign.uasset
BIN
View File
Binary file not shown.
Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_4_Jction_BP.uasset
BIN
View File
Binary file not shown.
Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_L_Jction_Custom_BP.uasset
BIN
View File
Binary file not shown.
Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_T_Jction_Custom_BP.uasset
BIN
View File
Binary file not shown.
Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_T_Jction_Custom_Without.uasset
BIN
View File
Binary file not shown.
Content/AssetPacks/ProceduralRoadGenerator/Road_12x12_T_Jction_Custom_WithoutSidewalk.uasset
BIN
View File
Binary file not shown.
Content/AssetPacks/ProceduralRoadGenerator/Road_24To12_T_Jction_BP.uasset
BIN
View File
Binary file not shown.
Content/AssetPacks/ProceduralRoadGenerator/Road_24To12_T_Jction_BP_Custom.uasset
BIN
View File
Binary file not shown.
Content/Blueprints/Building/BP_BuildingManager.uasset
BIN
View File
Binary file not shown.
Content/Blueprints/Building/BP_BuildingProcedural.uasset
BIN
View File
Binary file not shown.
Content/Blueprints/DistanceRing/BP_DistanceRing.uasset
BIN
View File
Binary file not shown.
Content/Blueprints/LevelActors/BP_Car_Yacht.uasset
BIN
View File
Binary file not shown.
Content/Blueprints/Managers/BP_Controller.uasset
BIN
View File
Binary file not shown.
Content/Blueprints/Managers/BP_PawnOverview.uasset
BIN
View File
Binary file not shown.
Content/Blueprints/Managers/BP_PawnWalking.uasset
BIN
View File
Binary file not shown.
Content/Blueprints/Managers/Floor/BP_FloorManager.uasset
BIN
View File
Binary file not shown.
Content/Blueprints/Structures/Struct_Building.uasset
BIN
View File
Binary file not shown.
Content/Blueprints/Structures/Struct_LevelsAllRC.uasset
BIN
View File
Binary file not shown.
Content/Core/Data/LevelsRC/DT_LevelsRC.uasset
BIN
View File
Binary file not shown.
Content/Freestyle/Maps/Freestyle_Developer.umap
BIN
View File
Binary file not shown.
Content/Freestyle/Meshes/OSM/Landscape_decal_Masharov.uasset
BIN
View File
Binary file not shown.
Content/Furniture/All/Materials/Inst/PaintedWood/MI_PaintWood_White.uasset
BIN
View File
Binary file not shown.
Content/HUD/Templates/UW_TemplateButton.uasset
BIN
View File
Binary file not shown.
Content/HUD/Widgets/UW_ButtonPoint.uasset
BIN
View File
Binary file not shown.
Content/Maps/L_DeveloperTactics.umap
BIN
View File
Binary file not shown.
Content/Maps/L_Test.umap
BIN
View File
Binary file not shown.
Content/Materials/Masters/Common/MF_Curvature.uasset
BIN
View File
Binary file not shown.
Content/Materials/Masters/Common/MM_Master.uasset
BIN
View File
Binary file not shown.
Content/Materials/Masters/Common/svalka.uasset
BIN
View File
Binary file not shown.
Content/Otrada/Maps/L_Developer_Otrada.umap
BIN
View File
Binary file not shown.
Content/Otrada/Meshes/Otrada/JeKa/Interior/Elevator/SM_ElevatorLarge_Door001.uasset
BIN
View File
Binary file not shown.
Content/Otrada/Meshes/Otrada/JeKa/Interior/Elevator/SM_Elevator_Door01.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1_1.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_1_2.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Facade_2.uasset → Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_2.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_2_1.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Facade_2_2.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1_1.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_1_2.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_2.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_2_1.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/MainBuilding/PROCEDURAL/SM_Exterior_Windows_2_2.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Facade_1.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Windows_1.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/MainBuilding/SM_Exterior_Windows_2.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/OutsideBuildings/ReUsed/SM_ENV_Court.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/house_t100.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/OutsideBuildings/Temp/house_t94.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/Yard_V2/SM_InnerYard_1.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/Yard_V2/SM_OuterYard_Test.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/Yard_V2/SM_TKT_Yard_Inner.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/Yard_V2/SM_Yard_Inner_Roof1.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/Yard_V2/SM_Yard_Inner_Roof2.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Exterior/Yard_V2/SandPit_2.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/Appartments/SM_Stairs_001.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/Custom/SM_Door_AI_SM_Door_AI.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/Custom/SM_Door_AI_SM_Door_Frame.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/Custom/SM_Door_Front_AI_SM_Door_Front_AI.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/Plintus/SM_S02F05A03_Plintis_Test.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/WallsCaps/S01F03_WallsCaps.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/WallsCaps/S01F04_WallsCaps.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/WallsCaps/S01F05_WallsCaps.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/WindowsDoors/SM_BalconDoorL_90_001.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/WindowsDoors/SM_BalconDoorR_80_001.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/WindowsDoors/SM_BalconDoorR_90_001.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/WindowsDoors/SM_DoorMOP_001.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/WindowsDoors/SM_RoomDoorL_001.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/WindowsDoors/SM_RoomDoorR_001.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F01_DoorsEntrance_001.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F01_DoorsEntrance_003.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/Interior/WindowsDoors/SM_S01F01_DoorsEntrance_004.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/MOP/SM_DoorAround.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/MOP/SM_DoorILargeClosed_1-2_001.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/MOP/SM_DoorILargeOpened_001.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/MOP/SM_DoorMOP_001.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/MOP/SM_DoorMOP_002.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/MOP/SM_DoorMOP_005.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_001.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_002.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_004.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/MOP/SM_DoorMOP_Frame_005.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/MOP/SM_ElevatorOutside_002.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/MOP/SM_S01F01_Windows_P1_180_001.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/MOP/SM_S01F01_Windows_P1_80_001.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Assets/MOP/SM_S01F01_Windows_P2_140_001.uasset
BIN
View File
Binary file not shown.
Content/Taktika/BP/BP_Lamp_Hall_TKT.uasset
BIN
View File
Binary file not shown.
Content/Taktika/BP/BP_Lamp_Hall_TKT_2.uasset
BIN
View File
Binary file not shown.
Content/Taktika/BP/BP_Lamp_Hall_TKT_Long.uasset
BIN
View File
Binary file not shown.
Content/Taktika/BP/BP_LightLampMOP.uasset
BIN
View File
Binary file not shown.
Content/Taktika/BP/Light_4Bake_025.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Landscape_Decals/Landscape_decal_TKT.uasset
BIN
View File
Binary file not shown.
Content/Taktika/Maps/Interior/Bakery/TKT_Bakery.umap
BIN
View File
Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More