EgorSuv/SibIntel1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
566 Commits 4 Branches 2 Tags
a94de0d836d8a0246b4772efecb38f5438b442a9
Commit Graph

355 Commits

Author SHA1 Message Date
GRAFF 1e5fee0527 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-24 18:25:13 +05:00
GRAFF 7430813cb7 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Maps/Interior/GP3/Furniture/F_S03A00.umap
 2022-08-24 18:25:08 +05:00
PC-G04 4dccefe806 F_S03A01,2K-11 2022-08-24 18:24:41 +05:00
GRAFF 6922c73378 gp3 2022-08-24 18:24:33 +05:00
Igor e392c9da5d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-24 15:11:00 +05:00
Igor 236e0a4d02 2K-10 2022-08-24 15:10:53 +05:00
GRAFF 3e1188aa29 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 
# Conflicts:
#	Content/Maps/Interior/GP2/S02F13-16.umap
 2022-08-24 15:07:57 +05:00
GRAFF a141f94272 всякое 2022-08-24 15:07:07 +05:00
PC-G12 459f1d33fa Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-24 14:53:58 +05:00
PC-G12 670cb28a66 Gp3_F01 2022-08-24 14:53:45 +05:00
GRAFF c804ae6996 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-24 12:41:06 +05:00
GRAFF e1f75b852a interiormats, GP2 Mops + volumetric rebaked 2022-08-24 12:41:02 +05:00
PC-G12 d2bf3d6c99 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-23 19:51:27 +05:00
PC-G12 96aac4ad07 MOP_F1 2022-08-23 19:51:09 +05:00
Igor 35e794df5a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-23 18:51:56 +05:00
Igor e4bb10e603 LVL 03A00 2022-08-23 18:51:51 +05:00
PC-G12 82f2d0a231 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-23 12:33:28 +05:00
PC-G12 6fac7a0757 Parking? 2022-08-23 12:33:23 +05:00
GRAFF 6195c4f638 tone 2022-08-22 18:13:36 +05:00
GRAFF 69e06fe92d gp3_tr 2022-08-22 15:49:43 +05:00
GRAFF 593042a336 GP3_Interior 2022-08-22 14:59:53 +05:00
GRAFF 8caf4df53c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-08-15 12:29:20 +05:00
GRAFF bff9ac53f4 smsht 2022-08-15 12:29:17 +05:00
PC-G06 48e73c708c Test_Room_GP3_Mesh_Part_1-2 2022-08-12 20:25:45 +05:00
GRAFF 84a39b357e правка косячин и еще дополнения 2022-08-01 01:08:07 +05:00
GRAFF 8cf2b4eb37 много всякого КАЛАА 2022-07-19 04:08:57 +05:00
GRAFF b91b531ea7 вход с 2 этажа, 2этажные переключения, всякое говно еще, тачки катают по светофорам, коллизии 2022-07-18 02:58:05 +05:00
GRAFF 6b12c5943c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-07-16 22:00:14 +05:00
GRAFF 567e7c29ec caps 2022-07-16 21:49:55 +05:00
GRAFF c122da9464 всякое 2022-07-15 20:41:39 +05:00
GRAFF aeb09be06a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 
# Conflicts:
#	Content/Maps/Interior/GP2/S02F01.umap
#	Content/Maps/Masharov_cars.umap
 2022-07-15 15:14:19 +05:00
GRAFF b26775b64c УФФФ 2022-07-15 15:12:09 +05:00
PC-G12 91a79bf9d3 numbers 2022-07-14 19:47:55 +05:00
GRAFF 161c10d699 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-14 17:01:33 +05:00
GRAFF 26f9b1992c f2full+mops 2022-07-14 17:00:18 +05:00
PC-G12 a49c070071 Fd 2022-07-14 15:46:24 +05:00
GRAFF e925269d96 Revert "S02_Collision" 
This reverts commit 7c07922e99.
 2022-07-13 22:21:26 +05:00
GRAFF 1db9b2e327 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-07-13 21:17:34 +05:00
GRAFF aa0f17f4ea dasd 2022-07-13 21:16:55 +05:00
PC-G06 8eb4afe5fe Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-13 20:29:54 +05:00
PC-G06 7c07922e99 S02_Collision 2022-07-13 20:29:20 +05:00
GRAFF c472fb974e svet_potolokMopaFromF2toF3 2022-07-13 19:14:34 +05:00
GRAFF 777d3030a3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 
# Conflicts:
#	Content/Maps/Masharov_Buildings.umap
#	Content/Maps/Masharov_Landscape.umap
#	Content/Maps/Masharov_Yard.umap
#	Content/Maps/mainScene.umap
 2022-07-13 17:53:53 +05:00
GRAFF 56c014b2e2 коллизии всякие, интерфейс, косячки 2022-07-13 17:52:29 +05:00
GRAFF 487e198aa3 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-13 17:11:41 +05:00
GRAFF f49c40ecd8 bp_tochannel2_someprobes_someshitaswell 2022-07-13 17:11:33 +05:00
PC-G12 bf89e86b81 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-07-13 16:06:12 +05:00
PC-G12 c381a67a9d mps 2022-07-13 16:05:40 +05:00
GRAFF a4c315d634 bake 2022-07-13 14:46:41 +05:00
GRAFF a678643b9d ммммм, кусные рамы входных дверей 2022-07-13 02:19:57 +05:00