Commit Graph

430 Commits

Author SHA1 Message Date
GRAFF b9c7fbef18 что то делалось 2022-09-01 13:43:05 +05:00
DESKTOP-8J0BKKD\Admin 62a4dae398 Правки по домам + бордюры в парк 2022-08-04 12:01:58 +05:00
GRAFF bc163e12d4 скейтеры, велики 2022-07-10 12:55:04 +05:00
GRAFF a4bd3bb175 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/Landscape.umap
#	Content/Maps/MainScene.umap
#	Content/Maps/Yard_GP4.umap
#	Content/Maps/test.umap
#	Content/MigrateFortis/Otrada/Asset/SpeedTree/TreeMats/MM_Grass.uasset
2022-07-07 12:12:26 +05:00
GRAFF 7253f1ef79 правочки 2022-07-07 12:07:52 +05:00
JohnnyHatchet 1ea1e16067 Парк между ГП4 и ГП5 2022-07-07 07:24:56 +05:00
GRAFF 3783b5111e добавил пиздюков, скейтеров, велик 2022-07-07 01:21:24 +05:00
GRAFF 5a6590cc1f добавил велик на карту 2022-07-05 17:24:30 +05:00
PC-G01 6ef2c63ae9 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-07-05 16:59:47 +05:00
PC-G01 0967afe866 Скейтер 2022-07-05 16:59:11 +05:00
GRAFF 905ac6b6bf Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 2022-07-05 14:13:53 +05:00
JohnnyHatchet 3d0c381767 Фикс херни на потолке в порковке со двора 2022-07-05 12:02:22 +05:00
JohnnyHatchet ef471dd408 Мохнатые холмы два 2022-07-05 11:53:07 +05:00
JohnnyHatchet 395e2c300b Замена внешних деревьев, перепил двора 2022-07-05 01:02:08 +05:00
JohnnyHatchet 71fa2f0086 Шевелим всякое + не шевелим по дистанции для лодов 2022-07-04 19:37:20 +05:00
JohnnyHatchet 4cf98855d4 Мохнатые холмы 2022-07-04 09:03:13 +05:00
JohnnyHatchet ed81764162 Анимция травы, фикс херни с тенями лодов через эвол + бп + актор фолиаж (лоды кустов + деревья) 2022-07-03 05:50:28 +05:00
JohnnyHatchet 1a7b5f7219 Dopil 4 2022-07-02 19:11:28 +05:00
JohnnyHatchet 9266783d09 Dopil Genplan 2022-07-02 05:08:04 +05:00
JohnnyHatchet 2859c439ee Dopil 3 2022-07-01 22:36:58 +05:00
JohnnyHatchet c07b396516 Dopil2 2022-06-30 20:09:10 +05:00
JohnnyHatchet f449f948b5 dopil 2022-06-28 20:53:25 +05:00
DESKTOP-8J0BKKD\Admin c6f2b0725c Красота на набережной 2022-06-17 16:51:43 +05:00
DESKTOP-8J0BKKD\Admin e2754e0f28 бордюры + ул. домов окр. 2022-06-16 16:03:01 +05:00
DESKTOP-8J0BKKD\Admin e7cff66cfd Светильники на набережной 2022-06-14 18:23:24 +05:00
DESKTOP-8J0BKKD\Admin 90867fd833 1 2022-06-14 15:46:29 +05:00
DESKTOP-8J0BKKD\Admin c306723b1d Naberejka 2022-06-10 16:18:21 +05:00
DESKTOP-8J0BKKD\Admin 75b98667e5 Naberejka 2022-06-10 16:05:56 +05:00
DESKTOP-8J0BKKD\Admin 507f444882 Naberejka perilla 2022-06-09 18:53:16 +05:00
DESKTOP-8J0BKKD\Admin 2524d4f6ce Naberejka 2022-06-09 18:18:45 +05:00
JohnnyHatchet 3ea8fa92d7 Stone border Yard 2022-05-06 18:04:28 +05:00
GRAFF 0773499bb7 калич 2022-05-05 16:03:53 +05:00
GRAFF e49639c89d доавил звуки, и еще по мелочи 2022-04-23 15:42:42 +05:00
GRAFF 0cc18a55c9 всякое хуякое 2022-04-20 20:21:04 +05:00
GRAFF 8dee98005b лодочки и прочая фигня 2022-04-18 17:29:38 +05:00
GRAFF c06503bbec всякая говнина, конвертер картинок, скриншоты в мыло, 2 мыла 2022-04-17 18:32:42 +05:00
GRAFF 8db9667560 еще немного 2022-04-11 11:44:00 +05:00
GRAFF 2cdf663d96 ух ебать ну вроде сделал 2022-04-11 05:51:22 +05:00
GRAFF 0b5b390cc7 просто гора всякого еще 2022-04-10 01:04:22 +05:00
GRAFF 4e429a4091 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Blueprints/Player/GI.uasset
#	Content/Blueprints/Player/MyPC.uasset
#	Content/Blueprints/Player/WalkingPawn.uasset
#	Content/Blueprints/UI/Actors/walkPointer.uasset
#	Content/Blueprints/UI/WBPS/Menu/lift3dPanel.uasset
#	Content/Blueprints/UI/WBPS/Menu/saveData.uasset
#	Content/Blueprints/Utils/levelStruct.uasset
#	Content/Blueprints/World/BM_Elevator.uasset
#	Content/Blueprints/World/BM_Elevator_1.uasset
#	Content/Blueprints/World/BM_Elevator_2.uasset
#	Content/Maps/Interiors/GP4S1/Unique/S01A01.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A02.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A03.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A04.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A05.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A06.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A07.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A08.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A09.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A10.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01A11.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F01.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F02.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F03-10.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F03.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F11.umap
#	Content/Maps/Interiors/GP4S1/Unique/S01F12.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A00.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A01.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A02.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A03.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A04.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A05.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A06.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A07.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A08.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A09.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A10.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A11.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A12.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02A13.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02F01.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02F02.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02F03-13.umap
#	Content/Maps/Interiors/GP4S2/Unique/S02F14.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A00.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A01.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A02.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A03.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A04.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A05.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A06.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A07.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A08.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03A09.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F01.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F02.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F03-15.umap
#	Content/Maps/Interiors/GP4S3/Unique/S03F16-etc.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A00.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A01.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A02.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A03.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A04.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A05.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A06.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A07.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04A08.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04F01.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04F02_Hall.umap
#	Content/Maps/Interiors/GP4S4/Unique/S04F03-etc.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A08.umap
#	Content/Maps/Lift_GP4_H1.umap
#	Content/Maps/Lift_GP4_H2.umap
#	Content/Maps/Lift_GP4_H3.umap
#	Content/Maps/Lift_GP4_H4.umap
#	Content/Maps/Lift_GP4_H5.umap
#	Content/Maps/MainScene.umap
#	Content/Maps/Main_Building.umap
#	Content/Maps/Underground_parking_GP4.umap
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_F02.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_F03-13.uasset
#	Content/Meshes/Interiors/GP4S2/Unique/SM_dom_2_F14.uasset
#	Content/Meshes/Interiors/SM_Parking_Underground.uasset
#	Content/Meshes/Interiors/SM_Parking_Underground_asphalt.uasset
2022-04-09 21:22:14 +05:00
GRAFF 34d46b6078 полный идиотизм с лифтами 2022-04-09 21:13:50 +05:00
JohnnyHatchet d3c028c154 Подсветка ГП1235 2022-04-09 19:30:36 +05:00
JohnnyHatchet a1b4c635e1 Cum mercial 2022-04-09 19:22:46 +05:00
DESKTOP-8J0BKKD\Admin a61cf7020e S03 2022-04-09 14:40:55 +05:00
Igor 23d0b124fe S02 2022-04-09 14:37:53 +05:00
PC-G03 ea217b3125 S04 2022-04-09 14:36:14 +05:00
PC-G04 c2fafe5614 MOPs1 2022-04-08 18:12:50 +05:00
GRAFF 45e2673636 Fix animals 2022-04-08 18:03:01 +05:00
PC-G04 22cec26098 Interier,MOP_S1 2022-04-08 17:15:04 +05:00
GRAFF dfa1fabe13 OVER 9000 CHANGES 2022-04-08 16:08:23 +05:00