Commit Graph

30 Commits

Author SHA1 Message Date
PC-G04 5084ed2cd7 GP1_S04_A05_F09 2023-04-10 16:32:29 +05:00
PC-G13 599a0ff47b interiorshaders, ies, lamps,cubemapstex 2023-04-10 13:06:21 +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-G08 b390c1922a gp1gp2Mops 2023-03-31 17:51:07 +05:00
PRAyMU eb6fbcf010 Test_Room_Minimal_P3 2023-03-31 17:47:15 +05:00
JohnnyHatchet fb0728f687 3.3, 2.1, 2.2
Уровни со стенами
2023-03-30 12:03:31 +05:00
JohnnyHatchet 02855f2ec5 F_GP1_S01_A01 2023-03-29 19:31:12 +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 e073e158bd Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Meshes/Candle.uasset
#	Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Meshes/Candlestick_03.uasset
2023-03-29 03:10:00 +05:00
PRAyMU 726139843b Test_Room_Minimal_P2 2023-03-29 03:08:17 +05:00
PC-G08 fce46f8f01 MOP_GP01 2023-03-28 18:45:10 +05:00
JohnnyHatchet fe1f4d02bd Интерьеры 2023-03-27 19:55:44 +05:00
PRAyMU 921d5cb7e5 Test_Room_Minimal_P1 2023-03-27 15:42:17 +05:00
PRAyMU 3f8d03ad11 Test_Room_Lounge_P1 2023-03-24 01:50:53 +05:00
JohnnyHatchet 52ed1cb717 Furniture with materials V2 2023-03-23 10:19:01 +05:00
JohnnyHatchet b1c8c095d6 InteriorsV2_Furniture_Texture 2023-03-22 18:10:04 +05:00
PRAyMU d876930145 Test_Room_Update_P1 2023-03-20 22:01:36 +05:00
PC-G13 afb9cdd603 FixCall 2023-03-15 18:41:57 +05:00
PC-G13 c4777671fc demoroom 2023-03-13 19:36:56 +05:00
PC-G13 57110fc340 gp2 transforms, demoroom 2023-03-13 18:24:29 +05:00
JohnnyHatchet fcfc8064d5 Спальня и ванная 2023-03-13 14:24:15 +05:00
PRAyMU 62b0a1c7bc Test_Room_Part_3 2023-03-13 04:16:04 +05:00
PRAyMU 1568b06975 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-10 21:10:03 +05:00
PRAyMU ef6b28c225 Test_Room_Part_2 2023-03-10 20:53:40 +05:00
JohnnyHatchet 76ff3a32f0 Ирина 2023-03-10 19:56:20 +05:00
PRAyMU e1d9470e88 Test_Room_Part_1 2023-03-10 04:06:02 +05:00