 Dron
|
ed2dafd098
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
# Content/Blueprints/Lamp/BP_lampStreet_GP07_LightColumn.uasset
# Content/Maps/Yard_GP7-8.umap
|
2023-12-08 14:16:01 +05:00 |
|
|
Dron
|
e77ed2ce46
|
humans, sshhhhiiiit
|
2023-12-08 14:15:26 +05:00 |
|
 PC-G12
|
2398c3eeb7
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
# Content/Maps/Interiors/GP7/S01/GP7_S01_F02-22_MOP.umap
# Content/Maps/Interiors/GP7/S01/GP7_S01_F23-24_MOP.umap
# Content/Maps/Interiors/GP7/S02/GP7_S02_F02-18_MOP.umap
# Content/Maps/Interiors/GP7/S03/GP7_S03-F13_MOP.umap
# Content/Maps/Interiors/GP7/S03/GP7_S03_F02-12_MOP.umap
|
2023-12-08 12:06:06 +05:00 |
|
|
PC-G12
|
3a785da9f9
|
MP
|
2023-12-08 11:57:58 +05:00 |
|
 PC-G13
|
810b57858b
|
gp, mats, osm mat migrate,
|
2023-12-07 18:29:29 +05:00 |
|
|
Dron
|
312b58ad96
|
dohuisha vsego
|
2023-12-05 00:51:07 +05:00 |
|
|
PC-G13
|
b7ca364fcd
|
windows on facades
|
2023-12-04 16:14:46 +05:00 |
|
|
Dron
|
b38a0eaa53
|
ds
|
2023-12-04 15:22:56 +05:00 |
|
 JohnnyHatchet
|
6e03fb01a5
|
DEREVYA
|
2023-12-04 14:18:17 +05:00 |
|
|
JohnnyHatchet
|
f6396bc50a
|
Folliage
|
2023-12-04 10:35:40 +05:00 |
|
|
PC-G13
|
66c6ec0438
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2023-12-03 19:17:01 +05:00 |
|
|
PC-G13
|
fa7dc5940f
|
ny i 4to tam so stalkerom to?
|
2023-12-03 19:16:56 +05:00 |
|
 PC-G08
|
70f2b9f2d7
|
roads
|
2023-12-03 14:10:27 +05:00 |
|
|
JohnnyHatchet
|
200382f6d5
|
Up
|
2023-12-03 09:28:11 +05:00 |
|
|
Dron
|
4204d2d84c
|
zahodit znachit stalker v bar..
|
2023-12-03 01:43:29 +05:00 |
|
|
PC-G13
|
f07e373da4
|
int
|
2023-12-02 23:21:06 +05:00 |
|
|
PC-G12
|
180aad1850
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2023-12-02 14:32:57 +05:00 |
|
|
PC-G12
|
eeba501f0e
|
GP
|
2023-12-02 14:26:44 +05:00 |
|
|
JohnnyHatchet
|
78e0cdc9d0
|
Road mat + pp in landscape
|
2023-12-02 10:36:52 +05:00 |
|
|
PC-G13
|
f244fea985
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
# Content/Maps/MainScene.umap
# Content/SkatePark/Naberez_Model/fix/Yard/MI_SidewalkYard_OldCity.uasset
|
2023-12-02 02:46:13 +05:00 |
|
|
PC-G13
|
b1e2f6643c
|
int
|
2023-12-02 02:45:05 +05:00 |
|
|
Dron
|
2c9bd4004f
|
many fixes, core override, UNREAL 5.3
|
2023-12-02 02:33:31 +05:00 |
|
|
Dron
|
035067c2a5
|
fasadhide/points/core override/
|
2023-12-01 23:52:23 +05:00 |
|
|
PC-G08
|
74ce00bdd8
|
gp07-08Yard
|
2023-12-01 17:56:11 +05:00 |
|
|
JohnnyHatchet
|
b482280c17
|
Up
|
2023-12-01 09:56:55 +05:00 |
|
|
JohnnyHatchet
|
28d1143291
|
Fix + Merge
Replace BP Foliage to SM, Merge from LR, Nanite
|
2023-12-01 07:05:37 +05:00 |
|
|
PC-G13
|
017a43fa68
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
# Content/Maps/Landscape.umap
# Content/Maps/Main_Building.umap
|
2023-12-01 01:08:42 +05:00 |
|
|
PC-G13
|
3a54253cfd
|
int
|
2023-12-01 01:08:03 +05:00 |
|
|
PC-G12
|
b5f76169c8
|
MP
|
2023-11-30 20:01:05 +05:00 |
|
|
PC-G08
|
65e59b42bd
|
gp07-08Yard+09_10
|
2023-11-30 18:36:23 +05:00 |
|
|
PC-G12
|
e42a1b1e51
|
MP
|
2023-11-30 12:06:12 +05:00 |
|
|
PC-G12
|
1967e3ed0f
|
MP
|
2023-11-29 19:58:45 +05:00 |
|
|
PC-G12
|
004ac2bd27
|
GP
|
2023-11-29 12:07:35 +05:00 |
|
|
PC-G12
|
9ab3d56b29
|
GP
|
2023-11-28 20:06:55 +05:00 |
|
|
PC-G12
|
b79e33f226
|
GP
|
2023-11-27 19:55:55 +05:00 |
|
|
PC-G13
|
433741f953
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2023-11-27 14:33:45 +05:00 |
|
|
PC-G13
|
c77e9070c4
|
я маслину поймал
|
2023-11-27 14:33:33 +05:00 |
|
|
PC-G12
|
e3bff91d02
|
GP
|
2023-11-27 11:59:39 +05:00 |
|
|
PC-G12
|
e5b9fd03e9
|
qr
|
2023-11-22 19:47:52 +05:00 |
|
|
PC-G12
|
9c86314ae7
|
fr
|
2023-11-20 12:14:37 +05:00 |
|
|
PC-G12
|
9b6c4ca4e0
|
MPs
|
2023-11-17 19:58:28 +05:00 |
|
|
PC-G12
|
f255871c6b
|
05
|
2023-11-16 19:52:39 +05:00 |
|
|
PC-G13
|
272cf7e65c
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
# Content/Materials/Interior/Minimal/MI_Floor_Parquet_Min.uasset
# Content/Meshes/Interior/Test_Room/SM_GP1_S01_A00_Floor_Test_Room.uasset
|
2023-11-16 16:22:47 +05:00 |
|
|
PC-G13
|
e742367694
|
levels, gp wip, facades wip, pizdec wip
|
2023-11-16 16:21:09 +05:00 |
|
 PRAyMU
|
5f71a3f73a
|
M_Test_Room_P2
|
2023-11-15 01:04:34 +05:00 |
|
|
PRAyMU
|
f4db56a7f6
|
M_Test_Room_P1
|
2023-11-09 23:36:09 +05:00 |
|
|
PRAyMU
|
aac277d206
|
Base material minimal style
|
2023-11-08 20:33:08 +05:00 |
|
|
PRAyMU
|
cd7c0e5e97
|
MM_Master + Tile Green
|
2023-11-08 20:27:17 +05:00 |
|
 GRAFF
|
a4bd3bb175
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
# Content/Maps/Landscape.umap
# Content/Maps/MainScene.umap
# Content/Maps/Yard_GP4.umap
# Content/Maps/test.umap
# Content/MigrateFortis/Otrada/Asset/SpeedTree/TreeMats/MM_Grass.uasset
|
2022-07-07 12:12:26 +05:00 |
|
|
JohnnyHatchet
|
1ea1e16067
|
Парк между ГП4 и ГП5
|
2022-07-07 07:24:56 +05:00 |
|