Merge remote-tracking branch 'origin/develop' into develop

2020-08-07 16:08:17 +02:00 · 2020-08-07 16:08:17 +02:00 · 0e6d8dfdf9
commit 0e6d8dfdf9
parent 3f396e3787 0955dd8baa
17 changed files with 0 additions and 0 deletions
--- a/Content/0_Project/Core/Building_bp/Bp_RandomHouse.uasset
+++ b/Content/0_Project/Core/Building_bp/Bp_RandomHouse.uasset
--- a/Content/0_Project/Core/Tiles/Straight/Tile_Straight_A.uasset
+++ b/Content/0_Project/Core/Tiles/Straight/Tile_Straight_A.uasset
--- a/Content/0_Project/Core/Tiles/Tile_Coast.uasset
+++ b/Content/0_Project/Core/Tiles/Tile_Coast.uasset
--- a/Content/0_Project/Maps/MainMap.umap
+++ b/Content/0_Project/Maps/MainMap.umap
--- a/Content/0_Project/Material/M_GroundA.uasset
+++ b/Content/0_Project/Material/M_GroundA.uasset
--- a/Content/0_Project/Material/M_GroundA_Inst.uasset
+++ b/Content/0_Project/Material/M_GroundA_Inst.uasset
--- a/Content/0_Project/Material/SuperSecretPostProcess/Lowres_PP_Inst.uasset
+++ b/Content/0_Project/Material/SuperSecretPostProcess/Lowres_PP_Inst.uasset
--- a/Content/0_Project/Material/SuperSecretPostProcess/SuperSecretShader/PP_Cellshader_Inst.uasset
+++ b/Content/0_Project/Material/SuperSecretPostProcess/SuperSecretShader/PP_Cellshader_Inst.uasset
--- a/Content/0_Project/Material/SuperSecretPostProcess/SuperSecretShader/PP_Sobel.uasset
+++ b/Content/0_Project/Material/SuperSecretPostProcess/SuperSecretShader/PP_Sobel.uasset
--- a/Content/0_Project/Material/SuperSecretPostProcess/SuperSecretShader/PP_Sobelinstant.uasset
+++ b/Content/0_Project/Material/SuperSecretPostProcess/SuperSecretShader/PP_Sobelinstant.uasset
--- a/Content/0_Project/Material/TexturesCom_SoilRough0073_1_seamless_S.uasset
+++ b/Content/0_Project/Material/TexturesCom_SoilRough0073_1_seamless_S.uasset
--- a/Content/0_Project/Material/Water_shader/Mat_water.uasset
+++ b/Content/0_Project/Material/Water_shader/Mat_water.uasset
--- a/Content/0_Project/Material/Water_shader/Mat_water_Inst.uasset
+++ b/Content/0_Project/Material/Water_shader/Mat_water_Inst.uasset
--- a/Content/0_Project/Material/texturesoles.uasset
+++ b/Content/0_Project/Material/texturesoles.uasset
--- a/Content/0_Project/Mesh/Tiles_Shape/tiles_bridge.uasset
+++ b/Content/0_Project/Mesh/Tiles_Shape/tiles_bridge.uasset
--- a/Content/0_Project/Mesh/Tiles_Shape/tiles_coast.uasset
+++ b/Content/0_Project/Mesh/Tiles_Shape/tiles_coast.uasset
--- a/Content/0_Project/Mesh/Tiles_Shape/tiles_hill.uasset
+++ b/Content/0_Project/Mesh/Tiles_Shape/tiles_hill.uasset