From 483ab4eb2c116ebae3eb130722884eb4cae23f88 Mon Sep 17 00:00:00 2001 From: rhailrake <49613070+rhailrake@users.noreply.github.com> Date: Wed, 31 Jan 2024 15:08:17 +0000 Subject: [PATCH] - add: new tiles and another ui tweaks (#11) * - fix: audio crash * - tweak: main menu * connect gui * some shaders here * tiles --- Content.Client/Entry/EntryPoint.cs | 3 + .../Launcher/LauncherConnectingGui.xaml | 56 +++-- .../Launcher/LauncherConnectingGui.xaml.cs | 206 +++++++++--------- Content.Client/MainMenu/MainMenu.cs | 4 +- .../MainMenu/UI/MainMenuControl.xaml | 67 +++--- .../MainMenu/UI/MainMenuControl.xaml.cs | 13 +- Content.Client/_White/Overlays/ATMOverlay.cs | 37 ++++ .../_White/Overlays/GrainOverlay.cs | 38 ++++ .../_White/Other/DeathGasps/OnDeath.cs | 6 +- .../ru-RU/launcher/launcher-connecting.ftl | 48 ++-- Resources/Prototypes/Shaders/shaders.yml | 10 + Resources/Textures/Ohio/ohfuck.png | Bin 0 -> 383085 bytes Resources/Textures/Shaders/Ohio/atm.swsl | 23 ++ Resources/Textures/Shaders/Ohio/grain.swsl | 18 ++ Resources/Textures/Tiles/bar.png | Bin 1675 -> 758 bytes Resources/Textures/Tiles/blue.png | Bin 178 -> 1075 bytes Resources/Textures/Tiles/clown.png | Bin 851 -> 581 bytes Resources/Textures/Tiles/dark.png | Bin 615 -> 638 bytes Resources/Textures/Tiles/dark_diagonal.png | Bin 268 -> 603 bytes .../Textures/Tiles/dark_diagonal_mini.png | Bin 206 -> 405 bytes Resources/Textures/Tiles/dark_herringbone.png | Bin 337 -> 833 bytes Resources/Textures/Tiles/dark_mini.png | Bin 201 -> 416 bytes Resources/Textures/Tiles/dark_mono.png | Bin 216 -> 632 bytes Resources/Textures/Tiles/dark_offset.png | Bin 244 -> 420 bytes Resources/Textures/Tiles/dark_pavement.png | Bin 247 -> 450 bytes .../Textures/Tiles/dark_pavement_vertical.png | Bin 252 -> 432 bytes Resources/Textures/Tiles/dark_plastic.png | Bin 205 -> 522 bytes Resources/Textures/Tiles/freezer.png | Bin 1198 -> 1377 bytes Resources/Textures/Tiles/glass.png | Bin 395 -> 499 bytes Resources/Textures/Tiles/green_circuit.png | Bin 360 -> 1565 bytes Resources/Textures/Tiles/hydro.png | Bin 239 -> 854 bytes Resources/Textures/Tiles/kitchen.png | Bin 268 -> 1027 bytes Resources/Textures/Tiles/laundry.png | Bin 323 -> 498 bytes Resources/Textures/Tiles/lino.png | Bin 1093 -> 887 bytes Resources/Textures/Tiles/metaldiamond.png | Bin 448 -> 1362 bytes Resources/Textures/Tiles/plastic.png | Bin 221 -> 567 bytes Resources/Textures/Tiles/rglass.png | Bin 3158 -> 1055 bytes Resources/Textures/Tiles/rock_vault.png | Bin 248 -> 739 bytes Resources/Textures/Tiles/showroom.png | Bin 1198 -> 5865 bytes Resources/Textures/Tiles/shuttleblue.png | Bin 291 -> 595 bytes Resources/Textures/Tiles/shuttleorange.png | Bin 291 -> 595 bytes Resources/Textures/Tiles/shuttlepurple.png | Bin 291 -> 579 bytes Resources/Textures/Tiles/shuttlewhite.png | Bin 291 -> 606 bytes Resources/Textures/Tiles/silver.png | Bin 383 -> 1837 bytes Resources/Textures/Tiles/steel.png | Bin 598 -> 619 bytes .../Textures/Tiles/steel_diagonal_mini.png | Bin 821 -> 625 bytes Resources/Textures/Tiles/steel_dirty.png | Bin 1129 -> 1692 bytes .../Textures/Tiles/steel_herringbone.png | Bin 337 -> 870 bytes Resources/Textures/Tiles/steel_mini.png | Bin 201 -> 450 bytes Resources/Textures/Tiles/steel_mono.png | Bin 209 -> 762 bytes Resources/Textures/Tiles/steel_offset.png | Bin 244 -> 465 bytes Resources/Textures/Tiles/steel_pavement.png | Bin 247 -> 480 bytes .../Tiles/steel_pavement_vertical.png | Bin 252 -> 452 bytes Resources/Textures/Tiles/white diagonal.png | Bin 0 -> 653 bytes Resources/Textures/Tiles/white.png | Bin 598 -> 621 bytes .../Textures/Tiles/white_diagonal_mini.png | Bin 206 -> 576 bytes .../Textures/Tiles/white_herringbone.png | Bin 337 -> 909 bytes Resources/Textures/Tiles/white_mini.png | Bin 201 -> 455 bytes Resources/Textures/Tiles/white_mono.png | Bin 209 -> 778 bytes Resources/Textures/Tiles/white_offset.png | Bin 244 -> 466 bytes Resources/Textures/Tiles/white_pavement.png | Bin 247 -> 497 bytes .../Tiles/white_pavement_vertical.png | Bin 252 -> 457 bytes Resources/Textures/Tiles/white_plastic.png | Bin 221 -> 596 bytes Resources/Textures/Tiles/wood.png | Bin 762 -> 680 bytes Resources/Textures/Tiles/wood_broken.png | Bin 782 -> 3512 bytes Resources/Textures/Tiles/wood_tile.png | Bin 3989 -> 1048 bytes 66 files changed, 342 insertions(+), 187 deletions(-) create mode 100644 Content.Client/_White/Overlays/ATMOverlay.cs create mode 100644 Content.Client/_White/Overlays/GrainOverlay.cs create mode 100644 Resources/Textures/Ohio/ohfuck.png create mode 100644 Resources/Textures/Shaders/Ohio/atm.swsl create mode 100644 Resources/Textures/Shaders/Ohio/grain.swsl create mode 100644 Resources/Textures/Tiles/white diagonal.png diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index f1cf3fedc7..0b98428206 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -1,5 +1,6 @@ using Content.Client._White.JoinQueue; using Content.Client._White.Jukebox; +using Content.Client._White.Overlays; using Content.Client._White.Reputation; using Content.Client._White.Sponsors; using Content.Client._White.Stalin; @@ -178,6 +179,8 @@ namespace Content.Client.Entry _overlayManager.AddOverlay(new SingularityOverlay()); _overlayManager.AddOverlay(new FlashOverlay()); _overlayManager.AddOverlay(new RadiationPulseOverlay()); + _overlayManager.AddOverlay(new GrainOverlay()); + _overlayManager.AddOverlay(new AtmOverlay()); _chatManager.Initialize(); _clientPreferencesManager.Initialize(); _euiManager.Initialize(); diff --git a/Content.Client/Launcher/LauncherConnectingGui.xaml b/Content.Client/Launcher/LauncherConnectingGui.xaml index 083e4ca871..0e8120e958 100644 --- a/Content.Client/Launcher/LauncherConnectingGui.xaml +++ b/Content.Client/Launcher/LauncherConnectingGui.xaml @@ -1,70 +1,96 @@ - + + + + + + +