Commit Graph

295 Commits

Author SHA1 Message Date
PC-G13 31941fbc47 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-10-18 18:16:55 +05:00
PC-G13 460ceb0d46 normalfixer default 1 2023-10-18 18:16:53 +05:00
Dron d0ad05e481 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into to5.1 2023-10-16 21:06:56 +05:00
Dron 1add386a1f fix lumen, some shit in interior, location fix of points 2023-10-16 21:06:37 +05:00
SergeyVag dd6f326c38 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-10-16 18:04:39 +05:00
SergeyVag 57ca75b37c Разделил гнеплан на части 2023-10-16 18:04:36 +05:00
PC-G13 1b139f1e5f villas 2023-10-16 14:24:24 +05:00
Andrew_Jr 38a10d44dc AAA 2023-10-16 12:50:26 +05:00
Andrew_Jr fc304366dc Video + localization 2023-10-16 11:46:26 +05:00
Dron 2510e73f13 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into to5.1
# Conflicts:
#	Content/Maps/Landscape.umap
2023-10-15 20:39:02 +05:00
Dron 85ea3a0087 ыы 2023-10-15 20:37:59 +05:00
SergeyVag cafbd8940a Больше деревьев 2023-10-15 17:44:42 +05:00
SergeyVag 887040e073 Убоал уебищную траву 2023-10-15 17:17:43 +05:00
SergeyVag 1fe2f849ee ауф 2023-10-15 17:00:00 +05:00
Dron e1b3f2595f FUCKER 2023-10-15 16:29:44 +05:00
SergeyVag 65ba0c32cb Всякие улучшения 2023-10-15 14:55:45 +05:00
SergeyVag a374bc9b14 что то сделал а по факту нихуя 2023-10-14 18:57:22 +05:00
Dron 99464f095d many fixes, interiors, daytime, instanced villas 2023-10-14 01:05:34 +05:00
Andrew_Jr 909553871b Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-10-13 21:21:06 +05:00
Andrew_Jr c05e8d7c37 UI 2023-10-13 21:20:31 +05:00
PC-G13 1e770ed900 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1
# Conflicts:
#	Content/TMBackyardPack2/Materials/StdOpaque/M_StdOpaque.uasset
2023-10-13 21:07:33 +05:00
SergeyVag 139f4b5acd Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-10-13 19:57:09 +05:00
SergeyVag 50efaa4682 Тачки 2023-10-13 19:57:02 +05:00
PC-G13 163d812476 villas mesh channels, some nanite, 2023-10-13 19:54:57 +05:00
PC-G12 b9fe2a240c Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-10-13 19:53:27 +05:00
PC-G12 3ec809c8af ass 2023-10-13 19:52:49 +05:00
Daniil.I.Y 5d7b9a1dfa Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-10-13 18:24:13 +05:00
Daniil.I.Y ba1b2a1c85 genplan+fulage 2023-10-13 18:24:06 +05:00
Dron 1c5604880c Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into to5.1 2023-10-13 18:13:52 +05:00
Dron fc67f713c6 revert 2023-10-13 18:13:47 +05:00
Andrew_Jr db2c59f246 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-10-13 17:55:58 +05:00
Andrew_Jr 002b50f2b9 Fuckinh numbers 2023-10-13 17:55:54 +05:00
PC-G13 983b944311 smth 2023-10-13 17:04:59 +05:00
Dron d1c7deacf1 houses 2023-10-13 14:12:55 +05:00
PC-G12 e96d2a5d6b Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-10-12 19:56:29 +05:00
PC-G12 4dc61046da ns 2023-10-12 19:55:53 +05:00
PC-G13 46fba867f6 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1
# Conflicts:
#	Content/Maps/Buildings.umap
#	Content/Maps/Landscape.umap
#	Content/Maps/Main.umap
2023-10-12 19:54:56 +05:00
PC-G13 b5c6ada6f4 vilu 01 2023-10-12 19:54:29 +05:00
SergeyVag 1d74533f06 Генплан 2023-10-12 19:09:38 +05:00
SergeyVag 2d31361e52 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-10-12 15:27:20 +05:00
SergeyVag a4f7cf2bac Генплан 2023-10-12 15:27:17 +05:00
PC-G12 c5b7700887 np 2023-10-11 19:59:19 +05:00
PC-G12 b929dff130 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-10-10 19:51:25 +05:00
PC-G12 054640e004 bps 2023-10-10 19:51:20 +05:00
Dron 84a2a4476e settings 2023-10-10 19:40:21 +05:00
Dron 4ff0d2e43d some 2023-10-10 14:45:56 +05:00
PC-G12 cacd34832a TRS 2023-10-09 19:59:41 +05:00
PC-G12 8ca3b01486 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-10-06 20:02:23 +05:00
PC-G12 18a76fde38 G 2023-10-06 19:52:24 +05:00
PC-G13 a44434bb8c Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-10-06 18:14:26 +05:00