27 Commits

Author SHA1 Message Date
PC-G04 16449ba834 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F20_22_MOP.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F21_MOP.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F23_MOP.umap
#	Content/Maps/Masharov_Buildings.umap
#	Content/Maps/Masharov_Yard.umap
#	Content/Meshes/Exterior/Main/SM_S9_Se01_Facade.uasset
#	Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F03_09_Cap_Wall.uasset
#	Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F10_13_Cap_Wall.uasset
#	Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F14_15_Cap_Wall.uasset
#	Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F16_18_Cap_Wall.uasset
#	Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F19_Cap_Wall.uasset
#	Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F20_Cap_Wall.uasset
#	Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F21_Cap_Wall.uasset
#	Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F22_Cap_Wall.uasset
#	Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F23_Cap_Wall.uasset
2024-06-13 12:34:30 +05:00
PC-G04 85532d3770 S9 2024-06-13 12:32:44 +05:00
Dron 48996c64e2 гора багов, интерьерный свет, лифты, уи 2024-06-04 23:51:22 +05:00
PC-G13 ff70671d22 pravpn'ki 2024-05-31 19:49:59 +05:00
PC-G13 2208e5f0be some fixes 2024-05-15 18:14:49 +05:00
Dron 1d423afda0 elevators 2024-05-09 14:01:08 +05:00
PC-G04 1d34a1dac2 всякие правки интерьерные 2024-05-08 14:40:32 +05:00
PC-G04 8771cee5b8 Крышки и дверь в МОП 2024-05-08 13:39:59 +05:00
Dron 56400e90cd many stuff 2024-05-07 14:53:29 +05:00
PC-G13 3d1f413931 forest_far 2024-04-19 19:11:32 +05:00
PC-G13 af198e21a5 walls, mops, lamps 2024-04-19 15:05:13 +05:00
PC-G13 ab3bdcac06 bp_lamp, int mats, meshes 2024-04-18 18:24:21 +05:00
PC-G13 3ef5e68765 p1 2024-04-17 19:48:09 +05:00
PC-G13 c3bfba9fe7 mda 2024-04-17 15:52:24 +05:00
PC-G13 a70c8c0e84 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F03-09_A01_fur.umap
#	Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F03-19_A06_fur.umap
#	Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F10-13_A11_fur.umap
#	Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F10-19_A14_fur.umap
#	Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F16-19_A17_fur.umap
#	Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F16-19_A18_fur.umap
#	Content/Maps/Interior/GP9/F03-20_22/Walls/S9_Se01_F20_A24_walls.umap
#	Content/Maps/Interior/GP9/F03-20_22/Walls/S9_Se01_F22_A38_walls.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F03-09_MOP.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F10-13_MOP.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F14-15_MOP.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F16-19_MOP.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F20_22_MOP.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F21_MOP.umap
#	Content/Maps/Interior/GP9/MOPs/S9_Se01_F23_MOP.umap
2024-04-17 00:12:35 +05:00
PC-G13 8343c9dc64 ssd kaput temp commit 2024-04-17 00:07:00 +05:00
Dron 8ad7c2e9e6 parallax,elevators, utp 2024-04-15 21:17:22 +05:00
Dron 7267cd9894 gp9 online 2024-04-13 22:39:43 +05:00
PC-G13 c72f3a9529 yard meshes fix, caps 2024-04-12 20:26:58 +05:00
Dron abcc890d6b lifts, someshit 2024-04-11 19:27:57 +05:00
PC-G13 b1d677db72 mops, int, terasses, caps, + fasadhide in shaiders 2024-03-27 12:42:38 +05:00
PC-G13 51053c0e90 int + mops baked 2024-03-26 14:23:28 +05:00
PC-G13 56a8609e27 gp9 int, windows 2024-03-22 14:19:11 +05:00
PC-G13 1c809f7936 plinths 2024-03-18 17:41:39 +05:00
PC-G13 f637a2f500 leroooooy masharo-ov 2024-03-18 16:40:51 +05:00
PC-G13 bec348848b gp9mops 2024-03-18 13:42:11 +05:00
PC-G13 123e97354d gp9, yard+mops, 2024-03-14 13:51:34 +05:00