Merge branch 'develop' into player-guid
This commit is contained in:
commit
86dc259c17
387 files changed
+18124
-16761
No files matched your search
@@ -38,7 +38,7 @@ namespace VocaluxeLib.Menu
|
||||
}
|
||||
}
|
||||
|
||||
private bool _Teams;
|
||||
protected bool _Teams = true;
|
||||
protected int _NumTeams = -1;
|
||||
protected int _NumPlayer = -1;
|
||||
protected int[] _NumPlayerTeams;
|
||||
@@ -107,8 +107,6 @@ namespace VocaluxeLib.Menu
|
||||
for (int i = 0; i < _TeamList.Length; i++)
|
||||
_TeamList[i] = new List<Guid>();
|
||||
|
||||
_Teams = _NumTeams > 0;
|
||||
|
||||
_UpdateSlides();
|
||||
_LoadProfiles();
|
||||
_UpdateButtonVisibility();
|
||||
@@ -619,6 +617,7 @@ namespace VocaluxeLib.Menu
|
||||
_UpdatePlayerSlide();
|
||||
}
|
||||
_UpdateButtonState();
|
||||
_UpdateNextButtonVisibility();
|
||||
}
|
||||
|
||||
public void DecreasePlayerNum(int team)
|
||||
@@ -634,6 +633,7 @@ namespace VocaluxeLib.Menu
|
||||
_UpdatePlayerSlide();
|
||||
}
|
||||
_UpdateButtonState();
|
||||
_UpdateNextButtonVisibility();
|
||||
}
|
||||
|
||||
#region private methods
|
||||
@@ -726,7 +726,7 @@ namespace VocaluxeLib.Menu
|
||||
{
|
||||
if (_NumPlayerTeams[team] == _TeamList[team].Count && !_ChangePlayerNumDynamic)
|
||||
return;
|
||||
if (_NumPlayerTeams[team] == _PartyMode.MaxPlayersPerTeam)
|
||||
if (_NumPlayerTeams[team] > _PartyMode.MaxPlayersPerTeam)
|
||||
return;
|
||||
|
||||
_NameSelections[_NameSelection].UseProfile(profileID);
|
||||
@@ -778,7 +778,8 @@ namespace VocaluxeLib.Menu
|
||||
for (int p = 0; p < _NumPlayerTeams[t]; p++)
|
||||
{
|
||||
Guid profileID = _NameSelections[_NameSelection].GetRandomUnusedProfile();
|
||||
_AddPlayer(t, profileID, false);
|
||||
if(profileID != Guid.Empty)
|
||||
_AddPlayer(t, profileID);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user