Ed ef6d973301 Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync ...

# Conflicts:
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
#	Content.Server/Labels/Label/LabelSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/Pools/deathmatch.yml
#	Resources/Prototypes/Maps/arenas.yml

2025-04-30 20:31:50 +03:00

..

Tabs

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

2025-04-30 20:31:50 +03:00

EscapeMenu.xaml

Guidebook Revival (#13320)

2023-01-16 02:42:22 -06:00

EscapeMenu.xaml.cs

Merge more UI refactor stuff (#11277)

2022-09-14 14:34:48 -07: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

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

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

OptionsTabControlRow.xaml

Rewrite the options menu (#28389)

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

OptionsTabControlRow.xaml.cs

Rewrite the options menu (#28389)

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