Commit Graph

13 Commits

Author SHA1 Message Date
Lenta_Mebiusa a3c9ca5819 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter
# Conflicts:
#	Content/Maps/MainScene.umap
#	Content/Meshes/Yard/SM_Grass_003.uasset
2021-06-30 18:54:02 +05:00
Lenta_Mebiusa b263f6e8bc Двор двор двор 2021-06-30 18:51:51 +05:00
GRAFF 71a7089945 материалы и срез дома, форматирование текстур чтоб нормально рафнес работал и достройка материалов 2021-06-29 20:45:13 +05:00
Lenta_Mebiusa 3b723eff09 Двор 2021-06-28 22:07:05 +05:00
Lenta_Mebiusa a4a7993149 Двор 2021-06-28 19:31:32 +05:00
Lenta_Mebiusa 9ef979d92f Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter
# Conflicts:
#	Content/Assetpacks/AM_vol4/Textures/T_AM_vol4_trunk_26_N.uasset
#	Content/Assetpacks/CarMoveSpline/Materials/VehicleVarietyPack/Textures/Hatchback/TX_Hatchback_Normal_2.uasset
#	Content/Assetpacks/Kitchen/Textures/T_Tiles_Subway_R.uasset
#	Content/Assetpacks/Maf/Textures/T_Chute01_ORM.uasset
#	Content/Assetpacks/Maf/Textures/T_GamePad02_N.uasset
#	Content/Assetpacks/ThreeDee/Textures/Tileable/T_FabricPlain_N.uasset
#	Content/Assetpacks/xoio_berlinflat/Materials/blackmatte.uasset
#	Content/Maps/Yard.umap
#	Content/Materials/M_WinGlass.uasset
#	Content/Mavis/Materials/Interior/uh1lafuv_2K_Albedo.uasset
#	Content/Mavis/Meshes/Interior/Furniture/Textures/T_fabric_5_BC.uasset
#	Content/Mavis/Textures/Exterior/T_Bricks_dark_4K_AO.uasset
#	Content/Mavis/Textures/Exterior/T_Bricks_light_4K_AO.uasset
#	Content/Mavis/Textures/Exterior/T_Parking_Door_4K_Albedo.uasset
#	Content/Mavis/Textures/Exterior/T_Parking_Door_4K_Roughness.uasset
#	Content/Mavis/Textures/Exterior/ueinehidy_4K_Albedo.uasset
#	Content/Mavis/Textures/Exterior/ueinehidy_4K_Roughness.uasset
#	Content/Mavis/Textures/Exterior/ulmlbijg_4K_Roughness.uasset
#	Content/Mavis/Textures/Exterior/ulyobjsn_4K_Roughness.uasset
#	Content/Mavis/Textures/Exterior/umejfjwfw_4K_AO.uasset
#	Content/Mavis/Textures/Exterior/umejfjwfw_4K_Roughness.uasset
2021-06-23 16:42:51 +05:00
GRAFF da90eb476b ч2 2021-06-22 20:10:10 +05:00
PC-G09 514cf99d2f Materials + meshes update 2021-05-21 18:49:47 +05:00
Lenta_Mebiusa f8ce5b09da Обновил бехатон 2021-05-19 13:31:42 +05:00
Lenta_Mebiusa e9f5191ea4 Поправил бехатон в Yard-е 2021-05-18 19:25:02 +05:00
Lenta_Mebiusa 4e1cf7f663 Двор 2021-05-17 21:09:18 +05:00
Lenta_Mebiusa d6ff98c696 merge materials 1 2021-05-17 15:20:36 +05:00
GRAFF bf74d50530 погнали делать питерский академ 2021-05-10 20:06:48 +05:00