diff --git a/.gitignore b/.gitignore index f718eb54..ad9170f4 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,10 @@ Saved *.suo *.xcodeproj *.xcworkspace +<<<<<<< HEAD *BuiltData.uasset /Imgs/ Content/Blueprints/UI/Imgs/shit/screen* +======= +*BuiltData.uasset +>>>>>>> origin/Nikolay diff --git a/Content/Blueprints/UI/Imgs/22.uasset b/Content/Blueprints/UI/Imgs/22.uasset new file mode 100644 index 00000000..b605de28 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/22.uasset differ diff --git a/Content/Blueprints/UI/Imgs/33.uasset b/Content/Blueprints/UI/Imgs/33.uasset new file mode 100644 index 00000000..23cb9c04 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/33.uasset differ diff --git a/Content/Blueprints/UI/Imgs/400x600_0_2baaa94c3a24b0ff292c714bc80eed04_800x1200_0xac120003_78344611587718838.uasset b/Content/Blueprints/UI/Imgs/400x600_0_2baaa94c3a24b0ff292c714bc80eed04_800x1200_0xac120003_78344611587718838.uasset new file mode 100644 index 00000000..04fae294 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/400x600_0_2baaa94c3a24b0ff292c714bc80eed04_800x1200_0xac120003_78344611587718838.uasset differ diff --git a/Content/Blueprints/UI/Imgs/908253cc-dabc-496f-894f-b53aa1456b48_jpg_880x1000_x-False_q85.uasset b/Content/Blueprints/UI/Imgs/908253cc-dabc-496f-894f-b53aa1456b48_jpg_880x1000_x-False_q85.uasset new file mode 100644 index 00000000..02c5c13b Binary files /dev/null and b/Content/Blueprints/UI/Imgs/908253cc-dabc-496f-894f-b53aa1456b48_jpg_880x1000_x-False_q85.uasset differ diff --git a/Content/Blueprints/UI/Imgs/galkin_0.uasset b/Content/Blueprints/UI/Imgs/galkin_0.uasset new file mode 100644 index 00000000..c17b9e91 Binary files /dev/null and b/Content/Blueprints/UI/Imgs/galkin_0.uasset differ diff --git a/Content/Blueprints/UI/Imgs/Эскизный_Альбом2_Страница_32.uasset b/Content/Blueprints/UI/Imgs/Эскизный_Альбом2_Страница_32.uasset new file mode 100644 index 00000000..1d42a8cb Binary files /dev/null and b/Content/Blueprints/UI/Imgs/Эскизный_Альбом2_Страница_32.uasset differ diff --git a/Content/Materials/Instances/MI_Brick_03.uasset b/Content/Materials/Instances/MI_Brick_03.uasset new file mode 100644 index 00000000..72dea5e2 Binary files /dev/null and b/Content/Materials/Instances/MI_Brick_03.uasset differ diff --git a/Content/Materials/Instances/MI_Metall_04.uasset b/Content/Materials/Instances/MI_Metall_04.uasset new file mode 100644 index 00000000..c6ae1d46 Binary files /dev/null and b/Content/Materials/Instances/MI_Metall_04.uasset differ diff --git a/Content/Materials/Instances/MI_Metall_05.uasset b/Content/Materials/Instances/MI_Metall_05.uasset new file mode 100644 index 00000000..f92c6a12 Binary files /dev/null and b/Content/Materials/Instances/MI_Metall_05.uasset differ diff --git a/Content/Materials/Instances/MI_Plaster_01_Yellow.uasset b/Content/Materials/Instances/MI_Plaster_01_Yellow.uasset new file mode 100644 index 00000000..34bb4c4c Binary files /dev/null and b/Content/Materials/Instances/MI_Plaster_01_Yellow.uasset differ diff --git a/Content/Materials/Instances/MI_Plastic_02.uasset b/Content/Materials/Instances/MI_Plastic_02.uasset new file mode 100644 index 00000000..784fc96f Binary files /dev/null and b/Content/Materials/Instances/MI_Plastic_02.uasset differ diff --git a/Content/Materials/Instances/MI_Plastic_03.uasset b/Content/Materials/Instances/MI_Plastic_03.uasset new file mode 100644 index 00000000..202e5193 Binary files /dev/null and b/Content/Materials/Instances/MI_Plastic_03.uasset differ diff --git a/Content/Materials/Instances/MI_Squad_02_01.uasset b/Content/Materials/Instances/MI_Squad_02_01.uasset new file mode 100644 index 00000000..12a427ab Binary files /dev/null and b/Content/Materials/Instances/MI_Squad_02_01.uasset differ diff --git a/Content/Materials/Instances/MI_Squad_02_02.uasset b/Content/Materials/Instances/MI_Squad_02_02.uasset new file mode 100644 index 00000000..bdd530ca Binary files /dev/null and b/Content/Materials/Instances/MI_Squad_02_02.uasset differ diff --git a/Content/Materials/Instances/MI_Tile_01.uasset b/Content/Materials/Instances/MI_Tile_01.uasset new file mode 100644 index 00000000..3943ffa8 Binary files /dev/null and b/Content/Materials/Instances/MI_Tile_01.uasset differ diff --git a/Content/Meshes/Squads/SM_Squad_02.uasset b/Content/Meshes/Squads/SM_Squad_02.uasset new file mode 100644 index 00000000..fb24df6c Binary files /dev/null and b/Content/Meshes/Squads/SM_Squad_02.uasset differ diff --git a/Content/Meshes/Squads/SM_Squad_03.uasset b/Content/Meshes/Squads/SM_Squad_03.uasset index b6a923b2..ececf7af 100644 Binary files a/Content/Meshes/Squads/SM_Squad_03.uasset and b/Content/Meshes/Squads/SM_Squad_03.uasset differ diff --git a/Content/Meshes/Squads/SM_Squad_04.uasset b/Content/Meshes/Squads/SM_Squad_04.uasset index a0d6e41a..fe57977d 100644 Binary files a/Content/Meshes/Squads/SM_Squad_04.uasset and b/Content/Meshes/Squads/SM_Squad_04.uasset differ diff --git a/Content/Meshes/Squads/SM_Squad_05.uasset b/Content/Meshes/Squads/SM_Squad_05.uasset index 0197fb65..e5d31979 100644 Binary files a/Content/Meshes/Squads/SM_Squad_05.uasset and b/Content/Meshes/Squads/SM_Squad_05.uasset differ diff --git a/Content/Meshes/Squads/SM_Squad_05_01.uasset b/Content/Meshes/Squads/SM_Squad_05_01.uasset new file mode 100644 index 00000000..fb44eb16 Binary files /dev/null and b/Content/Meshes/Squads/SM_Squad_05_01.uasset differ diff --git a/Content/Meshes/Squads/SM_Squad_05_02.uasset b/Content/Meshes/Squads/SM_Squad_05_02.uasset new file mode 100644 index 00000000..3f0433c9 Binary files /dev/null and b/Content/Meshes/Squads/SM_Squad_05_02.uasset differ diff --git a/Content/Textures/Brick/T_Brick_01_BC_alt.uasset b/Content/Textures/Brick/T_Brick_01_BC_alt.uasset new file mode 100644 index 00000000..c826aae4 Binary files /dev/null and b/Content/Textures/Brick/T_Brick_01_BC_alt.uasset differ diff --git a/Content/Textures/Squads/T_Squad_01_BC.uasset b/Content/Textures/Squads/T_Squad_01_BC.uasset index e80eb473..3ea569ab 100644 Binary files a/Content/Textures/Squads/T_Squad_01_BC.uasset and b/Content/Textures/Squads/T_Squad_01_BC.uasset differ diff --git a/Content/Textures/Squads/T_Squad_02_01_BC.uasset b/Content/Textures/Squads/T_Squad_02_01_BC.uasset new file mode 100644 index 00000000..3ff3dd36 Binary files /dev/null and b/Content/Textures/Squads/T_Squad_02_01_BC.uasset differ diff --git a/Content/Textures/Squads/T_Squad_02_01_RA.uasset b/Content/Textures/Squads/T_Squad_02_01_RA.uasset new file mode 100644 index 00000000..8dad0179 Binary files /dev/null and b/Content/Textures/Squads/T_Squad_02_01_RA.uasset differ diff --git a/Content/Textures/Squads/T_Squad_02_02_BC.uasset b/Content/Textures/Squads/T_Squad_02_02_BC.uasset new file mode 100644 index 00000000..472c02bf Binary files /dev/null and b/Content/Textures/Squads/T_Squad_02_02_BC.uasset differ diff --git a/Content/Textures/Squads/T_Squad_02_02_RA.uasset b/Content/Textures/Squads/T_Squad_02_02_RA.uasset new file mode 100644 index 00000000..2470a633 Binary files /dev/null and b/Content/Textures/Squads/T_Squad_02_02_RA.uasset differ diff --git a/Content/Textures/Squads/T_Squad_03_01_BC.uasset b/Content/Textures/Squads/T_Squad_03_01_BC.uasset index 3bd53446..1b686596 100644 Binary files a/Content/Textures/Squads/T_Squad_03_01_BC.uasset and b/Content/Textures/Squads/T_Squad_03_01_BC.uasset differ diff --git a/Content/Textures/Squads/T_Squad_04_01_BC.uasset b/Content/Textures/Squads/T_Squad_04_01_BC.uasset index 7d18ab7e..14391227 100644 Binary files a/Content/Textures/Squads/T_Squad_04_01_BC.uasset and b/Content/Textures/Squads/T_Squad_04_01_BC.uasset differ diff --git a/Content/Textures/Squads/T_Squad_05_BC.uasset b/Content/Textures/Squads/T_Squad_05_BC.uasset index 1e2c3b36..a32a3c0c 100644 Binary files a/Content/Textures/Squads/T_Squad_05_BC.uasset and b/Content/Textures/Squads/T_Squad_05_BC.uasset differ diff --git a/Content/Textures/Tile/T_Tile_01_BC.uasset b/Content/Textures/Tile/T_Tile_01_BC.uasset new file mode 100644 index 00000000..6282a5a9 Binary files /dev/null and b/Content/Textures/Tile/T_Tile_01_BC.uasset differ diff --git a/Content/Textures/Tile/T_Tile_01_N.uasset b/Content/Textures/Tile/T_Tile_01_N.uasset new file mode 100644 index 00000000..33acccb8 Binary files /dev/null and b/Content/Textures/Tile/T_Tile_01_N.uasset differ diff --git a/Content/Textures/Tile/T_Tile_01_RMA.uasset b/Content/Textures/Tile/T_Tile_01_RMA.uasset new file mode 100644 index 00000000..ac83cae8 Binary files /dev/null and b/Content/Textures/Tile/T_Tile_01_RMA.uasset differ