merged trunk into lua branch

plugin loading is disabled atm because of a bug reading the files (lua may be the reason). 
Reading the files in usdx and passing the contents to lua may solve this

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2019 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 146 insertions, 52 deletions

diff --git a/Lua/game/themes/Deluxe.ini b/Lua/game/themes/Deluxe.ini
index 5f47c215..cf3ad368 100644
--- a/Lua/game/themes/Deluxe.ini
+++ b/Lua/game/themes/Deluxe.ini
@@ -139,7 +139,7 @@ Size = 24
 Align = 0
 Text = SING_LEGEND_NAVIGATE
 Reflection = 1
-ReflectionSpacing = 20
+ReflectionSpacing = 13
 
 [MainStatic5]
 X = 400
@@ -163,7 +163,7 @@ Size = 24
 Align = 0
 Text = SING_LEGEND_SELECT
 Reflection = 1
-ReflectionSpacing = 20
+ReflectionSpacing = 13
 
 [MainButtonSolo]
 X = 95
@@ -524,7 +524,7 @@ Size = 24
 Align = 0
 Text = +
 Reflection = 1
-ReflectionSpacing = 20
+ReflectionSpacing = 13
 
 [SongStaticNonParty3]
 X = 300
@@ -548,7 +548,7 @@ Size = 24
 Align = 0
 Text = SING_SONG_SELECTION_GOTO
 Reflection = 1
-ReflectionSpacing = 20
+ReflectionSpacing = 13
 
 # Menu opens with [M]
 [SongStaticNonParty4]
@@ -573,7 +573,7 @@ Size = 24
 Align = 0
 Text = SING_SONG_SELECTION_MENU
 Reflection = 1
-ReflectionSpacing = 20
+ReflectionSpacing = 13
 
 # The so famous search, shown with [J]
 [SongStaticNonParty5]
@@ -598,7 +598,7 @@ Size = 24
 Align = 0
 Text = SONG_JUMPTO_DESC
 Reflection = 1
-ReflectionSpacing = 20
+ReflectionSpacing = 13
 
 # [P]laylist
 [SongStaticNonParty6]
@@ -623,7 +623,7 @@ Size = 24
 Align = 0
 Text = SING_SONG_SELECTION_PLAYLIST
 Reflection = 1
-ReflectionSpacing = 20
+ReflectionSpacing = 13
 
 #and these are the ones for partymode
 [SongStaticParty1]
@@ -656,6 +656,8 @@ Font = 0
 Size = 24
 Align = 0
 Text = SONG_MENU_NAME_PARTY_JOKER
+Reflection = 1
+ReflectionSpacing = 13
 
 # menu
 [SongStaticParty3]
@@ -677,6 +679,8 @@ Font = 0
 Size = 24
 Align = 0
 Text = PARTY_SONG_MENU
+Reflection = 1
+ReflectionSpacing = 13
 
 [SongStaticParty4]
 X = 540
@@ -696,6 +700,8 @@ Font = 0
 Size = 24
 Align = 0
 Text = PARTY_SONG_LEGEND_CONTINUE
+Reflection = 1
+ReflectionSpacing = 13
 
 #Texts for Party Mode
 [SongTextParty1]
@@ -719,7 +725,6 @@ Align = 2
 Text = PARTY_SONG_WHEREAMI
 #variable statics end
 
-
 # Jokers, 5 for each team, only shown in party Mode
 [SongStaticTeam1Joker1]
 Tex = Joker
@@ -943,12 +948,12 @@ ColG=1
 
 [SingText1]
 Text = SING_TIME
-X = 20
+X = 43
 Y = 577
 Font = 1
 Size = 18
 Color = White
-Align = 0
+Align = 1
 
 [SingStatic1]
 ;TextBG
@@ -979,12 +984,12 @@ Color = White
 
 [SingTimeText]
 Text = SING_TIME
-X = 736
+X = 761
 Y = 577
 Font = 1
 Size = 18
 Color = White
-Align = 0
+Align = 1
 
 # O N E  P L A Y E R   M O D E # # # # # # # # # # # # # # # # # # # #
 #PlayerOne
@@ -1017,7 +1022,7 @@ Type = Colorized
 
 [SingP1TextScore]
 Text = 00000
-X = 690
+X = 698
 Y = 284
 Font = 0
 Size = 30
@@ -1061,7 +1066,7 @@ Type = Colorized
 
 [SingP1TwoPTextScore]
 Text = 00000
-X = 690
+X = 698
 Y = 104
 Font = 0
 Size = 30
@@ -1072,7 +1077,7 @@ Align = 0
 X = 680
 Y = 136
 W = 100
-H = 13
+H = 8
 
 #Player Two
 [SingP2RStatic]
@@ -1104,7 +1109,7 @@ Type = Colorized
 
 [SingP2RTextScore]
 Text = 00000
-X = 690
+X = 698
 Y = 284
 Font = 0
 Size = 30
@@ -1124,7 +1129,7 @@ Tex = P
 X = 16
 Y = 59
 W = 50
-H = 54
+H = 44
 Color = P1Dark
 Type = Colorized
 
@@ -1148,7 +1153,7 @@ Type = Colorized
 
 [SingP1ThreePTextScore]
 Text = 00000
-X = 85
+X = 93
 Y = 63
 Font = 0
 Size = 30
@@ -1167,7 +1172,7 @@ Tex = P
 X = 311
 Y = 59
 W = 50
-H = 54
+H = 44
 Color = P2Dark
 Type = Colorized
 
@@ -1191,7 +1196,7 @@ Type = Colorized
 
 [SingP2MTextScore]
 Text = 00000
-X = 380
+X = 388
 Y = 63
 Font = 0
 Size = 30
@@ -1210,7 +1215,7 @@ Tex = P
 X = 611
 Y = 59
 W = 50
-H = 54
+H = 44
 Color = P3Dark
 Type = Colorized
 
@@ -1234,7 +1239,7 @@ Type = Colorized
 
 [SingP3RTextScore]
 Text = 00000
-X = 680
+X = 688
 Y = 63
 Font = 0
 Size = 30
@@ -1264,7 +1269,7 @@ Align = 0
 
 [ScoreTextArtistTitle]
 X = 70
-Y = 53
+Y = 59
 Color = White
 Font = 0
 Size = 30
@@ -1322,7 +1327,7 @@ Size = 24
 Align = 0
 Text = SING_LEGEND_CONTINUE
 Reflection = 1
-ReflectionSpacing = 20
+ReflectionSpacing = 13
 #end of main stuff
 
 # # # # # # # # # # # # # # # # # # One Player Score # # # # # # # # # # # #
@@ -1470,25 +1475,25 @@ ReflectionSpacing = 31
 
 [ScoreTextTotal1]
 X = 237
-Y = 456
+Y = 454
 Color = White
 Font = 0
 Size = 30
 Text = SING_TOTAL
 Align = 0
 Reflection = 1
-ReflectionSpacing = 30
+ReflectionSpacing = 26
 
 [ScoreTextTotalSCore1]
 X = 487
-Y = 448
+Y = 444
 Color = White
 Font = 0
 Size = 42
 Align = 2
 Text = 0
 Reflection = 1
-ReflectionSpacing = 28
+ReflectionSpacing = 24
 
 #ScoreBar
 [ScoreStaticBackLevel1]
@@ -1659,24 +1664,24 @@ Text = 0000
 
 [ScoreTextTotal2]
 X = 82
-Y = 456
+Y = 454
 Color = White
 Font = 0
 Size = 30
 Text = SING_TOTAL
 Reflection = 1
-ReflectionSpacing = 30
+ReflectionSpacing = 24
 
 [ScoreTextTotalSCore2]
 X = 283
-Y = 448
+Y = 444
 Color = White
 Font = 0
 Size = 42
 Align = 2
 Text = 00000
 Reflection = 1
-ReflectionSpacing = 28
+ReflectionSpacing = 24
 
 # Lines
 [ScorePlayer2Static1]
@@ -1876,25 +1881,25 @@ Text = 0000
 
 [ScoreTextTotal3]
 X = 718
-Y = 456
+Y = 454
 Color = White
 Font = 0
 Size = 30
 Text = SING_TOTAL
 Align = 2
 Reflection = 1
-ReflectionSpacing = 30
+ReflectionSpacing = 24
 
 [ScoreTextTotalScore3]
 X = 517
-Y = 448
+Y = 444
 Color = White
 Font = 0
 Size = 42
 Align = 0
 Text = 00000
 Reflection = 1
-ReflectionSpacing = 28
+ReflectionSpacing = 24
 
 #Lines
 [ScorePlayer3Static1]
@@ -2061,21 +2066,25 @@ Color = White
 
 [ScoreTextTotal4]
 X = 47
-Y = 373
+Y = 371
 Font = 0
 Size = 30
 Align = 0
 Text = SING_TOTAL
 Color = White
+Reflection = 1
+ReflectionSpacing = -1
 
 [ScoreTextTotalScore4]
 X = 260
-Y = 364
+Y = 361
 Font = 0
 Size = 42
 Align = 2
 Text = 00000
 Color = White
+Reflection = 1
+ReflectionSpacing = -3
 
 [ScoreStaticBoxDark4]
 Tex = PlayerNumberBox
@@ -2222,21 +2231,25 @@ Color = White
 
 [ScoreTextTotal5]
 X = 307
-Y = 373
+Y = 371
 Font = 0
 Size = 30
 Align = 0
 Text = SING_TOTAL
 Color = White
+Reflection = 1
+ReflectionSpacing = -1
 
 [ScoreTextTotalScore5]
 X = 520
-Y = 364
+Y = 361
 Font = 0
 Size = 42
 Align = 2
 Text = 00000
 Color = White
+Reflection = 1
+ReflectionSpacing = -3
 
 [ScoreStaticBoxDark5]
 Tex = PlayerNumberBox
@@ -2382,21 +2395,25 @@ Color = White
 
 [ScoreTextTotal6]
 X = 567
-Y = 373
+Y = 371
 Font = 0
 Size = 30
 Align = 0
 Text = SING_TOTAL
 Color = White
+Reflection = 1
+ReflectionSpacing = -1
 
 [ScoreTextTotalScore6]
 X = 780
-Y = 364
+Y = 361
 Font = 0
 Size = 42
 Align = 2
 Text = 00000
 Color = White
+Reflection = 1
+ReflectionSpacing = -3
 
 [ScoreStaticBoxDark6]
 Tex = PlayerNumberBox
@@ -2553,7 +2570,7 @@ Size = 24
 Align = 0
 Text = SING_LEGEND_NAVIGATE
 Reflection=1
-ReflectionSpacing=20
+ReflectionSpacing=13
 
 [OptionsStatic5]
 X = 400
@@ -2575,7 +2592,7 @@ Size = 24
 Align = 0
 Text = SING_LEGEND_SELECT
 Reflection=1
-ReflectionSpacing=20
+ReflectionSpacing=13
 
 [OptionsStatic6]
 X = 550
@@ -2597,7 +2614,7 @@ Size = 24
 Align = 0
 Text = SING_LEGEND_ESC
 Reflection=1
-ReflectionSpacing=20
+ReflectionSpacing=13
 
 [OptionsButtonGame]
 X = 95
@@ -4424,6 +4441,24 @@ Size = 21
 Align = 0
 Text = SING_TOP_5_CHARTS_CONTINUE
 
+[Top5Static5]
+X = 530
+Y = 552
+W = 24
+H = 23
+Tex = ButtonNavi
+Color = White
+Type = Transparent
+
+[Top5Text5]
+X = 560
+Y = 552
+Color = Black
+Font = 0
+Size = 21
+Align = 0
+Text = SING_TOP_5_CHARTS_SWITCH_DIFFICULTY
+
 [Top5TextName1]
 X = 150
 Y = 190
@@ -4470,7 +4505,7 @@ Align = 0
 Text = 5. Player5
 
 [Top5TextScore1]
-X = 680
+X = 560
 Y = 190
 Color = White
 Font = 0
@@ -4479,7 +4514,7 @@ Align = 2
 Text = 00000
 
 [Top5TextScore2]
-X = 680
+X = 560
 Y = 240
 Color = White
 Font = 0
@@ -4488,7 +4523,7 @@ Align = 2
 Text = 00000
 
 [Top5TextScore3]
-X = 680
+X = 560
 Y = 290
 Color = White
 Font = 0
@@ -4497,7 +4532,7 @@ Align = 2
 Text = 00000
 
 [Top5TextScore4]
-X = 680
+X = 560
 Y = 340
 Color = White
 Font = 0
@@ -4506,7 +4541,53 @@ Align = 2
 Text = 00000
 
 [Top5TextScore5]
-X = 680
+X = 560
+Y = 390
+Color = White
+Font = 0
+Size = 42
+Align = 2
+Text = 00000
+
+
+[Top5TextDate1]
+X = 760
+Y = 190
+Color = White
+Font = 0
+Size = 42
+Align = 2
+Text = 00000
+
+[Top5TextDate2]
+X = 760
+Y = 240
+Color = White
+Font = 0
+Size = 42
+Align = 2
+Text = 00000
+
+[Top5TextDate3]
+X = 760
+Y = 290
+Color = White
+Font = 0
+Size = 42
+Align = 2
+Text = 00000
+
+[Top5TextDate4]
+X = 760
+Y = 340
+Color = White
+Font = 0
+Size = 42
+Align = 2
+Text = 00000
+
+[Top5TextDate5]
+X = 760
 Y = 390
 Color = White
 Font = 0
@@ -8150,7 +8231,6 @@ Text = OK
 Align = 1
 Z = 1
 
-
 [PausePopUpStatic]
 Tex = Pause
 X = 0
@@ -8159,4 +8239,18 @@ W = 800
 H = 600
 Z = 0.95
 Color = White
-Type = Colorized
\ No newline at end of file
+Type = Colorized
+
+[SingLyricsUpperBar]
+X = 80
+W = 640
+Y = 493
+H = 41
+;YOffSet (+/-) for the Sing-Indicator
+IndicatorYOffset = 3
+
+[SingLyricsLowerBar]
+X = 80
+W = 640
+Y = 535
+H = 41
\ No newline at end of file