CatStation/Content.Client/Options/UI/Tabs
faint 69ddbdd9f4 Merge remote-tracking branch 'wizards/master' into upstream-sync
# Conflicts:
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Resources/Prototypes/secret_weights.yml
2023-05-31 03:26:01 +03:00
..
AudioTab.xaml Merge remote-tracking branch 'wizards/master' into upstream-sync 2023-05-31 03:26:01 +03:00
AudioTab.xaml.cs Merge remote-tracking branch 'wizards/master' into upstream-sync 2023-05-31 03:26:01 +03:00
GraphicsTab.xaml New indicators for combat mode (#15427) 2023-05-06 15:06:42 +10:00
GraphicsTab.xaml.cs New indicators for combat mode (#15427) 2023-05-06 15:06:42 +10:00
KeyRebindTab.xaml Add scroll zooming for admins and ghosts (#14061) 2023-04-22 04:26:41 -06:00
KeyRebindTab.xaml.cs Add shortcut to flip for construction menu (#14152) 2023-05-15 14:13:24 +10:00
NetworkTab.xaml Add new PVS options slider (#12146) 2022-10-26 14:19:11 +11:00
NetworkTab.xaml.cs Fix warnings and code cleanup/fixes (#13570) 2023-01-19 13:56:45 +11:00