Merge branch 'develop' into player-guid

This commit is contained in:
Florian Küpper committed 2017-11-05 23:32:30 +01:00
commit 86dc259c17
387 files changed
+18124 -16761

No files matched your search

+1 -17
View File
@@ -137,23 +137,6 @@ namespace VocaluxeLib
get { return A.HasValue; }
}
/// <summary>
/// Use only for old code! Remove when removing old LoadTheme()
/// </summary>
[XmlIgnore]
public SColorF Color
{
set
{
if (NameSpecified)
return;
R = value.R;
G = value.G;
B = value.B;
A = value.A;
}
}
public bool Get(int partyModeId, out SColorF color)
{
bool ok;
@@ -362,6 +345,7 @@ namespace VocaluxeLib
public double Points;
public double PointsLineBonus;
public double PointsGoldenNotes;
public double Rating;
public int NoteDiff;
public int VoiceNr;
public List<CSungLine> SungLines;