Merge branch 'newMain' of http://wolfpredator.sknt.ru/Retry/Japan_Raid into newMain

10 months ago · 8be886eb14
parent 482c2a0235 bc44922e51
commit 8be886eb14
31 changed files with 87 additions and 9 deletions
--- a/Japan_Raid/Content/Levels/Foliage_Main.umap
+++ b/Japan_Raid/Content/Levels/Foliage_Main.umap
--- a/Japan_Raid/Content/Levels/Geometry.umap
+++ b/Japan_Raid/Content/Levels/Geometry.umap
--- a/Japan_Raid/Content/Levels/Landscape.umap
+++ b/Japan_Raid/Content/Levels/Landscape.umap
--- a/Japan_Raid/Content/Material/Environment/M_MainHouse_Rock.uasset
+++ b/Japan_Raid/Content/Material/Environment/M_MainHouse_Rock.uasset
--- a/Japan_Raid/Content/Material/Environment/M_MainHouse_Roof.uasset
+++ b/Japan_Raid/Content/Material/Environment/M_MainHouse_Roof.uasset
--- a/Japan_Raid/Content/Material/Environment/M_MainHouse_Wall.uasset
+++ b/Japan_Raid/Content/Material/Environment/M_MainHouse_Wall.uasset
--- a/Japan_Raid/Content/Material/Environment/M_MainHouse_Window.uasset
+++ b/Japan_Raid/Content/Material/Environment/M_MainHouse_Window.uasset
--- a/Japan_Raid/Content/Material/Environment/M_MainHouse_Wood.uasset
+++ b/Japan_Raid/Content/Material/Environment/M_MainHouse_Wood.uasset
--- a/Japan_Raid/Content/Material/Environment/M_MainHouse_Wood_1.uasset
+++ b/Japan_Raid/Content/Material/Environment/M_MainHouse_Wood_1.uasset
--- a/Japan_Raid/Content/Material/Environment/M_MainHouse_Wood_floor.uasset
+++ b/Japan_Raid/Content/Material/Environment/M_MainHouse_Wood_floor.uasset
--- a/Japan_Raid/Content/Material/Environment/M_MainHouse_Wood_wall.uasset
+++ b/Japan_Raid/Content/Material/Environment/M_MainHouse_Wood_wall.uasset
--- a/Japan_Raid/Content/Meshes/Environment/SM_MainHouse.uasset
+++ b/Japan_Raid/Content/Meshes/Environment/SM_MainHouse.uasset
--- a/Japan_Raid/Content/Meshes/Environment/SM_Pavilion.uasset
+++ b/Japan_Raid/Content/Meshes/Environment/SM_Pavilion.uasset
--- a/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wall_BC.uasset
+++ b/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wall_BC.uasset
--- a/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wall_N.uasset
+++ b/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wall_N.uasset
--- a/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wall_R.uasset
+++ b/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wall_R.uasset
--- a/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_1_BC.uasset
+++ b/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_1_BC.uasset
--- a/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_1_N.uasset
+++ b/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_1_N.uasset
--- a/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_1_R.uasset
+++ b/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_1_R.uasset
--- a/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_BC.uasset
+++ b/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_BC.uasset
--- a/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_N.uasset
+++ b/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_N.uasset
--- a/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_R.uasset
+++ b/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_R.uasset
--- a/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_floor_BC.uasset
+++ b/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_floor_BC.uasset
--- a/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_floor_N.uasset
+++ b/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_floor_N.uasset
--- a/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_floor_R.uasset
+++ b/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_floor_R.uasset
--- a/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_wall_BC.uasset
+++ b/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_wall_BC.uasset
--- a/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_wall_N.uasset
+++ b/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_wall_N.uasset
--- a/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_wall_R.uasset
+++ b/Japan_Raid/Content/Textures/Tiles/T_MainHouse_Wood_wall_R.uasset
--- a/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_BC.uasset
+++ b/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_BC.uasset
--- a/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_N.uasset
+++ b/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_N.uasset
--- a/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_ORM.uasset
+++ b/Japan_Raid/Content/Textures/Unique/U_MainHouse_Roof_ORM.uasset