166 Commits

Author SHA1 Message Date
GRAFF 9b3ea3fdaa Еще меньше цен 2023-03-13 12:58:56 +05:00
GRAFF f2850614b6 Никаких цен 2023-03-13 11:31:51 +05:00
PC-G06 7a731f2aea Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Interior/Material/M_Glass_Black.uasset
2022-11-17 23:27:30 +05:00
PC-G06 513ad66c70 Furniture_Repair_Part_1 2022-11-17 23:26:57 +05:00
Andrew 9923bdb5b9 Снова фиксы 2022-11-17 15:49:15 +05:00
Andrew ce6e581f5a Фиксы 2022-11-16 14:53:58 +05:00
Andrew c5fd2c74b8 Новый вид окна избранного, фиксы 2022-11-14 18:33:24 +05:00
Andrew 681b175d23 Правочки 2022-11-11 19:12:48 +05:00
GRAFF b38270630b плагин читалка, кнопка с ссылкой 2022-11-11 12:22:59 +05:00
GRAFF 0dc2c31957 tupoe govno pidora 2022-11-09 21:34:51 +05:00
GRAFF 82531799f5 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-11-09 18:04:10 +05:00
Andrew c899916800 Перевод, работает 2022-11-09 16:55:57 +05:00
GRAFF e3111c999d Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Assetpacks/SpeedTree/Asset/SpeedTree/TreeMats/MM_Grass_TKT.uasset
2022-11-09 16:42:09 +05:00
GRAFF 5bb0c981f6 да бл 2022-11-09 16:41:51 +05:00
Andrew 5abe135f4c Merge remote-tracking branch 'origin/master' 2022-11-09 16:39:06 +05:00
Andrew cb266ec3df Перевод нерабочий 2022-11-09 16:38:31 +05:00
PC-G13 998e5622ee Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Assetpacks/SpeedTree/Asset/SpeedTree/TreeMats/MM_Grass_TKT.uasset
#	Content/Maps/Interior/A1T/A1T_L_Fol.umap
#	Content/Maps/Interior/A2M/A2M_R.umap
2022-11-09 16:16:12 +05:00
PC-G13 38da3c619f makepalmgreatagainandagain 2022-11-09 16:15:06 +05:00
Andrew 8c5a368c2b ASSHOLE 2022-11-07 18:34:04 +05:00
Andrew d4c2785f7d Очередной видос 2022-11-07 16:30:21 +05:00
Andrew 6baa55f99a ass 2022-11-07 13:39:48 +05:00
Andrew 8ff5e2fb1d Новое видео 2022-11-07 13:06:27 +05:00
GRAFF 11bbf63438 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-11-06 21:14:31 +05:00
GRAFF 96872230bf фикс нормалей, интерфейса, вроде готов к показу 2022-11-06 21:14:14 +05:00
Andrew 6510af6853 Изм. текст в таблице "About" 2022-11-06 19:25:05 +05:00
PC-G13 e45858e5c9 channelagainblat 2022-11-06 15:24:25 +05:00
PC-G13 556201da43 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-11-06 14:58:09 +05:00
PC-G13 e09cb4c04f eshe kolizii 2022-11-06 14:58:05 +05:00
Andrew b23090e8e9 Merge remote-tracking branch 'origin/master' 2022-11-06 14:33:27 +05:00
Andrew 71b7794add Серые пойнты 2022-11-06 14:32:48 +05:00
PC-G13 c051546122 channel,coll 2022-11-06 13:45:49 +05:00
PC-G13 bd4d6715ea Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Maps/Interior/C2M/C2M_L.umap
#	Content/Maps/Interior/C2M/C2M_R.umap
#	Content/Maps/Landscape.umap
#	Content/Materials/Instances/Grass/MI_Grass_Yellow.uasset
2022-11-06 13:09:10 +05:00
PC-G13 226b97648d smth 2022-11-06 13:06:47 +05:00
Andrew 5d474208f3 Кнопка выхода, обновленные слайды инфо 2022-11-06 12:26:31 +05:00
Andrew 9af09295da Автопрез., измененная 2022-11-05 21:31:01 +05:00
GRAFF 6072df0dd7 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Assetpacks/Tropical_Jungle_Pack/FoliageType/FT_Tree_Fern_02.uasset
#	Content/Maps/Buildings.umap
2022-11-04 19:07:23 +05:00
GRAFF eb5adc5ad0 блять сколько же кала 2022-11-04 19:06:32 +05:00
PC-G13 7c101a3348 ну допустим коллизии, ну допустим пальмы 2022-11-04 16:15:50 +05:00
PC-G06 acc4fe0638 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS
# Conflicts:
#	Content/Assetpacks/Furniture/Vol2_Unsorted/FurniturePack/Materials/Tiles_Rocks/M_Marble_White.uasset
#	Content/Interior/Material/MI_Decor_Marble_Biege.uasset
2022-11-04 07:55:21 +05:00
PC-G06 2443c85c27 Interior_Mat_Part_1 2022-11-04 07:54:22 +05:00
Andrew 9331652e22 Переверстанный, трижды проклятый, интерфейс 2022-11-04 01:54:49 +05:00
Andrew 4788e19c1b assda 2022-11-03 20:47:56 +05:00
GRAFF 9d46da9bc2 adssa 2022-11-03 20:27:03 +05:00
PC-G01 c5b25e38b7 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-11-03 19:55:22 +05:00
PC-G01 217b903c9f все парки 2022-11-03 19:55:14 +05:00
Andrew 38dcd97ef6 Merge remote-tracking branch 'origin/master' 2022-11-03 19:40:55 +05:00
Andrew 2d2d455861 Автопреза 2022-11-03 19:40:38 +05:00
PC-G01 a0783ac4af Барахапарака 2022-11-03 18:55:44 +05:00
GRAFF 331960dafa сплайновый спавнер сборной по футболу 2022-11-03 15:29:14 +05:00
PC-G13 a967af6186 белые фасады, прямые пальмы 2022-11-03 12:46:56 +05:00