3ea33fb...bbc4a31
commit bbc4a31aa83572258226f303ab767f8546de64fb Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Tue Mar 5 13:08:38 2019 +0200 Fixed missing item names in the extra cargo menu. Closes #1218 commit dd18bd163e05e8ba4718c0e98083e50ef0a0157e Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Tue Mar 5 13:04:54 2019 +0200 Fixed a compiler error in RespawnManager commit 904700eda3e4da5468208bd7553a803e9f41234e Author: Joonas Rikkonen <poe.regalis@gmail.com> Date: Tue Mar 5 12:56:29 2019 +0200 Autorestart/spectating fixes (closes #1219): - The server owner and spectators don't trigger autorestart. - The owner is allowed to spectate even if spectating is disallowed in server settings. - Fixed "play yourself" always toggling to true when a round ends. commit 9710612256875d5a788fb34371ca8ea6dd61b749 Author: ezjamsen <ezjames.fi@gmail.com> Date: Tue Mar 5 10:10:25 2019 +0200 dropped the point at which damage sprites appear slightly.
This commit is contained in:
@@ -300,6 +300,7 @@ namespace Barotrauma
|
||||
playYourself = new GUITickBox(new RectTransform(new Vector2(0.06f, 0.06f), myCharacterFrame.RectTransform) { RelativeOffset = new Vector2(0.05f,0.05f) },
|
||||
TextManager.Get("PlayYourself"))
|
||||
{
|
||||
Selected = true,
|
||||
OnSelected = TogglePlayYourself,
|
||||
UserData = "playyourself"
|
||||
};
|
||||
@@ -794,11 +795,6 @@ namespace Barotrauma
|
||||
if (GameMain.Client != null)
|
||||
{
|
||||
GameMain.Client.ServerSettings.Voting.ResetVotes(GameMain.Client.ConnectedClients);
|
||||
if (!playYourself.Selected)
|
||||
{
|
||||
playYourself.Selected = true;
|
||||
TogglePlayYourself(playYourself);
|
||||
}
|
||||
spectateButton.OnClicked = GameMain.Client.SpectateClicked;
|
||||
ReadyToStartBox.OnSelected = GameMain.Client.SetReadyToStart;
|
||||
}
|
||||
@@ -1102,6 +1098,13 @@ namespace Barotrauma
|
||||
|
||||
public void SetAllowSpectating(bool allowSpectating)
|
||||
{
|
||||
//server owner is allowed to spectate regardless of the server settings
|
||||
if (GameMain.Client != null && GameMain.Client.IsServerOwner)
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
//show the player config menu if spectating is not allowed
|
||||
if (!playYourself.Selected && !allowSpectating)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user