Commit Graph

583 Commits

Author SHA1 Message Date
GRAFF 08d0ca38db уфф 2022-10-13 17:26:48 +05:00
GRAFF 8292739e27 по срм всё сделано, кп тоже 2022-10-11 22:19:06 +05:00
GRAFF 5a140b8535 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-10-11 15:32:40 +05:00
GRAFF 077c5ca093 еще встраивание кп 2022-10-11 15:32:26 +05:00
PC-G13 e1d7c11e6b паркинг 2022-10-11 14:36:09 +05:00
GRAFF e3c253c44c блядский паркинг теперь в избранном 2022-10-09 20:30:03 +05:00
GRAFF 525bdc653d этакое всякое 2022-10-07 17:22:19 +05:00
GRAFF d4308eee55 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Masharov_Yard.umap
#	Content/Materials/Instances/Metal/MI_Metal_RAL_7016.uasset
2022-10-03 16:10:18 +05:00
GRAFF c368f1067c еще чуть фикс 2022-10-03 16:08:41 +05:00
PC-G13 451765d006 tera 2022-10-03 15:49:17 +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
PC-G01 c4659454da Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/Sibintel1
# Conflicts:
#	Content/Maps/Masharov_people.umap
#	Content/Maps/mainScene.umap
2022-10-03 15:20:23 +05:00
PC-G01 9a60b1d7c8 Больше людей расселось 2022-10-03 14:31:16 +05:00
GRAFF abc5a2bc25 удалил койче 2022-10-02 23:06:33 +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 a94de0d836 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-30 16:33:30 +05:00
PC-G13 404c84bf16 parking, outside garage door 2022-09-30 16:33:28 +05:00
GRAFF ad2298956a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/Parking/Parking.umap
2022-09-28 17:49:18 +05:00
GRAFF 137ed09681 чет менялось 2022-09-28 17:04:04 +05:00
PC-G13 07d07d3e1c parking 2022-09-27 18:49:35 +05:00
GRAFF 2646271b8b пара моментов 2022-09-21 17:22:31 +05:00
GRAFF 65e463a03e вмонтировал паркинг, лифты, интерйес, телепорты в паркинге v1.2 2022-09-20 23:12:24 +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
PC-G12 afd5af8e80 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-19 14:30:28 +05:00
PC-G12 dc6e40b391 Parkink 2022-09-19 14:30:23 +05:00
GRAFF fd6c048677 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-19 14:29:49 +05:00
GRAFF 4a59caea76 s 2022-09-19 14:29:46 +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 e239421c81 GP1_LF 2022-09-16 19:30:50 +05:00
PC-G12 b08d12254c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-16 19:06:47 +05:00
PC-G12 0b89e97f1a Parking_WIP1 2022-09-16 19:06:09 +05:00
GRAFF d580c52ea8 smt 2022-09-16 17:42:10 +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 f9374aa4dc Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Maps/Interior/GP2/S02F03-12.umap
#	Content/Maps/mainScene.umap
2022-09-15 17:57:58 +05:00
GRAFF b92f221b5e ?? 2022-09-15 17:55:33 +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 dce3f8850d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-09-14 19:47:35 +05:00
PC-G12 ec0d6a8c47 Parukingu_wip 2022-09-14 19:47:28 +05:00
DESKTOP-8J0BKKD\Admin 6543b56ba3 Правки GP3 2022-09-14 18:07:20 +05:00
PC-G06 ad61431ebf Main_Building_Furniture 2022-09-14 16:19:14 +05:00