 Dron
|
90317abe90
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2024-06-16 01:11:34 +05:00 |
|
|
Dron
|
9d279c5cd0
|
aga
|
2024-06-16 01:11:31 +05:00 |
|
 PC-G04
|
a09caae217
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2024-06-14 12:29:35 +05:00 |
|
|
PC-G04
|
4fbe3c1cb6
|
хы
|
2024-06-14 12:29:32 +05:00 |
|
|
Dron
|
d8708dce4b
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2024-06-13 19:52:31 +05:00 |
|
|
Dron
|
a849b97c0d
|
little fix
|
2024-06-13 19:52:18 +05:00 |
|
|
PC-G04
|
16449ba834
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
# Content/Maps/Interior/GP9/MOPs/S9_Se01_F20_22_MOP.umap
# Content/Maps/Interior/GP9/MOPs/S9_Se01_F21_MOP.umap
# Content/Maps/Interior/GP9/MOPs/S9_Se01_F23_MOP.umap
# Content/Maps/Masharov_Buildings.umap
# Content/Maps/Masharov_Yard.umap
# Content/Meshes/Exterior/Main/SM_S9_Se01_Facade.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F03_09_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F10_13_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F14_15_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F16_18_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F19_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F20_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F21_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F22_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F23_Cap_Wall.uasset
|
2024-06-13 12:34:30 +05:00 |
|
|
PC-G04
|
85532d3770
|
S9
|
2024-06-13 12:32:44 +05:00 |
|
|
Dron
|
5b3e3c3960
|
over9000 всяких фиксов
|
2024-06-11 20:25:50 +05:00 |
|
|
Dron
|
62767bac63
|
ФФ
|
2024-06-05 13:34:22 +05:00 |
|
|
Dron
|
105d5fb007
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
# Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F03-19_A03_fur.umap
|
2024-06-04 23:51:37 +05:00 |
|
|
Dron
|
48996c64e2
|
гора багов, интерьерный свет, лифты, уи
|
2024-06-04 23:51:22 +05:00 |
|
 PC-G13
|
b473dd5f08
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2024-06-04 17:59:32 +05:00 |
|
|
PC-G13
|
686e88cdeb
|
rects
|
2024-06-04 17:59:30 +05:00 |
|
|
Dron
|
c6e888fc95
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
# Content/Maps/Masharov_Buildings.umap
|
2024-06-03 18:56:43 +05:00 |
|
|
Dron
|
4674f815ce
|
m
|
2024-06-03 18:56:15 +05:00 |
|
|
PC-G13
|
ff70671d22
|
pravpn'ki
|
2024-05-31 19:49:59 +05:00 |
|
|
Dron
|
e3c19a6ff8
|
fixes
|
2024-05-22 17:57:49 +05:00 |
|
|
PC-G13
|
2208e5f0be
|
some fixes
|
2024-05-15 18:14:49 +05:00 |
|
|
Dron
|
1d423afda0
|
elevators
|
2024-05-09 14:01:08 +05:00 |
|
|
Dron
|
58667a6db5
|
cars, some else
|
2024-05-09 00:28:47 +05:00 |
|
|
Dron
|
48881a3d87
|
some shit
|
2024-05-08 14:50:53 +05:00 |
|
|
PC-G04
|
1d34a1dac2
|
всякие правки интерьерные
|
2024-05-08 14:40:32 +05:00 |
|
|
PC-G04
|
f566fe7971
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2024-05-08 13:40:05 +05:00 |
|
|
PC-G04
|
8771cee5b8
|
Крышки и дверь в МОП
|
2024-05-08 13:39:59 +05:00 |
|
|
Dron
|
7df3b333f5
|
da blyat ya ne mogu
|
2024-05-08 13:02:00 +05:00 |
|
|
Dron
|
56400e90cd
|
many stuff
|
2024-05-07 14:53:29 +05:00 |
|
|
Dron
|
9665402f53
|
sky control adopt, interior lighting fixes
|
2024-05-03 00:06:02 +05:00 |
|
|
PC-G13
|
40622d347c
|
parking
|
2024-05-02 13:46:58 +05:00 |
|
|
PC-G04
|
6a7ac42062
|
Котики в квартирах
|
2024-04-19 19:25:03 +05:00 |
|
|
PC-G04
|
26f517b7fe
|
pedro pedro OSM
|
2024-04-19 19:19:22 +05:00 |
|
|
PC-G13
|
5118b5099d
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
# Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-08_A00_fur.umap
# Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-08_A01_fur.umap
# Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-10_A02_fur.umap
# Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-10_A03_fur.umap
# Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-10_A04_fur.umap
# Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-10_A05_fur.umap
# Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F02-10_A06_fur.umap
# Content/Maps/Interior/GP7/Se03/F01-10/Furniture/S7_Se03_F09-10_A07_fur.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-12_A02_fur.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-12_A05_fur.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-12_A06_fur.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-12_A07_fur.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-13_A03_fur.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F11-13_A04_fur.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F13_A08_fur.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Furniture/S7_Se03_F13_A09_fur.umap
|
2024-04-19 19:12:11 +05:00 |
|
|
PC-G13
|
3d1f413931
|
forest_far
|
2024-04-19 19:11:32 +05:00 |
|
|
PC-G04
|
406529d54a
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
# Content/Maps/Interior/GP7/Se01/F11-12/Walls/S7_Se01_F11-12_A00_walls.umap
# Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-05_A02_walls.umap
# Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-05_A10_walls.umap
# Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-10_A05_walls.umap
# Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-10_A06_walls.umap
# Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F02-10_A09_walls.umap
# Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F06-08_A07_walls.umap
# Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F06-08_A12_walls.umap
# Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F09-10_A08_walls.umap
# Content/Maps/Interior/GP7/Se02/F01-10/Walls/S7_Se02_F09-10_A11_walls.umap
# Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_06-07_A05_walls.umap
# Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_A02_walls.umap
# Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_A03_walls.umap
# Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-03_A06_walls.umap
# Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-05_A00_walls.umap
# Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F02-08_A01_walls.umap
# Content/Maps/Interior/GP7/Se03/F01-10/Walls/S7_Se03_F09_A07_walls.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A02_walls.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A03_walls.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A04_walls.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A05_walls.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A06_walls.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F11_A07_walls.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F13_A08_walls.umap
# Content/Maps/Interior/GP7/Se03/F11-13/Walls/S7_Se03_F13_A09_walls.umap
|
2024-04-19 19:10:10 +05:00 |
|
|
PC-G04
|
c0cc21a0a9
|
коты/кошки и материал лендскейпа
|
2024-04-19 19:02:44 +05:00 |
|
|
PC-G13
|
aa59df1e51
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
|
2024-04-19 15:05:20 +05:00 |
|
|
PC-G13
|
af198e21a5
|
walls, mops, lamps
|
2024-04-19 15:05:13 +05:00 |
|
|
Dron
|
ef8384ca79
|
5.3 new sky, dynamic lamps (need setup instances), new plugins
|
2024-04-18 21:06:31 +05:00 |
|
|
Dron
|
45cc93bda0
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
# Content/Maps/mainScene.umap
|
2024-04-18 19:23:24 +05:00 |
|
|
Dron
|
1a0437f848
|
maket online
|
2024-04-18 19:21:54 +05:00 |
|
|
PC-G04
|
e78e825ce0
|
Мигрейт котов
|
2024-04-18 18:28:11 +05:00 |
|
|
PC-G13
|
ab3bdcac06
|
bp_lamp, int mats, meshes
|
2024-04-18 18:24:21 +05:00 |
|
|
PC-G13
|
61bd7de0c9
|
p2
|
2024-04-17 19:49:28 +05:00 |
|
|
PC-G13
|
3ef5e68765
|
p1
|
2024-04-17 19:48:09 +05:00 |
|
|
PC-G13
|
c3bfba9fe7
|
mda
|
2024-04-17 15:52:24 +05:00 |
|
|
PC-G13
|
a70c8c0e84
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
# Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F03-09_A01_fur.umap
# Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F03-19_A06_fur.umap
# Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F10-13_A11_fur.umap
# Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F10-19_A14_fur.umap
# Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F16-19_A17_fur.umap
# Content/Maps/Interior/GP9/F03-20_22/Furniture/S9_Se01_F16-19_A18_fur.umap
# Content/Maps/Interior/GP9/F03-20_22/Walls/S9_Se01_F20_A24_walls.umap
# Content/Maps/Interior/GP9/F03-20_22/Walls/S9_Se01_F22_A38_walls.umap
# Content/Maps/Interior/GP9/MOPs/S9_Se01_F03-09_MOP.umap
# Content/Maps/Interior/GP9/MOPs/S9_Se01_F10-13_MOP.umap
# Content/Maps/Interior/GP9/MOPs/S9_Se01_F14-15_MOP.umap
# Content/Maps/Interior/GP9/MOPs/S9_Se01_F16-19_MOP.umap
# Content/Maps/Interior/GP9/MOPs/S9_Se01_F20_22_MOP.umap
# Content/Maps/Interior/GP9/MOPs/S9_Se01_F21_MOP.umap
# Content/Maps/Interior/GP9/MOPs/S9_Se01_F23_MOP.umap
|
2024-04-17 00:12:35 +05:00 |
|
|
PC-G13
|
8343c9dc64
|
ssd kaput temp commit
|
2024-04-17 00:07:00 +05:00 |
|
|
Dron
|
9213c4fa57
|
maket socket
|
2024-04-16 19:52:04 +05:00 |
|
|
Dron
|
8ad7c2e9e6
|
parallax,elevators, utp
|
2024-04-15 21:17:22 +05:00 |
|
|
Dron
|
568cf76228
|
sshhhit
|
2024-04-15 01:20:26 +05:00 |
|