rechka/fish-station
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
fish-station/Content.Client/Options/UI
History
VigersRay 8fedc6f64a Merge remote-tracking branch 'refs/remotes/wizards/master' 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Options/UI/Tabs/AudioTab.xaml
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Shared/Preferences/Loadouts/RoleLoadout.cs
#	Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Loadouts/role_loadouts.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
#	Resources/Prototypes/lobbyscreens.yml
#	Resources/migration.yml
2024-06-23 21:07:25 +03:00
..
Tabs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-06-23 21:07:25 +03:00
EscapeMenu.xaml Guidebook Revival (#13320) 2023-01-16 02:42:22 -06:00
EscapeMenu.xaml.cs Merge more UI refactor stuff (#11277) 2022-09-14 14:34:48 -07:00
OptionDropDown.xaml Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
OptionDropDown.xaml.cs Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
OptionSlider.xaml Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
OptionSlider.xaml.cs Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
OptionsMenu.xaml Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
OptionsMenu.xaml.cs Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
OptionsTabControlRow.xaml Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00
OptionsTabControlRow.xaml.cs Rewrite the options menu (#28389) 2024-06-22 14:11:14 +10:00