Commit Graph

536 Commits

Author SHA1 Message Date
Dmitry a981cdcc30 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Blueprints/world/BP_HouseGP7-3.uasset
2023-08-31 03:40:57 +05:00
Dmitry 8587d46f57 Cars Yard Fasade 2023-08-31 03:38:52 +05:00
PC-G09 cb61751ede Landscape 2023-08-31 03:27:14 +05:00
PC-G09 17b657b9f2 Outside fix 2023-08-31 03:06:40 +05:00
PC-G09 241a79abe2 Nightlight 2023-08-31 01:27:55 +05:00
PC-G09 439afcc8f1 NightLight 2023-08-30 22:50:14 +05:00
Dron cd3c53a7bf Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-30 22:40:41 +05:00
Dron ba55db4590 asd 2023-08-30 22:40:39 +05:00
PC-G04 afc9d2dd1e Пипл 2023-08-30 22:37:52 +05:00
PC-G04 39f07b70c3 фасады окна 2023-08-30 19:30:23 +05:00
PC-G04 481b55dd32 YARD 2023-08-30 16:54:51 +05:00
PC-G13 2b43fd61e6 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/GP7/Se02/F01-10/MOPs/S7_Se02_F02-05_mops.umap
#	Content/Maps/Interior/GP7/Se02/F01-10/MOPs/S7_Se02_F06-10_mops.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/MOPs/S7_Se02_F11_mops.umap
#	Content/Maps/Interior/GP7/Se02/F11-12/MOPs/S7_Se02_F12_mops.umap
#	Content/Maps/Interior/GP7/Se03/F01-10/MOPs/S7_Se03_F02-10_mop.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/MOPs/S7_Se03_F11-12_mops.umap
#	Content/Maps/Interior/GP7/Se03/F11-13/MOPs/S7_Se03_F13_mops.umap
2023-08-30 13:46:07 +05:00
PC-G13 2c1715ee2a mops 2023-08-30 13:44:08 +05:00
PC-G04 5f846b257e Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-29 18:19:32 +05:00
PC-G04 3eee3f1c20 ярд, фасады материал эмиссива 2023-08-29 18:19:23 +05:00
PC-G09 90ddb37b05 Night Light + Cars 2023-08-29 17:15:51 +05:00
PC-G04 7d9cc5fec1 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-29 17:01:48 +05:00
PC-G04 b237fe4b95 yard 2023-08-29 17:01:40 +05:00
PC-G13 943aa63d90 eshe kaminov, bake, parking gp7 bake, krushki vozmojno 2023-08-29 15:57:43 +05:00
PC-G09 389a3efa73 Nanite 2023-08-29 11:49:46 +05:00
PC-G09 cd02ffe4d8 Фикс дорог 2023-08-29 08:57:09 +05:00
Dron 60c3f27033 navi, parallax se1, bugs, new search 2023-08-29 01:21:40 +05:00
PC-G13 222d476ae4 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-28 20:10:59 +05:00
PC-G13 48b33afbca cuminas 2023-08-28 20:10:50 +05:00
PC-G04 e005640724 ФасадГп3С3, ярд, билдингс 2023-08-28 20:04:34 +05:00
PC-G04 a05ca5231e ярд карс 2023-08-28 18:54:26 +05:00
PC-G04 37f9cafd90 Ярд, карс 2023-08-28 14:15:06 +05:00
PC-G04 8f16c34641 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-25 20:02:08 +05:00
PC-G04 22ff65b730 landscape,yard.buildings 2023-08-25 20:01:56 +05:00
PC-G13 af6eb89f1a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Interior/Parking/Parking_GP7.umap
2023-08-25 19:58:44 +05:00
PC-G13 82aff8c323 inter 2023-08-25 19:57:21 +05:00
PC-G04 e82ad66f06 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Maps/Masharov_Yard.umap
2023-08-25 12:11:52 +05:00
PC-G04 9c7ef5f6ec Yard 2023-08-25 12:06:23 +05:00
Dron 7f8f4702ab fasadhide fix 2023-08-24 19:53:37 +05:00
Dron 6fb9c64c7d ghoster fix, normals fix 2023-08-24 19:34:39 +05:00
PC-G04 b54be07191 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-24 12:38:39 +05:00
PC-G04 f8d3250b27 лендскейп, ярд. буилдинг 2023-08-24 12:38:20 +05:00
PC-G13 ad63324961 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-23 16:41:56 +05:00
PC-G13 44ea14ab1d int 2023-08-23 16:41:51 +05:00
PC-G04 132b8f56a2 ярд буилдингс 2023-08-22 19:57:47 +05:00
PC-G04 42c001189d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-21 19:53:20 +05:00
PC-G04 46652085b7 ярд и билдингс 2023-08-21 19:53:14 +05:00
PC-G13 e2467e08dc pravkiinterior 2023-08-21 19:50:31 +05:00
PC-G04 a263953b7d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-21 13:23:54 +05:00
PC-G04 60d8ab9e9f YARD 2023-08-21 13:23:49 +05:00
PC-G13 280f8d04ff 1 2023-08-18 19:33:46 +05:00
PC-G13 bc9b7b6e69 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2023-08-18 17:11:05 +05:00
PC-G13 218b9ee2e0 mastermat 2023-08-18 17:11:02 +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