Commit Graph

59 Commits

Author SHA1 Message Date
GRAFF ea85a1992e гора всякого 2022-06-10 12:05:24 +05:00
GRAFF 709eb46d0c куча всякого, дом скрываемый 2022-05-26 22:37:34 +05:00
GRAFF 30397595f2 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-05-26 11:58:12 +05:00
GRAFF 3e7ff77933 over9000 интерфейса и этажи 2022-05-26 11:55:51 +05:00
JohnnyHatchet 01c7f2024d Правки из списка правок (хуй знает че там как должно выглядеть в итоге) 2022-05-26 09:16:29 +05:00
Lenta_Mebiusa 8f6108476e отключил плагины 2022-05-24 11:30:39 +05:00
GRAFF b561f44001 интерфейс 2022-05-21 18:25:11 +05:00
GRAFF b30adc59a0 уф 2022-05-05 15:33:39 +05:00
GRAFF a5564a1f17 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Blueprints/Player/GI.uasset
#	Content/Blueprints/UI/WBPS/Elements/MenuBtn.uasset
#	Content/Blueprints/UI/WBPS/Menu/MainMenu.uasset
#	Content/Blueprints/UI/WBPS/Menu/aboutMoshar.uasset
#	Content/Blueprints/UI/WBPS/Menu/settings.uasset
#	Content/Maps/Masharov_Landscape.umap
#	Content/Maps/Masharov_people.umap
#	Content/Maps/mainScene.umap
2022-05-04 12:14:08 +05:00
GRAFF 50468cadd7 еще кал какой то 2022-05-04 12:13:17 +05:00
GRAFF 3e3c8095c9 да просрись ты уже 2022-05-04 12:10:03 +05:00
GRAFF d565e2ee89 НУУУУ 2022-05-04 12:07:39 +05:00
GRAFF 3457f8e278 люди и леваки 2022-05-04 12:03:44 +05:00
GRAFF 9b01120d9c ну давай отправляйся 2022-05-04 12:02:48 +05:00
GRAFF 38a97b2a8b еще пук 2022-05-04 08:03:31 +05:00
GRAFF 6ee08f412c ну что то я тут высрал вроде 2022-05-04 06:41:21 +05:00
GRAFF f9d13c6ecc всякий кал 2022-05-04 00:37:26 +05:00
GRAFF 297cb269b8 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer
# Conflicts:
#	Content/Levels/Masharov_Landscape.umap
#	Content/Levels/Masharov_MainScene.umap
2022-05-03 22:56:54 +05:00
GRAFF dceff7a67a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-05-03 22:56:28 +05:00
JohnnyHatchet bce7c5c5cb Some 2022-05-03 18:23:55 +05:00
JohnnyHatchet b58892390c Vneshka 2022-05-03 17:06:09 +05:00
JohnnyHatchet d7d1ee7b9e Zelen 2022-05-03 16:08:33 +05:00
JohnnyHatchet 0000ca0a4b - trees + decal 2022-05-03 15:23:29 +05:00
JohnnyHatchet 8112bb30f2 M - znachit Masharov 2022-05-03 14:36:14 +05:00
GRAFF ec18596f6d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 2022-05-03 12:39:26 +05:00
JohnnyHatchet 7310ed5828 MASHAROOOOOOOOW 2022-05-03 12:36:13 +05:00
JohnnyHatchet fdf8c64aa8 Vneshka 2022-05-03 09:49:03 +05:00
JohnnyHatchet db13991d6c Vneshka 2022-05-03 08:21:47 +05:00
JohnnyHatchet 165c4585ef Nasral nemnojk 2022-05-02 11:00:02 +05:00
JohnnyHatchet cc15ec6367 Bordo fix 2022-04-29 18:55:49 +05:00
JohnnyHatchet 69f38343c5 Vsyakoe 2022-04-29 16:40:31 +05:00
JohnnyHatchet 05c53cf77f Main Buildings 2022-04-28 18:15:20 +05:00
GRAFF 471d187aec тьма всякого барахла 2022-04-28 14:15:01 +05:00
JohnnyHatchet d9824dca71 Masharov 2022-04-27 13:51:48 +05:00
JohnnyHatchet cd953588ce Дозалив всякого 2022-04-26 12:01:21 +05:00
PC-G12 9cd33a4e1b RoadsVol2 2022-04-19 17:38:33 +05:00
PC-G12 0a7665d076 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-04-18 12:09:50 +05:00
PC-G12 a2ba5cf438 Roads_Volume01 2022-04-18 12:01:22 +05:00
GRAFF b75543ec80 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-04-15 16:18:17 +05:00
GRAFF 57901b9b81 smth 2022-04-15 16:16:56 +05:00
PC-G08 70d189cca6 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-04-15 13:17:28 +05:00
PC-G08 21d6a8b145 ModularKitchen 2022-04-15 13:17:23 +05:00
PC-G12 ad87e23219 Roads_and_Stuff 2022-04-15 12:12:08 +05:00
GRAFF 23450a0745 material 2022-04-14 10:28:37 +05:00
PC-G12 b22cb67e3d Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-04-13 13:38:20 +05:00
PC-G12 6935d0f118 Roads_CoolAsphalt 2022-04-13 13:37:36 +05:00
GRAFF 6de465705c Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-04-13 13:11:31 +05:00
GRAFF 66ca1dc54a bork 2022-04-13 13:11:29 +05:00
PC-G12 8c606457cf Roads 2022-04-13 12:06:38 +05:00
PC-G12 5c7861093a Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
#	Content/Assetpacks/ProceduralRoadGenerator/Material/Instances_masharov_roads/MI_Asphalt_1.uasset
#	Content/Levels/Masharov_Landscape.umap
2022-04-11 14:48:49 +05:00