Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Files
5c3f88608a8fb0a694de73729be225c462ae4d8e
Ivazovsky/Content
T
History
polina.marfuta 5c3f88608a Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 
# Conflicts:
#	Content/Maps/GP12_GP13.umap
#	Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_Cubemap.uasset
#	Content/Meshes/houses/GP12_13/GP12/S05/MI_F_GP12_S05_Facade.uasset
#	Content/Meshes/houses/GP12_13/GP12/S06/SM_GP12_S06_Facade.uasset
2026-01-13 19:30:32 +05:00
..
AE_vol1
…
AssetPacks
…
Blueprints
…
CC_Shaders
…
CityPark
…
Foliage
…
Fountain
…
Fountains_Sprinklers/Textures
…
Furniture
…
GraffIn/Materials
…
Humans
…
L10N
…
Lighting
…
Localization/Game
…
Maps
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
2026-01-13 19:30:32 +05:00
Materials
…
Megascans/3D_Assets/Mossy_Forest_Boulder_wfgpedbaw
…
Meshes
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
2026-01-13 19:30:32 +05:00
MigrateFortis
…
MigrateMatSofa
…
MigrateMavisTrees
…
MigrateNewFurnitureNikita
…
Movies
…
MSPresets
…
NikitaMigrate/Furniture
…
Particles/lightning
…
Peoples
…
script
…
sequences
…
SkatePark
…
Sounds
…
SpeedTree
…
Splash
…
Textures
…
UltraDynamicSky
…
Vefects/Water/VFX
…
WaterSplash_Pack_3
…
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
…