PRAyMU
|
34bdf465fb
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-19 16:31:43 +05:00 |
|
PRAyMU
|
07f7f4ffb3
|
Carpet_Test_P1
|
2023-04-19 16:21:13 +05:00 |
|
GRAFF
|
021f17ec14
|
подсказки для дэбилов, динамическая занятость паркинга
|
2023-04-18 23:54:16 +05:00 |
|
PC-G13
|
f7f30ddb2e
|
gp2(1). refl, f09
|
2023-04-18 18:59:22 +05:00 |
|
DESKTOP-8J0BKKD\Admin
|
ff03798fcf
|
Окна на балкон
|
2023-04-17 18:39:39 +05:00 |
|
GRAFF
|
c6895d99a7
|
HUY
|
2023-04-15 01:52:21 +05:00 |
|
PC-G13
|
7ad0ff0502
|
коллизии, немного пробок, пара шейдеров,
|
2023-04-14 15:10:13 +05:00 |
|
GRAFF
|
f9df855339
|
someShitElse, dragfix
|
2023-04-14 02:38:55 +05:00 |
|
PC-G13
|
bfd8b8c8e3
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
# Content/Maps/Interior/GP2/MOP/S04/MOP_GP2_S04_F01.umap
|
2023-04-13 20:35:25 +05:00 |
|
PC-G13
|
db9e1ae5fe
|
mops+volumetrics
|
2023-04-13 20:34:16 +05:00 |
|
PC-G04
|
b9b5457184
|
terrace
|
2023-04-13 19:53:05 +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 |
|
GRAFF
|
cfd05910ae
|
xml continue
|
2023-04-11 20:29: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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-G04
|
e77dd51ec3
|
GP1_S04_A05
|
2023-04-09 19:56:32 +05:00 |
|
PC-G12
|
805d133826
|
Col
|
2023-04-06 19:35:57 +05:00 |
|
PRAyMU
|
313ea77cf7
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
# Content/Maps/Interior/GP1/F09/S01/GP1_S01_A05_F09.umap
# Content/Meshes/Interior/Window/SM_Window_Angular.uasset
# Content/Meshes/Interior/Window/SM_Windowsill.uasset
|
2023-04-06 02:39:28 +05:00 |
|
PRAyMU
|
e3d6ca7fda
|
GP1_F09_S01_A05_P1
|
2023-04-06 02:23:56 +05:00 |
|
GRAFF
|
7f2901d31f
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
# Content/Materials/Interior/MI_Emissive_0_Power_Warm.uasset
|
2023-04-06 01:46:46 +05:00 |
|
GRAFF
|
f86d4f9218
|
asdasd
|
2023-04-06 01:46:26 +05:00 |
|
PC-G13
|
5f2f615bd3
|
svet
|
2023-04-06 00:19:39 +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-G12
|
a70a61ee5b
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-05 14:20:09 +05:00 |
|
PC-G12
|
bf358be6be
|
Parking
|
2023-04-05 14:17:52 +05:00 |
|
PC-G08
|
499a487fec
|
mopDoorLvlsLamp
|
2023-04-04 14:52:33 +05:00 |
|
PC-G08
|
53c8aef926
|
Mops
|
2023-04-03 19:10:44 +05:00 |
|
PC-G04
|
3559766369
|
Irina
|
2023-04-01 17:48:13 +05:00 |
|
PC-G08
|
b390c1922a
|
gp1gp2Mops
|
2023-03-31 17:51:07 +05:00 |
|
PRAyMU
|
eb6fbcf010
|
Test_Room_Minimal_P3
|
2023-03-31 17:47:15 +05:00 |
|
PC-G04
|
3df07e1641
|
Interior
|
2023-03-31 14:09:05 +05:00 |
|