Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #71 from flokuep/develop

Browse Source 
Develop
This commit is contained in:
Alexander Eckart committed 2013-05-25 00:50:00 -07:00
2 parents 339e0b41f7 4ba69da46e
commit a559a98640
16 files changed
+154 -153
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/PartyModes/Challenge/Screens/PartyScreenChallengeConfig.xml
+9 -9
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -65,7 +65,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -94,7 +94,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -123,7 +123,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -167,7 +167,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -224,7 +224,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -314,7 +314,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -379,7 +379,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -444,7 +444,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
Output/PartyModes/Challenge/Screens/PartyScreenChallengeMain.xml
+24 -24
View File
@@ -68,7 +68,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -97,7 +97,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -126,7 +126,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>50</H>
<H>44</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -155,7 +155,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>35</H>
<H>31</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>770</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -185,7 +185,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -214,7 +214,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>130</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -244,7 +244,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -273,7 +273,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -302,7 +302,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -331,7 +331,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -360,7 +360,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>100</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -390,7 +390,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -419,7 +419,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -448,7 +448,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -477,7 +477,7 @@
<!--<Z>: Text position-->
<Z>-1,01</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>380</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -522,7 +522,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -579,7 +579,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -636,7 +636,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -693,7 +693,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -750,7 +750,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -807,7 +807,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -856,7 +856,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -905,7 +905,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -954,7 +954,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
Output/PartyModes/Challenge/Screens/PartyScreenChallengeNames.xml
+3 -3
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -80,7 +80,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -137,7 +137,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyConfig.xml
+9 -9
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -65,7 +65,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -94,7 +94,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -123,7 +123,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -167,7 +167,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -224,7 +224,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -314,7 +314,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -379,7 +379,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -444,7 +444,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyMain.xml
+24 -24
View File
@@ -68,7 +68,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -97,7 +97,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -126,7 +126,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>50</H>
<H>44</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -155,7 +155,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>35</H>
<H>31</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>770</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -185,7 +185,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -214,7 +214,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>130</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -244,7 +244,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -273,7 +273,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -302,7 +302,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -331,7 +331,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -360,7 +360,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>100</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -390,7 +390,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -419,7 +419,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -448,7 +448,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -477,7 +477,7 @@
<!--<Z>: Text position-->
<Z>-1,01</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>380</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -522,7 +522,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -579,7 +579,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -636,7 +636,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -693,7 +693,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -750,7 +750,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -807,7 +807,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -856,7 +856,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -905,7 +905,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -954,7 +954,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyNames.xml
+3 -3
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -80,7 +80,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -137,7 +137,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeConfig.xml
+15 -15
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -65,7 +65,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -94,7 +94,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -123,7 +123,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -152,7 +152,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -181,7 +181,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -225,7 +225,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -282,7 +282,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -372,7 +372,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -437,7 +437,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -502,7 +502,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -567,7 +567,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -632,7 +632,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -697,7 +697,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
@@ -762,7 +762,7 @@
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<TextH>27,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeMain.xml
+13 -13
View File
@@ -84,7 +84,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -113,7 +113,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>40</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -142,7 +142,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>40</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -171,7 +171,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>40</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -229,7 +229,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>40</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -258,7 +258,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>40</H>
<H>35</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -287,7 +287,7 @@
<!--<Z>: Text position-->
<Z>-2,01</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>380</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -528,7 +528,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -585,7 +585,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -642,7 +642,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -699,7 +699,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -756,7 +756,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -813,7 +813,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
Output/PartyModes/TicTacToe/Screens/PartyScreenTicTacToeNames.xml
+7 -7
View File
@@ -36,7 +36,7 @@
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -65,7 +65,7 @@
<!--<Z>: Text position-->
<Z>-1,00</Z>
<!--<H>: Text height-->
<H>22</H>
<H>20</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -94,7 +94,7 @@
<!--<Z>: Text position-->
<Z>-1,00</Z>
<!--<H>: Text height-->
<H>22</H>
<H>20</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
@@ -138,7 +138,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -187,7 +187,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -236,7 +236,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
@@ -293,7 +293,7 @@
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<H>27</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
Output/Themes/Ambient/Screens/ScreenProfiles.xml
+2 -2
View File
@@ -120,7 +120,7 @@
<H>160</H>
<!--<Color>: Static color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<Color>Visible</Color>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
@@ -1124,4 +1124,4 @@
<NumVisible>2</NumVisible>
</SelectSlideActive>
</ScreenProfiles>
</root>
</root>
PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs
+6 -11
View File
@@ -543,8 +543,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
List<int> ids1 = new List<int>();
List<int> ids2 = new List<int>();
//Add IDs to team-list
while (_GameData.PlayerTeam1.Count < _GameData.NumFields + _GameData.NumJokerRetry[0] && ids1.Count == 0 &&
_GameData.PlayerTeam2.Count < _GameData.NumFields + _GameData.NumJokerRetry[1] && ids2.Count == 0)
while (_GameData.PlayerTeam1.Count < _GameData.NumFields + _GameData.NumJokerRetry[0] &&
_GameData.PlayerTeam2.Count < _GameData.NumFields + _GameData.NumJokerRetry[1] )
{
if (ids1.Count == 0)
{
@@ -557,11 +557,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe
ids2.Add(i);
}
int num;
int random;
if (_GameData.PlayerTeam1.Count < _GameData.NumFields + _GameData.NumJokerRetry[0])
{
random = CBase.Game.GetRandom((ids1.Count - 1) * 10);
num = (int)Math.Round((double)random / 10);
num = CBase.Game.GetRandom(ids1.Count);
if (num >= ids1.Count)
num = ids1.Count - 1;
_GameData.PlayerTeam1.Add(ids1[num]);
@@ -569,8 +567,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
if (_GameData.PlayerTeam2.Count < _GameData.NumFields + _GameData.NumJokerRetry[1])
{
random = CBase.Game.GetRandom((ids2.Count - 1) * 20);
num = (int)Math.Round((double)random / 20);
num = CBase.Game.GetRandom(ids2.Count);
if (num >= ids2.Count)
num = ids2.Count - 1;
_GameData.PlayerTeam2.Add(ids2[num]);
@@ -593,8 +590,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
if (_GameData.PlayerTeam1.Count < _GameData.NumFields + _GameData.NumJokerRetry[0])
{
int random = CBase.Game.GetRandom((ids.Count - 1) * 10);
int num = (int)Math.Round((double)random / 10);
int num = CBase.Game.GetRandom(ids.Count);
if (num >= ids.Count)
num = ids.Count - 1;
_GameData.PlayerTeam1.Add(ids[num]);
@@ -617,8 +613,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
if (_GameData.PlayerTeam2.Count < _GameData.NumFields + _GameData.NumJokerRetry[1])
{
int random = CBase.Game.GetRandom((ids.Count - 1) * 20);
int num = (int)Math.Round((double)random / 20);
int num = CBase.Game.GetRandom(ids.Count);
if (num >= ids.Count)
num = ids.Count - 1;
_GameData.PlayerTeam2.Add(ids[num]);
PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs
+35 -30
View File
@@ -473,27 +473,46 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
}
private void _FieldSelected()
private void _FieldSelected(bool jokerUsed = false)
{
if (!jokerUsed)
{
int singerTeam1 = 0;
int singerTeam2 = 0;
if (_GameData.PlayerTeam1.Count > 0)
{
singerTeam1 = _GameData.PlayerTeam1[0];
_GameData.PlayerTeam1.RemoveAt(0);
}
if (_GameData.PlayerTeam2.Count > 0)
{
singerTeam2 = _GameData.PlayerTeam2[0];
_GameData.PlayerTeam2.RemoveAt(0);
}
_GameData.Rounds[_SelectedField].SingerTeam1 = singerTeam1;
_GameData.Rounds[_SelectedField].SingerTeam2 = singerTeam2;
_Texts[_TextNextPlayerT1].Visible = true;
_Texts[_TextNextPlayerT2].Visible = true;
_Texts[_TextNextPlayerNameT1].Visible = true;
_Texts[_TextNextPlayerNameT2].Visible = true;
CProfile[] profiles = CBase.Profiles.GetProfiles();
_Texts[_TextNextPlayerNameT1].Text = profiles[_GameData.ProfileIDsTeam1[_GameData.Rounds[_SelectedField].SingerTeam1]].PlayerName;
_Texts[_TextNextPlayerNameT2].Text = profiles[_GameData.ProfileIDsTeam2[_GameData.Rounds[_SelectedField].SingerTeam2]].PlayerName;
_Statics[_StaticAvatarT1].Visible = true;
_Statics[_StaticAvatarT2].Visible = true;
_Statics[_StaticAvatarT1].Texture = profiles[_GameData.ProfileIDsTeam1[_GameData.Rounds[_SelectedField].SingerTeam1]].Avatar.Texture;
_Statics[_StaticAvatarT2].Texture = profiles[_GameData.ProfileIDsTeam2[_GameData.Rounds[_SelectedField].SingerTeam2]].Avatar.Texture;
}
int songID = 0;
int singerTeam1 = 0;
int singerTeam2 = 0;
if (_GameData.Songs.Count > 0)
{
songID = _GameData.Songs[0];
_GameData.Songs.RemoveAt(0);
}
if (_GameData.PlayerTeam1.Count > 0)
{
singerTeam1 = _GameData.PlayerTeam1[0];
_GameData.PlayerTeam1.RemoveAt(0);
}
if (_GameData.PlayerTeam2.Count > 0)
{
singerTeam2 = _GameData.PlayerTeam2[0];
_GameData.PlayerTeam2.RemoveAt(0);
}
CSong song = CBase.Songs.GetSongByID(songID);
CBase.BackgroundMusic.SetStatus(true);
@@ -506,22 +525,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_Status = EStatus.FieldSelected;
_Fields[_SelectedField].Content.SongID = songID;
_GameData.Rounds[_SelectedField].SongID = songID;
_GameData.Rounds[_SelectedField].SingerTeam1 = singerTeam1;
_GameData.Rounds[_SelectedField].SingerTeam2 = singerTeam2;
_UpdateFieldContents();
_Texts[_TextNextPlayerT1].Visible = true;
_Texts[_TextNextPlayerT2].Visible = true;
_Texts[_TextNextPlayerNameT1].Visible = true;
_Texts[_TextNextPlayerNameT2].Visible = true;
CProfile[] profiles = CBase.Profiles.GetProfiles();
_Texts[_TextNextPlayerNameT1].Text = profiles[_GameData.ProfileIDsTeam1[_GameData.Rounds[_SelectedField].SingerTeam1]].PlayerName;
_Texts[_TextNextPlayerNameT2].Text = profiles[_GameData.ProfileIDsTeam2[_GameData.Rounds[_SelectedField].SingerTeam2]].PlayerName;
_Statics[_StaticAvatarT1].Visible = true;
_Statics[_StaticAvatarT2].Visible = true;
_Statics[_StaticAvatarT1].Texture = profiles[_GameData.ProfileIDsTeam1[_GameData.Rounds[_SelectedField].SingerTeam1]].Avatar.Texture;
_Statics[_StaticAvatarT2].Texture = profiles[_GameData.ProfileIDsTeam2[_GameData.Rounds[_SelectedField].SingerTeam2]].Avatar.Texture;
_UpdateJokerButtons();
_Buttons[_ButtonNextRound].Visible = true;
@@ -581,7 +585,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_GameData.NumJokerRandom[teamNr]--;
if (!CBase.Sound.IsFinished(_PreviewStream))
CBase.Sound.FadeAndStop(_PreviewStream, 0, 1);
_FieldSelected();
_FieldSelected(true);
}
break;
@@ -597,6 +601,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_OldSelectedField = _SelectedField;
_SelectedField = -1;
_UpdateFieldContents();
_Buttons[_ButtonNextRound].Visible = false;
}
break;
}
Vocaluxe/Base/CConfig.cs
-3
View File
@@ -426,9 +426,6 @@ namespace Vocaluxe.Base
writer.WriteComment("Preview Volume from 0 to 100");
writer.WriteElementString("PreviewMusicVolume", PreviewMusicVolume.ToString());
writer.WriteComment("Preview Volume from 0 to 100");
writer.WriteElementString("PreviewMusicVolume", PreviewMusicVolume.ToString());
writer.WriteComment("Game Volume from 0 to 100");
writer.WriteElementString("GameMusicVolume", GameMusicVolume.ToString());
Vocaluxe/Screens/CScreenSing.cs
+1
View File
@@ -208,6 +208,7 @@ namespace Vocaluxe.Screens
if (mode > Enum.GetNames(typeof(ETimerMode)).Length - 1)
mode = 0;
CConfig.TimerMode = (ETimerMode)mode;
CConfig.SaveConfig();
break;
case Keys.I:
VocaluxeLib/Menu/CStatic.cs
+2
View File
@@ -206,6 +206,8 @@ namespace VocaluxeLib.Menu
public void Draw(float scale, float z, EAspect aspect, bool forceDraw = false)
{
CTexture texture = Texture;
if (texture == null)
texture = new CTexture((int)Rect.W, (int)Rect.H);
SRectF bounds = new SRectF(
Rect.X - Rect.W * (scale - 1f),
VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
+1
View File
@@ -468,6 +468,7 @@ namespace VocaluxeLib.Menu.SongMenu
{
_Actsongstream = -1;
_Vidtex = null;
ApplyVolume(CBase.Config.GetPreviewMusicVolume());
}
public virtual void OnHide()