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

81 Commits

Author SHA1 Message Date
PC-G13 0c7030c262 tv 2023-04-14 20:13:00 +05:00
PC-G13 f75d64e791 bpdoor sign 2023-04-14 17:32:12 +05:00
PC-G13 7ad0ff0502 коллизии, немного пробок, пара шейдеров, 2023-04-14 15:10:13 +05:00
PC-G13 41c6d29961 elevatoru. nomera dveri, nemnogokoliziu, meshi terras k fasady 2023-04-13 22:42:55 +05:00
PC-G13 db9e1ae5fe mops+volumetrics 2023-04-13 20:34:16 +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
DESKTOP-8J0BKKD\Admin 1c5ce702dc Мопы 2023-04-13 15:49:58 +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
DESKTOP-8J0BKKD\Admin 8cd8dea914 GP2_S04_SA06 2023-04-12 16:02:45 +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
PRAyMU c828b24092 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 15:04:22 +05:00
PRAyMU 5f3b274d32 F09_A05_A06 2023-04-11 15:03:28 +05:00
Igor e2c2306e2a Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 14:58:16 +05:00
Igor be3e21c1af F_GP2_S04_A00 2023-04-11 14:58:11 +05:00
PC-G04 8abbf22eec Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-11 13:20:03 +05:00
PC-G04 2b88950464 GP1_S04_A05_F09 2023-04-11 13:19:56 +05:00
DESKTOP-8J0BKKD\Admin bd2045d25b Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-10 19:10:56 +05:00
DESKTOP-8J0BKKD\Admin 6cdb4ea06d GP1_S04_F09 2023-04-10 19:10:52 +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 260157f0fa Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-10 16:37:07 +05:00
DESKTOP-8J0BKKD\Admin d130dfd37e S04_A04_F09 2023-04-10 16:37:01 +05:00
PC-G04 05974f64f4 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-10 16:32:34 +05:00
PC-G04 5084ed2cd7 GP1_S04_A05_F09 2023-04-10 16:32:29 +05:00
PC-G13 08784923b3 smth 2023-04-10 15:42:16 +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 116e1b79e7 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-09 19:56:39 +05:00
PC-G04 e77dd51ec3 GP1_S04_A05 2023-04-09 19:56:32 +05:00
Igor 85841d835d F_GP2_S03_A03 F_GP2_S02_A02 2023-04-09 19:52:36 +05:00
PC-G08 73a188628c gp1_walls 2023-04-07 14:46:27 +05:00
PC-G12 05ab5ef850 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-06 19:36:05 +05:00
PC-G12 805d133826 Col 2023-04-06 19:35:57 +05:00
Igor 1e6b5dd582 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 
# Conflicts:
#	Content/Meshes/Interior/Gp2/Plinth/SM_GP2_F2_S01_A03_Plinth.uasset
#	Content/Meshes/Interior/Window/SM_Window_08.uasset
 2023-04-06 16:36:12 +05:00
Igor cd0a5eee14 GP2_S01_A03 2023-04-06 16:35:19 +05:00
PC-G12 b83c15a74a Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 
# Conflicts:
#	Content/Meshes/Interior/Window/SM_Window_08.uasset
 2023-04-06 14:45:06 +05:00
PC-G12 16692a6dfc Home 2023-04-06 14:42:32 +05:00
PRAyMU 313ea77cf7 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 
# Conflicts:
#	Content/Maps/Interior/GP1/F09/S01/GP1_S01_A05_F09.umap
#	Content/Meshes/Interior/Window/SM_Window_Angular.uasset
#	Content/Meshes/Interior/Window/SM_Windowsill.uasset
 2023-04-06 02:39:28 +05:00
PRAyMU e3d6ca7fda GP1_F09_S01_A05_P1 2023-04-06 02:23:56 +05:00
PC-G13 f2130fa05f mops 2023-04-05 20:12:00 +05:00
PC-G08 1d2bd21cd7 MOPbl 2023-04-05 14:32:15 +05:00
PC-G12 a70a61ee5b Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-04-05 14:20:09 +05:00
PC-G12 bf358be6be Parking 2023-04-05 14:17:52 +05:00
maximpkt 7af66401d8 MopDoorBP 2023-04-04 19:15:47 +05:00
PC-G08 499a487fec mopDoorLvlsLamp 2023-04-04 14:52:33 +05:00
PC-G08 53c8aef926 Mops 2023-04-03 19:10:44 +05:00
PC-G04 de34946a67 F_GP1_S01_A02 
F_GP1_S01_A03
F_GP1_S02_A01
 2023-04-03 16:34:57 +05:00