 GRAFF
|
20058a48be
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-13 17:42:25 +05:00 |
|
|
GRAFF
|
4674c8106c
|
points
|
2023-04-13 17:42:15 +05:00 |
|
 PC-G13
|
c9b5255164
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-13 16:46:53 +05:00 |
|
|
PC-G13
|
0d6e85d7c2
|
f09, svet, bp elevatora+meshes, parkingWIP, numbers meshes
|
2023-04-13 16:46:08 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
1c5ce702dc
|
Мопы
|
2023-04-13 15:49:58 +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 |
|
 PRAyMU
|
8ff9627c0a
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-12 21:25:58 +05:00 |
|
|
PRAyMU
|
fd9005cd2e
|
S01_S02_F09
|
2023-04-12 21:25:49 +05:00 |
|
 PC-G12
|
889031c223
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-12 19:55:17 +05:00 |
|
|
PC-G12
|
1f4aadfa11
|
GreatestMops_Vol1
|
2023-04-12 19:55:12 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
65f1042aa1
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-12 18:40:39 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
932b36a06a
|
GP1_S03_A15
|
2023-04-12 18:40:35 +05:00 |
|
|
GRAFF
|
666cf634d3
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-12 17:23:38 +05:00 |
|
|
GRAFF
|
486c8f48ec
|
points, parking
|
2023-04-12 17:23:26 +05:00 |
|
|
PC-G12
|
b6f68b8309
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-12 16:34:24 +05:00 |
|
|
PC-G12
|
f4722cea5e
|
Comeat
|
2023-04-12 16:34:13 +05:00 |
|
|
PRAyMU
|
f363f0b020
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-12 16:08:50 +05:00 |
|
|
PRAyMU
|
d260207dde
|
F09_Repair
|
2023-04-12 16:08:00 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
8cd8dea914
|
GP2_S04_SA06
|
2023-04-12 16:02:45 +05:00 |
|
|
GRAFF
|
8bfc9489f1
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-11 20:29:29 +05:00 |
|
|
GRAFF
|
cfd05910ae
|
xml continue
|
2023-04-11 20:29:27 +05:00 |
|
|
PC-G12
|
2102cd7a23
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-11 19:52:00 +05:00 |
|
|
PC-G12
|
fe9a48b997
|
RM
|
2023-04-11 19:51:26 +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 |
|
|
PC-G12
|
ca0a4a2dda
|
Come eat_01
|
2023-04-11 12:18:50 +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 |
|
|
DESKTOP-8J0BKKD\Admin
|
6cdb4ea06d
|
GP1_S04_F09
|
2023-04-10 19:10:52 +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-G08
|
e5686d287e
|
GP01_Lvls_BF_and_F
|
2023-04-10 15:39:00 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
e83414e135
|
S04_A04_F09
|
2023-04-10 13:53:21 +05:00 |
|
|
PC-G04
|
e77dd51ec3
|
GP1_S04_A05
|
2023-04-09 19:56:32 +05:00 |
|
|
PC-G08
|
4121ca2728
|
Lvls_BF
|
2023-04-07 17:34:06 +05:00 |
|
|
PC-G08
|
73a188628c
|
gp1_walls
|
2023-04-07 14:46:27 +05:00 |
|
|
PC-G08
|
c3d61c0043
|
Lvls_W_GP1
|
2023-04-06 18:17:45 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
5d201c5458
|
Правки некоторых хат
|
2023-04-06 12:44:41 +05:00 |
|
|
GRAFF
|
d410e45920
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-06 04:56:55 +05:00 |
|
|
GRAFF
|
279ea5369f
|
gbpltw
|
2023-04-06 04:56:48 +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 |
|