1061 Commits

Author SHA1 Message Date
GRAFF 795fdbbbbd Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-03-14 18:58:23 +05:00
JohnnyHatchet f4bd3a055a New flats S3 + interiors aim map 2022-03-14 17:40:31 +05:00
GRAFF 82abd78661 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-03-14 17:18:41 +05:00
GRAFF 15f0b60364 куча хлама 2022-03-14 17:18:24 +05:00
PC-G06 1c44097bd6 Lamp_Mesh 2022-03-14 16:35:59 +05:00
PC-G06 5b99f9a6d9 Eclectic_Material_Part_2 2022-03-11 17:43:14 +05:00
PC-G06 2f4f6fbc3e Dom_1_Flat_0 2022-03-10 17:51:42 +05:00
PC-G06 787fdd0689 Eclectic_Material_Part_1 2022-03-10 17:18:07 +05:00
PC-G10 4927d43dac Migrate new furniture part 10 2022-03-04 16:48:01 +05:00
PC-G10 8ac90741f5 Migrate new furniture part 9 2022-03-04 16:46:31 +05:00
PC-G10 045a5412fd Migrate new furniture part 8 2022-03-04 16:44:07 +05:00
PC-G10 f9cbe55a8e Migrate new furniture part 7 2022-03-04 16:28:27 +05:00
PC-G10 20eb63e946 Migrate new furniture part 6 2022-03-04 16:10:39 +05:00
PC-G10 4496c0ec69 Migrate new furniture part 5 2022-03-04 16:08:20 +05:00
PC-G10 944c280f0b Migrate new furniture part 4 2022-03-04 16:05:04 +05:00
PC-G10 5cc95a4e19 Migrate new furniture part 3 2022-03-04 16:03:25 +05:00
PC-G10 ab7e0e6d63 Migrate new furniture part 2 2022-03-04 16:01:27 +05:00
PC-G10 849e777d94 Migrate new furniture part 1 2022-03-04 15:59:20 +05:00
PC-G10 f5a2342741 Old Furniture migrate part 6 2022-03-03 14:21:18 +05:00
PC-G10 7b4e938ba7 Old Furniture migrate part 5 2022-03-03 14:19:29 +05:00
PC-G10 2ceeed533d Old Furniture migrate part 4 2022-03-03 14:16:15 +05:00
PC-G10 dc80bbf82d Old Furniture migrate part 3 2022-03-03 14:13:12 +05:00
PC-G10 d128ec493d Old Furniture migrate part 2 2022-03-03 13:54:43 +05:00
PC-G10 ca42b6bbda Old Furniture migrate part 1 2022-03-03 13:53:05 +05:00
PC-G10 497322b60a Furniture Nikita 2022-03-03 13:40:21 +05:00
GRAFF 5ad444850b Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	.gitignore
#	Content/Maps/Underground_parking_GP4.umap
#	Content/UltraDynamicSky/Blueprints/Ultra_Dynamic_Sky.uasset
2022-03-01 13:56:39 +05:00
GRAFF 5d643ab427 без людей но со всем остальным, сдача 2 этапа 2022-03-01 13:55:55 +05:00
GRAFF 5715cc3f0d заменил свет в lighting, удалил лишний динамик скай, поправил постпроцесс в main_migrate 2022-03-01 13:44:26 +05:00
GRAFF fc8511454f всякие допилы говна, сдача 2 этапа 2022-03-01 13:09:50 +05:00
GRAFF 4508fbf18b Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/SkatePark/Naberez_Model/fix/Yard/MI_Roof6.uasset
#	Content/SkatePark/Naberez_Model/fix/Yard/umsmah1g_2K_Normal.uasset
2022-02-28 19:04:31 +05:00
GRAFF 1c18765aab добавление коллизий всему и вся, правки травы и еще чего то 2022-02-28 18:06:32 +05:00
JohnnyHatchet bed61ac1a4 Fix normal + fix outside gp fake 2022-02-28 13:45:00 +05:00
GRAFF 0ba22bd555 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Materials/Instances/M_Plastic_RAL_716.uasset
#	Content/Materials/Master/M_RMA_Tile_Triplanar.uasset
#	Content/Meshes/test_import_SM_HouseTerritory.uasset
#	Content/SkatePark/Naberez_Model/fix/Yard/MI_Roof3.uasset
2022-02-28 11:11:22 +05:00
GRAFF 99b632df44 ходилка по всяким местам, сплайн-тачка 2022-02-28 11:09:32 +05:00
JohnnyHatchet 1fd882d9d5 Ночная подсветка 2022-02-28 08:03:49 +05:00
JohnnyHatchet b38028c0c2 GP 1/2/3 + park +cars color random 2022-02-28 06:48:09 +05:00
JohnnyHatchet 997852e75b yard GP_4/ yard GP_5/ Yard/ Playground Ship/ Foliage/ Cars 2022-02-28 04:08:36 +05:00
JohnnyHatchet 457f46c053 Yard_GP_4 2022-02-26 19:29:00 +05:00
JohnnyHatchet e3ce980026 Yards 2022-02-25 21:21:16 +05:00
PC-G09 47b580decf Мафы 2022-02-24 16:26:49 +05:00
GRAFF c95fb0b61c Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-02-24 14:39:35 +05:00
GRAFF 4b20846dd3 что то 2022-02-24 14:39:32 +05:00
PC-G09 fb7d7447fc Parking 2022-02-24 14:38:27 +05:00
GRAFF a3bfcc2b0b Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Materials/Master/M_RMA_Tile_Master.uasset
#	Content/Materials/Master/M_RMA_Tile_Triplanar.uasset
#	Content/Meshes/Outside/M_Atlas_School1.uasset
2022-02-24 12:07:39 +05:00
GRAFF c60989d164 ИИ и прочие ништяки 2022-02-24 12:06:34 +05:00
PC-G09 306202a058 Gasstation 2022-02-24 06:27:19 +05:00
PC-G09 0c4604303a Pravii bereg 2022-02-24 02:44:19 +05:00
PC-G09 c74606e474 Pravii bereg 2022-02-23 23:19:20 +05:00
PC-G09 9958347a0c GP4 GP5 Yard 2022-02-21 18:20:29 +05:00
PC-G09 0528b575ac Naberejka 2022-02-20 17:18:12 +05:00