 PC-G13
|
ced59e2452
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-15 15:45:01 +05:00 |
|
|
PC-G13
|
00ed265040
|
mops gps fixes
|
2024-05-15 15:44:57 +05:00 |
|
 NikitsSysun
|
f7e74fc48b
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-15 14:52:08 +05:00 |
|
|
NikitsSysun
|
119c57b47e
|
Правки S01 S02 интерьеры
|
2024-05-15 14:51:52 +05:00 |
|
 Dron
|
71b122d4e0
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-15 13:09:02 +05:00 |
|
|
Dron
|
fb7b28a888
|
keep skuf motherfucker
|
2024-05-15 13:08:58 +05:00 |
|
|
NikitsSysun
|
3390b8540d
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-15 12:28:25 +05:00 |
|
|
NikitsSysun
|
75204584b9
|
еще генплана на лопате
|
2024-05-15 12:28:20 +05:00 |
|
|
PC-G13
|
d40cdff4de
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A00_F02-16.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A01_F02-16.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A02_F02-16.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A03_F02-16.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A04_F02-16.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A05_F02-16.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A06_F17.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A07_F17.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A08_F17.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A09_F17.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A10_F17.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A11_F17.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A12_F18.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A13_F18.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A14_F18.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A15_F18.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A16_F18.umap
# Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A17_F18.umap
|
2024-05-14 22:23:54 +05:00 |
|
|
PC-G13
|
3044d2507e
|
int mops fixes
|
2024-05-14 22:20:09 +05:00 |
|
|
Dron
|
e6e185a5d8
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-14 21:59:50 +05:00 |
|
|
Dron
|
4fed4ed3a2
|
aa
|
2024-05-14 21:59:47 +05:00 |
|
 Omar
|
dc405fd033
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-14 20:30:36 +05:00 |
|
|
Omar
|
c20c061e76
|
GP02 GP05 UPD
|
2024-05-14 20:30:32 +05:00 |
|
 pahachic
|
bf6c55b7a1
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-14 20:10:27 +05:00 |
|
|
pahachic
|
fefeab8043
|
Flat data (not cheked)
|
2024-05-14 20:08:51 +05:00 |
|
|
NikitsSysun
|
8c3ed5f9d3
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-14 19:13:55 +05:00 |
|
|
NikitsSysun
|
0a4f998889
|
правОЧКА гейплана
|
2024-05-14 19:06:20 +05:00 |
|
|
PC-G13
|
c89e75253d
|
mops fixes
|
2024-05-14 17:40:09 +05:00 |
|
|
PC-G13
|
4990e64c36
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-14 16:48:14 +05:00 |
|
|
PC-G13
|
00a47ab6b9
|
mops
|
2024-05-14 16:48:03 +05:00 |
|
|
Omar
|
3e4cd1037e
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-14 16:05:50 +05:00 |
|
|
Omar
|
3bf49b3da6
|
GP8_S03 UPD
|
2024-05-14 16:05:45 +05:00 |
|
 PC-G04
|
f348f3a608
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-14 15:22:45 +05:00 |
|
|
PC-G04
|
fa7f37d620
|
Правки gp8 s02 s05
|
2024-05-14 15:22:41 +05:00 |
|
|
Dron
|
0ef071785e
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-14 13:33:32 +05:00 |
|
|
Dron
|
805ea3e169
|
some else
|
2024-05-14 13:33:14 +05:00 |
|
|
PC-G13
|
4515f05599
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
# Content/Meshes/Interiors/GP7/GP7S05/MOP/S03/SM_GP7_S03_F01_MOP_Capwall.uasset
|
2024-05-14 13:19:51 +05:00 |
|
|
PC-G13
|
55c3bd6011
|
mops s05 + commons
|
2024-05-14 13:19:34 +05:00 |
|
|
NikitsSysun
|
89856cf0a8
|
Хуй
|
2024-05-13 20:35:29 +05:00 |
|
|
NikitsSysun
|
2913fe2c7b
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-13 20:01:11 +05:00 |
|
|
NikitsSysun
|
86baebfeb9
|
микроправки
|
2024-05-13 20:01:04 +05:00 |
|
|
Omar
|
a7a4215f86
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-13 19:54:57 +05:00 |
|
|
Omar
|
e51fe773d8
|
GP8_S03 UPD
|
2024-05-13 19:54:53 +05:00 |
|
|
NikitsSysun
|
552ef5d493
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-13 17:44:35 +05:00 |
|
|
NikitsSysun
|
09d53d658b
|
Правки S04 плинтус
|
2024-05-13 17:44:31 +05:00 |
|
|
Dron
|
0edaea0223
|
infra
|
2024-05-13 16:36:44 +05:00 |
|
 SergeyVag
|
1ecfaad102
|
чинил крышки
|
2024-05-13 15:44:41 +05:00 |
|
|
PC-G13
|
d65d88ddc3
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
# Content/Maps/Interiors/GP7/S02/GP7_S02_F01_MOP.umap
# Content/Maps/Interiors/GP7/S03/GP7_S03_F01_MOP.umap
# Content/Maps/Interiors/GP7/S04/GP7_S04_F01_MOP.umap
# Content/Maps/Main_Building.umap
# Content/Meshes/Interiors/GP8/S04/Cap/SM_GP8_S04_A03_F02_Cap.uasset
# Content/Meshes/Interiors/GP8/S04/CapWall/SM_GP8_S04_F02_07_CapWall.uasset
# Content/Meshes/houses/GP8/S02/SM_GP8_S02.uasset
# Content/Meshes/houses/GP8/SM_GP8_S01_Windows.uasset
# Content/Meshes/houses/GP8/SM_GP8_S03.uasset
|
2024-05-13 14:23:40 +05:00 |
|
|
PC-G13
|
0a28c5d04c
|
mops
|
2024-05-13 14:20:16 +05:00 |
|
|
NikitsSysun
|
dce7a9a7e5
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-13 13:37:34 +05:00 |
|
|
NikitsSysun
|
fe44b178cd
|
Правки первая секция
|
2024-05-13 13:37:25 +05:00 |
|
|
Dron
|
2948a25f4f
|
implementing
|
2024-05-13 13:11:49 +05:00 |
|
|
SergeyVag
|
006ae41cb8
|
колизии на фасадах
|
2024-05-13 12:55:53 +05:00 |
|
|
SergeyVag
|
efa5fed049
|
Еще правка фасада
|
2024-05-13 12:47:38 +05:00 |
|
|
SergeyVag
|
e55020437c
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-13 12:30:12 +05:00 |
|
|
SergeyVag
|
0a4f1c55c6
|
фасады
|
2024-05-13 12:30:10 +05:00 |
|
|
NikitsSysun
|
63a5564fc5
|
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
|
2024-05-13 12:23:20 +05:00 |
|
|
NikitsSysun
|
00ca3d331c
|
Правки секция 2
|
2024-05-13 12:22:55 +05:00 |
|
|
SergeyVag
|
68e9846805
|
всякое
|
2024-05-13 11:24:56 +05:00 |
|