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

Merge pull request #57 from flokuep/challenge

Browse Source 
merge flokuep/Vocaluxe/challenge into challenge
This commit is contained in:
Alexander Eckart committed 2012-12-15 10:30:19 -08:00
2 parents a78be79582 ee5cf21da6
commit fc2600ba89
6 files changed
+184 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Languages/Deutsch.xml
+3
View File
@@ -110,6 +110,9 @@
<TR_SCREENPARTY_TITLE>Party-Modus Auswahl</TR_SCREENPARTY_TITLE> <TR_SCREENPARTY_TITLE>Party-Modus Auswahl</TR_SCREENPARTY_TITLE>
<TR_SCREENPARTY_MODES>Party-Modus</TR_SCREENPARTY_MODES> <TR_SCREENPARTY_MODES>Party-Modus</TR_SCREENPARTY_MODES>
<TR_SCREENPARTY_DESCRIPTION>Beschreibung</TR_SCREENPARTY_DESCRIPTION> <TR_SCREENPARTY_DESCRIPTION>Beschreibung</TR_SCREENPARTY_DESCRIPTION>
<TR_SCREENPARTY_AUTHOR>Autor</TR_SCREENPARTY_AUTHOR>
<TR_SCREENPARTY_VERSION>Version</TR_SCREENPARTY_VERSION>
<TR_SCREENPARTY_ERROR>Dieser Party-Modus konnte nicht geladen werden.</TR_SCREENPARTY_ERROR>
<!--ScreenNames--> <!--ScreenNames-->
<TR_SCREENNAMES_MENU>Spielerauswahl</TR_SCREENNAMES_MENU> <TR_SCREENNAMES_MENU>Spielerauswahl</TR_SCREENNAMES_MENU>
<TR_SCREENNAMES_PLAYER>Spieler</TR_SCREENNAMES_PLAYER> <TR_SCREENNAMES_PLAYER>Spieler</TR_SCREENNAMES_PLAYER>
Output/Languages/English.xml
+3
View File
@@ -110,6 +110,9 @@
<TR_SCREENPARTY_TITLE>Party Mode Selection</TR_SCREENPARTY_TITLE> <TR_SCREENPARTY_TITLE>Party Mode Selection</TR_SCREENPARTY_TITLE>
<TR_SCREENPARTY_MODES>Party Mode</TR_SCREENPARTY_MODES> <TR_SCREENPARTY_MODES>Party Mode</TR_SCREENPARTY_MODES>
<TR_SCREENPARTY_DESCRIPTION>Description</TR_SCREENPARTY_DESCRIPTION> <TR_SCREENPARTY_DESCRIPTION>Description</TR_SCREENPARTY_DESCRIPTION>
<TR_SCREENPARTY_AUTHOR>Author</TR_SCREENPARTY_AUTHOR>
<TR_SCREENPARTY_VERSION>Version</TR_SCREENPARTY_VERSION>
<TR_SCREENPARTY_ERROR>Can't load this party-mode.</TR_SCREENPARTY_ERROR>
<!--ScreenNames--> <!--ScreenNames-->
<TR_SCREENNAMES_MENU>Player Selection</TR_SCREENNAMES_MENU> <TR_SCREENNAMES_MENU>Player Selection</TR_SCREENNAMES_MENU>
<TR_SCREENNAMES_PLAYER>Player</TR_SCREENNAMES_PLAYER> <TR_SCREENNAMES_PLAYER>Player</TR_SCREENNAMES_PLAYER>
Output/Languages/French.xml
+3
View File
@@ -110,6 +110,9 @@
<TR_SCREENPARTY_TITLE>TODO: Party Mode Selection</TR_SCREENPARTY_TITLE> <TR_SCREENPARTY_TITLE>TODO: Party Mode Selection</TR_SCREENPARTY_TITLE>
<TR_SCREENPARTY_MODES>TODO: Party Mode</TR_SCREENPARTY_MODES> <TR_SCREENPARTY_MODES>TODO: Party Mode</TR_SCREENPARTY_MODES>
<TR_SCREENPARTY_DESCRIPTION>TODO: Description</TR_SCREENPARTY_DESCRIPTION> <TR_SCREENPARTY_DESCRIPTION>TODO: Description</TR_SCREENPARTY_DESCRIPTION>
<TR_SCREENPARTY_AUTHOR>TODO: Author</TR_SCREENPARTY_AUTHOR>
<TR_SCREENPARTY_VERSION>TODO: Version</TR_SCREENPARTY_VERSION>
<TR_SCREENPARTY_ERROR>TODO: Can't load this party-mode.</TR_SCREENPARTY_ERROR>
<!--ScreenNames--> <!--ScreenNames-->
<TR_SCREENNAMES_MENU>Sélection des joueurs</TR_SCREENNAMES_MENU> <TR_SCREENNAMES_MENU>Sélection des joueurs</TR_SCREENNAMES_MENU>
<TR_SCREENNAMES_PLAYER>Joueur</TR_SCREENNAMES_PLAYER> <TR_SCREENNAMES_PLAYER>Joueur</TR_SCREENNAMES_PLAYER>
Output/Languages/Spanish.xml
+3
View File
@@ -104,6 +104,9 @@
<TR_SCREENPARTY_TITLE>TODO: Party Mode Selection</TR_SCREENPARTY_TITLE> <TR_SCREENPARTY_TITLE>TODO: Party Mode Selection</TR_SCREENPARTY_TITLE>
<TR_SCREENPARTY_MODES>TODO: Party Mode</TR_SCREENPARTY_MODES> <TR_SCREENPARTY_MODES>TODO: Party Mode</TR_SCREENPARTY_MODES>
<TR_SCREENPARTY_DESCRIPTION>TODO: Description</TR_SCREENPARTY_DESCRIPTION> <TR_SCREENPARTY_DESCRIPTION>TODO: Description</TR_SCREENPARTY_DESCRIPTION>
<TR_SCREENPARTY_AUTHOR>TODO: Author</TR_SCREENPARTY_AUTHOR>
<TR_SCREENPARTY_VERSION>TODO: Version</TR_SCREENPARTY_VERSION>
<TR_SCREENPARTY_ERROR>TODO: Can't load this party-mode.</TR_SCREENPARTY_ERROR>
<!--ScreenNames--> <!--ScreenNames-->
<TR_SCREENNAMES_MENU>Selección de Jugadores</TR_SCREENNAMES_MENU> <TR_SCREENNAMES_MENU>Selección de Jugadores</TR_SCREENNAMES_MENU>
<TR_SCREENNAMES_PLAYER>Jugador</TR_SCREENNAMES_PLAYER> <TR_SCREENNAMES_PLAYER>Jugador</TR_SCREENNAMES_PLAYER>
Output/Themes/Ambient/Screens/ScreenParty.xml
+148
View File
@@ -116,6 +116,64 @@
<!-- <Space>: Reflection Space--> <!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height--> <!-- <Height>: Reflection Height-->
</Text3> </Text3>
<Text4>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>225</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text>TR_SCREENPARTY_AUTHOR</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text4>
<Text5>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>285</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Left</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text>TR_SCREENPARTY_VERSION</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text5>
<TextDescription> <TextDescription>
<!--<X>, <Y>: Text position--> <!--<X>, <Y>: Text position-->
<X>850</X> <X>850</X>
@@ -146,6 +204,96 @@
<!-- <Space>: Reflection Space--> <!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height--> <!-- <Height>: Reflection Height-->
</TextDescription> </TextDescription>
<TextAuthor>
<!--<X>, <Y>: Text position-->
<X>850</X>
<Y>225</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text></Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextAuthor>
<TextVersion>
<!--<X>, <Y>: Text position-->
<X>850</X>
<Y>285</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text></Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextVersion>
<TextError>
<!--<X>, <Y>: Text position-->
<X>850</X>
<Y>345</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>TextWarningColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align horizontal: Left, Center, Right-->
<Align>Center</Align>
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
<HAlign>Center</HAlign>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text>TR_SCREENPARTY_ERROR</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextError>
<SelectSlideModes> <SelectSlideModes>
<!--<Skin>: Texture name--> <!--<Skin>: Texture name-->
<Skin>Invisible</Skin> <Skin>Invisible</Skin>
Vocaluxe/Screens/CScreenParty.cs
+24 -3
View File
@@ -14,6 +14,9 @@ namespace Vocaluxe.Screens
const int ScreenVersion = 1; const int ScreenVersion = 1;
const string TextDescription = "TextDescription"; const string TextDescription = "TextDescription";
const string TextAuthor = "TextAuthor";
const string TextVersion = "TextVersion";
const string TextError = "TextError";
const string ButtonStart = "ButtonStart"; const string ButtonStart = "ButtonStart";
const string ButtonExit = "ButtonExit"; const string ButtonExit = "ButtonExit";
const string SelectSlideModes = "SelectSlideModes"; const string SelectSlideModes = "SelectSlideModes";
@@ -30,7 +33,7 @@ namespace Vocaluxe.Screens
_ThemeName = "ScreenParty"; _ThemeName = "ScreenParty";
_ScreenVersion = ScreenVersion; _ScreenVersion = ScreenVersion;
_ThemeTexts = new string[] { TextDescription }; _ThemeTexts = new string[] { TextDescription, TextAuthor, TextVersion, TextError };
_ThemeButtons = new string[] { ButtonStart, ButtonExit }; _ThemeButtons = new string[] { ButtonStart, ButtonExit };
_ThemeSelectSlides = new string[] { SelectSlideModes }; _ThemeSelectSlides = new string[] { SelectSlideModes };
} }
@@ -142,6 +145,21 @@ namespace Vocaluxe.Screens
Texts[htTexts(TextDescription)].PartyModeID = _PartyModeInfos[index].PartyModeID; Texts[htTexts(TextDescription)].PartyModeID = _PartyModeInfos[index].PartyModeID;
Texts[htTexts(TextDescription)].Text = _PartyModeInfos[index].Description; Texts[htTexts(TextDescription)].Text = _PartyModeInfos[index].Description;
Texts[htTexts(TextAuthor)].Text = _PartyModeInfos[index].Author;
Texts[htTexts(TextAuthor)].PartyModeID = _PartyModeInfos[index].PartyModeID;
//Texts[htTexts(TextVersion)].Text = _PartyModeInfos[index].
Texts[htTexts(TextVersion)].PartyModeID = _PartyModeInfos[index].PartyModeID;
if (!_PartyModeInfos[index].Playable)
{
Buttons[htButtons(ButtonStart)].Visible = false;
Texts[htTexts(TextError)].Visible = true;
}
else
{
Buttons[htButtons(ButtonStart)].Visible = true;
Texts[htTexts(TextError)].Visible = false;
}
} }
private void StartPartyMode() private void StartPartyMode()
@@ -153,8 +171,11 @@ namespace Vocaluxe.Screens
if (index >= _PartyModeInfos.Count) if (index >= _PartyModeInfos.Count)
return; return;
CParty.SetPartyMode(_PartyModeInfos[index].PartyModeID); if (_PartyModeInfos[index].Playable)
CGraphics.FadeTo(EScreens.ScreenPartyDummy); {
CParty.SetPartyMode(_PartyModeInfos[index].PartyModeID);
CGraphics.FadeTo(EScreens.ScreenPartyDummy);
}
} }
} }
} }