Commit Graph

362 Commits

Author SHA1 Message Date
Daniil.I.Y 0d9fffcd2b Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-05 17:38:17 +05:00
Daniil.I.Y 1f54e81e63 genplan_6 2023-12-05 17:38:13 +05:00
volhvov c947fa2246 генплан 8,13, тачки деревья 2023-12-04 12:47:31 +05:00
Daniil.I.Y c2bd6bbc78 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-01 19:59:51 +05:00
Daniil.I.Y f33a57d9c5 genplan_5 2023-12-01 19:59:45 +05:00
SergeyVag 975482aaeb генплан 11 2023-12-01 19:43:17 +05:00
SergeyVag bfdb709b1f Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-12-01 17:34:27 +05:00
SergeyVag 0d5f802387 генплан 4 2023-12-01 17:34:22 +05:00
Daniil.I.Y 553c34a6d0 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-11-30 19:54:40 +05:00
Daniil.I.Y 15cb0c81c9 genplan_2 2023-11-30 19:54:34 +05:00
SergeyVag b082b53fe0 Генплан 4 2023-11-30 19:36:09 +05:00
SergeyVag 92bb0a211c гЕНПЛАН 3 И 1 2023-11-30 17:47:35 +05:00
Daniil.I.Y baf33b26c4 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-11-30 14:41:13 +05:00
Daniil.I.Y 55a5da0cf9 genplan_2 2023-11-30 14:41:06 +05:00
SergeyVag d7a54424bc гЕНПЛАН 3 2023-11-30 14:39:54 +05:00
SergeyVag fcbfba5286 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-11-30 13:27:36 +05:00
SergeyVag 77fdb1454a Генплан 3 2023-11-30 13:27:30 +05:00
volhvov cdde49b932 генплан 8 2023-11-30 13:14:19 +05:00
SergeyVag e4cc3f52cf Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-11-29 19:01:17 +05:00
SergeyVag 93e44bd982 Genplan_01 2023-11-29 19:01:06 +05:00
volhvov 9422d69411 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-11-29 18:58:19 +05:00
volhvov 9b3948302e genplan_8_vsyakoe 2023-11-29 18:57:48 +05:00
Andrew_Jr ef7ef2c950 fuckin ui states added 2023-11-29 17:22:19 +05:00
SergeyVag 7007ddf8d1 ПОКАВЫРЯЛ НЕМНОГО МАТЕРИАЛЫ 2023-11-28 18:13:01 +05:00
SergeyVag 464d92130e Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-11-27 18:45:36 +05:00
SergeyVag 34032a53ed Поправил генпланы 2023-11-27 18:45:32 +05:00
Dron 4c9f1d4d79 people up to 12 2023-11-23 18:40:38 +05:00
Dron a729d11c50 yobaniy rot etogo cazino blyat 2023-11-23 00:22:04 +05:00
Dron 35fd30ba25 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into to5.1 2023-11-22 19:53:45 +05:00
Dron b828439313 setup load, people 01 02 03 04 05 2023-11-22 19:53:44 +05:00
volhvov 46c07d922c BC_sections lamps 2023-11-22 19:14:14 +05:00
volhvov 2b2b6bc854 A_section lamps 2023-11-22 17:52:32 +05:00
SergeyVag 4c7963d73a жопка 2023-11-22 15:38:45 +05:00
volhvov 24407ccc25 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-11-22 15:33:46 +05:00
volhvov 981d7127ec добавил светильники 2023-11-22 15:33:36 +05:00
Andrew_Jr c285a340ac Translated img 2023-11-22 15:08:22 +05:00
Andrew_Jr a5765b75f6 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-11-22 14:51:48 +05:00
Andrew_Jr 30c4088bc5 AutoPres false 2023-11-22 14:51:40 +05:00
volhvov 895cb6e24b Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into UpTo_5.1 2023-11-22 14:20:59 +05:00
volhvov a5bab51080 genplan_8 2023-11-22 14:20:39 +05:00
Dron 4386e2dac1 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into to5.1
# Conflicts:
#	Content/Localization/Game/Game.csv
#	Content/Localization/Game/Game.manifest
#	Content/Localization/Game/ar-AE/Game.archive
#	Content/Localization/Game/en/Game.archive
2023-11-22 14:18:48 +05:00
Dron e2254650e2 outside tour 2023-11-22 14:17:55 +05:00
Andrew_Jr fd525c965e More translate 2023-11-22 13:46:24 +05:00
Andrew_Jr 79656fd96d Some translate 2023-11-22 11:47:00 +05:00
Dron b1d7eb00e1 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into to5.1 2023-11-20 19:58:08 +05:00
Dron c20730d3d6 nightsky 2023-11-20 19:58:04 +05:00
Andrew_Jr 61fa94a71c 3d-tour outside ui 2023-11-20 18:49:19 +05:00
Andrew_Jr 0d9d1deaa4 TextRender 2023-11-20 18:26:18 +05:00
Andrew_Jr 42c26a6611 Directions and fuckin HideUI 2023-11-20 18:08:43 +05:00
Dron 150f636da8 Merge branch 'UpTo_5.1' of http://192.168.1.163:3000/Dron/NorthBaniASS into to5.1 2023-11-20 14:14:21 +05:00