Merge branch 'master' of https://cgvrgit.ulno.net/Tuwi/BlockCraft

# Conflicts: # Content/StarterContent/Maps/Minimal_Default_BuiltData.uasset # Content/ThirdPerson/Blueprints/BP_ThirdPersonCharacter.uasset # Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/7E/BEYC27T14FHBU6LF2F60RR.uasset # Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/8/3J/6B9RJI3FDPCETRKXUXCQ4C.uasset # Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/E/8O/GK06JAEJ82TQ0GA2QB0DJG.uasset
2023-04-29 15:51:15 +03:00
parent da87922117 fdfbd878ad
commit b7706a57cf
406 changed files with 102 additions and 9 deletions
--- a/Content/Furniture/ground.uasset
+++ b/Content/Furniture/ground.uasset
--- a/Content/Furniture/plastic.uasset
+++ b/Content/Furniture/plastic.uasset
--- a/Content/Furniture/switchbutton.uasset
+++ b/Content/Furniture/switchbutton.uasset
--- a/Content/Furniture/switchbutton_Cube_PhysicsAsset.uasset
+++ b/Content/Furniture/switchbutton_Cube_PhysicsAsset.uasset
--- a/Content/Furniture/switchbutton_Cube_Skeleton.uasset
+++ b/Content/Furniture/switchbutton_Cube_Skeleton.uasset
--- a/Content/Furniture/switchbutton_Plane_001_Skeleton.uasset
+++ b/Content/Furniture/switchbutton_Plane_001_Skeleton.uasset
--- a/Content/Furniture/white.uasset
+++ b/Content/Furniture/white.uasset
--- a/Content/StarterContent/Architecture/Floor_400x400.uasset
+++ b/Content/StarterContent/Architecture/Floor_400x400.uasset
--- a/Content/StarterContent/Architecture/Pillar_50x500.uasset
+++ b/Content/StarterContent/Architecture/Pillar_50x500.uasset
--- a/Content/StarterContent/Architecture/SM_AssetPlatform.uasset
+++ b/Content/StarterContent/Architecture/SM_AssetPlatform.uasset
--- a/Content/StarterContent/Architecture/Wall_400x200.uasset
+++ b/Content/StarterContent/Architecture/Wall_400x200.uasset
--- a/Content/StarterContent/Architecture/Wall_400x300.uasset
+++ b/Content/StarterContent/Architecture/Wall_400x300.uasset
--- a/Content/StarterContent/Architecture/Wall_400x400.uasset
+++ b/Content/StarterContent/Architecture/Wall_400x400.uasset
--- a/Content/StarterContent/Architecture/Wall_500x500.uasset
+++ b/Content/StarterContent/Architecture/Wall_500x500.uasset
--- a/Content/StarterContent/Architecture/Wall_Door_400x300.uasset
+++ b/Content/StarterContent/Architecture/Wall_Door_400x300.uasset
--- a/Content/StarterContent/Architecture/Wall_Door_400x400.uasset
+++ b/Content/StarterContent/Architecture/Wall_Door_400x400.uasset
--- a/Content/StarterContent/Architecture/Wall_Window_400x300.uasset
+++ b/Content/StarterContent/Architecture/Wall_Window_400x300.uasset
--- a/Content/StarterContent/Architecture/Wall_Window_400x400.uasset
+++ b/Content/StarterContent/Architecture/Wall_Window_400x400.uasset
--- a/Content/StarterContent/Audio/Collapse01.uasset
+++ b/Content/StarterContent/Audio/Collapse01.uasset
--- a/Content/StarterContent/Audio/Collapse02.uasset
+++ b/Content/StarterContent/Audio/Collapse02.uasset
--- a/Content/StarterContent/Audio/Collapse_Cue.uasset
+++ b/Content/StarterContent/Audio/Collapse_Cue.uasset
--- a/Content/StarterContent/Audio/Explosion01.uasset
+++ b/Content/StarterContent/Audio/Explosion01.uasset
--- a/Content/StarterContent/Audio/Explosion02.uasset
+++ b/Content/StarterContent/Audio/Explosion02.uasset
--- a/Content/StarterContent/Audio/Explosion_Cue.uasset
+++ b/Content/StarterContent/Audio/Explosion_Cue.uasset
--- a/Content/StarterContent/Audio/Fire01.uasset
+++ b/Content/StarterContent/Audio/Fire01.uasset
--- a/Content/StarterContent/Audio/Fire01_Cue.uasset
+++ b/Content/StarterContent/Audio/Fire01_Cue.uasset
--- a/Content/StarterContent/Audio/Fire_Sparks01.uasset
+++ b/Content/StarterContent/Audio/Fire_Sparks01.uasset
--- a/Content/StarterContent/Audio/Fire_Sparks01_Cue.uasset
+++ b/Content/StarterContent/Audio/Fire_Sparks01_Cue.uasset
--- a/Content/StarterContent/Audio/Light01.uasset
+++ b/Content/StarterContent/Audio/Light01.uasset
--- a/Content/StarterContent/Audio/Light01_Cue.uasset
+++ b/Content/StarterContent/Audio/Light01_Cue.uasset
--- a/Content/StarterContent/Audio/Light02.uasset
+++ b/Content/StarterContent/Audio/Light02.uasset
--- a/Content/StarterContent/Audio/Light02_Cue.uasset
+++ b/Content/StarterContent/Audio/Light02_Cue.uasset
--- a/Content/StarterContent/Audio/Smoke01.uasset
+++ b/Content/StarterContent/Audio/Smoke01.uasset
--- a/Content/StarterContent/Audio/Smoke01_Cue.uasset
+++ b/Content/StarterContent/Audio/Smoke01_Cue.uasset
--- a/Content/StarterContent/Audio/Starter_Background_Cue.uasset
+++ b/Content/StarterContent/Audio/Starter_Background_Cue.uasset
--- a/Content/StarterContent/Audio/Starter_Birds01.uasset
+++ b/Content/StarterContent/Audio/Starter_Birds01.uasset
--- a/Content/StarterContent/Audio/Starter_Music01.uasset
+++ b/Content/StarterContent/Audio/Starter_Music01.uasset
--- a/Content/StarterContent/Audio/Starter_Music_Cue.uasset
+++ b/Content/StarterContent/Audio/Starter_Music_Cue.uasset
--- a/Content/StarterContent/Audio/Starter_Wind05.uasset
+++ b/Content/StarterContent/Audio/Starter_Wind05.uasset
--- a/Content/StarterContent/Audio/Starter_Wind06.uasset
+++ b/Content/StarterContent/Audio/Starter_Wind06.uasset
--- a/Content/StarterContent/Audio/Steam01.uasset
+++ b/Content/StarterContent/Audio/Steam01.uasset
--- a/Content/StarterContent/Audio/Steam01_Cue.uasset
+++ b/Content/StarterContent/Audio/Steam01_Cue.uasset
--- a/Content/StarterContent/Blueprints/Assets/FogBrightnessLUT.uasset
+++ b/Content/StarterContent/Blueprints/Assets/FogBrightnessLUT.uasset
--- a/Content/StarterContent/Blueprints/Assets/M_LightStage_Arrows.uasset
+++ b/Content/StarterContent/Blueprints/Assets/M_LightStage_Arrows.uasset
--- a/Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_Black.uasset
+++ b/Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_Black.uasset
--- a/Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_HDRI.uasset
+++ b/Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_HDRI.uasset
--- a/Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_Master.uasset
+++ b/Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_Master.uasset
--- a/Content/StarterContent/Blueprints/Assets/SM_Arrows.uasset
+++ b/Content/StarterContent/Blueprints/Assets/SM_Arrows.uasset
--- a/Content/StarterContent/Blueprints/Assets/Skybox.uasset
+++ b/Content/StarterContent/Blueprints/Assets/Skybox.uasset
--- a/Content/StarterContent/Blueprints/Assets/SunlightColorLUT.uasset
+++ b/Content/StarterContent/Blueprints/Assets/SunlightColorLUT.uasset
--- a/Content/StarterContent/Blueprints/BP_LightStudio.uasset
+++ b/Content/StarterContent/Blueprints/BP_LightStudio.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_Effect_Explosion.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_Effect_Explosion.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_Effect_Fire.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_Effect_Fire.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_Effect_Smoke.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_Effect_Smoke.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_Effect_Sparks.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_Effect_Sparks.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_Effect_Steam.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_Effect_Steam.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_WallSconce.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_WallSconce.uasset
--- a/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
+++ b/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
--- a/Content/StarterContent/Maps/Advanced_Lighting.umap
+++ b/Content/StarterContent/Maps/Advanced_Lighting.umap
--- a/Content/StarterContent/Maps/Advanced_Lighting_BuiltData.uasset
+++ b/Content/StarterContent/Maps/Advanced_Lighting_BuiltData.uasset
--- a/Content/StarterContent/Maps/Minimal_Default.umap
+++ b/Content/StarterContent/Maps/Minimal_Default.umap
--- a/Content/StarterContent/Maps/Minimal_Default_BuiltData.uasset
+++ b/Content/StarterContent/Maps/Minimal_Default_BuiltData.uasset
--- a/Content/StarterContent/Maps/StarterMap.umap
+++ b/Content/StarterContent/Maps/StarterMap.umap
--- a/Content/StarterContent/Maps/StarterMap_BuiltData.uasset
+++ b/Content/StarterContent/Maps/StarterMap_BuiltData.uasset
--- a/Content/StarterContent/Materials/M_AssetPlatform.uasset
+++ b/Content/StarterContent/Materials/M_AssetPlatform.uasset
--- a/Content/StarterContent/Materials/M_Basic_Floor.uasset
+++ b/Content/StarterContent/Materials/M_Basic_Floor.uasset
--- a/Content/StarterContent/Materials/M_Basic_Wall.uasset
+++ b/Content/StarterContent/Materials/M_Basic_Wall.uasset
--- a/Content/StarterContent/Materials/M_Brick_Clay_Beveled.uasset
+++ b/Content/StarterContent/Materials/M_Brick_Clay_Beveled.uasset
--- a/Content/StarterContent/Materials/M_Brick_Clay_New.uasset
+++ b/Content/StarterContent/Materials/M_Brick_Clay_New.uasset
--- a/Content/StarterContent/Materials/M_Brick_Clay_Old.uasset
+++ b/Content/StarterContent/Materials/M_Brick_Clay_Old.uasset
--- a/Content/StarterContent/Materials/M_Brick_Cut_Stone.uasset
+++ b/Content/StarterContent/Materials/M_Brick_Cut_Stone.uasset
--- a/Content/StarterContent/Materials/M_Brick_Hewn_Stone.uasset
+++ b/Content/StarterContent/Materials/M_Brick_Hewn_Stone.uasset
--- a/Content/StarterContent/Materials/M_Ceramic_Tile_Checker.uasset
+++ b/Content/StarterContent/Materials/M_Ceramic_Tile_Checker.uasset
--- a/Content/StarterContent/Materials/M_CobbleStone_Pebble.uasset
+++ b/Content/StarterContent/Materials/M_CobbleStone_Pebble.uasset
--- a/Content/StarterContent/Materials/M_CobbleStone_Rough.uasset
+++ b/Content/StarterContent/Materials/M_CobbleStone_Rough.uasset
--- a/Content/StarterContent/Materials/M_CobbleStone_Smooth.uasset
+++ b/Content/StarterContent/Materials/M_CobbleStone_Smooth.uasset
--- a/Content/StarterContent/Materials/M_ColorGrid_LowSpec.uasset
+++ b/Content/StarterContent/Materials/M_ColorGrid_LowSpec.uasset
--- a/Content/StarterContent/Materials/M_Concrete_Grime.uasset
+++ b/Content/StarterContent/Materials/M_Concrete_Grime.uasset
--- a/Content/StarterContent/Materials/M_Concrete_Panels.uasset
+++ b/Content/StarterContent/Materials/M_Concrete_Panels.uasset
--- a/Content/StarterContent/Materials/M_Concrete_Poured.uasset
+++ b/Content/StarterContent/Materials/M_Concrete_Poured.uasset
--- a/Content/StarterContent/Materials/M_Concrete_Tiles.uasset
+++ b/Content/StarterContent/Materials/M_Concrete_Tiles.uasset
--- a/Content/StarterContent/Materials/M_Glass.uasset
+++ b/Content/StarterContent/Materials/M_Glass.uasset
--- a/Content/StarterContent/Materials/M_Ground_Grass.uasset
+++ b/Content/StarterContent/Materials/M_Ground_Grass.uasset
--- a/Content/StarterContent/Materials/M_Ground_Gravel.uasset
+++ b/Content/StarterContent/Materials/M_Ground_Gravel.uasset
--- a/Content/StarterContent/Materials/M_Ground_Moss.uasset
+++ b/Content/StarterContent/Materials/M_Ground_Moss.uasset
--- a/Content/StarterContent/Materials/M_Metal_Brushed_Nickel.uasset
+++ b/Content/StarterContent/Materials/M_Metal_Brushed_Nickel.uasset
--- a/Content/StarterContent/Materials/M_Metal_Burnished_Steel.uasset
+++ b/Content/StarterContent/Materials/M_Metal_Burnished_Steel.uasset
--- a/Content/StarterContent/Materials/M_Metal_Chrome.uasset
+++ b/Content/StarterContent/Materials/M_Metal_Chrome.uasset
--- a/Content/StarterContent/Materials/M_Metal_Copper.uasset
+++ b/Content/StarterContent/Materials/M_Metal_Copper.uasset
--- a/Content/StarterContent/Materials/M_Metal_Gold.uasset
+++ b/Content/StarterContent/Materials/M_Metal_Gold.uasset
--- a/Content/StarterContent/Materials/M_Metal_Rust.uasset
+++ b/Content/StarterContent/Materials/M_Metal_Rust.uasset
--- a/Content/StarterContent/Materials/M_Metal_Steel.uasset
+++ b/Content/StarterContent/Materials/M_Metal_Steel.uasset
--- a/Content/StarterContent/Materials/M_Rock_Basalt.uasset
+++ b/Content/StarterContent/Materials/M_Rock_Basalt.uasset
--- a/Content/StarterContent/Materials/M_Rock_Marble_Polished.uasset
+++ b/Content/StarterContent/Materials/M_Rock_Marble_Polished.uasset
--- a/Content/StarterContent/Materials/M_Rock_Sandstone.uasset
+++ b/Content/StarterContent/Materials/M_Rock_Sandstone.uasset
--- a/Content/StarterContent/Materials/M_Rock_Slate.uasset
+++ b/Content/StarterContent/Materials/M_Rock_Slate.uasset
--- a/Content/StarterContent/Materials/M_Tech_Checker_Dot.uasset
+++ b/Content/StarterContent/Materials/M_Tech_Checker_Dot.uasset
--- a/Content/StarterContent/Materials/M_Tech_Hex_Tile.uasset
+++ b/Content/StarterContent/Materials/M_Tech_Hex_Tile.uasset
--- a/Content/StarterContent/Materials/M_Tech_Hex_Tile_Pulse.uasset
+++ b/Content/StarterContent/Materials/M_Tech_Hex_Tile_Pulse.uasset
--- a/Show More
+++ b/Show More