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

402 Commits

Author SHA1 Message Date
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
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
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
JohnnyHatchet edfa3500d2 S03 A09 A08 swap + caps 2022-03-29 12:11:29 +05:00
PC-G12 da54b4ed1a Cameraz 2022-03-28 19:50:42 +05:00
PC-G03 d356fb19f1 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/Interiors/GP4S4/Unique/S04A03.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A04.umap
 2022-03-28 19:50:30 +05:00
PC-G03 efc1039301 S04_S03 2022-03-28 19:36:08 +05:00
PC-G10 4338868aa7 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/Interiors/GP4S4/Unique/S04A00.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A07.umap
 2022-03-28 18:29:59 +05:00
PC-G10 618b8c0c18 Interiors GP4S4 S04A00 S04A07 2022-03-28 18:27:15 +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 a7e3c93bc6 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Interiors/GP4S4/Unique/S04A01.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A02.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A05.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A06.umap
 2022-03-28 15:14:33 +05:00
GRAFF aefc87b39a ухх блять ну вроде пашет 2022-03-28 15:12:26 +05:00
PC-G08 ed6c8b2099 S04A01A02A05A06 2022-03-26 15:08:00 +05:00
GRAFF 79834db85d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Content/Maps/Interiors/GP4S2/Unique/S02F03-13.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F03-15.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F03.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A00.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A01.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A02.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A03.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A04.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A05.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A06.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A07.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A08.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A09.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05F01.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05F02.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05F09.umap
#	Content/Meshes/Interiors/GP4S5/Unique/SM_dom_5_Hall.uasset
#	Content/Meshes/Lightning/BP_short_picket_light.uasset
#	Content/Meshes/Tree_Crone_2_FoliageType.uasset
 2022-03-26 11:29:17 +05:00
GRAFF b6cba38361 я щас сдохну уже 2022-03-26 11:25:10 +05:00
JohnnyHatchet ab3c0bd355 BP_Lightnings 2022-03-26 07:53:32 +05:00
JohnnyHatchet 7f82b0f84b Landscape Fontain foliage 2022-03-26 07:32:59 +05:00