 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 |
|
 GRAFF
|
09fb067dc0
|
UI
|
2023-04-11 18:09:27 +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
|
61b2942c99
|
bool
|
2023-04-11 16:22:03 +05:00 |
|
|
GRAFF
|
d4aff7e033
|
xml dispatcher
|
2023-04-11 16:20:07 +05:00 |
|
|
GRAFF
|
e72aa380e5
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-11 15:26:10 +05:00 |
|
|
GRAFF
|
ae1d917351
|
тачки, еще люди, загрузка данных по хатам, плагин парсер
|
2023-04-11 15:25:58 +05:00 |
|
 PRAyMU
|
c828b24092
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-11 15:04:22 +05:00 |
|
|
PRAyMU
|
5f3b274d32
|
F09_A05_A06
|
2023-04-11 15:03:28 +05:00 |
|
 Igor
|
e2c2306e2a
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-11 14:58:16 +05:00 |
|
|
Igor
|
be3e21c1af
|
F_GP2_S04_A00
|
2023-04-11 14:58:11 +05:00 |
|
 PC-G04
|
8abbf22eec
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-11 13:20:03 +05:00 |
|
|
PC-G04
|
2b88950464
|
GP1_S04_A05_F09
|
2023-04-11 13:19:56 +05:00 |
|
 PC-G12
|
78d8d6ef8b
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-11 12:18:55 +05:00 |
|
|
PC-G12
|
ca0a4a2dda
|
Come eat_01
|
2023-04-11 12:18:50 +05:00 |
|
|
Igor
|
42d18f364d
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-10 19:52:21 +05:00 |
|
|
PC-G12
|
94033d8c01
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-10 19:51:33 +05:00 |
|
|
PC-G12
|
bc3ca3131b
|
0609
|
2023-04-10 19:51:06 +05:00 |
|
|
Igor
|
0de09016fa
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-10 19:50:43 +05:00 |
|
|
Igor
|
43af0e486d
|
F_GP2_S03_A03 _ BF
|
2023-04-10 19:50:24 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
bd2045d25b
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-10 19:10:56 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
6cdb4ea06d
|
GP1_S04_F09
|
2023-04-10 19:10:52 +05:00 |
|
|
GRAFF
|
f0f5417bd3
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# Content/Blueprints/UI/Widgets/Point/Marker.uasset
|
2023-04-10 18:56:33 +05:00 |
|
|
GRAFF
|
bdb454fd74
|
Очередной юай
|
2023-04-10 18:53:53 +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
|
260157f0fa
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-10 16:37:07 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
d130dfd37e
|
S04_A04_F09
|
2023-04-10 16:37:01 +05:00 |
|
|
PC-G04
|
05974f64f4
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-10 16:32:34 +05:00 |
|
|
PC-G04
|
5084ed2cd7
|
GP1_S04_A05_F09
|
2023-04-10 16:32:29 +05:00 |
|
|
PC-G13
|
1246e02c98
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-10 15:42:19 +05:00 |
|
|
PC-G13
|
08784923b3
|
smth
|
2023-04-10 15:42:16 +05:00 |
|
 PC-G08
|
e5686d287e
|
GP01_Lvls_BF_and_F
|
2023-04-10 15:39:00 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
9e24f07d46
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-10 13:53:24 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
e83414e135
|
S04_A04_F09
|
2023-04-10 13:53:21 +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-G12
|
98e8703d70
|
Redirections
|
2023-04-10 13:00:37 +05:00 |
|
|
PC-G12
|
0151ba39cd
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-10 12:12:21 +05:00 |
|
|
PC-G12
|
4f074552ef
|
Come eat
|
2023-04-10 12:12:14 +05:00 |
|
|
PC-G04
|
116e1b79e7
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-09 19:56:39 +05:00 |
|
|
PC-G04
|
e77dd51ec3
|
GP1_S04_A05
|
2023-04-09 19:56:32 +05:00 |
|
|
Igor
|
85841d835d
|
F_GP2_S03_A03 F_GP2_S02_A02
|
2023-04-09 19:52:36 +05:00 |
|
|
Igor
|
f0dce537b7
|
F_GP2_S02_A02_F_GP2_S01_A03
|
2023-04-07 20:02:02 +05:00 |
|
|
PC-G04
|
9252d1588d
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-07 19:57:44 +05:00 |
|
|
PC-G04
|
0e6b55cc3d
|
Много интерьеров
|
2023-04-07 19:57:38 +05:00 |
|
|
PC-G12
|
a0ef43b911
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-07 19:38:20 +05:00 |
|
|
PC-G12
|
16515e0e41
|
BaseFloors
|
2023-04-07 19:38:14 +05:00 |
|