Commit Graph

115 Commits

Author SHA1 Message Date
DESKTOP-8J0BKKD\Admin e0616289b4 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence
# Conflicts:
#	Content/Maps/Interior/GP1/Walls/F02/S03/W_GP1_S03_F02_A03.umap
2023-03-31 17:57:52 +05:00
DESKTOP-8J0BKKD\Admin 3319b38459 Закинут меши стен полков и полов в леваки 2023-03-31 17:52:11 +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
PC-G04 3d33af9286 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-31 17:16:43 +05:00
PC-G04 1e101eadca F_GP1_S03_A03 2023-03-31 17:16:37 +05:00
DESKTOP-8J0BKKD\Admin 9ec8bd8e7f Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-31 15:45:06 +05:00
DESKTOP-8J0BKKD\Admin dee59777bd GP1_S03_A00 2023-03-31 15:45:02 +05:00
PC-G13 0e033102ad Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-31 14:43:56 +05:00
PC-G13 dc433e7d8a furniture levels _gp2 2023-03-31 14:43:49 +05:00
PC-G04 3df07e1641 Interior 2023-03-31 14:09:05 +05:00
PC-G04 528dd1adaa Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-30 20:04:36 +05:00
PC-G04 f0b8ad5ace InteriorsIrina 2023-03-30 20:04:23 +05:00
PC-G09 a9d5122365 Парк 2023-03-30 19:34:54 +05:00
GRAFF 156c25d7d9 infra 2023-03-30 18:49:40 +05:00
PC-G09 d888ee6233 Парк 2023-03-30 17:24:12 +05:00
PC-G13 50c1047564 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-30 13:09:36 +05:00
PC-G13 d4e4edf9c6 MM_tilerandom_anotherOne 2023-03-30 13:08:41 +05:00
JohnnyHatchet e4a872d463 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-30 12:06:05 +05:00
JohnnyHatchet fb0728f687 3.3, 2.1, 2.2
Уровни со стенами
2023-03-30 12:03:31 +05:00
PC-G09 b4bcaa730f Внешка 2023-03-29 20:38:46 +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-G09 5013d94c17 Внешка 2023-03-28 18:50:50 +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 815e9f7c63 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-27 15:42:22 +05:00
PRAyMU 921d5cb7e5 Test_Room_Minimal_P1 2023-03-27 15:42:17 +05:00
JohnnyHatchet aefaf3f30b Интерьеры 2.1 и 2.2 2023-03-27 14:46:41 +05:00
PC-G09 9796231ccc ВнешОчка 2023-03-24 15:14:37 +05:00
PRAyMU 3f8d03ad11 Test_Room_Lounge_P1 2023-03-24 01:50:53 +05:00
PRAyMU c0befaef3e Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-23 16:13:01 +05:00
PRAyMU 1fb8da18fb Plinth_P1 2023-03-23 16:12:53 +05:00
JohnnyHatchet 52ed1cb717 Furniture with materials V2 2023-03-23 10:19:01 +05:00
JohnnyHatchet a6d44b0108 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-22 18:10:10 +05:00
JohnnyHatchet b1c8c095d6 InteriorsV2_Furniture_Texture 2023-03-22 18:10:04 +05:00
PC-G13 6bb13bec98 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-22 18:03:07 +05:00
PC-G13 7726f57f84 levels 2023-03-22 18:02:01 +05:00
PRAyMU ad52f683fb Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-20 22:04:45 +05:00
PRAyMU d876930145 Test_Room_Update_P1 2023-03-20 22:01:36 +05:00
PC-G09 56aa2a8419 Декалиусы и дракониусы 2023-03-20 19:40:21 +05:00
PC-G13 6a0df8c505 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence 2023-03-20 19:01:56 +05:00
PC-G13 b52bfed842 levels GP1S01 2023-03-20 19:01:02 +05:00
PC-G09 2aaec6c28f Инстансы тачек 2023-03-17 16:45:35 +05:00
PC-G09 a465e18483 тачк 2023-03-17 16:10:33 +05:00
GRAFF 3529ec15e2 ws v0.8a 2023-03-16 00:46:21 +05:00
PC-G09 7339def1da Рядом с жилкой земеля 2023-03-15 21:08:09 +05:00