CatStation/Content.Client/Options/UI/Tabs
Morb0 58ef40767e Merge remote-tracking branch 'upstream/master' into upstream-sync2
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/Preferences/ClientPreferencesManager.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
2023-09-19 11:41:15 +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 Fix hud theme selection (#19106) 2023-09-14 22:05:55 -04:00
KeyRebindTab.xaml Add scroll zooming for admins and ghosts (#14061) 2023-04-22 04:26:41 -06:00
KeyRebindTab.xaml.cs Improve vv /c/enthover and add keybind (#20127) 2023-09-16 14:09:51 +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