Unstable v0.19.1.0

This commit is contained in:
Juan Pablo Arce
2022-08-19 13:59:08 -03:00
parent 6b55adcdd9
commit 1219615d64
192 changed files with 3875 additions and 2648 deletions

View File

@@ -382,10 +382,9 @@ namespace Barotrauma
LocalizedString toolTip = TextManager.Get($"sp.{propertyTag}.description");
if (toolTip.IsNullOrEmpty())
{
toolTip = TextManager.Get($"{propertyTag}.description", $"sp.{fallbackTag}.description");
toolTip = TextManager.Get($"{propertyTag}.description", $"sp.{fallbackTag}.description");
}
if (toolTip == null)
if (toolTip.IsNullOrEmpty())
{
toolTip = property.GetAttribute<Serialize>().Description;
}
@@ -700,9 +699,12 @@ namespace Barotrauma
List<MapEntity> prevSelected = MapEntity.SelectedList.ToList();
//reselect the entities that were selected during editing
//otherwise multi-editing won't work when we deselect the entities with unapplied changes in the textbox
foreach (var entity in editedEntities)
{
MapEntity.SelectedList.Add(entity);
if (editedEntities.Count > 1)
{
foreach (var entity in editedEntities)
{
MapEntity.SelectedList.Add(entity);
}
}
if (SetPropertyValue(property, entity, textBox.Text))
{