8 Commits

Author SHA1 Message Date
Dron 42c4b73a6a удалил кучу лишней хуйни 2019-12-18 21:37:13 +05:00
Zheka3777123 cc80a0f43b добавил моп 2019-11-22 14:35:04 +05:00
Dron 69f00daa76 kasdkkasd 2019-10-28 20:22:14 +05:00
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
Dron c7ad21aa0b всякое 2019-10-28 18:06:44 +05:00
Zheka3777123 744c95a549 поправил телики 2019-10-28 17:27:45 +05:00
Zheka3777123 1341866919 расставил мебель 2019-10-24 22:58:02 +05:00
Zheka3777123 577ef169ac добавил паки из старых проектов 2019-10-22 14:50:29 +05:00