- File transfer improvements (switching the sub selection during transfer works, max transfer duration, waiting for transfers to finish before starting the round)

- Firesource changes (more particles with shorter lifetimes, combining bugfix)
- StatusEffects can target hulls and always be active
- Cyrillic character support
- Saving server settings
- Swapping items in inventory by dropping an item to a non-free slot
This commit is contained in:
Regalis
2016-02-27 21:01:10 +02:00
parent 7309201b11
commit cc4ada952f
31 changed files with 470 additions and 199 deletions

View File

@@ -155,24 +155,28 @@ namespace Barotrauma
if (held) heldQueue = true;
}
public bool Dequeue
public bool DequeueHit()
{
get
{
bool value = hitQueue;
hitQueue = false;
return value;
}
bool value = hitQueue;
hitQueue = false;
return value;
}
public bool DequeueHeld
public bool DequeueHeld()
{
get
{
bool value = heldQueue;
heldQueue = false;
return value;
}
bool value = heldQueue;
heldQueue = false;
return value;
}
public bool GetHeldQueue
{
get { return heldQueue; }
}
public bool GetHitQueue
{
get { return hitQueue; }
}