(3622747f3) Unstable 0.9.705.0
This commit is contained in:
Joonas Rikkonen
@@ -262,7 +262,10 @@ namespace Barotrauma
|
||||
|
||||
#if CLIENT
|
||||
private Sprite jobIcon;
|
||||
private Vector2 jobIconPos;
|
||||
private Vector2 jobIconPos
|
||||
{
|
||||
get { return new Vector2(HUDLayoutSettings.HealthBarAreaLeft.Right, HUDLayoutSettings.HealthBarAreaLeft.Y - HUDLayoutSettings.Padding); }
|
||||
}
|
||||
#endif
|
||||
|
||||
private Sprite portraitBackground;
|
||||
@@ -449,9 +452,6 @@ namespace Barotrauma
|
||||
Job = (jobPrefab == null) ? Job.Random(Rand.RandSync.Server) : new Job(jobPrefab, variant);
|
||||
#if CLIENT
|
||||
jobIcon = Job.Prefab.Icon;
|
||||
//TODO: fix jobIconPos
|
||||
jobIconPos = new Vector2(HUDLayoutSettings.HealthBarAreaLeft.Right, HUDLayoutSettings.HealthBarAreaLeft.Y - HUDLayoutSettings.Padding);
|
||||
GameMain.Instance.OnResolutionChanged += () => jobIconPos = new Vector2(HUDLayoutSettings.HealthBarAreaLeft.Right, HUDLayoutSettings.HealthBarAreaLeft.Y - HUDLayoutSettings.Padding);
|
||||
#endif
|
||||
|
||||
if (!string.IsNullOrEmpty(name))
|
||||
|
||||
@@ -282,6 +282,8 @@ namespace Barotrauma
|
||||
|
||||
commands.Add(new Command("botspawnmode", "botspawnmode [fill/normal]: Set how bots are spawned in the multiplayer.", null));
|
||||
|
||||
commands.Add(new Command("killdisconnectedtimer", "killdisconnectedtimer [seconds]: Set the time after which disconnect players' characters get automatically killed.", null));
|
||||
|
||||
commands.Add(new Command("autorestart", "autorestart [true/false]: Enable or disable round auto-restart.", null));
|
||||
|
||||
commands.Add(new Command("autorestartinterval", "autorestartinterval [seconds]: Set how long the server waits between rounds before automatically starting a new one. If set to 0, autorestart is disabled.", null));
|
||||
|
||||
@@ -67,6 +67,9 @@ namespace Barotrauma
|
||||
{
|
||||
if (isClient) { return; }
|
||||
|
||||
pendingEventSets.Clear();
|
||||
selectedEvents.Clear();
|
||||
|
||||
var suitableSettings = EventManagerSettings.List.FindAll(s =>
|
||||
level.Difficulty >= s.MinLevelDifficulty &&
|
||||
level.Difficulty <= s.MaxLevelDifficulty);
|
||||
@@ -322,6 +325,12 @@ namespace Barotrauma
|
||||
|
||||
pendingEventSets.RemoveAt(i);
|
||||
|
||||
if (!selectedEvents.ContainsKey(eventSet))
|
||||
{
|
||||
DebugConsole.ThrowError("Error in EventManager.Update: pending event set \"" + eventSet.DebugIdentifier + "\" not present in selected event sets.");
|
||||
continue;
|
||||
}
|
||||
|
||||
//start events in this set
|
||||
foreach (ScriptedEvent scriptedEvent in selectedEvents[eventSet])
|
||||
{
|
||||
|
||||
@@ -198,7 +198,7 @@ namespace Barotrauma
|
||||
}
|
||||
}
|
||||
|
||||
if (!free) continue;
|
||||
if (!free) { continue; }
|
||||
|
||||
for (int i = 0; i < capacity; i++)
|
||||
{
|
||||
@@ -212,7 +212,8 @@ namespace Barotrauma
|
||||
item.Equip(character);
|
||||
placedInSlot = i;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (placedInSlot > -1) { break; }
|
||||
}
|
||||
|
||||
return placedInSlot > -1;
|
||||
|
||||
@@ -752,7 +752,7 @@ namespace Barotrauma.Networking
|
||||
private set;
|
||||
}
|
||||
|
||||
[Serialize(30.0f, true)]
|
||||
[Serialize(120.0f, true)]
|
||||
public float KillDisconnectedTime
|
||||
{
|
||||
get;
|
||||
|
||||
@@ -86,7 +86,7 @@ namespace Barotrauma
|
||||
HashSet<string> newLanguages = new HashSet<string>();
|
||||
Dictionary<string, List<TextPack>> newTextPacks = new Dictionary<string, List<TextPack>>();
|
||||
|
||||
var textFiles = ContentPackage.GetFilesOfType(selectedContentPackages, ContentType.Text);
|
||||
var textFiles = ContentPackage.GetFilesOfType(selectedContentPackages, ContentType.Text).ToList();
|
||||
|
||||
foreach (ContentFile file in textFiles)
|
||||
{
|
||||
@@ -131,13 +131,7 @@ namespace Barotrauma
|
||||
{
|
||||
textPacks = newTextPacks;
|
||||
availableLanguages = newLanguages;
|
||||
|
||||
string loadedLangsMsg = "Loaded languages: ";
|
||||
foreach (string language in newLanguages)
|
||||
{
|
||||
loadedLangsMsg += language + ", ";
|
||||
}
|
||||
DebugConsole.NewMessage(loadedLangsMsg.Substring(0,loadedLangsMsg.Length-2));
|
||||
DebugConsole.NewMessage("Loaded languages: " + string.Join(", ", newLanguages));
|
||||
}
|
||||
|
||||
Initialized = true;
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace Barotrauma
|
||||
/// </summary>
|
||||
public readonly string TranslatedName;
|
||||
|
||||
private Dictionary<string, List<string>> texts;
|
||||
private readonly Dictionary<string, List<string>> texts;
|
||||
|
||||
public readonly string FilePath;
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ namespace Barotrauma
|
||||
|
||||
public static double Accumulator;
|
||||
public const int FixedUpdateRate = 60;
|
||||
public static double Step = 1.0 / FixedUpdateRate;
|
||||
public const double Step = 1.0 / FixedUpdateRate;
|
||||
|
||||
private static int frameLimit;
|
||||
/// <summary>
|
||||
|
||||
@@ -1,3 +1,29 @@
|
||||
---------------------------------------------------------------------------------------------------------
|
||||
v0.9.705.0 (Unstable)
|
||||
---------------------------------------------------------------------------------------------------------
|
||||
|
||||
- Fixed server owner occasionally timing out if loading the round takes too long.
|
||||
- Fixed server owner's character occasionally being killed due to round start timeouts.
|
||||
- Reduced the severity of the burns caused by deusizine.
|
||||
- Fixed report buttons doing nothing.
|
||||
- Fixed report buttons being visible when not controlling a character.
|
||||
- Fixed sonar markers being visible when not receiving a signal from a remotely controlled shuttle.
|
||||
- Fixed wire being drawn twice in the connection panel interface if it's first connected from both ends and then dragged away from the connection.
|
||||
- Fixed client-side giveperm/giverank.
|
||||
- Added "killdisconnectedtime" command that can be used to set the time after a disconnected player's character gets automatically killed.
|
||||
- Increased default killdisconnectedtime to 2 minutes.
|
||||
- Fixed items that can be put in either hand slot, but not in the "Any" slots (e.g. duffel bag), being put into both hand slots.
|
||||
- Fixed crashing when attempting to draw an inventory when not controlling a character (happened in the sub editor when selecting an item container in the character mode and switching to default mode).
|
||||
- Fixed crashing if there's no audio device available.
|
||||
- Fixed wire being drawn twice in the connection panel interface if it's first connected from both ends and then dragged away from the connection.
|
||||
- Fixed inventory toggle button working unreliably.
|
||||
- Fixed alarm buzzer not returning to the original rotation when the alarm stops.
|
||||
- Fixed grenades sometimes not exploding client-side in multiplayer.
|
||||
- Fixed characters letting go of ladders when opening the health interface.
|
||||
- An attempt to fix occasional crashing when autoupdating workshop items.
|
||||
- Improved crewlist scaling on small resolutions.
|
||||
- Fixes to text overflows on small resolutions.
|
||||
|
||||
---------------------------------------------------------------------------------------------------------
|
||||
v0.9.704.0 (Unstable)
|
||||
---------------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
modeselectionmode="Manual"
|
||||
endvoterequiredratio="0.6"
|
||||
kickvoterequiredratio="0.6"
|
||||
killdisconnectedtime="30"
|
||||
killdisconnectedtime="120"
|
||||
kickafktime="120"
|
||||
traitoruseratio="True"
|
||||
traitorratio="0.2"
|
||||
|
||||
Reference in New Issue
Block a user