Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky

Browse Source

# Conflicts:
#	Content/Maps/GP12_GP13.umap
#	Content/Maps/Interiors/GP13/S01/Interior/GP13_S01_A00_F02-03.umap
#	Content/Maps/Interiors/GP13/S01/Interior/GP13_S01_A11_F08.umap
#	Content/Maps/Interiors/GP13/S05/Interior/GP13_S05_A00_F02.umap
#	Content/Maps/MainScene.umap

...

This commit is contained in:

Dron

2025-12-24 16:48:10 +05:00

parent aab518cf20 85fa0c058c

commit 25d3d560f6

411 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Content/AssetPacks/Fountains_Sprinklers/Demo_scene/Fountains_Sprinklers.umap

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Demo_scene/Materials/MI_Ground.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Demo_scene/Materials/MI_Wall.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Demo_scene/Materials/M_Ground_Master.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Demo_scene/Textures/T_Noise_05.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Demo_scene/Textures/T_Noise_05_Normal.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Effects/NS_Fountaine_01.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Effects/NS_Fountaine_02.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Effects/NS_Fountaine_03.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Effects/NS_Fountaine_04.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Effects/NS_Fountaine_05.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Effects/NS_Fountaine_06.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Effects/NS_Ground_Drops.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Effects/NS_Sprinkler_01.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Effects/NS_Sprinkler_02.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Effects/NS_Sprinkler_03.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Effects/NS_Sprinkler_04.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Effects/NS_Sprinkler_05.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Effects/NS_Sprinkler_06.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Effects/NS_Waves_Splashes.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/MI_VFX_Drop_01.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/MI_VFX_Drop_02.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/MI_VFX_Mesh_Liquid_01.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/MI_VFX_Mesh_Liquid_02.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/MI_VFX_Mesh_Liquid_03.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/MI_VFX_Mesh_Liquid_04.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/MI_VFX_Mesh_Liquid_05.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/MI_VFX_Mesh_Liquid_06.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/MI_VFX_Mesh_Liquid_07.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/MI_VFX_Splash_01.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/MI_VFX_Splash_02.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/MI_VFX_Splash_03.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/M_VFX_Liquid_Masked.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/M_VFX_Mesh_Liquid_01.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/M_VFX_Mesh_Liquid_02.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Materials/M_VFX_Mesh_Liquid_03.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Meshes/Mesh_VFX_Fountain_01.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Meshes/Mesh_VFX_Fountain_02.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Meshes/Mesh_VFX_Fountain_03.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Meshes/Mesh_VFX_Fountain_04.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Meshes/Mesh_VFX_Fountain_05.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Meshes/Mesh_VFX_Wave_Circle_01.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Textures/T_VFX_Drop.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Textures/T_VFX_Drop_NM.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Textures/T_VFX_Noise_01.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Textures/T_VFX_Noise_01_NM.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Textures/T_VFX_Noise_02.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Textures/T_VFX_Noise_03.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Textures/T_VFX_Splashes_02.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Textures/T_VFX_Splashes_02_Normal.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Textures/T_VFX_Splashes_03.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Textures/T_VFX_Splashes_03_Normal.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Textures/T_VFX_Splashes_07.uasset

BIN

Binary file not shown.

Content/AssetPacks/Fountains_Sprinklers/Textures/T_VFX_Splashes_07_Normal.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/BP/BP_ShowroomStand.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/BP/BP_WaterPlane.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/BP/BP_Water_Dripping.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/BP/BP_Water_Dropping.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/BP/BP_Water_Spline_1.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/BP/BP_Water_Spline_2.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/BP/BP_Water_Spline_3.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/BP/Enum/E_Meshes.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Maps/DemoMap.umap

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/MPC/MPC_Water.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/Foam/MI_Foam_01.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/Foam/MI_Foam_Overflow.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/Foam/MI_Foam_Ribbon.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/Foam/MI_Foam_Splash_Ground.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/Foam/MI_Foam_Spline.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/Foam/MI_Foam_Spline_2.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/Foam/MI_Foam_Spray.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/Foam/MI_Foam_Spray_2.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/MI_Ground.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/MI_Ground_Small.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/Mist/MI_Mist_01.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/Showroom/MI_Showstand_Circle.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/Showroom/MI_Showstand_backdrop.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterDrop/MI_Water_Drop_1.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterDrop/MI_Water_Drop_2.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterFall/MI_WaterFall_1.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterPuddle/MI_Water_Puddle.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterPuddle/MI_Water_Puddle2.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterSplash/MI_Water_Drop_Collision_Splash.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterSplash/MI_Water_Splash_1.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterSplash/MI_Water_Splash_2.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterSplash/MI_Water_Splash_3.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterSplash/MI_Water_Splash_4.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterSplash/MI_Water_Splash_5.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterSplash/MI_Water_Splash_6.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterSplash/MI_Water_Splash_7.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterSplash_Mesh/MI_WaterSplash_1.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterSplash_Mesh/MI_WaterSplash_2.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/WaterSplash_Mesh/MI_WaterSplash_3.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/Water_Spesificy/MI_WaterBubble_1.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/Water_Spesificy/MI_WaterBubble_2.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/Water_Spesificy/MI_WaterBubble_3.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/Instance/Water_Spesificy/MI_WaterBubble_4.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/M_Functions/MF_FlowMask_Foam.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/M_Functions/MF_WaterNormal.uasset

BIN

Binary file not shown.

Content/AssetPacks/WaterSplash_Pack_3/Sources/Materials/M_Functions/MF_WaterRipples.uasset

BIN

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More