Commit Graph

154 Commits

Author SHA1 Message Date
Dron c96f7bfd30 ui fix 2024-05-21 19:16:58 +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
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
Dron 0cac718412 many sshhhiiiiiitttt streaming enabled 2024-05-16 02:11:48 +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
pahachic 5bf189fd63 points 2024-05-15 17:44:29 +05:00
Dron fb7b28a888 keep skuf motherfucker 2024-05-15 13:08:58 +05:00
Dron e6e185a5d8 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky 2024-05-14 21:59:50 +05:00
Dron 4fed4ed3a2 aa 2024-05-14 21:59:47 +05:00
pahachic fefeab8043 Flat data (not cheked) 2024-05-14 20:08:51 +05:00
Dron 805ea3e169 some else 2024-05-14 13:33:14 +05:00
Dron 0edaea0223 infra 2024-05-13 16:36:44 +05:00
Dron 2948a25f4f implementing 2024-05-13 13:11:49 +05:00
Dron 4a51947349 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Config/DefaultEngine.ini
#	Content/Blueprints/Lamp/BP_InteriorLamp.uasset
2024-05-11 17:06:28 +05:00
Dron 1b25647521 new core 2024-05-11 17:04:56 +05:00
PC-G13 58bab16e45 gp7 tumendinamics 2024-04-26 13:58:02 +05:00
Dron 501f62d351 optimize xml, people upd 2024-03-28 18:10:01 +05:00
Dron 34ab2b53ed PS tweaks 2024-01-26 13:47:55 +05:00
Dron f3474e6b4e ?? 2024-01-26 12:49:48 +05:00
Dron 3e40eb7441 vagina 2023-12-26 01:01:03 +05:00
Dron d613c1ace9 zalupa 2023-12-25 10:05:46 +05:00
Dron d2014b7589 pizdec 2023-12-25 09:30:55 +05:00
Dron b7c06beead 2d plans, all good NIKITA BLYAT PUSHIT KTO BUDET 2023-12-25 03:49:17 +05:00
Dron 1773b8ff74 car, people subdiv 2023-12-20 22:18:58 +05:00
Dron 9fd28ffdb0 people, mops 2023-12-19 14:20:05 +05:00
Dron a43d779dcc some 2023-12-13 02:21:17 +05:00
Dron 21695ba07a Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP7/S04/GP7_S04_F14-15_P.umap
2023-12-12 14:50:55 +05:00
Dron 6984494958 ыыы 2023-12-12 14:50:39 +05:00
PC-G13 3634c22b39 mops 2023-12-12 14:19:40 +05:00
PC-G12 593ccb0a69 MP 2023-12-11 19:23:51 +05:00
PC-G12 9cf0749edc MPs 2023-12-08 19:53:00 +05:00
Dron ed2dafd098 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Blueprints/Lamp/BP_lampStreet_GP07_LightColumn.uasset
#	Content/Maps/Yard_GP7-8.umap
2023-12-08 14:16:01 +05:00
Dron e77ed2ce46 humans, sshhhhiiiit 2023-12-08 14:15:26 +05:00
PC-G12 2398c3eeb7 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky
# Conflicts:
#	Content/Maps/Interiors/GP7/S01/GP7_S01_F02-22_MOP.umap
#	Content/Maps/Interiors/GP7/S01/GP7_S01_F23-24_MOP.umap
#	Content/Maps/Interiors/GP7/S02/GP7_S02_F02-18_MOP.umap
#	Content/Maps/Interiors/GP7/S03/GP7_S03-F13_MOP.umap
#	Content/Maps/Interiors/GP7/S03/GP7_S03_F02-12_MOP.umap
2023-12-08 12:06:06 +05:00