Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
379 Commits 9 Branches 0 Tags
e80adf33d9fbab57d61654ddec61eb199048fb53
Commit Graph

93 Commits

Author SHA1 Message Date
GRAFF 0076654b59 всякая байда и мопы с моей ветки 2022-04-07 13:54:21 +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
GRAFF eff3c9be30 дохуища всякого, планшет рабочий 2022-04-06 19:58:02 +05:00
PC-G06 77d8c32a49 GP4_Full(*) 2022-04-06 18:53:59 +05:00
PC-G04 09776cfd50 MOPs_sign_exit 2022-04-04 17:48:22 +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
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-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 1afb869cf8 S02_Door 2022-03-29 15:14:03 +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
GRAFF eda7455bb0 всё почти рабочее 2022-03-26 06:06:50 +05:00
JohnnyHatchet 7094ded109 GP1-2 Genplsan + GP04S03 Caps + Windows interior 2022-03-26 05:16:42 +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
PC-G06 2ac6068a32 Plintus 2022-03-25 18:55:37 +05:00
PC-G06 ef84401b8a 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-25 15:45:01 +05:00
PC-G06 a6cd5d2ae3 S02A00_Test 2022-03-25 15:44:15 +05:00
PC-G04 ad39f710e1 S03F01 2022-03-25 15:05:50 +05:00
PC-G06 eb523108a8 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-03-24 15:20:27 +05:00
PC-G06 a166a5041e S03A01 2022-03-24 15:20:22 +05:00
GRAFF c8933ec319 merge DEV to master 2022-03-24 13:30:34 +05:00
JohnnyHatchet d769377519 Nightlight 2022-03-24 13:02:12 +05:00
PC-G11 7adf219fa3 Cats 2022-03-24 10:57:10 +05:00
PC-G04 47a3cd55b4 S03A02, Posters_kid_and_plants 2022-03-23 22:25:43 +05:00
PC-G06 ee7f953982 S03_Mesh 2022-03-23 20:52:42 +05:00
PC-G08 fae8b815b5 S03A00 2022-03-23 11:51:22 +05:00
PC-G04 3f6b845026 S03A02, S05A09 2022-03-22 21:53:18 +05:00
PC-G06 cef555c90e S03_A01_Mat 2022-03-22 20:19:05 +05:00
PC-G06 ab6eb61ff8 S03_Test 2022-03-22 16:22:08 +05:00
JohnnyHatchet 634ad689b5 Фонтан + беседка двор гп4 2022-03-22 01:21:03 +05:00
PC-G06 8f7d0e7a8f Gp4S3 2022-03-21 20:33:00 +05:00
PC-G03 36ead82def S01A03-S01A06-S01A08-S01A11-S05A06-S05A07-S05A08 2022-03-21 20:17:01 +05:00
JohnnyHatchet 6afab6906e Материал на крышу + пристрои 2022-03-20 06:34:27 +05:00
JohnnyHatchet 86b2eac701 New facades S01 S05 2022-03-20 02:06:05 +05:00