Andron666 f9374aa4dc Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer ...

# Conflicts:
#	Content/Maps/Interior/GP2/S02F03-12.umap
#	Content/Maps/mainScene.umap

2022-09-15 17:57:58 +05:00

..

Assetpacks

??

2022-09-15 17:55:33 +05:00

Blueprints

Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer

2022-09-15 17:57:58 +05:00

CC_Shaders

…

Furniture

Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer

2022-09-15 17:57:58 +05:00

Maps

Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer

2022-09-15 17:57:58 +05:00

Materials

gp3

2022-09-15 14:33:26 +05:00

Meshes

Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer

2022-09-15 17:57:58 +05:00

MigrateIvazovsky

миллиард говна

2022-09-01 05:09:34 +05:00

MigrateMavisTrees

Зелень + фикс коммерции

2022-08-31 17:45:30 +05:00

Movies

Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer

2022-07-13 18:16:12 +05:00

MSPresets/MS_Foliage_Material

…

Peoples

??

2022-09-15 17:55:33 +05:00

script

еще пачка изменений, циферки, лифт, пиздюки, коллизии

2022-07-10 12:44:24 +05:00

Sequence

всякое

2022-08-29 12:55:17 +05:00

Sounds

новые звуки, лифты, анимБПхи новые

2022-08-31 13:49:12 +05:00

Splash

…

TEST

…

Textures

Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer

2022-09-15 17:57:58 +05:00

UltraDynamicSky

всякое

2022-08-24 15:07:07 +05:00

Xml

…

Cook.umap

…

NewDataAsset.uasset

??

2022-09-15 17:55:33 +05:00

SM_Frame_Elevator_210.uasset

…