66 Commits

Author SHA1 Message Date
PC-G13 ff70671d22 pravpn'ki 2024-05-31 19:49:59 +05:00
Dron 7df3b333f5 da blyat ya ne mogu 2024-05-08 13:02:00 +05:00
Dron 56400e90cd many stuff 2024-05-07 14:53:29 +05:00
Dron 9665402f53 sky control adopt, interior lighting fixes 2024-05-03 00:06:02 +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 20f022b18d bake, terassu 2024-03-28 13:13:49 +05:00
PC-G13 b1d677db72 mops, int, terasses, caps, + fasadhide in shaiders 2024-03-27 12:42:38 +05:00
Dron 9526f9e7d9 light fixes, people fixes 2023-09-08 21:42:32 +05:00
PC-G04 61d9fb9312 МОПы ГП7, Здание Машарова ГП2 2023-09-07 17:57:08 +05:00
Dron 51dc9c4a60 AAAAAAAAAAAAAAA 2023-09-05 00:16:12 +05:00
PC-G04 1eb72e4eeb Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-18 13:36:22 +05:00
PC-G04 6928253b85 Yard 2023-08-18 13:36:14 +05:00
PC-G13 503162a6ad int fixes 2023-08-17 13:59:58 +05:00
PC-G09 e0433f5868 Fasade lights 2023-08-14 14:25:28 +05:00
PC-G04 987451aaa2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-08_A01_walls.umap
2023-08-11 18:10:39 +05:00
PC-G04 db0e645956 Se03 Interiors 2023-08-11 18:01:34 +05:00
PRAyMU 7e6b8a87b5 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-10 22:11:10 +05:00
PRAyMU 6b82e3f74c S7_Se02_F12_A14 2023-08-10 22:03:56 +05:00
PC-G13 db0177582e se01 2023-08-08 18:41:17 +05:00
PC-G13 9d9831dcc4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-08 12:25:07 +05:00
PC-G13 fa63b3ec23 daebanuifork 2023-08-08 12:24:32 +05:00
PC-G12 ff74922ea3 MOPs 2023-08-07 19:47:00 +05:00
PC-G12 5d33714450 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-03 19:48:27 +05:00
PC-G12 2829c5f913 MPS 2023-08-03 19:48:13 +05:00
PC-G13 5ff6e4a94e int 2023-08-03 13:03:28 +05:00
PRAyMU 071796360c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Materials/Masharov_Interior/Palette/MI_Wall_Bedroom_Matte_Bordo_Plintus.uasset
2023-08-01 19:01:09 +05:00
PRAyMU 5f31e90b82 Test_Room_GP3_Part_1 2023-08-01 18:53:07 +05:00
PC-G13 4e8b0e7a9d pr.kucha 2023-08-01 13:15:39 +05:00
GRAFF 6bb34197d0 интерьеры новые встроены 2023-03-22 12:39:43 +05:00
GRAFF e743e43179 pointFade, переклепал текстуры в который раз, гора косяков 2022-09-16 20:49:06 +05:00
PC-G06 ad61431ebf Main_Building_Furniture 2022-09-14 16:19:14 +05:00
PC-G06 09b699c35c GP_2_Interior_Repair 2022-09-07 18:03:45 +05:00
GRAFF e932338ee9 новые звуки, лифты, анимБПхи новые 2022-08-31 13:49:12 +05:00
GRAFF 84f5ef6d28 GP3_mats,a06 2022-08-26 14:48:23 +05:00
GRAFF 593042a336 GP3_Interior 2022-08-22 14:59:53 +05:00
GRAFF 8cf2b4eb37 много всякого КАЛАА 2022-07-19 04:08:57 +05:00
GRAFF b91b531ea7 вход с 2 этажа, 2этажные переключения, всякое говно еще, тачки катают по светофорам, коллизии 2022-07-18 02:58:05 +05:00
GRAFF aeb09be06a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Interior/GP2/S02F01.umap
#	Content/Maps/Masharov_cars.umap
2022-07-15 15:14:19 +05:00
GRAFF b26775b64c УФФФ 2022-07-15 15:12:09 +05:00
GRAFF e925269d96 Revert "S02_Collision"
This reverts commit 7c07922e99.
2022-07-13 22:21:26 +05:00
GRAFF 1db9b2e327 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-07-13 21:17:34 +05:00
PC-G06 7c07922e99 S02_Collision 2022-07-13 20:29:20 +05:00
GRAFF 777d3030a3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Masharov_Buildings.umap
#	Content/Maps/Masharov_Landscape.umap
#	Content/Maps/Masharov_Yard.umap
#	Content/Maps/mainScene.umap
2022-07-13 17:53:53 +05:00
GRAFF 56c014b2e2 коллизии всякие, интерфейс, косячки 2022-07-13 17:52:29 +05:00
GRAFF f49c40ecd8 bp_tochannel2_someprobes_someshitaswell 2022-07-13 17:11:33 +05:00
GRAFF 7a13be35ca уфффф 2022-07-12 05:34:44 +05:00
PC-G06 909a6bb4b9 S02F01_Mat 2022-07-11 20:02:55 +05:00
JohnnyHatchet 3bc6dcaaa0 Ночное освещение 2022-07-11 11:36:38 +05:00