Commit Graph

36 Commits

Author SHA1 Message Date
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
JohnnyHatchet 1ea1e16067 Парк между ГП4 и ГП5 2022-07-07 07:24:56 +05:00
GRAFF 3783b5111e добавил пиздюков, скейтеров, велик 2022-07-07 01:21:24 +05:00
GRAFF 0cc18a55c9 всякое хуякое 2022-04-20 20:21:04 +05:00
GRAFF 8dee98005b лодочки и прочая фигня 2022-04-18 17:29:38 +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 79caaf2b19 ооой мляяяя 2022-04-08 11:21:22 +05:00
GRAFF 63f9f8ee06 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
# Conflicts:
#	Content/Maps/MainScene.umap
2022-04-08 06:42:50 +05:00
JohnnyHatchet 8147a4725e nightlight 2022-04-08 06:27:32 +05:00
GRAFF 4856dd3c62 sdfsdf 2022-04-07 21:29:50 +05:00
GRAFF e354f1787d баба с коляской, паркинг, лифт, и всякое 2022-04-07 10:48:34 +05:00
PC-G06 ce60080037 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2022-04-06 13:20:05 +05:00
PC-G06 db945d397f S02_Window 2022-04-06 13:20:01 +05:00
JohnnyHatchet f5a6cf5224 Elevators + parking FIX 2022-04-05 17:34:11 +05:00
JohnnyHatchet 7288ff3275 Parking + Elevators 2022-04-05 06:05:11 +05:00
Igor c87ad86be4 Dom5_correct 2022-04-04 19:53:39 +05:00
PC-G04 2624748cc9 InfoSheet_NumberFloor 2022-04-01 21:11:25 +05:00
GRAFF d9c1a28027 дохера всего, апдейты из моей ветки 2022-03-28 16:52:04 +05:00
JohnnyHatchet a6e59992b0 S02 interiors + Caps 2022-03-24 17:52:10 +05:00
GRAFF c8933ec319 merge DEV to master 2022-03-24 13:30:34 +05:00
JohnnyHatchet d769377519 Nightlight 2022-03-24 13:02:12 +05:00
PC-G06 ee7f953982 S03_Mesh 2022-03-23 20:52:42 +05:00
PC-G06 ab8023a828 dom_1_flat_0_11 2022-03-18 19:59:22 +05:00
PC-G04 6a76960a59 Dom_1_f7 2022-03-17 17:33:41 +05:00
PC-G10 4927d43dac Migrate new furniture part 10 2022-03-04 16:48:01 +05:00
PC-G10 8ac90741f5 Migrate new furniture part 9 2022-03-04 16:46:31 +05:00
PC-G10 045a5412fd Migrate new furniture part 8 2022-03-04 16:44:07 +05:00
PC-G10 f9cbe55a8e Migrate new furniture part 7 2022-03-04 16:28:27 +05:00
PC-G10 20eb63e946 Migrate new furniture part 6 2022-03-04 16:10:39 +05:00
PC-G10 4496c0ec69 Migrate new furniture part 5 2022-03-04 16:08:20 +05:00
PC-G10 944c280f0b Migrate new furniture part 4 2022-03-04 16:05:04 +05:00
PC-G10 5cc95a4e19 Migrate new furniture part 3 2022-03-04 16:03:25 +05:00
PC-G10 ab7e0e6d63 Migrate new furniture part 2 2022-03-04 16:01:27 +05:00
PC-G10 849e777d94 Migrate new furniture part 1 2022-03-04 15:59:20 +05:00