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

80 Commits

Author SHA1 Message Date
GRAFF fe8b05b4ea Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 
# Conflicts:
#	Content/Maps/Masharov_Landscape.umap
#	Content/Maps/Masharov_Yard.umap
#	Content/Maps/mainScene.umap
 2022-06-23 01:05:06 +05:00
GRAFF 2268443ed8 куча всякого 2022-06-23 01:04:26 +05:00
JohnnyHatchet e0d89d5ec7 Всякое по двору, фасадам 2022-06-23 00:24:53 +05:00
PC-G06 62fc5f1bc6 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-06-22 21:24:58 +05:00
PC-G06 13a359cfe2 Test_Room_Interior_SM_S02A17 2022-06-22 21:24:53 +05:00
PC-G12 19b1740315 S02A46 2022-06-22 19:35:27 +05:00
PC-G12 d178690c3a Fast_Materials 2022-06-22 15:01:28 +05:00
PC-G06 4a699fcb73 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-06-22 13:16:06 +05:00
PC-G06 2c142e3342 Test_Room_Part_1 2022-06-22 13:15:58 +05:00
GRAFF bc2cc1ab5f Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 
# Conflicts:
#	Content/Maps/mainScene.umap
 2022-06-21 20:41:04 +05:00
GRAFF 1d46299019 много интерфейса 2022-06-21 20:40:42 +05:00
PC-G12 c333cb8797 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 2022-06-20 18:24:09 +05:00
PC-G12 d7913151a9 Splines 2022-06-20 18:24:03 +05:00
JohnnyHatchet eaf1e6b768 Roof 2022-06-20 16:00:59 +05:00
JohnnyHatchet 309b145931 GP1 Roof 2022-06-20 13:22:07 +05:00
JohnnyHatchet 9235808494 Допил дворов часть 3 2022-06-20 09:41:12 +05:00
JohnnyHatchet b2588c11c3 Допил дворов часть 2 2022-06-20 09:40:10 +05:00
JohnnyHatchet 41e8965a36 Допилы дворов часть 1 2022-06-20 09:38:33 +05:00
GRAFF ea38165380 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 
# Conflicts:
#	Content/Maps/mainScene.umap
 2022-06-16 12:12:49 +05:00
GRAFF 18aec2e485 ИИ тачек 2022-06-16 12:12:19 +05:00
JohnnyHatchet 7fa2776503 da 2022-06-15 17:57:57 +05:00
JohnnyHatchet ff00d61eab Генплан +покрытия стелобата+материальные объекты малой инфры 2022-06-15 05:05:14 +05:00
JohnnyHatchet 0af9b6af04 Генплан 2022-06-14 18:03:39 +05:00
JohnnyHatchet 0e9a91b773 минус клумбы 2022-06-13 12:15:31 +05:00
JohnnyHatchet 2e94e51d38 New genplan 2022-06-13 11:57:49 +05:00
GRAFF 219c7f2d45 Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1 into developer 
# Conflicts:
#	Content/Maps/mainScene.umap
 2022-06-10 12:21:39 +05:00
GRAFF ea85a1992e гора всякого 2022-06-10 12:05:24 +05:00
JohnnyHatchet 9674b52cd2 Genplan 2022-06-10 12:02:13 +05:00
JohnnyHatchet 9adb668318 Генплан 2022-06-09 21:23:46 +05:00
JohnnyHatchet 1202d9ff68 Dram 2022-06-06 17:49:17 +05:00
JohnnyHatchet a650aa84f4 Genplan, Dram 2022-06-06 14:44:43 +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
GRAFF b561f44001 интерфейс 2022-05-21 18:25:11 +05:00
GRAFF b30adc59a0 уф 2022-05-05 15:33:39 +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 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