Commit Graph

315 Commits

Author SHA1 Message Date
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
Igor 88eeaf4869 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 16:31:08 +05:00
Igor 2ddd36ac88 G203 2023-02-20 16:31:04 +05:00
PC-G08 fa3d63aeac G02_11 interior 2023-02-20 16:11:54 +05:00
PC-G12 a66e0053c9 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 15:49:58 +05:00
PC-G12 bfc9274699 222 2023-02-20 15:49:54 +05:00
JohnnyHatchet 65e8731bf1 F25B F36A 2023-02-20 13:36:35 +05:00
FavoredBag 8761c8fab8 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 13:03:18 +05:00
FavoredBag fe475e0b2d F36A F25B 2023-02-20 13:03:13 +05:00
Igor 20b1a397e6 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-20 12:35:03 +05:00
Igor 1519923ac9 G302 2023-02-20 12:34:58 +05:00
Andrew 39620a0816 Реимпорт анимированного OSV корабля 2023-02-20 12:30:32 +05:00
DESKTOP-8J0BKKD\Admin 4e52845dca Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-19 14:23:28 +05:00
DESKTOP-8J0BKKD\Admin b0938b9a7d C220_221, Zone_C_G 2023-02-19 14:18:33 +05:00