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

Merge pull request #50 from flokuep/develop

Browse Source 
merge flokuep/Vocaluxe/develop into develop
This commit is contained in:
Alexander Eckart committed 2012-12-08 08:45:40 -08:00
2 parents 4918788e3b 9db2d63026
commit 3c03e1241b
11 files changed
+46 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Languages/Deutsch.xml
+1
View File
@@ -18,6 +18,7 @@
<TR_DEBUG_TEXTURES>Textures</TR_DEBUG_TEXTURES>
<TR_DEBUG_TONE_ABS>ToneAbs</TR_DEBUG_TONE_ABS>
<TR_DEBUG_MAX_VOLUME>Max. Volume</TR_DEBUG_MAX_VOLUME>
<TR_DEBUG_SONGS>Geladene Songs</TR_DEBUG_SONGS>
<TR_DEBUG_MOUSE>Maus</TR_DEBUG_MOUSE>
<!--General: Game-Modes-->
<TR_GAMEMODE_NORMAL>Normal</TR_GAMEMODE_NORMAL>
Output/Languages/English.xml
+1
View File
@@ -18,6 +18,7 @@
<TR_DEBUG_TEXTURES>Textures</TR_DEBUG_TEXTURES>
<TR_DEBUG_TONE_ABS>ToneAbs</TR_DEBUG_TONE_ABS>
<TR_DEBUG_MAX_VOLUME>Max Volume</TR_DEBUG_MAX_VOLUME>
<TR_DEBUG_SONGS>Loaded songs</TR_DEBUG_SONGS>
<TR_DEBUG_MOUSE>Mouse</TR_DEBUG_MOUSE>
<!--General: Game-Modes-->
<TR_GAMEMODE_NORMAL>Normal</TR_GAMEMODE_NORMAL>
Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
+8 -8
View File
@@ -215,7 +215,7 @@
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Normal</Font>
<Font>Outline</Font>
<!--<Text>: Nothing or translation tag-->
<Text>TR_SCREENO_VIDEO_VIDEOSTOBACKGROUND</Text>
<!--<Reflection> If exists:-->
@@ -244,7 +244,7 @@
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Normal</Font>
<Font>Outline</Font>
<!--<Text>: Text or translation tag-->
<Text>TR_SCREENO_VIDEO_WEBCAMDEVICES</Text>
<!--<Reflection> If exists:-->
@@ -273,7 +273,7 @@
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Normal</Font>
<Font>Outline</Font>
<!--<Text>: Text or translation tag-->
<Text>TR_SCREENO_VIDEO_WEBCAMCAPABILITIES</Text>
<!--<Reflection> If exists:-->
@@ -591,7 +591,7 @@
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
<TextFont>Normal</TextFont>
<TextFont>Outline</TextFont>
<!--<TextStyle>: Text style: Normal, Italic, Bold, BoldItalic-->
<TextStyle>Bold</TextStyle>
<!--<NumVisible>: Number of visible elements in the slide-->
@@ -656,7 +656,7 @@
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
<TextFont>Normal</TextFont>
<TextFont>Outline</TextFont>
<!--<TextStyle>: Text style: Normal, Italic, Bold, BoldItalic-->
<TextStyle>Bold</TextStyle>
<!--<NumVisible>: Number of visible elements in the slide-->
@@ -719,9 +719,9 @@
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<TextMaxW>150,00</TextMaxW>
<!--<TextFont>: Text font name-->
<TextFont>Normal</TextFont>
<TextFont>Outline</TextFont>
<!--<TextStyle>: Text style: Normal, Italic, Bold, BoldItalic-->
<TextStyle>Bold</TextStyle>
<!--<NumVisible>: Number of visible elements in the slide-->
@@ -744,4 +744,4 @@
<!-- <Height>: Reflection Height-->
</StaticWebcamOutput>
</ScreenOptionsVideo>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenProfiles.xml
+3 -19
View File
@@ -697,7 +697,7 @@
<SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>300</X>
<Y>210</Y>
<Y>205</Y>
<Z>0,00</Z>
<W>150</W>
<H>50</H>
@@ -735,17 +735,9 @@
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
<Reflection>
<Space>10</Space>
<Height>26</Height>
</Reflection>
<!--<SReflection> If exists:-->
<!-- <Space>: Reflection Space of selected button-->
<!-- <Height>: Reflection Height of selected button-->
<SReflection>
<Space>10</Space>
<Height>26</Height>
</SReflection>
</ButtonSaveSnapshot>
<ButtonDiscardSnapshot>
<!--<Skin>: Texture name-->
@@ -754,7 +746,7 @@
<SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>300</X>
<Y>110</Y>
<Y>125</Y>
<Z>0,00</Z>
<W>150</W>
<H>50</H>
@@ -792,17 +784,9 @@
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
<Reflection>
<Space>10</Space>
<Height>26</Height>
</Reflection>
<!--<SReflection> If exists:-->
<!-- <Space>: Reflection Space of selected button-->
<!-- <Height>: Reflection Height of selected button-->
<SReflection>
<Space>10</Space>
<Height>26</Height>
</SReflection>
</ButtonDiscardSnapshot>
<SelectSlideProfiles>
<!--<Skin>: Texture name-->
@@ -1130,4 +1114,4 @@
<NumVisible>2</NumVisible>
</SelectSlideActive>
</ScreenProfiles>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenSing.xml
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<ScreenSing>
<ScreenVersion>5</ScreenVersion>
<ScreenVersion>6</ScreenVersion>
<Background1>
<!--<Type>: Background type: None, Color, Texture, Video-->
<Type>None</Type>
@@ -2771,4 +2771,4 @@
</BarPositions>
</SingBars>
</ScreenSing>
</root>
</root>
Output/Themes/Changelog/Changelog_ScreenOptionsVideo.txt
+9
View File
@@ -1,5 +1,14 @@
ScreenOptionsTheme
++++++++++
Version 3:
Add:
<SelectSlideWebcamDevices>, <SelectSlideWebcamCapabilities>, <StaticWebcamOutput>
and some texts and static for description (Text6, Text7)
"TR_SCREENO_VIDEO_WEBCAMDEVICES", "TR_SCREENO_VIDEO_WEBCAMCAPABILITIES"
++++++++++
Version 2:
Output/Themes/Changelog/Changelog_ScreenSing.txt
+1 -1
View File
@@ -1,7 +1,7 @@
ScreenSing
+++++++++
Version 5
Version 6
Add:
<TextDuetName1> and <TextDuetName2> (only showed when sining duet)
Vocaluxe/Menu/CGraphics.cs
+2 -2
View File
@@ -732,7 +732,7 @@ namespace Vocaluxe.Menu
dy += rect.Height;
}
if (CConfig.DebugLevel >= EDebugLevel.TR_CONFIG_LEVEL2)
if (CConfig.DebugLevel >= EDebugLevel.TR_CONFIG_LEVEL3)
{
txt = CSongs.NumSongsWithCoverLoaded.ToString(CLanguage.Translate("TR_DEBUG_SONGS") + ": 00000");
@@ -743,7 +743,7 @@ namespace Vocaluxe.Menu
dy += rect.Height;
}
if (CConfig.DebugLevel >= EDebugLevel.TR_CONFIG_LEVEL2)
if (CConfig.DebugLevel >= EDebugLevel.TR_CONFIG_LEVEL_MAX)
{
txt = _Cursor.X.ToString(CLanguage.Translate("TR_DEBUG_MOUSE") + " : (0000/") + _Cursor.Y.ToString("0000)");
Vocaluxe/Screens/CScreenProfiles.cs
+11
View File
@@ -71,6 +71,8 @@ namespace Vocaluxe.Screens
Buttons[htButtons(ButtonTakeSnapshot)].Visible = false;
if (CWebcam.GetDevices().Length > 0)
Buttons[htButtons(ButtonWebcam)].Visible = true;
else
Buttons[htButtons(ButtonWebcam)].Visible = false;
SelectSlides[htSelectSlides(SelectSlideDifficulty)].SetValues<EGameDifficulty>(0);
SelectSlides[htSelectSlides(SelectSlideGuestProfile)].SetValues<EOffOn>(0);
SelectSlides[htSelectSlides(SelectSlideActive)].SetValues<EOffOn>(0);
@@ -206,6 +208,8 @@ namespace Vocaluxe.Screens
{
CProfiles.SetAvatar(SelectSlides[htSelectSlides(SelectSlideProfiles)].Selection,
SelectSlides[htSelectSlides(SelectSlideAvatars)].Selection);
if (CWebcam.GetDevices().Length > 0 && _WebcamTexture.index > 0)
OnDiscardSnapshot();
} else if (SelectSlides[htSelectSlides(SelectSlideGuestProfile)].Selected)
{
CProfiles.SetGuestProfile(SelectSlides[htSelectSlides(SelectSlideProfiles)].Selection,
@@ -339,6 +343,13 @@ namespace Vocaluxe.Screens
UpdateGame();
}
public override void OnClose()
{
base.OnClose();
OnDiscardSnapshot();
}
public override bool Draw()
{
return base.Draw();
Vocaluxe/Screens/CScreenSing.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace Vocaluxe.Screens
class CScreenSing : CMenu
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
const int ScreenVersion = 5;
const int ScreenVersion = 6;
struct TimeRect
{
output/Themes/Changelog/Changelog_ScreenProfiles.txt
+7
View File
@@ -0,0 +1,7 @@
ScreenProfiles
++++++++++
Version 2:
Add: <ButtonDiscardSnapshot>, <ButtonSaveSnapshot>, <ButtonWebcam>, <ButtonTakeSnapshot>
++++++++++