Commit Graph

499 Commits

Author SHA1 Message Date
Igor a96a2651cd dom5_correct 2022-04-05 19:56:37 +05:00
PC-G12 99cb379c2f cars 2022-04-05 19:24:57 +05:00
PC-G04 cf8fa73343 MOPs 2022-04-05 19:24:45 +05:00
PC-G12 7516e9ff3c Cameraz_Cars 2022-04-05 18:30:06 +05:00
JohnnyHatchet f5a6cf5224 Elevators + parking FIX 2022-04-05 17:34:11 +05:00
PC-G12 80fc7c6baa Cameraz 2022-04-05 15:12:47 +05:00
Igor 73bb386f2a dom5_lvl_2_6_8_9_correct 2022-04-05 13:17:22 +05:00
JohnnyHatchet 285a163ca8 Лифты 2022-04-05 10:17:26 +05:00
JohnnyHatchet 7288ff3275 Parking + Elevators 2022-04-05 06:05:11 +05:00
Igor c87ad86be4 Dom5_correct 2022-04-04 19:53:39 +05:00
PC-G04 09776cfd50 MOPs_sign_exit 2022-04-04 17:48:22 +05:00
PC-G04 2624748cc9 InfoSheet_NumberFloor 2022-04-01 21:11:25 +05:00
JohnnyHatchet 1bbe6c3ddb Parking 2022-04-01 21:03:45 +05:00
PC-G04 3dcfc6758d S01F01,S03F01,S04F01,S05F01_and_Halls(ass) 2022-04-01 20:10:01 +05:00
PC-G12 4835890cc6 Curtains 2022-04-01 12:37:20 +05:00
JohnnyHatchet fe6072d105 Parking 2022-03-31 19:27:11 +05:00
PC-G04 be1f1351e2 S01F01 2022-03-31 19:14:12 +05:00
Igor 300da1bd57 dom_2_lvl_0_6_7_8_13 2022-03-31 18:30:44 +05:00
PC-G10 bf16e5f3c0 S02A02 2022-03-31 18:07:29 +05:00
PC-G08 ba353f4d83 S02_MOPs 2022-03-31 17:08:03 +05:00
PC-G03 b554e855f7 Dom2 (A03, A05, A10, A12) 2022-03-31 15:50:46 +05:00
PC-G12 dfae895338 01040911 2022-03-31 15:02:13 +05:00
PC-G12 1acca649e9 S02_04_11 2022-03-31 14:42:39 +05:00
PC-G03 c1ea29b629 Dom 2 (A03, A05, A10, A12) 2022-03-31 13:13:11 +05:00
GRAFF 2e6a34a767 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-03-31 12:19:44 +05:00
PC-G04 4feeadd394 MOP_S2,3,4 2022-03-30 21:30:30 +05:00
PC-G12 2bc5f0fdae s02A04 2022-03-30 20:02:50 +05:00
PC-G12 7673c159dd Probes_S04_03040708. LvS02_010409 2022-03-30 18:46:12 +05:00
Igor 47c7ee1d3b dom2_lvl_0_7_8 2022-03-30 18:36:15 +05:00
PC-G08 fead8e8ad3 S03_MOPs 2022-03-30 18:05:58 +05:00
PC-G12 a7dcb2b041 S02_1_4_9 2022-03-30 15:52:12 +05:00
PC-G06 78bbbfe386 S02_Furniture 2022-03-30 15:47:11 +05:00
PC-G03 c2b132c64b S02(A05, A12) 2022-03-30 13:17:48 +05:00
PC-G04 2bc99e62ad S03F01, S04F01 2022-03-29 20:28:42 +05:00
PC-G12 f7d3b2193e s05a01 2022-03-29 19:59:05 +05:00
Igor 665f5f937e dom2_lvl0 2022-03-29 19:59:07 +05:00
PC-G12 79b6f36610 S04A08 2022-03-29 18:52:08 +05:00
Igor 1803843823 dom2_lvl_0_1_2_3_4 2022-03-29 18:26:48 +05:00
PC-G03 1fbc3b686e S02 - (A05, A06, A12, A13) 2022-03-29 18:25:18 +05:00
PC-G12 b7d98c641e 7-11_Storki 2022-03-29 18:21:53 +05:00
PC-G06 918d020903 S02_Mesh 2022-03-29 18:20:50 +05:00
JohnnyHatchet 998691fb84 Parking props 2022-03-29 17:42:51 +05:00
PC-G12 19dd64e6da 7-11DoorsPlus 2022-03-29 16:55:40 +05:00
PC-G12 62ba6f9bb5 7-11PlintuthPlus 2022-03-29 16:37:45 +05:00
GRAFF a2118c8c42 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Blueprints/Player/GI.uasset
#	Content/Blueprints/Player/MathAndConvertFns.uasset
#	Content/Blueprints/Player/MyPC.uasset
#	Content/Blueprints/Player/MyPawn.uasset
#	Content/Blueprints/Player/VR/Materials/InteraktivnyaBlyamda/Blyamda_LP_M_Blyamda_OcclusionRoughnessMetallic.uasset
#	Content/Blueprints/Player/VR/Materials/fantomMap/M_FantomBuildings.uasset
#	Content/Blueprints/Player/VR/Materials/fantomMap/M_FantomBuildings_Brick.uasset
#	Content/Blueprints/Player/VR/Materials/fantomMap/M_FantomBuildings_rub.uasset
#	Content/Blueprints/Player/VR/VRHand.uasset
#	Content/Blueprints/Player/VR/VRPawn.uasset
#	Content/Blueprints/Player/VR/fantomMap1.uasset
#	Content/Blueprints/Player/WalkingPawn.uasset
#	Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset
#	Content/Blueprints/UI/WBPS/Menu/menuSecondLine.uasset
#	Content/Blueprints/UI/WBPS/VR/menuVR.uasset
#	Content/Maps/Interiors/GP4S2/Unique/S02A00.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A01.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A02.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A03.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A04.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A05.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A06.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A08.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A09.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F02.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F16-etc.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A00.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A03.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A04.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A07.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04F01.umap
#	Content/Maps/MainScene.umap
#	Content/Maps/bake/H3.umap
#	Content/Maps/mainsceneStuff.umap
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_0.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_1.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_10.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_11.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_12.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_13.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_2.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_3.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_4.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_5.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_6.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_7.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_8.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_9.uasset
#	Content/Meshes/Interiors/GP4S4/Unique/SM_dom_4_F01.uasset
#	Content/Textures/Interior/T_Fabric_Chicago_D.uasset
#	plugins/UnrealCLR/Runtime/Win64/shared/Microsoft.NETCore.App/5.0.9/System.Private.CoreLib.dll
2022-03-29 16:36:11 +05:00
GRAFF 77d3d3e649 подкрутил карту, панорама 2022-03-29 16:29:55 +05:00
PC-G03 b6471cba4c Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-29 15:42:22 +05:00
PC-G03 1855ff8c5d S04A03, S04A04 2022-03-29 15:30:07 +05:00
PC-G06 1afb869cf8 S02_Door 2022-03-29 15:14:03 +05:00
PC-G06 3671e88edb Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-29 14:45:05 +05:00