Commit Graph

471 Commits

Author SHA1 Message Date
JohnnyHatchet 78489d54dc Люди, анимация 2023-03-15 19:48:15 +05:00
GRAFF cd6f78f128 Человеки + плагин к ним 2023-03-15 12:46:56 +05:00
JohnnyHatchet c06391f286 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-03-15 12:25:57 +05:00
JohnnyHatchet e2e5051c76 A304_2, Zone A, Zone C 2023-03-15 12:20:49 +05:00
PC-G08 a43e8e10b1 new_vehicle 2023-03-14 10:23:37 +05:00
GRAFF ad069a2e84 Цвет водички 2023-03-07 18:52:51 +05:00
Andrew 899201ca6e немного фиксов 2023-03-07 13:00:48 +05:00
Andrew ff253113c6 UI shit 2023-03-06 18:10:36 +05:00
GRAFF 0fed6603bd да ебан бобан! 2023-02-22 23:29:31 +05:00
GRAFF 180b164bcb да сколько можно путите домой 2023-02-22 23:17:25 +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
GRAFF 011841f065 asd 2023-02-22 22:10:42 +05:00
GRAFF 1c0bbe4571 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi
# Conflicts:
#	Content/Maps/Main_Scene.umap
2023-02-22 21:39:40 +05:00
GRAFF 7b49b1fd21 asd 2023-02-22 21:38:19 +05:00
PC-G09 03dc9ca043 Landscape 2023-02-22 21:37:49 +05:00
Andrew bbf5c40db3 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	Content/Blueprints/UI/Widgets/menu/mainMenu.uasset
2023-02-22 21:02:45 +05:00
Andrew 75d274f82c aboba 2023-02-22 21:01:41 +05:00
GRAFF a79789fcc4 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-22 20:59:09 +05:00
GRAFF 078cc1db7e asd 2023-02-22 20:58:56 +05:00
JohnnyHatchet 73fc6d4848 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-22 20:53:32 +05:00
Andrew fb901f6171 с211 fix 2023-02-22 19:37:37 +05:00
GRAFF ca24b44a38 asd 2023-02-22 19:20:55 +05:00
JohnnyHatchet 84319b4389 ПРавки по ЗАПЕЧКЕЕ И ЦЕХ 2023-02-22 19:03:49 +05:00
JohnnyHatchet 04f556c5b0 Landscape v2 2023-02-22 13:09:12 +05:00
Andrew 13f11152b9 a304 2023-02-22 13:00:07 +05:00
GRAFF d4c7c83af9 asd 2023-02-22 12:54:50 +05:00
Andrew 213e99767e Merge remote-tracking branch 'origin/master' 2023-02-22 12:28:32 +05:00
Andrew 0ae0aa8c82 Пойнты в зоне А, пойнты оборудования в майне 2023-02-22 12:21:36 +05:00
PC-G09 70bb84208e 8k textures fix size 2023-02-22 11:52:41 +05:00
GRAFF 1ba83ad183 добавил скрывалку, гора интерьеров, конь, залупа, клитор, пень 2023-02-22 00:43:26 +05:00
PC-G09 f0a51a8288 Landscape v2 2023-02-21 20:12:42 +05:00
Andrew 7539ffd201 Merge remote-tracking branch 'origin/master' 2023-02-21 20:09:15 +05:00
Andrew 35c2647408 Merge commit '4042892835ee1114fa282b4f3c7439f7bea13110' 2023-02-21 20:08:34 +05:00
Andrew 2e08dcbad4 Пойнты 3д тура в зонах B, C, F, G 2023-02-21 20:08:06 +05:00
JohnnyHatchet 116b20f62a Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-21 19:49:29 +05:00
JohnnyHatchet 4042892835 G2_10 on Zone A, little bit D201 2023-02-21 19:48:09 +05:00
Andrew d8d351bcff Merge remote-tracking branch 'origin/master' 2023-02-21 18:32:20 +05:00
Andrew 900842abe7 Доп пойнты 2023-02-21 18:31:39 +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
Andrew f69bc82b03 Merge remote-tracking branch 'origin/master' 2023-02-21 18:13:20 +05:00
Andrew 9aac9dcdc0 пу пу пу 2023-02-21 18:13:10 +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 12842cade1 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-21 17:31:04 +05:00
JohnnyHatchet 7a1663c127 F24 2023-02-21 17:26:55 +05:00
GRAFF c7febcd596 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-21 16:43:19 +05:00
GRAFF 1dcc5c49d7 asd 2023-02-21 16:43:06 +05:00
PC-G12 d7f67fa771 Merge branch 'master' of http://192.168.1.163:3000/Dron/ShipyardSaudi 2023-02-21 16:02:36 +05:00