Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
377 Commits 9 Branches 0 Tags
46563bbf4e220f261aa7fca9746df7ea77f1df3d
Commit Graph

205 Commits

Author SHA1 Message Date
GRAFF 46563bbf4e Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Main_Building.umap
 2022-04-07 10:51:02 +05:00
GRAFF e354f1787d баба с коляской, паркинг, лифт, и всякое 2022-04-07 10:48:34 +05:00
JohnnyHatchet e67d025a3c GP4 Entrence 2022-04-07 06:56:30 +05:00
JohnnyHatchet 2acdf09d6f Fasad huesad fix zfight 2022-04-07 05:29:49 +05:00
JohnnyHatchet f59d4e1524 Genplan GP4 assholes fix 2022-04-07 05:23:43 +05:00
JohnnyHatchet 7d39ed49f8 Хотел фасады трахнуть? Они сами тебя трахнут, ублюдок мать твою а ну иди сюда.... 2022-04-07 04:39:32 +05:00
JohnnyHatchet 1337d9cbd0 ФАСАДЫ 2022-04-07 03:50:51 +05:00
JohnnyHatchet 66e1be99a9 GP4 Buildings 2022-04-07 02:50:26 +05:00
JohnnyHatchet 56c05537f0 parking gates + main buildings eblya 2022-04-07 00:22:02 +05:00
GRAFF 0f4ebf3a47 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A01_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/S01A04_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/S01A05.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A07.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F01.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F02.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F03-10.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F11.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F12.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02F01.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A03.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A08.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A09.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F01.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04F03-etc.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A06.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05F02.umap
#	Content/Maps/Underground_parking_GP4.umap
#	Content/Meshes/Interiors/GP4S4/Unique/SM_dom_4_F01.uasset
#	Content/Meshes/Interiors/SM_Parking_Underground_fix.uasset
 2022-04-06 20:01:28 +05:00
GRAFF eff3c9be30 дохуища всякого, планшет рабочий 2022-04-06 19:58:02 +05:00
PC-G06 77d8c32a49 GP4_Full(*) 2022-04-06 18:53:59 +05:00
PC-G06 73f0681bd4 S04A08 2022-04-06 17:38:32 +05:00
PC-G06 1c15e83b0e S02_Window 2022-04-06 17:00:25 +05:00
DESKTOP-8J0BKKD\Admin 8fd8870ed6 S04 Window 2022-04-06 15:51:50 +05:00
PC-G10 53b49e3bfe Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-04-06 15:28:09 +05:00
PC-G10 c2409ac05a Dom 3 pravki 2022-04-06 15:27:43 +05:00
JohnnyHatchet fe72e630dd фикс въезда на парковку 2022-04-06 14:57:27 +05:00
PC-G06 ce60080037 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-04-06 13:20:05 +05:00
PC-G06 db945d397f S02_Window 2022-04-06 13:20:01 +05:00
Igor a96a2651cd dom5_correct 2022-04-05 19:56:37 +05:00
PC-G04 cf8fa73343 MOPs 2022-04-05 19:24:45 +05:00
JohnnyHatchet f5a6cf5224 Elevators + parking FIX 2022-04-05 17:34:11 +05:00
JohnnyHatchet 285a163ca8 Лифты 2022-04-05 10:17:26 +05:00
JohnnyHatchet 7288ff3275 Parking + Elevators 2022-04-05 06:05:11 +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
JohnnyHatchet fe6072d105 Parking 2022-03-31 19:27:11 +05:00
PC-G04 be1f1351e2 S01F01 2022-03-31 19:14:12 +05:00
PC-G08 ba353f4d83 S02_MOPs 2022-03-31 17:08:03 +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-G08 fead8e8ad3 S03_MOPs 2022-03-30 18:05:58 +05:00
PC-G06 78bbbfe386 S02_Furniture 2022-03-30 15:47:11 +05:00
PC-G04 2bc99e62ad S03F01, S04F01 2022-03-29 20:28:42 +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-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 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-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
PC-G06 bccc51309b S02_Plintus_Mat 2022-03-29 14:44:58 +05:00
Igor f78937daf0 S02_Full 2022-03-29 14:41:41 +05:00
PC-G04 87e34237d5 S04F01 2022-03-29 13:37:54 +05:00