vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

3ea33fb...bbc4a31

Browse Source 
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:
Joonas Rikkonen
2019-03-18 22:29:57 +02:00
parent 97f31d0c94
commit a9d8c14b05
20 changed files with 562 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Networking/GameClient.cs
+6 -9
View File
@@ -92,6 +92,11 @@ namespace Barotrauma.Networking
private int ownerKey;
public bool IsServerOwner
{
get { return ownerKey > 0; }
}
public GameClient(string newName, string ip, int ownerKey=0)
{
//TODO: gui stuff should probably not be here?
@@ -894,6 +899,7 @@ namespace Barotrauma.Networking
}
yield return new WaitForSeconds(0.5f);
}
}
waitInServerQueueBox?.Close();
waitInServerQueueBox = null;
@@ -935,16 +941,7 @@ namespace Barotrauma.Networking
{
if (newPermissions == permissions) return;
}
}
private void SetMyPermissions(ClientPermissions newPermissions, IEnumerable<string> permittedConsoleCommands)
{
if (!(this.permittedConsoleCommands.Any(c => !permittedConsoleCommands.Contains(c)) ||
permittedConsoleCommands.Any(c => !this.permittedConsoleCommands.Contains(c))))
{
if (newPermissions == permissions) return;
}
permissions = newPermissions;
this.permittedConsoleCommands = new List<string>(permittedConsoleCommands);
//don't show the "permissions changed" popup if the client owns the server
Barotrauma/BarotraumaClient/Source/Networking/ServerSettings.cs
+8 -1
View File
@@ -524,8 +524,15 @@ namespace Barotrauma.Networking
img.Color = img.Sprite == ip.InventoryIcon ? ip.InventoryIconColor : ip.SpriteColor;
}
new GUITextBlock(new RectTransform(new Vector2(0.75f, 1.0f), itemFrame.RectTransform),
ip.Name, font: GUI.SmallFont)
{
Wrap = true,
CanBeFocused = false
};
ExtraCargo.TryGetValue(ip, out int cargoVal);
var amountInput = new GUINumberInput(new RectTransform(new Vector2(0.3f, 1.0f), itemFrame.RectTransform),
var amountInput = new GUINumberInput(new RectTransform(new Vector2(0.35f, 1.0f), itemFrame.RectTransform),
GUINumberInput.NumberType.Int, textAlignment: Alignment.CenterLeft)
{
MinValueInt = 0,