Commit Graph

6 Commits

Author SHA1 Message Date
PC-G13 ecbdca5039 smth 2023-04-13 01:33:46 +05:00
PC-G13 b93abcd470 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_1.uasset
#	Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Cylindr_Res.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Pendant_Crouise.uasset
#	Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Lamps/WallLampsMaterial/MI_WallLamp.uasset
2023-04-11 16:27:29 +05:00
PC-G13 f70c9bb3e2 smth gp1 2023-04-11 16:26:45 +05:00
GRAFF c8e761042f источники света, людишки, тачилки, правки мастермата и эмиссив 2023-04-10 17:14:08 +05:00
PC-G13 599a0ff47b interiorshaders, ies, lamps,cubemapstex 2023-04-10 13:06:21 +05:00
PC-G04 29a05b2f35 BP_Lamp_KoservaTism 2023-04-05 20:43:43 +05:00