 PC-G13
|
739ede701b
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-17 19:39:37 +05:00 |
|
|
PC-G13
|
ddbbe039eb
|
gp2(1)
|
2023-04-17 19:39:29 +05:00 |
|
 PC-G09
|
a619cbf5e5
|
Fix lightning
|
2023-04-17 16:52:08 +05:00 |
|
 GRAFF
|
c6895d99a7
|
HUY
|
2023-04-15 01:52:21 +05:00 |
|
|
PC-G09
|
fd2cb665c1
|
Nightlight
|
2023-04-14 20:49:55 +05:00 |
|
|
PC-G09
|
5e1203da25
|
Nightlight yard
|
2023-04-14 18:53:26 +05:00 |
|
|
PC-G13
|
f0bdf06d13
|
streetlamp BP
|
2023-04-14 16:36:00 +05:00 |
|
|
PC-G13
|
db9e1ae5fe
|
mops+volumetrics
|
2023-04-13 20:34:16 +05:00 |
|
|
PC-G13
|
0d6e85d7c2
|
f09, svet, bp elevatora+meshes, parkingWIP, numbers meshes
|
2023-04-13 16:46:08 +05:00 |
|
|
PC-G13
|
c3c946b450
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
# Content/Maps/Interior/GP1/MOP/S02/MOP_GP1_S02_F01.umap
# Content/Maps/Interior/Parking/Parking_GP1.umap
# Content/Maps/Interior/Parking/Parking_GP2.umap
|
2023-04-13 01:35:54 +05:00 |
|
|
PC-G13
|
ecbdca5039
|
smth
|
2023-04-13 01:33:46 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
8cd8dea914
|
GP2_S04_SA06
|
2023-04-12 16:02:45 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
6750271f76
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-11 18:25:59 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
5b3ff8ba51
|
GP2_S01_A004
|
2023-04-11 18:25:56 +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
|
860bc35dae
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
# Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_FloorLamp_1.uasset
# Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_1.uasset
# Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_2.uasset
# Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_3.uasset
# Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_4.uasset
# Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Pedant_light_013.uasset
# Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Aplomb_Large.uasset
# Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Chandelier_Modo.uasset
# Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Cyl_Lounge.uasset
# Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Cylindr_Res.uasset
# Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_bedroom_LR.uasset
# Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_1_minimalism.uasset
# Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_2_Minimal.uasset
# Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Bathroom_Minimal.uasset
# Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Chicago.uasset
# Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Cyl_Minimal.uasset
# Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Pendant_Crouise.uasset
# Content/Blueprints/UI/Widgets/Search/Search.uasset
# Content/Materials/Interior/MI_Door_Res.uasset
|
2023-04-10 17:15:30 +05:00 |
|
|
GRAFF
|
c8e761042f
|
источники света, людишки, тачилки, правки мастермата и эмиссив
|
2023-04-10 17:14:08 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
d130dfd37e
|
S04_A04_F09
|
2023-04-10 16:37:01 +05:00 |
|
|
PC-G13
|
9afb07252d
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
# Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Living/SM_LTV.uasset
# Content/Furniture/Vol2_Unsorted/Textures/T_BShoe_Fabric_R.uasset
# Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MI_Metal_Gold_Light.uasset
# Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Meshes/Bedroom/SM_Bed_Queen.uasset
# Content/Meshes/Interior/Furniture/Interior_V3/SM_Lamp_3_SM_Lamp_3.uasset
# Content/Meshes/Interior/Furniture/Interior_V3/SM_Table_Lounge_Table.uasset
# Content/Meshes/Interior/Furniture/Interior_V3/SM_Tidafors_Sofa.uasset
# Content/Meshes/Interior/Furniture/Interior_V3/SM_Wardrobe_3_SM_Wardrobe_3.uasset
# Content/Meshes/Interior/Furniture/Interior_V3/SM_child_bed_1_SM_child_bed_1.uasset
# Content/Meshes/Interior/Furniture/Interior_V3/SM_child_bed_2_SM_child_bed_3.uasset
# Content/Meshes/Interior/Furniture/Interior_V3/SM_child_dresser.uasset
# Content/Meshes/Interior/Furniture/Interior_V3/SM_child_shelf.uasset
# Content/Meshes/Interior/Furniture/Interior_V3/SM_child_table.uasset
# Content/Meshes/Interior/Window/SM_Window_08.uasset
# Content/Meshes/Interior/Window/SM_Windowsill.uasset
|
2023-04-10 13:06:43 +05:00 |
|
|
PC-G13
|
599a0ff47b
|
interiorshaders, ies, lamps,cubemapstex
|
2023-04-10 13:06:21 +05:00 |
|
 PC-G04
|
e77dd51ec3
|
GP1_S04_A05
|
2023-04-09 19:56:32 +05:00 |
|
|
PC-G04
|
b9d9e7283c
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-05 20:43:59 +05:00 |
|
|
PC-G04
|
29a05b2f35
|
BP_Lamp_KoservaTism
|
2023-04-05 20:43:43 +05:00 |
|
|
PC-G13
|
f2130fa05f
|
mops
|
2023-04-05 20:12:00 +05:00 |
|
 PC-G08
|
1d2bd21cd7
|
MOPbl
|
2023-04-05 14:32:15 +05:00 |
|
|
PC-G04
|
3eb39b4c4f
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-05 13:01:11 +05:00 |
|
|
PC-G04
|
0d431cc716
|
Lamps_Lounge
Interiors
|
2023-04-05 12:57:01 +05:00 |
|
|
PC-G08
|
499a487fec
|
mopDoorLvlsLamp
|
2023-04-04 14:52:33 +05:00 |
|
|
PC-G04
|
20195aeb4a
|
BP_Lamps,Interiors
|
2023-04-04 12:04:38 +05:00 |
|
|
PC-G13
|
2e7f72c9ef
|
BP_Lamp
|
2023-04-03 16:05:32 +05:00 |
|