Commit Graph

23 Commits

Author SHA1 Message Date
PC-G12 c754d2ca1a DRMs 2024-06-25 20:03:34 +05:00
PC-G12 512acbb066 DRMs 2024-06-24 19:59:06 +05:00
PC-G12 8a518bfb36 DRMs 2024-06-20 20:07:12 +05:00
SergeyVag 423b1df5b4 МОПЫ 2024-05-22 19:47:34 +05:00
Dron 29543d3e0f Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Main_Building.umap
2024-05-21 19:17:47 +05:00
Dron c96f7bfd30 ui fix 2024-05-21 19:16:58 +05:00
SergeyVag e746284a80 бл 2024-05-21 18:06:16 +05:00
Dron 4f295e3fa6 kucha vsego 2024-05-20 20:05:56 +05:00
PC-G13 00a47ab6b9 mops 2024-05-14 16:48:03 +05:00
PC-G13 55c3bd6011 mops s05 + commons 2024-05-14 13:19:34 +05:00
PC-G13 d65d88ddc3 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP7/S02/GP7_S02_F01_MOP.umap
#	Content/Maps/Interiors/GP7/S03/GP7_S03_F01_MOP.umap
#	Content/Maps/Interiors/GP7/S04/GP7_S04_F01_MOP.umap
#	Content/Maps/Main_Building.umap
#	Content/Meshes/Interiors/GP8/S04/Cap/SM_GP8_S04_A03_F02_Cap.uasset
#	Content/Meshes/Interiors/GP8/S04/CapWall/SM_GP8_S04_F02_07_CapWall.uasset
#	Content/Meshes/houses/GP8/S02/SM_GP8_S02.uasset
#	Content/Meshes/houses/GP8/SM_GP8_S01_Windows.uasset
#	Content/Meshes/houses/GP8/SM_GP8_S03.uasset
2024-05-13 14:23:40 +05:00
PC-G13 0a28c5d04c mops 2024-05-13 14:20:16 +05:00
Daniil.I.Y dbd4eb6618 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-08 20:05:55 +05:00
Daniil.I.Y c6eef2ffbd A12_A11_A08_A07 2024-05-08 20:05:51 +05:00
SergeyVag 66ccd79f88 Крышки S04 отдернул окна от фасадов 2024-05-08 17:59:48 +05:00
Omar 48dc633a73 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-08 13:11:02 +05:00
Omar 2abaa6cefa GP8_S04 2024-05-08 13:10:58 +05:00
Daniil.I.Y bbf06b2642 A02_A07 2024-05-07 21:01:49 +05:00
NikitsSysun d308c40e03 GP8_S04_A03-A04 2024-05-07 19:07:01 +05:00
NikitsSysun eea5a83b18 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Meshes/Interiors/GP8/S04/SM_GP8_S04_A03_F02_Walls.uasset
2024-05-07 16:22:50 +05:00
NikitsSysun 54fc1ba5ac хуй 2024-05-07 16:21:12 +05:00
PC-G13 26a807fa6d mops 2024-05-06 22:18:59 +05:00
PC-G13 b511c0ec19 gp8s04_fasadtemp 2024-05-02 14:12:18 +05:00