Commit Graph

128 Commits

Author SHA1 Message Date
GRAFF 58a7df15ae еще пачка всякого, добавил таги, запекатель параллаксов 2022-03-18 16:58:38 +05:00
GRAFF a0618fa4a2 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Blueprints/Lamp/BP_spotlight.uasset
#	Content/Blueprints/Lamp/BP_spotlight_1.uasset
#	Content/Blueprints/Lamp/BP_spotlight_egg.uasset
#	Content/Blueprints/Lamp/BP_spotlight_sphere.uasset
#	Content/Blueprints/Lamp/BP_spotlight_xiaomi.uasset
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_0.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_1.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_2.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_3.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_4.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_5.umap
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_7.umap
#	Content/Maps/Landscape.umap
#	Content/Maps/Main_Building.umap
#	Content/Materials/Instances/MI_Brick_01.uasset
#	Content/Materials/Instances/MI_RMA_Fasad_RAL_9003.uasset
2022-03-17 17:05:24 +05:00
GRAFF 407047409d куча барахла еще 2022-03-17 17:00:50 +05:00
PC-G06 e9c02dc03b Plintus_WallPicture_Hookan 2022-03-17 16:58:07 +05:00
JohnnyHatchet c3a798e401 fix some + add Halls 2022-03-17 05:22:24 +05:00
JohnnyHatchet 57fd964f13 Fixup redirections 2022-03-17 04:26:55 +05:00
JohnnyHatchet 1a4f1643b0 Новые фасады + фикс для процедурного меша 2022-03-17 04:26:15 +05:00
Igor f0ca2332e4 Dom1_flat_1,2,5 2022-03-16 18:43:32 +05:00
PC-G06 ff5da097be Door_Mesh_And_Mat 2022-03-16 18:37:43 +05:00
PC-G04 7a7a88f6d3 dom_1_flat_4_Interior 2022-03-16 18:22:12 +05:00
JohnnyHatchet 004ebd3b08 Fix all flats + fix fasade 1 2 5 2022-03-15 19:37:03 +05:00
PC-G06 8cad594926 Dom_1_Flat_All 2022-03-15 19:33:01 +05:00
PC-G04 acbd747dbe dom_1_f4 2022-03-15 19:18:55 +05:00
PC-G03 83deecc734 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP4S1/Unique/dom_1_flat_2.umap
2022-03-15 19:14:54 +05:00
PC-G03 3fe002b8af d_1_F3 2022-03-15 19:14:14 +05:00
Igor deb182ad67 dom_1_F1_F2_F5 2022-03-15 19:04:52 +05:00
PC-G06 14ed31d2a2 BP_Light_intensity_and_Door 2022-03-15 17:20:08 +05:00
GRAFF 1974841428 бпехи с лампами 2022-03-14 19:06:47 +05:00
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