Morb0 c333fc2b20 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Power/PowerMonitoringWindow.xaml.cs # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Mobs/NPCs/pets.yml # Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml # Resources/Prototypes/Maps/omega.yml # Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json		2023-12-24 20:02:16 +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 'upstream/master' into upstream-sync	2023-12-10 10:43:49 +03:00
GraphicsTab.xaml	Move HUD options to general options tab (#22884)	2023-12-22 23:32:56 -07:00
GraphicsTab.xaml.cs	Move HUD options to general options tab (#22884)	2023-12-22 23:32:56 -07:00
KeyRebindTab.xaml	Add scroll zooming for admins and ghosts (#14061)	2023-04-22 04:26:41 -06:00
KeyRebindTab.xaml.cs	Add generic settings tab and move a bunch of settings over (And add the ability to toggle Discord RPC) (#22430)	2023-12-12 17:58:20 -08:00
MiscTab.xaml	Move HUD options to general options tab (#22884)	2023-12-22 23:32:56 -07:00
MiscTab.xaml.cs	Move HUD options to general options tab (#22884)	2023-12-22 23:32:56 -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