Commit Graph

440 Commits

Author SHA1 Message Date
Dron 8799d72dc8 caps, flatN, elevator, doors, lvlmanage,sky tvix, volumes 2024-05-17 00:43:06 +05:00
pahachic ac17254013 point lifted 2024-05-16 18:42:55 +05:00
Dron 0b58307513 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-16 18:03:55 +05:00
SergeyVag f7a46fbf07 бЛЯТЬ 2024-05-16 18:01:26 +05:00
SergeyVag 6513ae00a7 пОПРАВИЛ gP8_s05_a14 2024-05-16 17:59:56 +05:00
Dron a06c56ff05 Merge remote-tracking branch 'origin/Points-(test-after-constant-crushes)'
# Conflicts:
#	Content/Blueprints/UI/Actors/FlatPoint.uasset
2024-05-16 17:51:20 +05:00
pahachic 997e4bc0f6 s5 flat data and points 2024-05-16 17:45:39 +05:00
pahachic ca40a6fad3 s4 points 2024-05-16 15:23:39 +05:00
pahachic 9a0dde86cf s3 points and s4 flatdata 2024-05-16 14:30:35 +05:00
SergeyVag d901ed118e Правки 2024-05-16 14:10:09 +05:00
pahachic 088ec7774a h2 points gp8 2024-05-15 21:08:34 +05:00
NikitsSysun 26bde50c41 Pravki S04 S05 2024-05-15 19:55:48 +05:00
NikitsSysun 396fd5254a dobavil stenu v sartir A05S03 2024-05-15 19:13:17 +05:00
NikitsSysun eadcd5022d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-15 19:00:54 +05:00
NikitsSysun e2bac2e4c4 pravki S03 2024-05-15 19:00:49 +05:00
pahachic b63c2ef5a8 s1 points 2024-05-15 18:36:29 +05:00
pahachic 5bf189fd63 points 2024-05-15 17:44:29 +05:00
PC-G13 ced59e2452 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-15 15:45:01 +05:00
PC-G13 00ed265040 mops gps fixes 2024-05-15 15:44:57 +05:00
NikitsSysun 119c57b47e Правки S01 S02 интерьеры 2024-05-15 14:51:52 +05:00
PC-G13 d40cdff4de Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A00_F02-16.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A01_F02-16.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A02_F02-16.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A03_F02-16.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A04_F02-16.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A05_F02-16.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A06_F17.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A07_F17.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A08_F17.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A09_F17.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A10_F17.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A11_F17.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A12_F18.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A13_F18.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A14_F18.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A15_F18.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A16_F18.umap
#	Content/Maps/Interiors/GP8/S02/Interior/GP8_S02_A17_F18.umap
2024-05-14 22:23:54 +05:00
PC-G13 3044d2507e int mops fixes 2024-05-14 22:20:09 +05:00
Omar dc405fd033 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-14 20:30:36 +05:00
Omar c20c061e76 GP02 GP05 UPD 2024-05-14 20:30:32 +05:00
PC-G13 c89e75253d mops fixes 2024-05-14 17:40:09 +05:00
PC-G13 4990e64c36 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-14 16:48:14 +05:00
PC-G13 00a47ab6b9 mops 2024-05-14 16:48:03 +05:00
Omar 3e4cd1037e Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-14 16:05:50 +05:00
Omar 3bf49b3da6 GP8_S03 UPD 2024-05-14 16:05:45 +05:00
PC-G04 f348f3a608 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-14 15:22:45 +05:00
PC-G04 fa7f37d620 Правки gp8 s02 s05 2024-05-14 15:22:41 +05:00
PC-G13 4515f05599 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Meshes/Interiors/GP7/GP7S05/MOP/S03/SM_GP7_S03_F01_MOP_Capwall.uasset
2024-05-14 13:19:51 +05:00
PC-G13 55c3bd6011 mops s05 + commons 2024-05-14 13:19:34 +05:00
NikitsSysun 89856cf0a8 Хуй 2024-05-13 20:35:29 +05:00
NikitsSysun 2913fe2c7b Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-13 20:01:11 +05:00
NikitsSysun 86baebfeb9 микроправки 2024-05-13 20:01:04 +05:00
Omar a7a4215f86 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-13 19:54:57 +05:00
Omar e51fe773d8 GP8_S03 UPD 2024-05-13 19:54:53 +05:00
NikitsSysun 09d53d658b Правки S04 плинтус 2024-05-13 17:44:31 +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
NikitsSysun fe44b178cd Правки первая секция 2024-05-13 13:37:25 +05:00
NikitsSysun 63a5564fc5 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-13 12:23:20 +05:00
NikitsSysun 00ca3d331c Правки секция 2 2024-05-13 12:22:55 +05:00
SergeyVag 68e9846805 всякое 2024-05-13 11:24:56 +05:00
SergeyVag f1afb7132d перенеймил пару уровней 2024-05-13 10:53:23 +05:00
Omar 9d896cfcff GP8_S04 UPD 2024-05-11 14:51:49 +05:00
Omar 59a717291c GP8_S05 2024-05-11 14:47:50 +05:00
Daniil.I.Y 3726fce8b4 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-10 19:01:15 +05:00
Daniil.I.Y 0a9f16aaf0 A10_A14 2024-05-10 19:01:12 +05:00