Dron/NorthBaniASS
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
56 Commits 3 Branches 0 Tags
8d69c34cb1e065a4d9f7ae8193ce573bbc4df316
Commit Graph

56 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PC-G13 8d69c34cb1 int 2022-10-30 12:49:51 +05:00
PC-G13 afa898740d Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 
# Conflicts:
#	Content/Maps/Main.umap
#	Content/Meshes/Villas/C1T_L/SM_C1T_L.uasset
 2022-10-29 14:57:01 +05:00
PC-G13 9dc069294a яебуалибабу 2022-10-29 14:53:59 +05:00
GRAFF 4f60bb96a5 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 
# Conflicts:
#	Content/Blueprints/UI/Widgets/Submenu/Infrastruct.uasset
#	Content/Blueprints/UI/Widgets/Submenu/Search.uasset
 2022-10-28 21:00:59 +05:00
GRAFF 6030d09a7a заебся 2022-10-28 20:53:28 +05:00
Andrew 1f8b6edf97 Merge remote-tracking branch 'origin/master' 2022-10-28 20:52:25 +05:00
Andrew b71a0d865f Автопрез, мелкие фиксы 2022-10-28 20:52:10 +05:00
PC-G06 8904983a38 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-28 20:00:53 +05:00
PC-G06 48268816b6 B1T_Interior_Part_1 2022-10-28 20:00:46 +05:00
PC-G12 2ec48bd0ec C1T_d 2022-10-28 19:48:24 +05:00
PC-G12 204d172614 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-28 19:16:32 +05:00
PC-G12 51fef57cf3 C1T 2022-10-28 19:16:27 +05:00
GRAFF 09de277dfb еще всякое 2022-10-28 19:05:00 +05:00
Andrew c9f256c2bf Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Content/Blueprints/UI/Actors/InfraPoint.uasset
#	Content/Maps/Main.umap
#	Content/Maps/points/points.umap
 2022-10-28 18:48:25 +05:00
Andrew 860ec414a8 Пойнты инфраструктуры 2022-10-28 18:46:38 +05:00
GRAFF 56ec4c2a62 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 
# Conflicts:
#	Content/Blueprints/UI/Widgets/Elements/Compass.uasset
#	Content/Blueprints/UI/Widgets/Elements/MenuBtn.uasset
#	Content/Blueprints/UI/Widgets/Elements/styledText.uasset
#	Content/Blueprints/UI/Widgets/Marker/Point.uasset
#	Content/Blueprints/UI/Widgets/Submenu/Infrastruct.uasset
#	Content/Blueprints/UI/Widgets/menu/mainMenu.uasset
#	Content/Maps/Main.umap
 2022-10-28 16:02:16 +05:00
GRAFF 4ffd553bf0 всякое 2022-10-28 16:01:33 +05:00
PC-G13 3846833531 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 
# Conflicts:
#	Content/Maps/Interior/C1T/C1T_L.umap
 2022-10-28 15:33:12 +05:00
PC-G13 1cb8a9adb2 A1T, fence 2022-10-28 15:32:48 +05:00
PC-G12 b17ebe9239 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-28 14:59:11 +05:00
PC-G12 aeadb76fc7 C1T 2022-10-28 14:59:05 +05:00
Andrew e84a14f3b4 Прекол пойнта 2022-10-28 14:56:53 +05:00
Andrew 5962d268bd Merge remote-tracking branch 'origin/master' 2022-10-28 13:55:52 +05:00
Andrew 9eb55f6a95 Дополнения интерфейса 2022-10-28 13:55:37 +05:00
PC-G06 b180bb43e3 A1T_Part_3 2022-10-28 13:03:43 +05:00
PC-G06 08b585e7e1 A1T_FLoor_2_Part_2 2022-10-28 12:55:45 +05:00
PC-G13 2991c963fe Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 
# Conflicts:
#	Content/Maps/Buildings.umap
#	Content/Maps/Interior/A1T_Interior.umap
 2022-10-28 10:51:43 +05:00
PC-G13 eae1688123 1 2022-10-28 10:50:29 +05:00
PC-G06 cedcf4abb1 A1T_Interior_Floor_2_Part_1 2022-10-28 09:22:01 +05:00
GRAFF 2b948ad749 всякое 2022-10-27 23:16:46 +05:00
GRAFF e9b67ccba3 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 
# Conflicts:
#	Content/Blueprints/UI/Widgets/menu/mainMenu.uasset
 2022-10-27 20:34:56 +05:00
GRAFF a7fee139a0 всякое поднастроено, поинты расставлены вилл и кластеров 2022-10-27 20:34:32 +05:00
Andrew 3f9fcde79d Merge remote-tracking branch 'origin/master' 2022-10-27 20:18:41 +05:00
Andrew 19899cdb49 Интерфейс 2022-10-27 20:18:01 +05:00
PC-G13 b325318a1e чет песка в пустыне много 2022-10-27 16:49:50 +05:00
PC-G13 1d79736e1b Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-27 12:01:58 +05:00
PC-G13 5c0f97c60d dick fight desert 2022-10-27 12:00:41 +05:00
Andrew 1b0320bcad Merge remote-tracking branch 'origin/master' 2022-10-26 20:10:55 +05:00
Andrew c07625eda4 Интерфейс 2022-10-26 20:07:55 +05:00
PC-G13 65d095a34e Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-26 19:12:44 +05:00
PC-G13 729af6f2dd villas. gp, palms, decals, inter 2022-10-26 19:12:21 +05:00
GRAFF b550193b47 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-26 19:00:03 +05:00
GRAFF 28fd3bc9ce там пара параметров, есть подсказка как заполнять при наведении 2022-10-26 18:59:23 +05:00
PC-G06 cad8369804 A1T_Interior 2022-10-26 10:31:48 +05:00
GRAFF b8c98b721e если я создаю 2 файла проекта значит так надо блять ВСЕ РАБОТАЮТ НЕ В ДЕВ 2022-10-26 02:43:20 +05:00
GRAFF 46b5378547 Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-26 02:39:20 +05:00
GRAFF 39fc38138c БП сокетов 2022-10-25 19:42:24 +05:00
PC-G13 4085de14d2 int 2022-10-25 18:55:18 +05:00
PC-G06 80c599593d Merge branch 'master' of http://192.168.1.163:3000/Dron/NorthBaniASS 2022-10-25 16:05:34 +05:00
PC-G06 208ca3ebcd A1T_Interior_Part_2 2022-10-25 16:05:24 +05:00