Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,061 Commits 9 Branches 0 Tags
master
Commit Graph

85 Commits

Author SHA1 Message Date
PC-G13 f639258785 vsyakoe 2025-12-24 12:50:48 +05:00
PC-G13 541d99f899 mda 2025-09-19 16:26:47 +05:00
PC-G13 b8335383cf Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Materials/MFunctions/MF_BaseUV.uasset
#	Content/Textures/Dummy/T_Dummy_NAC.uasset
 2025-09-16 12:36:06 +05:00
PC-G13 ee8b6d9d0f masters, facades 2025-09-16 12:33:52 +05:00
Maria_B af1aeb5885 maf 2025-09-15 18:13:42 +05:00
NikitsSysun b2ed4625a5 Надеюсь не обосрался NEWGP 2024-07-07 00:23:35 +05:00
PC-G13 58bab16e45 gp7 tumendinamics 2024-04-26 13:58:02 +05:00
PC-G13 78a6f972ac facades, gp11_12, oms mats, s01, s02, s04 flats partially rebaked, 2023-12-08 19:02:56 +05:00
PC-G13 810b57858b gp, mats, osm mat migrate, 2023-12-07 18:29:29 +05:00
Dron b38a0eaa53 ds 2023-12-04 15:22:56 +05:00
JohnnyHatchet 4c8a38f441 KUDA J TI V LANSCAPE TO NU 2023-12-04 07:49:10 +05:00
JohnnyHatchet 200382f6d5 Up 2023-12-03 09:28:11 +05:00
PC-G08 f382527376 genplanGP7_8 2023-12-01 18:36:37 +05:00
JohnnyHatchet b482280c17 Up 2023-12-01 09:56:55 +05:00
JohnnyHatchet 28d1143291 Fix + Merge 
Replace BP Foliage to SM, Merge from LR, Nanite
 2023-12-01 07:05:37 +05:00
PC-G08 53491c647b yardGP0708 2023-11-29 18:27:02 +05:00
PC-G13 c77e9070c4 я маслину поймал 2023-11-27 14:33:33 +05:00
PRAyMU 5f71a3f73a M_Test_Room_P2 2023-11-15 01:04:34 +05:00
PRAyMU f4db56a7f6 M_Test_Room_P1 2023-11-09 23:36:09 +05:00
PRAyMU aac277d206 Base material minimal style 2023-11-08 20:33:08 +05:00
PRAyMU cd7c0e5e97 MM_Master + Tile Green 2023-11-08 20:27:17 +05:00
JohnnyHatchet 1ea1e16067 Парк между ГП4 и ГП5 2022-07-07 07:24:56 +05:00
JohnnyHatchet 2859c439ee Dopil 3 2022-07-01 22:36:58 +05:00
JohnnyHatchet c07b396516 Dopil2 2022-06-30 20:09:10 +05:00
JohnnyHatchet f449f948b5 dopil 2022-06-28 20:53:25 +05:00
JohnnyHatchet 3ea8fa92d7 Stone border Yard 2022-05-06 18:04:28 +05:00
GRAFF 2cdf663d96 ух ебать ну вроде сделал 2022-04-11 05:51:22 +05:00
GRAFF 79caaf2b19 ооой мляяяя 2022-04-08 11:21:22 +05:00
GRAFF ef8f9707fa Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-04-07 20:01:34 +05:00
GRAFF 94187c56e2 MOOOOREEE 2022-04-07 19:30:54 +05:00
PC-G06 8c7f900bae GP4_correction 2022-04-07 18:12:01 +05:00
GRAFF e354f1787d баба с коляской, паркинг, лифт, и всякое 2022-04-07 10:48:34 +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
PC-G04 09776cfd50 MOPs_sign_exit 2022-04-04 17:48:22 +05:00
PC-G04 3dcfc6758d S01F01,S03F01,S04F01,S05F01_and_Halls(ass) 2022-04-01 20:10:01 +05:00
PC-G04 be1f1351e2 S01F01 2022-03-31 19:14:12 +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-G08 fead8e8ad3 S03_MOPs 2022-03-30 18:05:58 +05:00
PC-G06 918d020903 S02_Mesh 2022-03-29 18:20:50 +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 bccc51309b S02_Plintus_Mat 2022-03-29 14:44:58 +05:00
PC-G06 18f6f58f98 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_flat_0.uasset
 2022-03-28 18:09:10 +05:00
PC-G06 7e7af7f1d9 S02_Material_Part_1 2022-03-28 18:07:00 +05:00
GRAFF d9c1a28027 дохера всего, апдейты из моей ветки 2022-03-28 16:52:04 +05:00
GRAFF aefc87b39a ухх блять ну вроде пашет 2022-03-28 15:12:26 +05:00
GRAFF b6cba38361 я щас сдохну уже 2022-03-26 11:25:10 +05:00
GRAFF a3e3a2a0bd Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Maps/Main_Building.umap
 2022-03-26 06:11:54 +05:00
PC-G04 bf1d4ccbdf MOPs 3S 2022-03-26 03:51:22 +05:00
PC-G04 224c2523e7 Dom3F02, Dom3F01 2022-03-25 20:00:35 +05:00