Commit Graph

328 Commits

Author SHA1 Message Date
GRAFF ecbecf465a Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi
# Conflicts:
#	Content/Blueprints/Data/objectsData.uasset
#	Content/Maps/Main_Scene.umap
2023-05-18 19:12:51 +05:00
GRAFF 4e60ba6ac1 фывфы 2023-05-18 19:12:15 +05:00
Igor d404a413f7 SM_C406_детали 2023-05-17 12:10:39 +05:00
PC-G04 86d963cf8d Zone C, C110_11, C110_11 2023-05-12 18:50:51 +05:00
PC-G04 6985febbb2 A113 2023-05-10 13:35:54 +05:00
PC-G04 3b93e90fde Pravki 2023-05-05 18:42:41 +05:00
GRAFF dc26e2fe59 ыыы 2023-03-23 17:03:42 +05:00
GRAFF 0b12a8d049 кто то не знал про 2й канал в интерьерах и очередные коллизии 2023-03-23 15:26:49 +05:00
DESKTOP-8J0BKKD\Admin e8f0a86b1f Изменение материалов буровой платформы 2023-03-23 14:11:56 +05:00
JohnnyHatchet 3d134571c0 C220_221 2023-03-22 15:13:12 +05:00
JohnnyHatchet f1ad52a48c A218 2023-03-22 14:51:26 +05:00
JohnnyHatchet 1bb00630e8 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-03-22 13:23:53 +05:00
JohnnyHatchet 489fda3f5a E_06_SOP055 2023-03-22 13:21:52 +05:00
GRAFF 1a038c6e3b фывфвфыв 2023-03-21 17:59:18 +05:00
JohnnyHatchet 72a87f95b1 D201 минус крышки, В Т зоне новое здание 2023-03-21 17:55:56 +05:00
JohnnyHatchet 9be4a13f8c Анимация ходьбы, Некоторые фасады 2023-03-21 14:42:50 +05:00
JohnnyHatchet ef19080197 Human final 2023-03-20 17:49:58 +05:00
JohnnyHatchet 4670678d7d Humans 2023-03-17 19:28:51 +05:00
JohnnyHatchet e2e5051c76 A304_2, Zone A, Zone C 2023-03-15 12:20:49 +05:00
Andrew 899201ca6e немного фиксов 2023-03-07 13:00:48 +05:00
JohnnyHatchet 91b004ec35 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-22 22:15:45 +05:00
JohnnyHatchet 3111f14246 С203 2023-02-22 22:13:31 +05:00
PC-G09 03dc9ca043 Landscape 2023-02-22 21:37:49 +05:00
JohnnyHatchet 73fc6d4848 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-22 20:53:32 +05:00
JohnnyHatchet 84319b4389 ПРавки по ЗАПЕЧКЕЕ И ЦЕХ 2023-02-22 19:03:49 +05:00
JohnnyHatchet 04f556c5b0 Landscape v2 2023-02-22 13:09:12 +05:00
PC-G09 70bb84208e 8k textures fix size 2023-02-22 11:52:41 +05:00
PC-G09 f0a51a8288 Landscape v2 2023-02-21 20:12:42 +05:00
Andrew 35c2647408 Merge commit '4042892835ee1114fa282b4f3c7439f7bea13110' 2023-02-21 20:08:34 +05:00
JohnnyHatchet 4042892835 G2_10 on Zone A, little bit D201 2023-02-21 19:48:09 +05:00
GRAFF d6fab44ba5 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi
# Conflicts:
#	Content/Maps/Main_Scene.umap
2023-02-21 18:14:30 +05:00
GRAFF 5acf706413 д204 терь как все остальные 2023-02-21 18:14:14 +05:00
PC-G12 f24adec8c4 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-21 17:33:57 +05:00
PC-G12 cafb5f31e2 Benches_C 2023-02-21 17:33:50 +05:00
JohnnyHatchet 7a1663c127 F24 2023-02-21 17:26:55 +05:00
PC-G13 bd1bc073fd Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi
# Conflicts:
#	Content/Maps/Interior/Zone_F/F24/F24_F1.umap
2023-02-21 15:10:51 +05:00
PC-G13 5bc1a2b435 f24 2023-02-21 15:09:53 +05:00
PC-G12 ac60b30bff Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-21 13:36:22 +05:00
PC-G12 efffc8ea63 204 2023-02-21 13:36:17 +05:00
Andrew 8ed5ad5fb0 Point anim 2023-02-21 12:36:09 +05:00
PC-G12 4f3d566d32 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 20:01:50 +05:00
PC-G12 6be86b650d Bench 2023-02-20 20:01:40 +05:00
JohnnyHatchet 48da429132 G2 2023-02-20 19:58:14 +05:00
JohnnyHatchet d40e5c3fc1 Zone_G1 2023-02-20 18:57:48 +05:00
DESKTOP-8J0BKKD\Admin 4df6c2c12e Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 18:25:07 +05:00
DESKTOP-8J0BKKD\Admin 9521b6fd9e Правки фасадов по зоне G1 2023-02-20 18:25:04 +05:00
JohnnyHatchet 23960ae69a Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 17:45:48 +05:00
JohnnyHatchet 08e7b0002f D304-2 2023-02-20 17:44:08 +05:00
DESKTOP-8J0BKKD\Admin ac857dafe6 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 16:52:07 +05:00
DESKTOP-8J0BKKD\Admin 774ac6dd35 Замена меша нефтянной платформы 2023-02-20 16:52:04 +05:00