Andron666 a4887d4313 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence ...

# Conflicts:
#	Content/Blueprints/UI/Widgets/Menu/mainMenu.uasset
#	Content/Blueprints/UI/Widgets/Search/Search.uasset
#	Content/Blueprints/UI/Widgets/SubMenu/Submenu.uasset
#	Content/Maps/MainBuildings.umap
#	Content/Maps/NightLight.umap
#	Content/Maps/Points.umap
#	Content/Maps/mainScene.umap

2023-04-15 01:55:00 +05:00

..

Interior

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

2023-04-15 01:55:00 +05:00

Cars.umap

…

IV.umap

…

Lightning_for_bake.umap

…

Lightning.umap

HUY

2023-04-15 01:52:21 +05:00

MainBuildings.umap

HUY

2023-04-15 01:52:21 +05:00

mainScene.umap

HUY

2023-04-15 01:52:21 +05:00

NewWorld.umap

…

NightLight.umap

HUY

2023-04-15 01:52:21 +05:00

Outside.umap

HUY

2023-04-15 01:52:21 +05:00

people.umap

HUY

2023-04-15 01:52:21 +05:00

Points.umap

HUY

2023-04-15 01:52:21 +05:00

starter.umap

…

Temp_roads.umap

…

Terrace.umap

…

Yard.umap

HUY

2023-04-15 01:52:21 +05:00

YardFoliage.umap

…

YardMAF.umap

…