Commit Graph

742 Commits

Author SHA1 Message Date
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
PC-G09 565981852f Naberejka 2022-02-19 22:04:58 +05:00
PC-G09 9f3a725e8a Nabeejnaya 2022-02-18 19:36:36 +05:00
PC-G09 51ead7566b Naberejnaya 2022-02-17 20:02:57 +05:00
PC-G09 4845d02c09 Naberejnaya 2022-02-17 19:33:26 +05:00
PC-G09 3838e6db1f Naberejnaya 2022-02-17 17:57:31 +05:00
PC-G09 c9ff4bbc8b Naberejka 2022-02-17 17:32:15 +05:00
PC-G09 8233bfecb0 Naberejnaya trees 2022-02-17 14:20:28 +05:00
PC-G09 56be76b7dd Exterior 2022-02-17 14:09:29 +05:00
GRAFF fb9c00e7a5 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Maps/MainSceneMigrate.umap
#	Content/Materials/Instances/MI_RMA_naberejnaya1.uasset
#	Content/Materials/LandscapeMaterials/MI_sand.uasset
2022-02-17 13:51:59 +05:00
GRAFF 8315f32314 куча изменений в интерфейсе, ИИ для люда, обновление лицензии 2022-02-17 13:51:23 +05:00
PC-G09 4d99a762f9 Exterior 2022-02-16 19:57:46 +05:00
PC-G09 4e538441bf Exterior 2022-02-16 19:17:06 +05:00
PC-G09 7d989ab362 Exterior 2022-02-16 18:07:26 +05:00
PC-G09 386dcbb3be Exterior + sofa mat 2022-02-16 15:40:16 +05:00
PC-G09 c9451d9221 Naberejnaya 2022-02-15 20:05:59 +05:00
PC-G09 4b5b1a1a41 Outside + osm fix 2022-02-01 13:36:19 +05:00
GRAFF 0f6c4c0be2 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Materials/Instances/MI_RMA_Fasad_RAL_6028.uasset
#	Content/Materials/Instances/MI_RMA_Fasad_RAL_9003.uasset
2022-01-31 18:07:39 +05:00
GRAFF f0baaf1908 всякий кал 2022-01-31 18:07:11 +05:00
PC-G09 6666f2da0e Outside + interior lvls 2022-01-28 17:59:48 +05:00