NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-11-08 20:14:16 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
CatStation/Content.Client/Options/UI/Tabs
History
Morb0 caf8ac8005 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Textures/Objects/Tools/crowbar.rsi/meta.json
#	Resources/Textures/Objects/Tools/wrench.rsi/meta.json
2023-12-08 13:54:31 +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-12-03 15:10:26 +03:00
GraphicsTab.xaml Grid inventory fixes (#22161) 2023-12-05 16:38:10 -07:00
GraphicsTab.xaml.cs Grid inventory fixes (#22161) 2023-12-05 16:38:10 -07:00
KeyRebindTab.xaml Add scroll zooming for admins and ghosts (#14061) 2023-04-22 04:26:41 -06:00
KeyRebindTab.xaml.cs Grid Inventory (#21931) 2023-12-04 16:04:39 -07: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