Arthur Asimov 3da699ad32 Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING-monkey.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png # Resources/Textures/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json		2023-12-05 07:42:45 +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	Fancy speech bubbles - Names over speech bubbles, and 1:1 chat parity for emotes and LOOC! (#21999)	2023-12-04 16:10:49 -07:00
GraphicsTab.xaml.cs	Fancy speech bubbles - Names over speech bubbles, and 1:1 chat parity for emotes and LOOC! (#21999)	2023-12-04 16:10:49 -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