]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Lobby refactor + species loadouts support (#27576)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Sat, 11 May 2024 23:18:21 +0000 (09:18 +1000)
committerGitHub <noreply@github.com>
Sat, 11 May 2024 23:18:21 +0000 (09:18 +1000)
commit332f54a3aebe669f6e50d26e7b047f0bdc28e0fb
treeadd14aa9e9699e7f261cc62e179a38a4c6d9eacd
parent999d0441390e073018b6cf02e7338374efdd9f48
Lobby refactor + species loadouts support (#27576)

* Vox stuff

* Species loadouts and lobby refactor

The control flow for lobby is all over the shop so I pulled it all up from the individual controls so now they handle the bare minimum required and LobbyUIController handles the rest.

* a

* Bulk changes

* a

* weh

* Character import / export

* finalise

* woops this stuff too

* Also datafield exporting

* comments

* Review
49 files changed:
Content.Client/Entry/EntryPoint.cs
Content.Client/IoC/ClientContentIoC.cs
Content.Client/Lobby/ClientPreferencesManager.cs [moved from Content.Client/Preferences/ClientPreferencesManager.cs with 97% similarity]
Content.Client/Lobby/IClientPreferencesManager.cs [moved from Content.Client/Preferences/IClientPreferencesManager.cs with 92% similarity]
Content.Client/Lobby/LobbyState.cs
Content.Client/Lobby/LobbyUIController.cs
Content.Client/Lobby/UI/CharacterPickerButton.xaml [new file with mode: 0644]
Content.Client/Lobby/UI/CharacterPickerButton.xaml.cs [new file with mode: 0644]
Content.Client/Lobby/UI/CharacterSetupGui.xaml [moved from Content.Client/Preferences/UI/CharacterSetupGui.xaml with 91% similarity]
Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs [new file with mode: 0644]
Content.Client/Lobby/UI/HighlightedContainer.xaml [moved from Content.Client/Preferences/UI/HighlightedContainer.xaml with 100% similarity]
Content.Client/Lobby/UI/HighlightedContainer.xaml.cs [moved from Content.Client/Preferences/UI/HighlightedContainer.xaml.cs with 88% similarity]
Content.Client/Lobby/UI/HumanoidProfileEditor.xaml [moved from Content.Client/Preferences/UI/HumanoidProfileEditor.xaml with 68% similarity]
Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs [moved from Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs with 50% similarity]
Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml [moved from Content.Client/Preferences/UI/LoadoutContainer.xaml with 100% similarity]
Content.Client/Lobby/UI/Loadouts/LoadoutContainer.xaml.cs [moved from Content.Client/Preferences/UI/LoadoutContainer.xaml.cs with 95% similarity]
Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml [moved from Content.Client/Preferences/UI/LoadoutGroupContainer.xaml with 100% similarity]
Content.Client/Lobby/UI/Loadouts/LoadoutGroupContainer.xaml.cs [moved from Content.Client/Preferences/UI/LoadoutGroupContainer.xaml.cs with 84% similarity]
Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml [moved from Content.Client/Preferences/UI/LoadoutWindow.xaml with 100% similarity]
Content.Client/Lobby/UI/Loadouts/LoadoutWindow.xaml.cs [moved from Content.Client/Preferences/UI/LoadoutWindow.xaml.cs with 69% similarity]
Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.xaml.cs
Content.Client/Lobby/UI/LobbyGui.xaml.cs
Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs
Content.Client/Lobby/UI/Roles/RequirementsSelector.xaml [new file with mode: 0644]
Content.Client/Lobby/UI/Roles/RequirementsSelector.xaml.cs [new file with mode: 0644]
Content.Client/Lobby/UI/Roles/TraitPreferenceSelector.xaml [new file with mode: 0644]
Content.Client/Lobby/UI/Roles/TraitPreferenceSelector.xaml.cs [new file with mode: 0644]
Content.Client/Preferences/UI/AntagPreferenceSelector.cs [deleted file]
Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs [deleted file]
Content.Client/Preferences/UI/HumanoidProfileEditor.Random.cs [deleted file]
Content.Client/Preferences/UI/JobPrioritySelector.cs [deleted file]
Content.Client/Preferences/UI/RequirementsSelector.cs [deleted file]
Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs
Content.IntegrationTests/Tests/Preferences/ServerDbSqliteTests.cs
Content.Server/Database/ServerDbBase.cs
Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
Content.Shared/Humanoid/HumanoidProfileExport.cs [new file with mode: 0644]
Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
Content.Shared/Preferences/HumanoidCharacterProfile.cs
Content.Shared/Preferences/Loadouts/Effects/GroupLoadoutEffect.cs
Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs
Content.Shared/Preferences/Loadouts/Effects/LoadoutEffect.cs
Content.Shared/Preferences/Loadouts/Effects/PointsCostLoadoutEffect.cs
Content.Shared/Preferences/Loadouts/Effects/SpeciesLoadoutEffect.cs
Content.Shared/Preferences/Loadouts/Loadout.cs
Content.Shared/Preferences/Loadouts/RoleLoadout.cs
Resources/Locale/en-US/preferences/ui/character-setup-gui.ftl
Resources/Locale/en-US/preferences/ui/humanoid-profile-editor.ftl
Resources/Prototypes/Species/vox.yml