diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml
index 147713db..1c508212 100644
--- a/Output/Themes/Ambient/Screens/ScreenSing.xml
+++ b/Output/Themes/Ambient/Screens/ScreenSing.xml
@@ -17,10 +17,10 @@
Score
190
- 10
- -1,00
+ 694
+ -1,10
900
- 50
+ 25
StaticColor
@@ -222,7 +222,7 @@
0
0
- -1,10
+ -2,10
1280
720
@@ -234,7 +234,7 @@
- Score
+ Invisible
1150
350
@@ -250,7 +250,7 @@
- Score
+ Invisible
1150
150
@@ -266,7 +266,7 @@
- Score
+ Invisible
1150
350
@@ -282,7 +282,7 @@
- Score
+ Invisible
1150
10
@@ -298,7 +298,7 @@
- Score
+ Invisible
1150
210
@@ -314,7 +314,7 @@
- Score
+ Invisible
1150
410
@@ -330,7 +330,7 @@
- Score
+ Invisible
528
150
@@ -346,7 +346,7 @@
- Score
+ Invisible
528
350
@@ -362,7 +362,7 @@
- Score
+ Invisible
1150
150
@@ -378,7 +378,7 @@
- Score
+ Invisible
1150
350
@@ -394,7 +394,7 @@
- Score
+ Invisible
528
10
@@ -410,7 +410,7 @@
- Score
+ Invisible
528
210
@@ -426,7 +426,7 @@
- Score
+ Invisible
528
410
@@ -442,7 +442,7 @@
- Score
+ Invisible
1150
150
@@ -458,7 +458,7 @@
- Score
+ Invisible
1150
350
@@ -474,7 +474,7 @@
- Score
+ Invisible
528
10
@@ -490,7 +490,7 @@
- Score
+ Invisible
528
210
@@ -506,7 +506,7 @@
- Score
+ Invisible
528
410
@@ -522,7 +522,7 @@
- Score
+ Invisible
1150
10
@@ -538,7 +538,7 @@
- Score
+ Invisible
1150
210
@@ -554,7 +554,7 @@
- Score
+ Invisible
1150
410
@@ -571,11 +571,11 @@
640
- 18
+ 695
- -1,00
+ -1,10
- 32
+ 23
880
@@ -628,7 +628,7 @@
640
170
- -1,11
+ -2,11
100
@@ -652,21 +652,21 @@
- 1200
+ 1240
355
-1,00
- 40
+ 198
- Player1
+ Player1Dim2
TextSColor
- Center
+ Right
@@ -679,21 +679,21 @@
- 1200
+ 1240
155
-1,00
- 40
+ 173
- Player1
+ Player1Dim2
Player1
- Center
+ Right
@@ -706,21 +706,21 @@
- 1200
+ 1240
355
-1,00
- 40
+ 173
- Player2
+ Player2Dim2
Player2
- Center
+ Right
@@ -733,21 +733,21 @@
- 1200
- 15
+ 1240
+ 106
-1,00
- 40
+ 158
- Player1
+ Player1Dim2
Player1
- Center
+ Right
@@ -760,21 +760,21 @@
- 1200
- 215
+ 1240
+ 269
-1,00
- 40
+ 158
- Player2
+ Player2Dim2
Player2
- Center
+ Right
@@ -787,21 +787,21 @@
- 1200
- 415
+ 1240
+ 437
-1,00
- 40
+ 158
- Player3
+ Player3Dim2
Player3
- Center
+ Right
@@ -814,16 +814,16 @@
- 578
+ 324
155
-1,00
- 40
+ 173
- Player1
+ Player1Dim2
Player1
@@ -841,16 +841,16 @@
- 578
+ 324
355
-1,00
- 40
+ 173
- Player2
+ Player2Dim2
Player2
@@ -868,16 +868,16 @@
- 1200
+ 967
155
-1,00
- 40
+ 173
- Player3
+ Player3Dim2
Player3
@@ -895,16 +895,16 @@
- 1200
+ 967
355
-1,00
- 40
+ 173
- Player4
+ Player4Dim2
Player4
@@ -922,16 +922,16 @@
- 578
- 15
+ 324
+ 106
-1,00
- 40
+ 158
- Player1
+ Player1Dim2
Player1
@@ -949,16 +949,16 @@
- 578
- 215
+ 324
+ 269
-1,00
- 40
+ 158
- Player2
+ Player2Dim2
Player2
@@ -976,16 +976,16 @@
- 578
- 415
+ 324
+ 437
-1,00
- 40
+ 158
- Player3
+ Player3Dim2
Player3
@@ -1003,16 +1003,16 @@
- 1200
+ 967
155
-1,00
- 40
+ 173
- Player4
+ Player4Dim2
Player4
@@ -1030,16 +1030,16 @@
- 1200
+ 967
355
-1,00
- 40
+ 173
- Player5
+ Player5Dim2
Player5
@@ -1057,16 +1057,16 @@
- 578
- 15
+ 324
+ 106
-1,00
- 40
+ 158
- Player1
+ Player1Dim2
Player1
@@ -1084,16 +1084,16 @@
- 578
- 215
+ 324
+ 269
-1,00
- 40
+ 158
- Player2
+ Player2Dim2
Player2
@@ -1111,16 +1111,16 @@
- 578
- 415
+ 324
+ 437
-1,00
- 40
+ 158
- Player3
+ Player3Dim2
Player3
@@ -1138,16 +1138,16 @@
- 1200
- 15
+ 967
+ 106
-1,00
- 40
+ 158
- Player4
+ Player4Dim2
Player4
@@ -1165,16 +1165,16 @@
- 1200
- 215
+ 967
+ 269
-1,00
- 40
+ 158
- Player5
+ Player5Dim2
Player5
@@ -1192,16 +1192,16 @@
- 1200
- 415
+ 967
+ 437
-1,00
- 40
+ 158
- Player6
+ Player6Dim2
Player6
@@ -1225,7 +1225,7 @@
670
300
- -1,11
+ -2,11
150
50
@@ -1280,7 +1280,7 @@
460
300
- -1,11
+ -2,11
150
50
@@ -1436,109 +1436,109 @@
35
350
- -0,50
+ -1,50
1210
200
35
150
- -0,50
+ -1,50
1210
175
35
350
- -0,50
+ -1,50
1210
175
35
- 10
- -0,50
+ 105
+ -1,50
1210
- 150
+ 160
35
- 210
- -0,50
+ 268
+ -1,50
1210
- 150
+ 160
35
- 410
- -0,50
+ 436
+ -1,50
1210
- 150
+ 160
35
150
- -0,50
+ -1,50
578
175
35
350
- -0,50
+ -1,50
578
175
678
150
- -0,50
+ -1,50
578
175
678
350
- -0,50
+ -1,50
578
175
35
- 10
- -0,50
+ 105
+ -1,50
578
- 150
+ 160
35
- 210
- -0,50
+ 268
+ -1,50
578
- 150
+ 160
35
- 410
- -0,50
+ 436
+ -1,50
578
- 150
+ 160
678
150
- -0,50
+ -1,50
578
175
678
350
- -0,50
+ -1,50
578
175
35
- 10
- -0,50
+ 105
+ -1,50
578
- 150
+ 160
35
- 210
- -0,50
+ 268
+ -1,50
578
- 150
+ 160
35
- 410
- -0,50
+ 436
+ -1,50
578
- 150
+ 160
678
- 10
- -0,50
+ 105
+ -1,50
578
- 150
+ 160
678
- 210
- -0,50
+ 268
+ -1,50
578
- 150
+ 160
678
- 410
- -0,50
+ 436
+ -1,50
578
- 150
+ 160
diff --git a/Output/Themes/Ambient/Skin Blue.xml b/Output/Themes/Ambient/Skin Blue.xml
index 0be63f4b..80bdb88c 100644
--- a/Output/Themes/Ambient/Skin Blue.xml
+++ b/Output/Themes/Ambient/Skin Blue.xml
@@ -82,6 +82,42 @@
0,500
0,500
+
+ 0,000
+ 0,000
+ 1,000
+ 0,400
+
+
+ 1,000
+ 0,000
+ 0,000
+ 0,400
+
+
+ 0,000
+ 1,000
+ 0,000
+ 0,400
+
+
+ 0,500
+ 0,000
+ 1,000
+ 0,400
+
+
+ 1,000
+ 0,800
+ 0,000
+ 0,400
+
+
+ 1,000
+ 0,000
+ 0,500
+ 0,400
+
0,000
0,000
diff --git a/Output/Themes/Ambient/Skin Green.xml b/Output/Themes/Ambient/Skin Green.xml
index 11ad8556..095e1243 100644
--- a/Output/Themes/Ambient/Skin Green.xml
+++ b/Output/Themes/Ambient/Skin Green.xml
@@ -82,6 +82,42 @@
0,500
0,500
+
+ 0,000
+ 0,000
+ 1,000
+ 0,400
+
+
+ 1,000
+ 0,000
+ 0,000
+ 0,400
+
+
+ 0,000
+ 1,000
+ 0,000
+ 0,400
+
+
+ 0,500
+ 0,000
+ 1,000
+ 0,400
+
+
+ 1,000
+ 0,800
+ 0,000
+ 0,400
+
+
+ 1,000
+ 0,000
+ 0,500
+ 0,400
+
0,000
0,000
diff --git a/Output/Themes/Ambient/Skin Red.xml b/Output/Themes/Ambient/Skin Red.xml
index e00b17a7..c92cceda 100644
--- a/Output/Themes/Ambient/Skin Red.xml
+++ b/Output/Themes/Ambient/Skin Red.xml
@@ -82,6 +82,42 @@
0,500
0,500
+
+ 0,000
+ 0,000
+ 1,000
+ 0,400
+
+
+ 1,000
+ 0,000
+ 0,000
+ 0,400
+
+
+ 0,000
+ 1,000
+ 0,000
+ 0,400
+
+
+ 0,500
+ 0,000
+ 1,000
+ 0,400
+
+
+ 1,000
+ 0,800
+ 0,000
+ 0,400
+
+
+ 1,000
+ 0,000
+ 0,500
+ 0,400
+
0,000
0,000
diff --git a/Output/Themes/Ambient/Skin Yellow.xml b/Output/Themes/Ambient/Skin Yellow.xml
index f6065aa7..fbc4a227 100644
--- a/Output/Themes/Ambient/Skin Yellow.xml
+++ b/Output/Themes/Ambient/Skin Yellow.xml
@@ -82,6 +82,42 @@
0,500
0,500
+
+ 0,000
+ 0,000
+ 1,000
+ 0,400
+
+
+ 1,000
+ 0,000
+ 0,000
+ 0,400
+
+
+ 0,000
+ 1,000
+ 0,000
+ 0,400
+
+
+ 0,500
+ 0,000
+ 1,000
+ 0,400
+
+
+ 1,000
+ 0,800
+ 0,000
+ 0,400
+
+
+ 1,000
+ 0,000
+ 0,500
+ 0,400
+
0,000
0,000
diff --git a/Vocaluxe/Menu/SingNotes/CSingNotes.cs b/Vocaluxe/Menu/SingNotes/CSingNotes.cs
index a157e9fa..006e7369 100644
--- a/Vocaluxe/Menu/SingNotes/CSingNotes.cs
+++ b/Vocaluxe/Menu/SingNotes/CSingNotes.cs
@@ -583,7 +583,7 @@ namespace Vocaluxe.Menu.SingNotes
for (int i = 0; i < CSettings.NumNoteLines - 1; i++)
{
float y = Rect.Y + Rect.H / CSettings.NumNoteLines * (i + 1);
- CDraw.DrawColor(Color, new SRectF(Rect.X, y, Rect.W, 1, -0.5f));
+ CDraw.DrawColor(Color, new SRectF(Rect.X, y, Rect.W, 1, -1.0f));
}
}
diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index 7152d80d..08a9220a 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -290,7 +290,14 @@ namespace Vocaluxe.Screens
for (int p = 0; p < CGame.NumPlayer; p++)
{
- Texts[htTexts(TextScores[p, CGame.NumPlayer - 1])].Text = CGame.Player[p].Points.ToString("00000");
+ if (CGame.Player[p].Points < 10000)
+ {
+ Texts[htTexts(TextScores[p, CGame.NumPlayer - 1])].Text = CGame.Player[p].Points.ToString("0000");
+ }
+ else
+ {
+ Texts[htTexts(TextScores[p, CGame.NumPlayer - 1])].Text = CGame.Player[p].Points.ToString("00000");
+ }
}
if (_CurrentVideo != -1 && !_FadeOut && CConfig.VideosInSongs == EOffOn.TR_CONFIG_ON)
@@ -496,7 +503,7 @@ namespace Vocaluxe.Screens
SingNotes[htSingNotes(SingBars)].Reset();
- bool LyricsOnTop = (CGame.NumPlayer == 2 || CGame.NumPlayer == 4) && CConfig.LyricsOnTop == EOffOn.TR_CONFIG_ON;
+ bool LyricsOnTop = (CGame.NumPlayer != 1) && CConfig.LyricsOnTop == EOffOn.TR_CONFIG_ON;
if (song.IsDuet)
{
CGame.Player[1].LineNr = 1;