 GRAFF
|
2bb2b0a84e
|
some
|
2023-04-12 21:20:02 +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 |
|
 Igor
|
f80cd7caa5
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-12 17:21:56 +05:00 |
|
|
Igor
|
3ca1899a38
|
GP2_S02_A05
|
2023-04-12 17:21:45 +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
|
212fffcbe8
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-12 16:02:48 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
8cd8dea914
|
GP2_S04_SA06
|
2023-04-12 16:02:45 +05:00 |
|
 PC-G08
|
d28b184bf4
|
GP2_S03_A05
|
2023-04-12 15:10:15 +05:00 |
|
|
GRAFF
|
60d30c4ca2
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-12 14:46:15 +05:00 |
|
|
GRAFF
|
8db3fa5018
|
some
|
2023-04-12 14:45:49 +05:00 |
|
 PC-G09
|
3c056e899c
|
Всякое хуесякое
|
2023-04-12 14:42:48 +05:00 |
|
|
PC-G12
|
d0d5a60498
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-12 12:18:48 +05:00 |
|
|
PC-G12
|
ce6e5b04eb
|
CMIT
|
2023-04-12 12:17:28 +05:00 |
|
|
PC-G09
|
d16c87d81e
|
Foliage cull fix (Masks to nomipmap x64 res)
|
2023-04-12 09:44:37 +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 |
|
|
Igor
|
765ff77c1f
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-11 20:17:59 +05:00 |
|
|
Igor
|
ac2f84531d
|
GP2_S02_A05
|
2023-04-11 20:17:30 +05:00 |
|
|
PC-G12
|
ac39c45b06
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-11 19:55:33 +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 |
|
|
DESKTOP-8J0BKKD\Admin
|
8dd9bb4020
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
|
2023-04-11 19:50:47 +05:00 |
|
|
DESKTOP-8J0BKKD\Admin
|
2da5c911c6
|
GP2_S04_A06_F9
|
2023-04-11 19:50:43 +05:00 |
|
|
PC-G08
|
36e6c9715d
|
GP02_S03_A04 inta
|
2023-04-11 18:46:14 +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
|
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
|
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 |
|