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

# Conflicts:
#	Content/Maps/Main_Building.umap

2024-05-21 19:17:47 +05:00

..

AE_vol1

…

AssetPacks

kucha vsego

2024-05-20 20:05:56 +05:00

Blueprints

ui fix

2024-05-21 19:16:58 +05:00

CC_Shaders

…

CityPark

…

Foliage

…

Furniture

…

GraffIn/Materials

…

Humans

…

L10N

…

Lighting

…

Localization/Game

…

Maps

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

2024-05-21 19:17:47 +05:00

Materials

kucha vsego

2024-05-20 20:05:56 +05:00

Megascans/3D_Assets/Mossy_Forest_Boulder_wfgpedbaw

…

Meshes

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

2024-05-21 19:17:47 +05:00

MigrateFortis

…

MigrateMatSofa

…

MigrateMavisTrees

…

MigrateNewFurnitureNikita

…

Movies

…

MSPresets

…

NikitaMigrate/Furniture

…

Particles/lightning

…

Peoples

…

script

…

sequences

…

SkatePark

kucha vsego

2024-05-20 20:05:56 +05:00

Sounds

…

SpeedTree

…

Splash

…

Textures

…

UltraDynamicSky

kucha vsego

2024-05-20 20:05:56 +05:00

WindowsOutsideMat

…

Xml

…

School.uasset

…

SM_MERGED_Outside_building_Outside_main_17.uasset

…

SM_MERGED_Road.uasset

…

SM_MERGED_SM_Outside_ivazovski_Melnikayte_AutoBuildings_2.uasset

…

SM_MERGED_SM_Outside_ivazovski_NovaTech_2.uasset

…

SM_MERGED_StaticMeshActor_3.uasset

…

SM_MERGED_StaticMeshActor_4.uasset

…

SM_MERGED_StaticMeshActor_6.uasset

…

SM_MERGED_StaticMeshActor_10.uasset

…

SM_MERGED_StaticMeshActor_11.uasset

…

SM_MERGED_StaticMeshActor_12.uasset

…

SM_MERGED_StaticMeshActor_13.uasset

…

SM_MERGED_StaticMeshActor_14.uasset

…

SM_MERGED_StaticMeshActor_18.uasset

…

SM_MERGED_StaticMeshActor_22.uasset

…

SM_MERGED_StaticMeshActor_23.uasset

…

SM_MERGED_StaticMeshActor_24.uasset

…

SM_MERGED_StaticMeshActor_25.uasset

…

SM_MERGED_StaticMeshActor_33.uasset

…