Commit Graph

182 Commits

Author SHA1 Message Date
PC-G13 ea574ab63e int tweaks 2023-08-02 12:24:17 +05:00
PC-G13 50758401b5 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-01 14:51:34 +05:00
PC-G13 b714583c2b fasades 2023-08-01 14:50:57 +05:00
PC-G12 f7f866a4d2 qwerty 2023-08-01 14:34:17 +05:00
PC-G12 11c67ae985 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-01 13:20:45 +05:00
PC-G12 29b5221ca0 MPS 2023-08-01 13:20:38 +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
PC-G13 58e206ddb8 masharov F2-4 2023-03-10 19:42:43 +05:00
PC-G13 1940b9155a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Masharov_Yard.umap
2022-10-03 15:43:17 +05:00
PC-G13 bb1207898e smth 2022-10-03 15:40:14 +05:00
GRAFF 7ac752e46a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/Parking/Parking.umap
#	Content/Maps/Masharov_Yard.umap
2022-10-02 23:03:23 +05:00
GRAFF 20c96b9743 тёлки кофий пьют, еще пачка багов, еще паркинг, еще хуйня какая то 2022-10-02 22:58:42 +05:00
PC-G13 404c84bf16 parking, outside garage door 2022-09-30 16:33:28 +05:00
PC-G13 07d07d3e1c parking 2022-09-27 18:49:35 +05:00
GRAFF 12e1fc4869 паркингхуяркинг 2022-09-20 15:45:00 +05:00
GRAFF dfbb6bfc5a паркинг всякий 2022-09-20 13:31:42 +05:00
GRAFF 1c06aa5181 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Materials/Instances/Asphalt/MI_Asphalt.uasset
#	Content/Materials/Instances/Bricks/MI_Bricks_Gray11.uasset
#	Content/Materials/Instances/Concrete/MI_Concrete_BrightGray.uasset
#	Content/Materials/Instances/Concrete/MI_Concrete_DarkGray.uasset
#	Content/Materials/Instances/Metal/MI_Metal_Black.uasset
#	Content/Materials/Masharov_Interior/Palette/MI_Emissive_0_Power_Warm.uasset
2022-09-19 20:28:47 +05:00
GRAFF 5fd52aa5f2 minusPP_fromparking 2022-09-19 19:51:07 +05:00
GRAFF d6cb448d25 parking 2022-09-19 19:41:24 +05:00
GRAFF b0e2fbbf49 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Masharov_Yard.umap
#	Content/Maps/mainScene.umap
2022-09-16 20:49:59 +05:00
GRAFF e743e43179 pointFade, переклепал текстуры в который раз, гора косяков 2022-09-16 20:49:06 +05:00
PC-G12 0b89e97f1a Parking_WIP1 2022-09-16 19:06:09 +05:00
PC-G12 8bc9cbdcb1 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-15 19:41:31 +05:00
PC-G12 c10286b9e6 Parking_WIP 2022-09-15 19:41:25 +05:00
GRAFF 8740547a84 gp3 2022-09-15 14:33:26 +05:00
GRAFF a6d8966bcb Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-14 22:15:55 +05:00
GRAFF 5d9c6c62d7 gp3ska 2022-09-14 22:15:52 +05:00
PC-G12 ec0d6a8c47 Parukingu_wip 2022-09-14 19:47:28 +05:00
GRAFF 738da108c1 gp3 2022-09-12 19:38:47 +05:00
GRAFF 1512444078 gp3_check_gp2baketocheck 2022-09-12 13:25:19 +05:00
GRAFF ffeb51dd98 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-07 18:12:40 +05:00
GRAFF 3ab5e34064 a00,a06, lamps 2022-09-07 18:12:38 +05:00
PC-G06 09b699c35c GP_2_Interior_Repair 2022-09-07 18:03:45 +05:00
GRAFF 58c86e3969 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-09-01 02:53:52 +05:00
GRAFF ad677e529a svet 2022-09-01 02:20:52 +05:00
GRAFF 26f8dbdfbc asd 2022-08-31 16:56:53 +05:00
GRAFF 3471fbc080 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-08-31 13:53:00 +05:00
GRAFF e932338ee9 новые звуки, лифты, анимБПхи новые 2022-08-31 13:49:12 +05:00
GRAFF 5c18534b05 bake_firstwave 2022-08-31 13:24:03 +05:00
GRAFF c5a4f70e01 transforms 2022-08-30 18:06:36 +05:00
GRAFF d60fc65f6b Merge branch 'developer'
# Conflicts:
#	Content/Maps/Interior/GP2/S02F01.umap
2022-08-29 23:19:51 +05:00
GRAFF 2489392f03 ишо всякое 2022-08-29 23:17:36 +05:00
GRAFF 29b26e20d0 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP3/F19/S03F19A07.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F05-06_A04.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F05-06_A08.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F07-08_A08.umap
#	Content/Maps/Interior/GP3/Walls/W_S03F09-10_A08.umap
#	Content/Meshes/Interior/GP3/Plinth/SM_S03A08_Plintuth.uasset
2022-08-29 14:18:46 +05:00
GRAFF 2b3dc3a2ac gp3_06-08 2022-08-29 14:18:02 +05:00
GRAFF 3046c5e91d всякое 2022-08-29 12:55:17 +05:00
PC-G04 5a1c44b9d9 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-27 16:30:15 +05:00
PC-G04 f91c11767f ИРИНА 2022-08-27 16:29:54 +05:00
GRAFF ce11242e69 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-27 15:49:26 +05:00
GRAFF 637a9e8332 gp3 2022-08-27 15:48:58 +05:00