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

Config

…

Content

…

Platforms/HoloLens/Config

…

Plugins

…

.gitignore

…

.p4ignore

…

lifeResidence.uproject

…

S

Description

No description provided

28 GiB

Languages

C++ 85.4%

Python 8.5%

C# 5.6%

C 0.3%

Batchfile 0.2%