Dron/lifeResidence
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
340 Commits 3 Branches 1 Tag
4564c8f494a42839e7d689962cd63d23e104f809
Commit Graph

103 Commits

Author SHA1 Message Date
GRAFF 1177bb7012 Отправка говна в конце сеанса, картинки планов, сало, мёд, говно и гвозди 2023-04-13 19:37:23 +05:00
GRAFF 1a899ed03e Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 
# Conflicts:
#	Content/Blueprints/UI/Widgets/KPWidget.uasset
 2023-04-13 19:07:39 +05:00
GRAFF 691eb2783b some 2023-04-13 19:06:41 +05:00
GRAFF 35a1ab2a5d Паркинг, пойнты, свободные места, менеджеры 2023-04-13 18:13:15 +05:00
GRAFF 20058a48be Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 17:42:25 +05:00
GRAFF 4674c8106c points 2023-04-13 17:42:15 +05:00
PC-G13 c9b5255164 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 16:46:53 +05:00
PC-G13 0d6e85d7c2 f09, svet, bp elevatora+meshes, parkingWIP, numbers meshes 2023-04-13 16:46:08 +05:00
GRAFF 279fc14b8b КП, УТП 2023-04-13 15:25:31 +05:00
GRAFF 7cddc41092 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-13 13:45:57 +05:00
GRAFF 9e2be0ce6f tags 2023-04-13 13:45:00 +05:00
PC-G13 c3c946b450 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 
# Conflicts:
#	Content/Maps/Interior/GP1/MOP/S02/MOP_GP1_S02_F01.umap
#	Content/Maps/Interior/Parking/Parking_GP1.umap
#	Content/Maps/Interior/Parking/Parking_GP2.umap
 2023-04-13 01:35:54 +05:00
PC-G13 ecbdca5039 smth 2023-04-13 01:33:46 +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
GRAFF f7e86141e8 Половина КП сверстано, сеттер в пойнте 2023-04-12 18:54:44 +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
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
GRAFF 75bbaea609 9th 2023-04-12 14:55:19 +05:00
GRAFF 8db3fa5018 some 2023-04-12 14:45:49 +05:00
GRAFF 0fced1917a async loading plans 2023-04-11 20:59:31 +05:00
GRAFF cfd05910ae xml continue 2023-04-11 20:29:27 +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
PC-G13 f70c9bb3e2 smth gp1 2023-04-11 16:26:45 +05:00
GRAFF 61b2942c99 bool 2023-04-11 16:22:03 +05:00
GRAFF d4aff7e033 xml dispatcher 2023-04-11 16:20:07 +05:00
GRAFF e72aa380e5 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 15:26:10 +05:00
GRAFF ae1d917351 тачки, еще люди, загрузка данных по хатам, плагин парсер 2023-04-11 15:25:58 +05:00
GRAFF f0f5417bd3 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Content/Blueprints/UI/Widgets/Point/Marker.uasset
 2023-04-10 18:56:33 +05:00
GRAFF bdb454fd74 Очередной юай 2023-04-10 18:53:53 +05:00
GRAFF 860bc35dae Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 
# Conflicts:
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_FloorLamp_1.uasset
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_1.uasset
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_2.uasset
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_3.uasset
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_4.uasset
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Pedant_light_013.uasset
#	Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Aplomb_Large.uasset
#	Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Chandelier_Modo.uasset
#	Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Cyl_Lounge.uasset
#	Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Cylindr_Res.uasset
#	Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_bedroom_LR.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_1_minimalism.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_2_Minimal.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Bathroom_Minimal.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Chicago.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Cyl_Minimal.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Pendant_Crouise.uasset
#	Content/Blueprints/UI/Widgets/Search/Search.uasset
#	Content/Materials/Interior/MI_Door_Res.uasset
 2023-04-10 17:15:30 +05:00
GRAFF c8e761042f источники света, людишки, тачилки, правки мастермата и эмиссив 2023-04-10 17:14:08 +05:00
DESKTOP-8J0BKKD\Admin d130dfd37e S04_A04_F09 2023-04-10 16:37:01 +05:00
PC-G13 9afb07252d Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 
# Conflicts:
#	Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Living/SM_LTV.uasset
#	Content/Furniture/Vol2_Unsorted/Textures/T_BShoe_Fabric_R.uasset
#	Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Materials/MI_Metal_Gold_Light.uasset
#	Content/Furniture/Vol2_Unsorted/Unimodels_Department_Vol_1/Meshes/Bedroom/SM_Bed_Queen.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_Lamp_3_SM_Lamp_3.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_Table_Lounge_Table.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_Tidafors_Sofa.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_Wardrobe_3_SM_Wardrobe_3.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_child_bed_1_SM_child_bed_1.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_child_bed_2_SM_child_bed_3.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_child_dresser.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_child_shelf.uasset
#	Content/Meshes/Interior/Furniture/Interior_V3/SM_child_table.uasset
#	Content/Meshes/Interior/Window/SM_Window_08.uasset
#	Content/Meshes/Interior/Window/SM_Windowsill.uasset
 2023-04-10 13:06:43 +05:00
PC-G13 599a0ff47b interiorshaders, ies, lamps,cubemapstex 2023-04-10 13:06:21 +05:00
PC-G04 e77dd51ec3 GP1_S04_A05 2023-04-09 19:56:32 +05:00
GRAFF de12f57cd1 Очередной юай фихс 2023-04-07 18:50:51 +05:00
GRAFF 7adc9232e6 Немного UI fix 2023-04-07 11:37:10 +05:00
GRAFF 815a35b3a2 UI fix 2023-04-06 17:25:15 +05:00
GRAFF 279ea5369f gbpltw 2023-04-06 04:56:48 +05:00
GRAFF f86d4f9218 asdasd 2023-04-06 01:46:26 +05:00
GRAFF 1b81e3ef0b RENAMING, highlights mats, loading shits 2023-04-05 23:31:22 +05:00
GRAFF 3845cff740 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 21:44:09 +05:00
GRAFF fc107fafaa поинты, загрузка леваков 2023-04-05 21:44:07 +05:00