Commit Graph

413 Commits

Author SHA1 Message Date
PC-G13 ecbdca5039 smth 2023-04-13 01:33:46 +05:00
PRAyMU 8ff9627c0a Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 21:25:58 +05:00
PRAyMU fd9005cd2e S01_S02_F09 2023-04-12 21:25:49 +05:00
GRAFF 19c3a0990b Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/UI/Widgets/KPWidget.uasset
2023-04-12 21:20:30 +05:00
GRAFF 2bb2b0a84e some 2023-04-12 21:20:02 +05:00
PC-G12 889031c223 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 19:55:17 +05:00
PC-G12 1f4aadfa11 GreatestMops_Vol1 2023-04-12 19:55:12 +05:00
DESKTOP-8J0BKKD\Admin 6427c869f2 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 19:49:14 +05:00
DESKTOP-8J0BKKD\Admin 59543b5fd1 GP2_S02_A05 2023-04-12 19:49:10 +05:00
PC-G04 5eb1b72479 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 19:00:53 +05:00
PC-G04 277afb1de5 GP2_S01_A05 2023-04-12 19:00:45 +05:00
GRAFF f7e86141e8 Половина КП сверстано, сеттер в пойнте 2023-04-12 18:54:44 +05:00
DESKTOP-8J0BKKD\Admin 65f1042aa1 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 18:40:39 +05:00
DESKTOP-8J0BKKD\Admin 932b36a06a GP1_S03_A15 2023-04-12 18:40:35 +05:00
PC-G04 04779d39cc Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Meshes/Interior/Gp2/Plinth/SM_GP2_F9_S01_A00_Plinth.uasset
2023-04-12 17:46:33 +05:00
PC-G04 f30f04749f GP2_S01_A05_F09 2023-04-12 17:44:00 +05:00
GRAFF 666cf634d3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 17:23:38 +05:00
GRAFF 486c8f48ec points, parking 2023-04-12 17:23:26 +05:00
Igor f80cd7caa5 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 17:21:56 +05:00
Igor 3ca1899a38 GP2_S02_A05 2023-04-12 17:21:45 +05:00
PC-G12 b6f68b8309 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 16:34:24 +05:00
PC-G12 f4722cea5e Comeat 2023-04-12 16:34:13 +05:00
PRAyMU f363f0b020 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 16:08:50 +05:00
PRAyMU d260207dde F09_Repair 2023-04-12 16:08:00 +05:00
DESKTOP-8J0BKKD\Admin 212fffcbe8 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 16:02:48 +05:00
DESKTOP-8J0BKKD\Admin 8cd8dea914 GP2_S04_SA06 2023-04-12 16:02:45 +05:00
GRAFF d16ceac50f UI: картинки и данные 2023-04-12 15:41:48 +05:00
PC-G08 d28b184bf4 GP2_S03_A05 2023-04-12 15:10:15 +05:00
GRAFF 75bbaea609 9th 2023-04-12 14:55:19 +05:00
GRAFF 60d30c4ca2 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 14:46:15 +05:00
GRAFF 8db3fa5018 some 2023-04-12 14:45:49 +05:00
PC-G09 3c056e899c Всякое хуесякое 2023-04-12 14:42:48 +05:00
PC-G12 d0d5a60498 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-12 12:18:48 +05:00
PC-G12 ce6e5b04eb CMIT 2023-04-12 12:17:28 +05:00
PC-G09 d16c87d81e Foliage cull fix (Masks to nomipmap x64 res) 2023-04-12 09:44:37 +05:00
GRAFF 0fced1917a async loading plans 2023-04-11 20:59:31 +05:00
GRAFF 8bfc9489f1 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 20:29:29 +05:00
GRAFF cfd05910ae xml continue 2023-04-11 20:29:27 +05:00
Igor 765ff77c1f Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 20:17:59 +05:00
Igor ac2f84531d GP2_S02_A05 2023-04-11 20:17:30 +05:00
PC-G12 ac39c45b06 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 19:55:33 +05:00
PC-G12 2102cd7a23 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 19:52:00 +05:00
PC-G12 fe9a48b997 RM 2023-04-11 19:51:26 +05:00
DESKTOP-8J0BKKD\Admin 8dd9bb4020 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 19:50:47 +05:00
DESKTOP-8J0BKKD\Admin 2da5c911c6 GP2_S04_A06_F9 2023-04-11 19:50:43 +05:00
PC-G08 36e6c9715d GP02_S03_A04 inta 2023-04-11 18:46:14 +05:00
DESKTOP-8J0BKKD\Admin 6750271f76 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 18:25:59 +05:00
DESKTOP-8J0BKKD\Admin 5b3ff8ba51 GP2_S01_A004 2023-04-11 18:25:56 +05:00
GRAFF 09fb067dc0 UI 2023-04-11 18:09:27 +05:00
PC-G13 b93abcd470 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_1.uasset
#	Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Cylindr_Res.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Pendant_Crouise.uasset
#	Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Lamps/WallLampsMaterial/MI_WallLamp.uasset
2023-04-11 16:27:29 +05:00