 GRAFF
|
e193db95cf
|
еще цитферки
|
2022-07-11 14:56:49 +05:00 |
|
|
GRAFF
|
5971d13f93
|
каблучки макияж, и этот день наш
|
2022-07-11 14:47:58 +05:00 |
|
 JohnnyHatchet
|
dfcb766a19
|
Свет во дворах
|
2022-07-11 12:58:25 +05:00 |
|
|
JohnnyHatchet
|
788e56295b
|
Фонари на дороги
|
2022-07-11 12:33:47 +05:00 |
|
|
GRAFF
|
ef43cd3d16
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2022-07-11 12:28:10 +05:00 |
|
|
GRAFF
|
9bf066c207
|
bake_pivotsingsov
|
2022-07-11 12:27:37 +05:00 |
|
|
JohnnyHatchet
|
3bc6dcaaa0
|
Ночное освещение
|
2022-07-11 11:36:38 +05:00 |
|
|
JohnnyHatchet
|
435066c4a6
|
Декаль на внешку (пока 8к) , деревья внешка, выпилил пропсы с дорог (не видно их нифига)
|
2022-07-11 05:04:24 +05:00 |
|
|
JohnnyHatchet
|
fc4d17a9b0
|
Decal outside all + foliage rework
|
2022-07-10 17:54:04 +05:00 |
|
|
GRAFF
|
fb77d65acb
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
# Content/Meshes/Interior/GP2/MOP/Elevator/SM_Elevator.uasset
|
2022-07-10 12:46:37 +05:00 |
|
|
GRAFF
|
2f0730d3a8
|
еще пачка изменений, циферки, лифт, пиздюки, коллизии
|
2022-07-10 12:44:24 +05:00 |
|
|
GRAFF
|
88ea1d965e
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2022-07-08 20:11:29 +05:00 |
|
|
GRAFF
|
4c403a05f8
|
кнупки
|
2022-07-08 20:11:26 +05:00 |
|
 PC-G12
|
bd4c5283ec
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
# Content/Meshes/Interior/GP2/MOP/HallDoor/SM_Door_Outer.uasset
|
2022-07-08 19:10:31 +05:00 |
|
|
PC-G12
|
37d50e3fce
|
Mops
|
2022-07-08 19:07:58 +05:00 |
|
|
GRAFF
|
41f8ab658b
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2022-07-08 18:13:33 +05:00 |
|
|
GRAFF
|
f4cff46e92
|
baker
|
2022-07-08 18:13:30 +05:00 |
|
|
GRAFF
|
2a4b767589
|
Детишки + ЛОДы + удаление пустых карт
|
2022-07-08 16:59:47 +05:00 |
|
|
GRAFF
|
47d640a706
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
# Content/Maps/Interior/GP2/S02A30.umap
# Content/Maps/Interior/GP2/S02A31.umap
# Content/Maps/Interior/GP2/S02A47.umap
# Content/Meshes/Interior/GP2/Plintuth/Plinth_Up/SM_S02A30_Plinth.uasset
# Content/Meshes/Interior/GP2/SM_S02A30.uasset
|
2022-07-08 10:45:49 +05:00 |
|
|
GRAFF
|
325f4302a6
|
mama mama, ma baker
|
2022-07-08 10:45:33 +05:00 |
|
 PC-G06
|
e4587618b5
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2022-07-07 20:14:45 +05:00 |
|
|
PC-G06
|
6cd8561207
|
S0_New_UV_Part_1
|
2022-07-07 20:14:42 +05:00 |
|
|
PC-G12
|
28c9d15314
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2022-07-07 20:09:15 +05:00 |
|
|
PC-G12
|
0c55ced6ec
|
Mopz
|
2022-07-07 20:08:50 +05:00 |
|
|
GRAFF
|
1e4d6298c0
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2022-07-07 19:49:57 +05:00 |
|
|
GRAFF
|
b66ee2ebcd
|
угу
|
2022-07-07 19:48:53 +05:00 |
|
|
GRAFF
|
27decfd074
|
подшаманил немного
|
2022-07-07 19:42:47 +05:00 |
|
|
PC-G06
|
6a5253fb87
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2022-07-07 18:04:58 +05:00 |
|
|
PC-G06
|
0924317541
|
S02_Mesh_18_20_27_28_52
|
2022-07-07 18:04:54 +05:00 |
|
|
GRAFF
|
d0495811d1
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
# Content/Meshes/Interior/GP2/SM_S02A18.uasset
# Content/Meshes/Interior/GP2/SM_S02A20.uasset
# Content/Meshes/Interior/GP2/SM_S02A27.uasset
|
2022-07-07 17:32:45 +05:00 |
|
|
GRAFF
|
dcaaf47521
|
ma baker
|
2022-07-07 17:32:24 +05:00 |
|
|
PC-G06
|
f97f65c6bb
|
S02_Door_Inner
|
2022-07-07 17:17:52 +05:00 |
|
|
GRAFF
|
7a0fd727f2
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2022-07-07 14:31:51 +05:00 |
|
|
GRAFF
|
cc25272b39
|
ma baker
|
2022-07-07 14:31:47 +05:00 |
|
|
GRAFF
|
fda80f0b65
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
# Config/DefaultEngine.ini
# Config/DefaultGame.ini
# Content/Blueprints/Lamp/BP_InteriorLamp_CylLamp.uasset
# Content/Blueprints/Lamp/BP_streetLamp.uasset
# Content/Blueprints/Lamp/BP_streetLamp_Child_6m.uasset
# Content/Blueprints/Player/GI.uasset
# Content/Blueprints/Player/MathAndConvertFns.uasset
# Content/Blueprints/Player/MyPawn.uasset
# Content/Blueprints/Player/WalkingPawn.uasset
# Content/Blueprints/Player/myGM.uasset
# Content/Blueprints/UI/Actors/InfraPoint.uasset
# Content/Blueprints/UI/Actors/KPmaker.uasset
# Content/Blueprints/UI/Others/FlatData.uasset
# Content/Blueprints/UI/Others/clientData.uasset
# Content/Blueprints/UI/WBPS/Elements/MenuBtn.uasset
# Content/Blueprints/UI/WBPS/KPWidget.uasset
# Content/Blueprints/UI/WBPS/Menu/InfoPanel.uasset
# Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset
# Content/Blueprints/UI/WBPS/Menu/bottomMenu.uasset
# Content/Blueprints/UI/WBPS/Menu/flatInfoBig.uasset
# Content/Blueprints/UI/WBPS/Menu/floorInfo.uasset
# Content/Blueprints/UI/WBPS/Menu/houseInfo.uasset
# Content/Blueprints/UI/WBPS/Menu/saveData.uasset
# Content/Blueprints/UI/WBPS/Menu/welcomeData.uasset
# Content/Blueprints/UI/WBPS/filter/Filter.uasset
# Content/Blueprints/UI/WBPS/filter/FlatCard.uasset
# Content/Blueprints/UI/WBPS/filter/FlatCardBig.uasset
# Content/Blueprints/UI/WBPS/widgetActions.uasset
# Content/Maps/Interior/GP2/S02A17.umap
# Content/Maps/Interior/GP2/S02F02.umap
# Content/Maps/Interior/GP2/S02F03-12.umap
# Content/Maps/Interior/GP2/S02F13-16.umap
# Content/Maps/Interior/GP2/S02F17-18.umap
# Content/Maps/Interior/GP2/S02F19.umap
# Content/Maps/Interior/GP2/S02F20.umap
# Content/Maps/Interior/L_Test_Room.umap
# Content/Maps/Masharov_Buildings.umap
# Content/Maps/Masharov_Landscape.umap
# Content/Maps/Masharov_Yard.umap
# Content/Maps/mainScene.umap
# Content/Maps/test1.umap
# Content/Materials/Masharov_Interior/Palette/MI_Emissive_2_Mash.uasset
# Content/Materials/Masharov_Interior/Palette/MI_Emissive_Mash.uasset
# Content/Meshes/Exterior/Main/SM_Masharov_GP3_pos.uasset
# Content/Meshes/Interior/Furniture/Kitchen/Modular/SM_Down_Locker_With_Sink.uasset
# Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_1.uasset
# Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_2.uasset
# Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_2_V2.uasset
# Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Chandelier_Lamp_V2.uasset
# Content/Meshes/Interior/Furniture/Lamp_Mesh/SM_Torchere_2.uasset
# Content/Meshes/Interior/Furniture/Other/SM_Door_Invis.uasset
# Masharov.uproject
|
2022-07-07 12:23:47 +05:00 |
|
|
PC-G12
|
6bd7faa5b0
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
# Content/Maps/Interior/GP2/S02F02.umap
|
2022-07-07 12:12:50 +05:00 |
|
|
GRAFF
|
7edddefceb
|
всякие правки
|
2022-07-07 12:11:07 +05:00 |
|
|
PC-G12
|
fb0dd38a36
|
MOPS
|
2022-07-07 12:10:33 +05:00 |
|
|
JohnnyHatchet
|
5af77f839c
|
Правки
|
2022-07-07 07:30:44 +05:00 |
|
|
GRAFF
|
81adb1c8cf
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
# Content/Maps/Interior/GP2/S02A01.umap
# Content/Meshes/Interior/Window/SM__GP2_Windows_8.uasset
|
2022-07-06 19:19:23 +05:00 |
|
|
GRAFF
|
b3f52b0654
|
baking_mops
|
2022-07-06 19:18:33 +05:00 |
|
|
PC-G06
|
b2bfa0b9a3
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2022-07-06 19:18:03 +05:00 |
|
|
PC-G06
|
4355c94ebe
|
S02_Larin_S
|
2022-07-06 19:18:00 +05:00 |
|
|
GRAFF
|
bf557cb75c
|
Девчата + отключенный плагин
|
2022-07-06 19:00:06 +05:00 |
|
 PC-G10
|
34646dbf5d
|
S02A01 09 19 30 44
|
2022-07-06 16:26:19 +05:00 |
|
|
PC-G06
|
7249e84ffc
|
S0_Danis
|
2022-07-06 15:57:10 +05:00 |
|
|
PC-G06
|
929264aa25
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2022-07-06 15:14:38 +05:00 |
|
 Lenta_Mebiusa
|
c4f876e285
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2022-07-06 15:10:33 +05:00 |
|
|
Lenta_Mebiusa
|
6f0c16e37f
|
S02A43
|
2022-07-06 15:10:23 +05:00 |
|
|
PC-G10
|
4df629b727
|
S02A01 09 19 30 44
|
2022-07-06 15:00:53 +05:00 |
|