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

76 Commits

Author SHA1 Message Date
PC-G13 ecbdca5039 smth 2023-04-13 01:33:46 +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
PC-G04 b9d9e7283c Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 20:43:59 +05:00
PC-G04 29a05b2f35 BP_Lamp_KoservaTism 2023-04-05 20:43:43 +05:00
GRAFF 5b0e4a7016 Merge remote-tracking branch 'origin/master' 2023-04-05 20:38:40 +05:00
GRAFF 2a28f7ed55 Fix ui 2023-04-05 20:38:20 +05:00
PC-G13 06a71d96a3 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 20:12:07 +05:00
PC-G13 f2130fa05f mops 2023-04-05 20:12:00 +05:00
GRAFF 70e2bd61eb Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 19:41:53 +05:00
GRAFF 315130da3e data 2023-04-05 19:41:46 +05:00
GRAFF 9e520cbbcc Navigation 2023-04-05 17:56:37 +05:00
PC-G08 1d2bd21cd7 MOPbl 2023-04-05 14:32:15 +05:00
PC-G04 3eb39b4c4f Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 13:01:11 +05:00
PC-G04 0d431cc716 Lamps_Lounge 
Interiors
 2023-04-05 12:57:01 +05:00
GRAFF 6989443365 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-04 20:51:36 +05:00
GRAFF 9b9102a9a8 люди, тачки 2023-04-04 20:51:17 +05:00
GRAFF 1f27bd9e7f UI fix 2023-04-04 19:08:36 +05:00
PC-G08 499a487fec mopDoorLvlsLamp 2023-04-04 14:52:33 +05:00
PC-G04 20195aeb4a BP_Lamps,Interiors 2023-04-04 12:04:38 +05:00
PC-G13 2e7f72c9ef BP_Lamp 2023-04-03 16:05:32 +05:00
GRAFF 156c25d7d9 infra 2023-03-30 18:49:40 +05:00
JohnnyHatchet 6b0e95415a Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 
# Conflicts:
#	Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Living/SM_LDC_Book_11.uasset
#	Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Tableware/SM_Cup.uasset
 2023-03-29 15:06:13 +05:00
JohnnyHatchet 3121688b66 Ассет детский, Консерватизм 2023-03-29 15:05:42 +05:00
PRAyMU 726139843b Test_Room_Minimal_P2 2023-03-29 03:08:17 +05:00
GRAFF 3529ec15e2 ws 2023-03-16 00:46:21 +05:00
GRAFF 8a72c91148 всякий shit 2023-03-15 20:25:30 +05:00
GRAFF 7086d62b62 UI косяки 2023-03-15 15:31:47 +05:00
GRAFF ddff93b265 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 
# Conflicts:
#	Content/Blueprints/UI/Widgets/SubMenu/NavigationBars.uasset
 2023-03-15 14:29:36 +05:00
GRAFF 14f8be1632 йобана 2023-03-15 13:04:43 +05:00