Ed f59de85047 Merge remote-tracking branch 'upstream/stable' into ed-21-07-2025-upstream-sync ...

# Conflicts:
#	Content.Client/Overlays/StencilOverlay.Weather.cs
#	Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs
#	Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.cs
#	Content.Shared/Damage/Systems/SharedStaminaSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/GameTicking/SharedGameTicker.cs

2025-07-21 11:27:53 +03:00

..

Tabs

Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream

2025-07-08 00:40:30 +03:00

EscapeMenu.xaml

Minor escape menu UX improvements (#38650)

2025-07-05 12:28:59 +03:00

EscapeMenu.xaml.cs

Merge more UI refactor stuff (#11277)

2022-09-14 14:34:48 -07:00

OptionColorSlider.xaml

Add text highlighting (#31442)

2025-06-04 12:12:37 +02:00

OptionColorSlider.xaml.cs

Add text highlighting (#31442)

2025-06-04 12:12:37 +02:00

OptionDropDown.xaml

Rewrite the options menu (#28389)

2024-06-22 14:11:14 +10:00

OptionDropDown.xaml.cs

Rewrite the options menu (#28389)

2024-06-22 14:11:14 +10:00

OptionSlider.xaml

Rewrite the options menu (#28389)

2024-06-22 14:11:14 +10:00

OptionSlider.xaml.cs

Rewrite the options menu (#28389)

2024-06-22 14:11:14 +10:00

OptionsMenu.xaml

Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2

2025-03-03 23:23:40 +03:00

OptionsMenu.xaml.cs

Update OptionsMenu.xaml.cs

2025-06-21 14:25:51 +03:00

OptionsTabControlRow.xaml

Rewrite the options menu (#28389)

2024-06-22 14:11:14 +10:00

OptionsTabControlRow.xaml.cs

Add text highlighting (#31442)

2025-06-04 12:12:37 +02:00