Ed 04d29b6268 Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream ...

# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml

2024-06-17 14:20:38 +03:00

..

Loadouts

Lobby refactor + species loadouts support (#27576)

2024-05-12 09:18:21 +10:00

Roles

Revert "Ed 09 06 2024 upstream (#230)"

2024-06-11 15:20:47 +03:00

CharacterPickerButton.xaml

Lobby refactor + species loadouts support (#27576)

2024-05-12 09:18:21 +10:00

CharacterPickerButton.xaml.cs

Revert "Ed 09 06 2024 upstream (#230)"

2024-06-11 15:20:47 +03:00

CharacterSetupGui.xaml

Lobby refactor + species loadouts support (#27576)

2024-05-12 09:18:21 +10:00

CharacterSetupGui.xaml.cs

Lobby refactor + species loadouts support (#27576)

2024-05-12 09:18:21 +10:00

HighlightedContainer.xaml

Lobby refactor + species loadouts support (#27576)

2024-05-12 09:18:21 +10:00

HighlightedContainer.xaml.cs

Lobby refactor + species loadouts support (#27576)

2024-05-12 09:18:21 +10:00

HumanoidProfileEditor.xaml

Fix profile editor save buttons disappearing at small resolutions (#28001)

2024-05-14 14:03:06 +10:00

HumanoidProfileEditor.xaml.cs

Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream

2024-06-17 14:20:38 +03:00

LobbyCharacterPreviewPanel.xaml

Loadouts redux (#25715)

2024-04-16 22:57:43 +10:00

LobbyCharacterPreviewPanel.xaml.cs

Lobby refactor + species loadouts support (#27576)

2024-05-12 09:18:21 +10:00

LobbyGui.xaml

Make the lobby AHelp button red for admins when one is received (#20390)

2023-09-21 17:40:57 +10:00

LobbyGui.xaml.cs

Lobby refactor + species loadouts support (#27576)

2024-05-12 09:18:21 +10:00

ObserveWarningWindow.xaml

Fix late join & observe to de-admin admins. (#28319)

2024-05-28 14:00:42 -04:00

ObserveWarningWindow.xaml.cs

Fix late join & observe to de-admin admins. (#28319)

2024-05-28 14:00:42 -04:00