diff --git a/.gitignore b/.gitignore index f824c38e..f718eb54 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ Saved *.xcworkspace *BuiltData.uasset /Imgs/ +Content/Blueprints/UI/Imgs/shit/screen* diff --git a/Content/Blueprints/Player/MyPawn.uasset b/Content/Blueprints/Player/MyPawn.uasset index ef6e78ce..e3e29f61 100644 Binary files a/Content/Blueprints/Player/MyPawn.uasset and b/Content/Blueprints/Player/MyPawn.uasset differ diff --git a/Content/Blueprints/Player/WalkingPawn.uasset b/Content/Blueprints/Player/WalkingPawn.uasset index a67ffbe3..51757a6c 100644 Binary files a/Content/Blueprints/Player/WalkingPawn.uasset and b/Content/Blueprints/Player/WalkingPawn.uasset differ diff --git a/Content/Blueprints/Player/infoHud.uasset b/Content/Blueprints/Player/infoHud.uasset index 5832cd85..fbf82625 100644 Binary files a/Content/Blueprints/Player/infoHud.uasset and b/Content/Blueprints/Player/infoHud.uasset differ diff --git a/Content/Blueprints/UI/Imgs/Custom_Size_–_3.uasset b/Content/Blueprints/UI/Imgs/Custom_Size_–_3.uasset deleted file mode 100644 index 6aea2a0e..00000000 Binary files a/Content/Blueprints/UI/Imgs/Custom_Size_–_3.uasset and /dev/null differ diff --git a/Content/Blueprints/UI/Imgs/bkg_logo_graff-1.uasset b/Content/Blueprints/UI/Imgs/bkg_logo_graff-1.uasset new file mode 100644 index 00000000..17f9e899 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/bkg_logo_graff-1.uasset differ diff --git a/Content/Blueprints/UI/Imgs/bkg_map_big.uasset b/Content/Blueprints/UI/Imgs/bkg_map_big.uasset new file mode 100644 index 00000000..ae514bfa Binary files /dev/null and b/Content/Blueprints/UI/Imgs/bkg_map_big.uasset differ diff --git a/Content/Blueprints/UI/Imgs/btn_close.uasset b/Content/Blueprints/UI/Imgs/btn_close.uasset new file mode 100644 index 00000000..d15859fd Binary files /dev/null and b/Content/Blueprints/UI/Imgs/btn_close.uasset differ diff --git a/Content/Blueprints/UI/Imgs/graff_info.uasset b/Content/Blueprints/UI/Imgs/graff_info.uasset new file mode 100644 index 00000000..b4b09c36 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/graff_info.uasset differ diff --git a/Content/Blueprints/UI/Imgs/hint_floor.uasset b/Content/Blueprints/UI/Imgs/hint_floor.uasset new file mode 100644 index 00000000..a8954a50 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/hint_floor.uasset differ diff --git a/Content/Blueprints/UI/Imgs/logo_graff.uasset b/Content/Blueprints/UI/Imgs/logo_graff.uasset index ec6e761c..d1cc4684 100644 Binary files a/Content/Blueprints/UI/Imgs/logo_graff.uasset and b/Content/Blueprints/UI/Imgs/logo_graff.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/photo_2020-11-26_15-19-18.uasset b/Content/Blueprints/UI/Imgs/shit/photo_2020-11-26_15-19-18.uasset new file mode 100644 index 00000000..32640aab Binary files /dev/null and b/Content/Blueprints/UI/Imgs/shit/photo_2020-11-26_15-19-18.uasset differ diff --git a/Content/Blueprints/UI/Imgs/shit/photo_2020-11-26_15-19-18_Mat.uasset b/Content/Blueprints/UI/Imgs/shit/photo_2020-11-26_15-19-18_Mat.uasset new file mode 100644 index 00000000..a23d318d Binary files /dev/null and b/Content/Blueprints/UI/Imgs/shit/photo_2020-11-26_15-19-18_Mat.uasset differ diff --git a/Content/Blueprints/UI/Imgs/window_map_big.uasset b/Content/Blueprints/UI/Imgs/window_map_big.uasset new file mode 100644 index 00000000..483aa82d Binary files /dev/null and b/Content/Blueprints/UI/Imgs/window_map_big.uasset differ diff --git a/Content/Blueprints/UI/Materials/FasadHide.uasset b/Content/Blueprints/UI/Materials/FasadHide.uasset index be8d25ad..482f2b9d 100644 Binary files a/Content/Blueprints/UI/Materials/FasadHide.uasset and b/Content/Blueprints/UI/Materials/FasadHide.uasset differ diff --git a/Content/Blueprints/UI/Materials/PointFade.uasset b/Content/Blueprints/UI/Materials/PointFade.uasset new file mode 100644 index 00000000..18f7dc6a Binary files /dev/null and b/Content/Blueprints/UI/Materials/PointFade.uasset differ diff --git a/Content/Blueprints/UI/Materials/TestFasad.uasset b/Content/Blueprints/UI/Materials/TestFasad.uasset index aa4d81f9..fc6ad215 100644 Binary files a/Content/Blueprints/UI/Materials/TestFasad.uasset and b/Content/Blueprints/UI/Materials/TestFasad.uasset differ diff --git a/Content/Blueprints/UI/WBPS/BalconPointer.uasset b/Content/Blueprints/UI/WBPS/BalconPointer.uasset new file mode 100644 index 00000000..0c39b1dc Binary files /dev/null and b/Content/Blueprints/UI/WBPS/BalconPointer.uasset differ diff --git a/Content/Blueprints/UI/WBPS/Compas.uasset b/Content/Blueprints/UI/WBPS/Compas.uasset index 75c3823a..ddf13dd4 100644 Binary files a/Content/Blueprints/UI/WBPS/Compas.uasset and b/Content/Blueprints/UI/WBPS/Compas.uasset differ diff --git a/Content/Blueprints/UI/WBPS/MainMenu.uasset b/Content/Blueprints/UI/WBPS/MainMenu.uasset index fa3cac16..e11d213f 100644 Binary files a/Content/Blueprints/UI/WBPS/MainMenu.uasset and b/Content/Blueprints/UI/WBPS/MainMenu.uasset differ diff --git a/Content/Blueprints/UI/WBPS/MenuBtn.uasset b/Content/Blueprints/UI/WBPS/MenuBtn.uasset index 2aa1d368..90f00404 100644 Binary files a/Content/Blueprints/UI/WBPS/MenuBtn.uasset and b/Content/Blueprints/UI/WBPS/MenuBtn.uasset differ diff --git a/Content/Blueprints/UI/WBPS/map.uasset b/Content/Blueprints/UI/WBPS/map.uasset index 1dbd8017..3e1c37f7 100644 Binary files a/Content/Blueprints/UI/WBPS/map.uasset and b/Content/Blueprints/UI/WBPS/map.uasset differ diff --git a/Content/Maps/MainScene.umap b/Content/Maps/MainScene.umap index 94a5e018..0c577a5e 100644 Binary files a/Content/Maps/MainScene.umap and b/Content/Maps/MainScene.umap differ diff --git a/Content/Maps/Test_Level.umap b/Content/Maps/Test_Level.umap index 3c3accad..4f715368 100644 Binary files a/Content/Maps/Test_Level.umap and b/Content/Maps/Test_Level.umap differ diff --git a/Content/Maps/Test_Level_BuiltData.uasset b/Content/Maps/Test_Level_BuiltData.uasset index b818be5a..f4716014 100644 Binary files a/Content/Maps/Test_Level_BuiltData.uasset and b/Content/Maps/Test_Level_BuiltData.uasset differ diff --git a/Content/Maps/brushes.umap b/Content/Maps/brushes.umap new file mode 100644 index 00000000..51f949e7 Binary files /dev/null and b/Content/Maps/brushes.umap differ diff --git a/Content/Materials/Functions/DistanceFade.uasset b/Content/Materials/Functions/DistanceFade.uasset new file mode 100644 index 00000000..8addf135 Binary files /dev/null and b/Content/Materials/Functions/DistanceFade.uasset differ diff --git a/Content/Materials/Instances/MI_Concrete.uasset b/Content/Materials/Instances/MI_Concrete.uasset index 372ab2ae..2b2a7860 100644 Binary files a/Content/Materials/Instances/MI_Concrete.uasset and b/Content/Materials/Instances/MI_Concrete.uasset differ diff --git a/Content/Materials/Instances/MI_Squad_01.uasset b/Content/Materials/Instances/MI_Squad_01.uasset index fd6d4fd2..6c9b4d8d 100644 Binary files a/Content/Materials/Instances/MI_Squad_01.uasset and b/Content/Materials/Instances/MI_Squad_01.uasset differ diff --git a/Content/Materials/Instances/MI_Squad_03_01.uasset b/Content/Materials/Instances/MI_Squad_03_01.uasset index cccc881d..98a05bc2 100644 Binary files a/Content/Materials/Instances/MI_Squad_03_01.uasset and b/Content/Materials/Instances/MI_Squad_03_01.uasset differ diff --git a/Content/Materials/Instances/MI_Squad_03_02.uasset b/Content/Materials/Instances/MI_Squad_03_02.uasset index a1959da6..6299b300 100644 Binary files a/Content/Materials/Instances/MI_Squad_03_02.uasset and b/Content/Materials/Instances/MI_Squad_03_02.uasset differ diff --git a/Content/Materials/Instances/MI_Squad_04_01.uasset b/Content/Materials/Instances/MI_Squad_04_01.uasset index f1cbf4ff..0c46fc71 100644 Binary files a/Content/Materials/Instances/MI_Squad_04_01.uasset and b/Content/Materials/Instances/MI_Squad_04_01.uasset differ diff --git a/Content/Materials/Instances/MI_Squad_04_02.uasset b/Content/Materials/Instances/MI_Squad_04_02.uasset index 6aee4cd8..17fe295d 100644 Binary files a/Content/Materials/Instances/MI_Squad_04_02.uasset and b/Content/Materials/Instances/MI_Squad_04_02.uasset differ diff --git a/Content/Materials/Instances/MI_Squad_05.uasset b/Content/Materials/Instances/MI_Squad_05.uasset index d8b9f35b..51a7ca2d 100644 Binary files a/Content/Materials/Instances/MI_Squad_05.uasset and b/Content/Materials/Instances/MI_Squad_05.uasset differ diff --git a/Content/Materials/Instances/MI_Squad_Build.uasset b/Content/Materials/Instances/MI_Squad_Build.uasset index 803b672a..537483f2 100644 Binary files a/Content/Materials/Instances/MI_Squad_Build.uasset and b/Content/Materials/Instances/MI_Squad_Build.uasset differ diff --git a/Content/Materials/M_Scan_RA_Master.uasset b/Content/Materials/M_Scan_RA_Master.uasset index 1084609f..9db3a486 100644 Binary files a/Content/Materials/M_Scan_RA_Master.uasset and b/Content/Materials/M_Scan_RA_Master.uasset differ diff --git a/Content/Textures/Baumit/T_Baumit_Plaster_N.uasset b/Content/Textures/Baumit/T_Baumit_Plaster_N.uasset index 14dd4d35..1087c474 100644 Binary files a/Content/Textures/Baumit/T_Baumit_Plaster_N.uasset and b/Content/Textures/Baumit/T_Baumit_Plaster_N.uasset differ diff --git a/Content/Textures/Squads/T_SquadBuild_01_RA.uasset b/Content/Textures/Squads/T_SquadBuild_01_RA.uasset index 13050f7d..796cd390 100644 Binary files a/Content/Textures/Squads/T_SquadBuild_01_RA.uasset and b/Content/Textures/Squads/T_SquadBuild_01_RA.uasset differ diff --git a/Content/Textures/Squads/T_Squad_01_RA.uasset b/Content/Textures/Squads/T_Squad_01_RA.uasset index 6380692e..3a864885 100644 Binary files a/Content/Textures/Squads/T_Squad_01_RA.uasset and b/Content/Textures/Squads/T_Squad_01_RA.uasset differ diff --git a/Content/Textures/Squads/T_Squad_03_01_RA.uasset b/Content/Textures/Squads/T_Squad_03_01_RA.uasset index ce572dfd..3ce7e1f1 100644 Binary files a/Content/Textures/Squads/T_Squad_03_01_RA.uasset and b/Content/Textures/Squads/T_Squad_03_01_RA.uasset differ diff --git a/Content/Textures/Squads/T_Squad_03_02_RA.uasset b/Content/Textures/Squads/T_Squad_03_02_RA.uasset index 8bc8d869..a8b5a02b 100644 Binary files a/Content/Textures/Squads/T_Squad_03_02_RA.uasset and b/Content/Textures/Squads/T_Squad_03_02_RA.uasset differ diff --git a/Content/Textures/Squads/T_Squad_04_01_RA.uasset b/Content/Textures/Squads/T_Squad_04_01_RA.uasset index d7c8ffc1..f9b649ee 100644 Binary files a/Content/Textures/Squads/T_Squad_04_01_RA.uasset and b/Content/Textures/Squads/T_Squad_04_01_RA.uasset differ diff --git a/Content/Textures/Squads/T_Squad_04_02_BC.uasset b/Content/Textures/Squads/T_Squad_04_02_BC.uasset index be124ccc..885f4666 100644 Binary files a/Content/Textures/Squads/T_Squad_04_02_BC.uasset and b/Content/Textures/Squads/T_Squad_04_02_BC.uasset differ diff --git a/Content/Textures/Squads/T_Squad_04_02_RA.uasset b/Content/Textures/Squads/T_Squad_04_02_RA.uasset index 8ca924ca..cc71c08e 100644 Binary files a/Content/Textures/Squads/T_Squad_04_02_RA.uasset and b/Content/Textures/Squads/T_Squad_04_02_RA.uasset differ diff --git a/Content/Textures/Squads/T_Squad_05_RA.uasset b/Content/Textures/Squads/T_Squad_05_RA.uasset index 8990a08b..0199a9eb 100644 Binary files a/Content/Textures/Squads/T_Squad_05_RA.uasset and b/Content/Textures/Squads/T_Squad_05_RA.uasset differ