Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
412 Commits 9 Branches 0 Tags
02f4e38707a6ab20b01421fa3e2f68a4adabb87c
Commit Graph

56 Commits

Author SHA1 Message Date
GRAFF dfa1fabe13 OVER 9000 CHANGES 2022-04-08 16:08:23 +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
GRAFF 084c869638 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-03-25 19:44:03 +05:00
PC-G06 2ac6068a32 Plintus 2022-03-25 18:55:37 +05:00
PC-G06 a6cd5d2ae3 S02A00_Test 2022-03-25 15:44:15 +05:00
GRAFF 267eeaaa1e Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Yard_GP4.umap
 2022-03-25 14:37:25 +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
GRAFF df24de7f10 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Config/DefaultEngine.ini
#	Content/Maps/Interiors/GP4S1/Unique/S01A08.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A05.umap
#	Content/Maps/NightlightAim.umap
#	Content/Maps/Yard_GP4.umap
#	Content/Materials/FakeInteriors/MI_CubeRoom_1.uasset
#	Content/Materials/FakeInteriors/MI_CubeRoom_2.uasset
#	Content/Materials/FakeInteriors/MI_CubeRoom_3.uasset
#	Content/Materials/FakeInteriors/MI_CubeRoom_6.uasset
#	Content/Materials/FakeInteriors/MI_FakeEmpty.uasset
#	Content/Meshes/Furniture/Custom/SM_CylLamp_AI.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_AI_SM_Door_AI.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_AI_SM_Door_Frame.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_Front_AI_SM_Door_Front_AI.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_Front_Frame_AI.uasset
 2022-03-24 13:14:31 +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
GRAFF 905abc65ff ААААААААААААААААААААААААААА БЛЕЯТЬААААААА 2022-03-23 01:34:38 +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
GRAFF b40f1d7ef8 ХУУУУУУУУУУУУУУУУЙ 2022-03-22 09:13:08 +05:00
GRAFF 8ad3f1e65a sdfnslfg 2022-03-22 08:48:05 +05:00
GRAFF 4bc67d6a74 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/S01A00.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A01.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A02.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A03.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A04.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A05.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A06.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A07.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A08.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A09.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A10.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A11.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A01.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A02.umap
 2022-03-21 23:18:22 +05:00
GRAFF d0374d966f всякая штука 2022-03-21 23:15:47 +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
GRAFF f4550ff35d 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/dom_1_flat_0.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_1.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_10.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_2.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_3.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_4.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_4_BuiltData.uasset
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_5.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_6.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_7.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_8.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_9.umap
#	Content/Maps/L_Lighting.umap
#	Content/Maps/MainSceneMigrate.umap
#	Content/Maps/Main_Building.umap
#	Content/Materials/Instances/M_Greeds_Inst.uasset
#	Content/Materials/Instances/M_Plastic_RAL_6005.uasset
#	Content/Materials/Instances/M_Plastic_RAL_7026.uasset
#	Content/Materials/Instances/M_Plastic_RAL_716.uasset
#	Content/Materials/Instances/t_conditioner_grid_Opacity.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_1.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_2.uasset
#	Content/Meshes/Furniture/Custom/SM_Celling_Lamp_3.uasset
#	Content/Meshes/test_import_SM_HouseTerritory.uasset
#	Content/Peoples/Male_01/SM_Male_01_fbm/9_meshes_Merge_Normal.uasset
 2022-03-21 11:48:57 +05:00
JohnnyHatchet d9c4c56bb0 Фулл апдейт по фасадам + ОРМка 2022-03-20 18:58:56 +05:00
PC-G04 bee7c9e425 dom_1_FL1,dom_1_Hall,dom_1_Hall_F11,dom_1_Hall_F12 2022-03-18 20:09:28 +05:00
GRAFF a0618fa4a2 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Blueprints/Lamp/BP_spotlight.uasset
#	Content/Blueprints/Lamp/BP_spotlight_1.uasset
#	Content/Blueprints/Lamp/BP_spotlight_egg.uasset
#	Content/Blueprints/Lamp/BP_spotlight_sphere.uasset
#	Content/Blueprints/Lamp/BP_spotlight_xiaomi.uasset
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_0.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_1.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_2.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_3.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_4.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_5.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_7.umap
#	Content/Maps/Landscape.umap
#	Content/Maps/Main_Building.umap
#	Content/Materials/Instances/MI_Brick_01.uasset
#	Content/Materials/Instances/MI_RMA_Fasad_RAL_9003.uasset
 2022-03-17 17:05:24 +05:00
GRAFF 407047409d куча барахла еще 2022-03-17 17:00:50 +05:00
PC-G06 e9c02dc03b Plintus_WallPicture_Hookan 2022-03-17 16:58:07 +05:00
PC-G06 5b99f9a6d9 Eclectic_Material_Part_2 2022-03-11 17:43:14 +05:00
PC-G06 787fdd0689 Eclectic_Material_Part_1 2022-03-10 17:18:07 +05:00
GRAFF fc8511454f всякие допилы говна, сдача 2 этапа 2022-03-01 13:09:50 +05:00
PC-G09 c9451d9221 Naberejnaya 2022-02-15 20:05:59 +05:00