T

Dron ca2d090b58 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA

# Conflicts:
#	Content/AssetPacks/Au_Bedroom_03/Mesh/Props/SM_TV.uasset
#	Content/AssetPacks/Flowers_Plants_Part1/Meshes/SM_CornusAlba_01_FoliageType.uasset
#	Content/AssetPacks/TreePackMaple/MapleTree/SM_mapleTree_B_FoliageType.uasset
#	Content/AssetPacks/TreePackMaple/MapleTree/SM_mapleTree_D_FoliageType.uasset
#	Content/AssetPacks/TreePackMaple/MapleTree/SM_mapleTree_H_FoliageType.uasset
#	Content/Blueprints/BP_Elevator_OTIS.uasset
#	Content/Level/Building1.umap
#	Content/Level/Environment.umap
#	Content/Level/Index.umap
#	Content/Level/Lights.umap
#	Content/Level/MAF.umap
#	Content/Level/S2F1.umap
#	Content/Level/S2F2.umap
#	Content/Level/reflections.umap
#	Content/Materials/M_FakeInterior.uasset

2019-10-28 18:08:57 +05:00

Config

всякое

2019-10-28 18:06:44 +05:00

Content

Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA

2019-10-28 18:08:57 +05:00

.gitignore

библиотеки

2019-10-09 17:01:54 +05:00

README.md

Initial commit