Dron/GraphicaPiter
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
338 Commits 2 Branches 0 Tags
addCLR
Commit Graph

174 Commits

Author SHA1 Message Date
GRAFF 4c30ff8ec5 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter into addCLR 
# Conflicts:
#	Content/Maps/Interiors/K2_S2/K2_S2_F1.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F10.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F11.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F12.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F13.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F14.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F15.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F16.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F17.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F18.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F2.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F3.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F4.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F5.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F6.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F7.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F8.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F9.umap
 2022-03-21 14:59:10 +05:00
GRAFF c1baf69360 еще пачка кала 2022-03-21 14:58:37 +05:00
PC-G13 5e071b4782 K2_S2_Caps 2022-03-21 14:17:58 +05:00
GRAFF c9fd5ea6b0 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter into addCLR 2022-03-20 20:22:36 +05:00
GRAFF 7b51c1ce45 ещё гора всякой шняги, расставил по этажам херни всякие, добавил планы в интерфейсы 2022-03-20 20:22:30 +05:00
PC-G12 800d08f6b1 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-03-20 16:49:34 +05:00
PC-G12 305baa4cc0 Caps 2022-03-20 16:49:27 +05:00
GRAFF c82ead318e Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter into addCLR 
# Conflicts:
#	Content/Maps/Interiors/K2_S2/K2_S2_F1.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F10.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F11.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F12.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F13.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F14.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F15.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F16.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F17.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F18.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F2.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F3.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F4.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F5.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F6.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F7.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F8.umap
#	Content/Maps/Interiors/K2_S2/K2_S2_F9.umap
#	Content/Maps/Interiors/K2_S2/Reflections/K2_S2_Reflections_General.umap
#	Content/Mavis/Meshes/Interior/K1_S4/F2/SM_K01S04F02A00.uasset
#	Content/Mavis/Meshes/Interior/K1_S4/F5/SM_K01S04F05A00.uasset
 2022-03-20 15:06:16 +05:00
GRAFF a19508442a OVER9000 CHANGES, куча всего но еще надо всякое расставить, крышки еще корявые и коллизии не настроены 2022-03-20 15:04:08 +05:00
PC-G13 133365bcef CAPS k2s2 2022-03-20 12:53:18 +05:00
PC-G13 b010c96f38 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 
# Conflicts:
#	Content/Maps/Interiors/K2_S2/K2_S2_F1.umap
 2022-03-20 12:10:58 +05:00
PC-G13 9c62f6ec59 Caps, k2_s1,s2 2022-03-20 12:09:54 +05:00
PC-G12 b38d97b39f Highlights 2022-03-19 15:34:10 +05:00
PC-G12 6d277da363 Caps 2022-03-19 15:17:55 +05:00
PC-G12 c11c9df65d fixs 2022-03-19 14:50:49 +05:00
PC-G12 aa127ac164 bldng_some_fix 2022-03-18 16:34:47 +05:00
PC-G12 eef1ee73da Buildings 2022-03-18 16:13:23 +05:00
PC-G13 0b4ece967c Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 
# Conflicts:
#	Content/Mavis/Meshes/Interior/K1_S4/F1/SM_K01S04F01A00.uasset
#	Content/Mavis/Meshes/Interior/K1_S4/F1/SM_K01S04F01_CapWall.uasset
 2022-03-18 15:24:31 +05:00
PC-G13 20d1753d59 K1_S4_Mop 2022-03-18 15:24:12 +05:00
PC-G12 22fe645bc8 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-03-18 15:09:21 +05:00
PC-G12 e40f9d31a8 k1s4 2022-03-18 15:09:04 +05:00
PC-G08 779cb10e94 K02S02 2022-03-18 14:22:51 +05:00
PC-G12 cbd6e10ae6 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-03-17 15:30:52 +05:00
PC-G12 ce8639a595 K1S4 2022-03-17 15:28:19 +05:00
PC-G13 f59fbafb12 K2_ASS1 2022-03-17 14:30:35 +05:00
PC-G13 a757b9ee5d Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-03-15 16:34:20 +05:00
PC-G13 ce64633b8c K2_S1 2022-03-15 16:34:17 +05:00
PC-G12 9035f9009f Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 2022-03-14 19:36:42 +05:00
PC-G13 9317fedd8a K2_S1 2022-03-14 19:36:42 +05:00
PC-G12 88ae1d53b2 K1_S4 2022-03-14 19:36:29 +05:00
PC-G13 9ddac503a4 K2_S1 2022-03-11 11:32:51 +05:00
PC-G12 bd107ff075 bldngs 2022-03-10 12:13:39 +05:00
GRAFF 70f5a7d1f4 всякие еще правки, деревья, разметка 2021-10-27 13:58:26 +05:00
PC-G09 9e10ae914d Add LOD 2nd floor 2021-10-22 20:07:10 +05:00
GRAFF f28632d8e1 asdad 2021-10-22 20:03:41 +05:00
GRAFF 9c2974939b Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 
# Conflicts:
#	Content/Maps/DayLight.umap
#	Content/Maps/Landscape_textures.umap
 2021-10-22 19:44:07 +05:00
PC-G09 b6670ccefa Деревья 2021-10-22 16:58:01 +05:00
GRAFF eef2055004 Merge branch 'master' of http://192.168.1.163:3000/Dron/GraphicaPiter 
# Conflicts:
#	Content/Mavis/Meshes/Exterior/LandscapeTextured/overlay.uasset
#	Content/Mavis/Meshes/Exterior/LandscapeTextured/overlay2.uasset
 2021-10-22 15:16:11 +05:00
GRAFF 92f41c0c08 мелкие допилки 2021-10-22 15:15:43 +05:00
PC-G09 37194ad363 Карта со спутника микс с зеленкой 2021-10-22 13:50:53 +05:00
PC-G09 8eff83667e Ограждения на 2м этаже 2021-10-20 13:20:58 +05:00
PC-G09 eb94c7caf5 Внешка осм + подсветка ректанглами ночью 2021-10-20 12:58:07 +05:00
PC-G09 4f817561ba Допилы. Круглая карта спутник микс + дома осм. Мигрейт деревьев 2021-10-18 10:05:56 +05:00
GRAFF e6976f7cd2 v1.0 с CRM 2021-09-30 19:26:25 +05:00
GRAFF 0ad8b36b7a v096 перепек всё, лифты поменял, пару багов нашел 2021-09-14 18:19:15 +05:00
GRAFF ca3ecea68c долбанутое количество изменений, v095 2021-09-10 21:27:24 +05:00
GRAFF 96ac007931 удалены редиректоры 2021-09-01 13:43:05 +05:00
PC-G09 d51f66a995 FL1 Fix wall + add emissie to enterence 2021-08-31 17:51:50 +05:00
GRAFF 873a674928 minor 2021-08-31 16:15:43 +05:00
GRAFF aba25a2550 перенес коммерцию в отдельный уровень и поднастроил малеха 2021-08-30 14:13:50 +05:00