Commit Graph

1023 Commits

Author SHA1 Message Date
Dron b3421d5049 da eba 2024-05-22 00:27:59 +05:00
Dron a07721289a ффффф 2024-05-21 21:20:16 +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
SergeyVag 1ad13393da пофиксил крышку 2024-05-21 17:51:38 +05:00
PC-G13 6360cd3e7d gp8 s03 facade fix 2024-05-21 15:44:47 +05:00
Dron 4f295e3fa6 kucha vsego 2024-05-20 20:05:56 +05:00
Dron 440afdf0a6 search, tags 2024-05-18 01:56:42 +05:00
Dron a9c0882bd1 tester 2024-05-17 19:20:43 +05:00
pahachic fa7f5e8609 floor map test (probably not working) 2024-05-17 18:15:22 +05:00
Dron 72b9d35fd6 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-17 16:04:46 +05:00
Dron 1af7916625 images, doors N 2024-05-17 15:59:34 +05:00
pahachic 2bc3f8ef1c Flat data and points 2024-05-17 15:02:00 +05:00
pahachic 727a1c83f9 s3 2024-05-17 13:59:39 +05:00
pahachic 893d47904a Hous Id range 2024-05-17 13:02:07 +05:00
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
Dron 40216ffab4 длжтдльт 2024-05-16 17:50:04 +05:00
pahachic 8f4105c34a flat data duplicate deleted 2024-05-16 17:46:30 +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
Dron 0cac718412 many sshhhiiiiiitttt streaming enabled 2024-05-16 02:11:48 +05:00
Dron 05e83fc911 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-15 23:52:30 +05:00
Dron a7d955010d gavnoi vonyaet 2024-05-15 23:52:28 +05:00
pahachic 828b61be42 flatdata h3 2024-05-15 23:46:54 +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 858df04b2f yard 2024-05-15 16:02:05 +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 f7e74fc48b Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-15 14:52:08 +05:00
NikitsSysun 119c57b47e Правки S01 S02 интерьеры 2024-05-15 14:51:52 +05:00
Dron 71b122d4e0 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-15 13:09:02 +05:00
Dron fb7b28a888 keep skuf motherfucker 2024-05-15 13:08:58 +05:00
NikitsSysun 3390b8540d Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-15 12:28:25 +05:00
NikitsSysun 75204584b9 еще генплана на лопате 2024-05-15 12:28:20 +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