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

Merge pull request #122 from flokuep/develop

Browse Source 
Some fixes
This commit is contained in:
Stephan Sundermann committed 2014-12-05 19:13:41 +01:00
2 parents 5580210632 fdfbed9981
commit b33cf54f1e
11 files changed
+51 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Installer/setup.aip
+8 -8
View File
@@ -19,7 +19,7 @@
<ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
<ROW Property="ARPURLINFOABOUT" Value="www.vocaluxe.org"/>
<ROW Property="BannerBitmap" Value="banner" MultiBuildValue="DefaultBuild:banner.jpg" Type="1" MsiKey="BannerBitmap"/>
<ROW Property="CTRLS" Value="2"/>
<ROW Property="CTRLS" Value="3"/>
<ROW Property="DialogBitmap" Value="dialog" MultiBuildValue="DefaultBuild:dialog.jpg" Type="1" MsiKey="DialogBitmap"/>
<ROW Property="Manufacturer" Value="Vocaluxe Team"/>
<ROW Property="ProductCode" Value="1031:{6F739A39-4176-4B04-963E-EB795C92500C} 1055:{435EE1A8-3B5C-491E-902D-C832B8A35EAF} 1033:{0E70A564-F59D-4416-9204-8251148FC233} 1043:{E3F45D8B-BCA9-4E3E-AB81-1C434123EA1A} 1036:{43220506-39C8-4036-9A80-19C0A31C602D} 1038:{BBC1C7B6-8D91-45E7-89A4-2AFAECCBDF83} 1029:{56D06188-C172-4BBA-B9B2-275F7F969DEB} 1053:{207C81B6-7382-48DB-BA8B-BD65A60163BC} 3082:{2F040ED1-129B-41C4-A69A-A83455899E5A} 1040:{724EC6B8-3F68-45D9-A93D-11731BE438A5} " Type="16"/>
@@ -265,11 +265,11 @@
<ROW Component="x86" ComponentId="{F2634242-1280-4509-B10E-234D7BF81FA4}" Directory_="AI_Bin32_Dir" Attributes="0"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
<ROW Feature="AI32BitFiles" Title="32-bit" Description="32-bit Executables and Libraries" Display="7" Level="1" Directory_="APPDIR" Attributes="0" Components="SQLite.Interop.dll_5 SlimDX.dll_5 System.Data.SQLite.dll Vocaluxe.exe.config Vocaluxe.exe_2 acinerella.dll_5 avcodec54.dll_5 avformat54.dll_5 avutil52.dll_5 hidapi.dll_5 swresample0.dll_5 swscale2.dll_5"/>
<ROW Feature="AI64BitFiles" Title="64-bit" Description="64-bit Executables and Libraries" Display="9" Level="1" Directory_="APPDIR" Attributes="0" Components="SQLite.Interop.dll_6 SlimDX.dll_6 System.Data.SQLite.dll_3 Vocaluxe_x64.exe Vocaluxe_x64.exe.config acinerella.dll_6 avcodec54.dll_6 avformat54.dll_6 avutil52.dll_6 hidapi.dll_6 swresample0.dll_6 swscale2.dll_6"/>
<ROW Feature="AIOtherFiles" Title="Common" Description="Shared Resource and Regular Files" Display="5" Level="1" Directory_="APPDIR" Attributes="16" Components="AForge AForge.Video.DirectShow.dll AForge.Video.dll AIShRegAnswer Ambient Ambient.xml AmbientBlue AmbientBlue.xml AmbientGreen AmbientRed AmbientYellow Asturian.xml Asturian.xml_1 Asturian.xml_2 Avatar_f.png BackgroundMusic Button.png_3 CChallengeRounds.cs CChallengeRounds.cs_1 CPartyModeTicTacToe.cs Challenge Challenge.xml ChallengeMedley Changelog Changelog_ScreenHighscore.txt ClientServerLib.dll Code Code_1 Code_4 Community.CsharpSqlite.dll Cover DJadWalkingAloneLicense.txt Default Default.xml Default.xml_1 Default.xml_2 Default.xml_3 Default.xml_4 Default.xml_5 Default_1 Default_2 Dutch.xml Fonts Fonts.xml FreeSans FreeSans.ttf Graphics Hz.mp3 InstallLanguage Interop.NetFwTypeLib.dll LICENSE.txt LICENSE.txt_1 LICENSENewtonsoft.Json.txt Languages Languages_1 Languages_2 Languages_4 License.txt Licenses Logo.png Newtonsoft.Json Newtonsoft.Json.dll NoCover.png NoCover.png_1 NoCover.png_2 NoCover.png_3 Normal.psd Normal.psd_1 Normal.psd_2 Normal.psd_3 OpenTK.Compatibility.dll OpenTK.GLControl.dll OpenTK.dll PartyModes PartyScreenChallengeConfig.xml PartyScreenChallengeMedleyConfig.xml PartyScreenTicTacToeConfig.xml PopupScreenPlayerControl.xml PortAudio PortAudio.dll PortAudio.dll_1 PortAudioSharp PortAudioSharp.dll Profiles QRCoder QRCoder.dll QRCoder.txt Resources Resources_1 Resources_2 Resources_3 SHORTCUTDIR Screens Screens_1 Screens_3 Screens_4 Security.Cryptography.dll SlimDx Sounds Themes Themes_1 Themes_2 Themes_3 TicTacToe VocaluxeLib.dll Website addPlaylist.png ajaxloader.gif copyright.txt cs.json css glibsharp.dll gpl3.0.txt gstreamersharp.dll i18next1.7.1.min.js images img index.html jquery.mobile1.3.2.min.css js libgstreamersharpglue1.0.0.dll libgstreamersharpglue1.0.0.dll_1 locales x64 x86"/>
<ROW Feature="Funktion" Feature_Parent="AIOtherFiles" Title="Videos" Description="Beschreibung" Display="3" Level="1" Directory_="APPDIR" Attributes="0" Components="BlueBG_Video.mp4 BlueIntroIn.mp4 BlueIntroMid.mp4 BlueIntroOut.mp4 GreenBG_Video.mp4 GreenIntroIn.mp4 GreenIntroMid.mp4 GreenIntroOut.mp4 RedBG_Video.mp4 RedIntroIn.mp4 RedIntroMid.mp4 RedIntroOut.mp4 YellowBG_Video.mp4 YellowIntroIn.mp4 YellowIntroMid.mp4 YellowIntroOut.mp4"/>
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="3" Level="0" Directory_="APPDIR" Attributes="0" Components="APPDIR ProductInformation"/>
<ROW Feature="AI32BitFiles" Title="32-bit" Description="32-bit Executables and Libraries" Display="7" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify AI_ExePath SQLite.Interop.dll_5 SlimDX.dll_5 System.Data.SQLite.dll Vocaluxe.exe.config Vocaluxe.exe_2 acinerella.dll_5 avcodec54.dll_5 avformat54.dll_5 avutil52.dll_5 hidapi.dll_5 swresample0.dll_5 swscale2.dll_5"/>
<ROW Feature="AI64BitFiles" Title="64-bit" Description="64-bit Executables and Libraries" Display="9" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify AI_ExePath SQLite.Interop.dll_6 SlimDX.dll_6 System.Data.SQLite.dll_3 Vocaluxe_x64.exe Vocaluxe_x64.exe.config acinerella.dll_6 avcodec54.dll_6 avformat54.dll_6 avutil52.dll_6 hidapi.dll_6 swresample0.dll_6 swscale2.dll_6"/>
<ROW Feature="AIOtherFiles" Title="Common" Description="Shared Resource and Regular Files" Display="5" Level="1" Directory_="APPDIR" Attributes="16" Components="AForge AForge.Video.DirectShow.dll AForge.Video.dll AIShRegAnswer AI_CustomARPName AI_DisableModify AI_ExePath Ambient Ambient.xml AmbientBlue AmbientBlue.xml AmbientGreen AmbientRed AmbientYellow Asturian.xml Asturian.xml_1 Asturian.xml_2 Avatar_f.png BackgroundMusic Button.png_3 CChallengeRounds.cs CChallengeRounds.cs_1 CPartyModeTicTacToe.cs Challenge Challenge.xml ChallengeMedley Changelog Changelog_ScreenHighscore.txt ClientServerLib.dll Code Code_1 Code_4 Community.CsharpSqlite.dll Cover DJadWalkingAloneLicense.txt Default Default.xml Default.xml_1 Default.xml_2 Default.xml_3 Default.xml_4 Default.xml_5 Default_1 Default_2 Dutch.xml Fonts Fonts.xml FreeSans FreeSans.ttf Graphics Hz.mp3 InstallLanguage Interop.NetFwTypeLib.dll LICENSE.txt LICENSE.txt_1 LICENSENewtonsoft.Json.txt Languages Languages_1 Languages_2 Languages_4 License.txt Licenses Logo.png Newtonsoft.Json Newtonsoft.Json.dll NoCover.png NoCover.png_1 NoCover.png_2 NoCover.png_3 Normal.psd Normal.psd_1 Normal.psd_2 Normal.psd_3 OpenTK.Compatibility.dll OpenTK.GLControl.dll OpenTK.dll PartyModes PartyScreenChallengeConfig.xml PartyScreenChallengeMedleyConfig.xml PartyScreenTicTacToeConfig.xml PopupScreenPlayerControl.xml PortAudio PortAudio.dll PortAudio.dll_1 PortAudioSharp PortAudioSharp.dll Profiles QRCoder QRCoder.dll QRCoder.txt Resources Resources_1 Resources_2 Resources_3 SHORTCUTDIR Screens Screens_1 Screens_3 Screens_4 Security.Cryptography.dll SlimDx Sounds Themes Themes_1 Themes_2 Themes_3 TicTacToe VocaluxeLib.dll Website addPlaylist.png ajaxloader.gif copyright.txt cs.json css glibsharp.dll gpl3.0.txt gstreamersharp.dll i18next1.7.1.min.js images img index.html jquery.mobile1.3.2.min.css js libgstreamersharpglue1.0.0.dll libgstreamersharpglue1.0.0.dll_1 locales x64 x86"/>
<ROW Feature="Funktion" Feature_Parent="AIOtherFiles" Title="Videos" Description="Beschreibung" Display="3" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify AI_ExePath BlueBG_Video.mp4 BlueIntroIn.mp4 BlueIntroMid.mp4 BlueIntroOut.mp4 GreenBG_Video.mp4 GreenIntroIn.mp4 GreenIntroMid.mp4 GreenIntroOut.mp4 RedBG_Video.mp4 RedIntroIn.mp4 RedIntroMid.mp4 RedIntroOut.mp4 YellowBG_Video.mp4 YellowIntroIn.mp4 YellowIntroMid.mp4 YellowIntroOut.mp4"/>
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="3" Level="0" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_DisableModify AI_ExePath APPDIR ProductInformation"/>
<ATTRIBUTE name="CurrentFeature" value="AIOtherFiles"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
@@ -348,7 +348,7 @@
<ROW File="Dutch.xml_1" Component_="Asturian.xml" FileName="Dutch.xml" Attributes="0" SourcePath="..\Output\PartyModes\Challenge\Languages\Dutch.xml" SelfReg="false" NextFile="English.xml_1"/>
<ROW File="Dutch.xml_2" Component_="Asturian.xml_1" FileName="Dutch.xml" Attributes="0" SourcePath="..\Output\PartyModes\ChallengeMedley\Languages\Dutch.xml" SelfReg="false" NextFile="English.xml_2"/>
<ROW File="Dutch.xml_3" Component_="Asturian.xml_2" FileName="Dutch.xml" Attributes="0" SourcePath="..\Output\PartyModes\TicTacToe\Languages\Dutch.xml" SelfReg="false" NextFile="English.xml_3"/>
<ROW File="EnergyBeam.png" Component_="Button.png_3" FileName="Energy~1.png|EnergyBeam.png" Attributes="0" SourcePath="..\Output\Themes\Ambient\EnergyBeam.png" SelfReg="false" NextFile="Invisible.png_3"/>
<ROW File="EnergyBeam.png" Component_="Button.png_3" FileName="Energy~1.png|EnergyBeam.png" Attributes="0" SourcePath="..\Output\Themes\Ambient\EnergyBeam.png" SelfReg="false" NextFile="LyricHelper.png"/>
<ROW File="English.xml" Component_="Dutch.xml" FileName="English.xml" Attributes="0" SourcePath="..\Output\Languages\English.xml" SelfReg="false" NextFile="French.xml"/>
<ROW File="English.xml_1" Component_="Asturian.xml" FileName="English.xml" Attributes="0" SourcePath="..\Output\PartyModes\Challenge\Languages\English.xml" SelfReg="false" NextFile="French.xml_1"/>
<ROW File="English.xml_2" Component_="Asturian.xml_1" FileName="English.xml" Attributes="0" SourcePath="..\Output\PartyModes\ChallengeMedley\Languages\English.xml" SelfReg="false" NextFile="French.xml_2"/>
@@ -378,7 +378,6 @@
<ROW File="Hungarian.xml_3" Component_="Asturian.xml_2" FileName="Hungar~1.xml|Hungarian.xml" Attributes="0" SourcePath="..\Output\PartyModes\TicTacToe\Languages\Hungarian.xml" SelfReg="false" NextFile="Italian.xml_3"/>
<ROW File="Hz.mp3" Component_="Hz.mp3" FileName="440Hz.mp3" Attributes="0" SourcePath="..\Output\Sounds\440Hz.mp3" SelfReg="false" NextFile="Button.png_3"/>
<ROW File="Interop.NetFwTypeLib.dll" Component_="Interop.NetFwTypeLib.dll" FileName="Intero~1.dll|Interop.NetFwTypeLib.dll" Attributes="0" SourcePath="..\Output\Interop.NetFwTypeLib.dll" SelfReg="false" NextFile="PortAudioSharp.dll"/>
<ROW File="Invisible.png_3" Component_="Button.png_3" FileName="Invisi~1.png|Invisible.png" Attributes="0" SourcePath="..\Output\Themes\Ambient\Invisible.png" SelfReg="false" NextFile="LyricHelper.png"/>
<ROW File="Italian.xml" Component_="Dutch.xml" FileName="Italian.xml" Attributes="0" SourcePath="..\Output\Languages\Italian.xml" SelfReg="false" NextFile="Swedish.xml"/>
<ROW File="Italian.xml_1" Component_="Asturian.xml" FileName="Italian.xml" Attributes="0" SourcePath="..\Output\PartyModes\Challenge\Languages\Italian.xml" SelfReg="false" NextFile="Spanish.xml_1"/>
<ROW File="Italian.xml_2" Component_="Asturian.xml_1" FileName="Italian.xml" Attributes="0" SourcePath="..\Output\PartyModes\ChallengeMedley\Languages\Italian.xml" SelfReg="false" NextFile="Spanish.xml_2"/>
@@ -826,6 +825,7 @@
<ROW Action="AI_SETPROGRAMFILES64" Type="51" Source="AI_ProgramFiles" Target="[ProgramFiles64Folder]"/>
<ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/>
<ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
<ROW Action="AI_ViewReadme" Type="1" Source="aicustact.dll" Target="[#Readme.txt_1]"/>
<ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[AI_ProgramFiles]\[ProductName]"/>
<ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
<ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
Output/CreditsRessourcesDB.sqlite
BIN
View File
Binary file not shown.
PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
+1 -1
View File
@@ -210,7 +210,7 @@ namespace VocaluxeLib.PartyModes.Challenge
_Stage = EStage.Config;
break;
case EStage.Main:
_Stage = EStage.Config;
_Stage = EStage.Names;
break;
default: // Rest is not allowed
throw new ArgumentException("Invalid stage: " + _Stage);
PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs
+1 -1
View File
@@ -217,7 +217,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
_Stage = EStage.Config;
break;
case EStage.Main:
_Stage = EStage.Config;
_Stage = EStage.Names;
break;
default: // Rest is not allowed
throw new ArgumentException("Invalid stage: " + _Stage);
PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs
+4 -3
View File
@@ -187,7 +187,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
case EStage.Main:
return _Screens["CPartyScreenTicTacToeMain"];
case EStage.Singing:
return CBase.Graphics.GetScreen(EScreen.Song);
return CBase.Graphics.GetScreen(EScreen.Sing);
default:
throw new ArgumentException("Invalid stage: " + _Stage);
}
@@ -195,7 +195,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
private void _FadeToScreen()
{
CBase.Graphics.FadeTo(_GetNextScreen());
if(CBase.Graphics.GetNextScreen() != _GetNextScreen())
CBase.Graphics.FadeTo(_GetNextScreen());
}
public void Next()
@@ -242,7 +243,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_Stage = EStage.Config;
break;
case EStage.Main:
_Stage = EStage.Config;
_Stage = EStage.Names;
break;
default: // Rest is not allowed
throw new ArgumentException("Invalid stage: " + _Stage);
Vocaluxe/Lib/Database/CResourceDB.cs
+1 -1
View File
@@ -38,7 +38,7 @@ namespace Vocaluxe.Lib.Database
private readonly string[] _FilesV1 = new string[]
{
"Logo_voc.png", "PerfectNoteStar.png", "redDot.png", "blueDot.png", "brunzel.png", "Darkice.png", "flokuep.png", "flamefire.png", "bohning.png", "mesand.png",
"babene03.png", "pantero.png", "Pinky007.png"
"babene03.png", "lukeIam.png"
};
#endif
public CResourceDB(string filePath) : base(filePath) {}
Vocaluxe/Screens/CScreenCredits.cs
+7 -8
View File
@@ -137,11 +137,10 @@ namespace Vocaluxe.Screens
private CTextureRef _TexNameDarkice;
private CTextureRef _TexNameFlokuep;
private CTextureRef _TexNameFlamefire;
private CTextureRef _TexNameLukeIam;
private CTextureRef _TexNameMesand;
private CTextureRef _TexNameBohning;
private CTextureRef _TexNameBabene03;
private CTextureRef _TexNamePantero;
private CTextureRef _TexNamePinky007;
private SThemeBackground _BGTheme;
@@ -208,11 +207,10 @@ namespace Vocaluxe.Screens
ressourceOK &= CDataBase.GetCreditsRessource("Darkice.png", ref _TexNameDarkice);
ressourceOK &= CDataBase.GetCreditsRessource("flokuep.png", ref _TexNameFlokuep);
ressourceOK &= CDataBase.GetCreditsRessource("flamefire.png", ref _TexNameFlamefire);
ressourceOK &= CDataBase.GetCreditsRessource("lukeIam.png", ref _TexNameLukeIam);
ressourceOK &= CDataBase.GetCreditsRessource("bohning.png", ref _TexNameBohning);
ressourceOK &= CDataBase.GetCreditsRessource("mesand.png", ref _TexNameMesand);
ressourceOK &= CDataBase.GetCreditsRessource("babene03.png", ref _TexNameBabene03);
ressourceOK &= CDataBase.GetCreditsRessource("pantero.png", ref _TexNamePantero);
ressourceOK &= CDataBase.GetCreditsRessource("Pinky007.png", ref _TexNamePinky007);
if (!ressourceOK)
CLog.LogError("Could not load all ressources!", true, true);
@@ -228,6 +226,7 @@ namespace Vocaluxe.Screens
continue;
string newLine = " " + paragraph[e];
CText text = GetNewText(75, lastY, -2, 25, -1, EAlignment.Left, EStyle.Bold, "Outline", new SColorF(1, 1, 1, 1), line);
text.Visible = false;
if (CFonts.GetTextBounds(text).Width < (CSettings.RenderW - 220))
{
line += newLine;
@@ -247,6 +246,7 @@ namespace Vocaluxe.Screens
line = newLine;
lastY += 27;
}
_AddText(text);
}
}
@@ -273,11 +273,10 @@ namespace Vocaluxe.Screens
_AddNewCreditName(_TexNameDarkice, 360, 55, true);
_AddNewCreditName(_TexNameFlokuep, 214, 14, true);
_AddNewCreditName(_TexNameFlamefire, 496, 46, true);
_AddNewCreditName(_TexNameLukeIam, 411, 26, true);
_AddNewCreditName(_TexNameBohning, 383, 54, false);
_AddNewCreditName(_TexNameMesand, 525, 13, false);
_AddNewCreditName(_TexNameBabene03, 33, 26, false);
_AddNewCreditName(_TexNamePantero, 311, 45, false);
_AddNewCreditName(_TexNamePinky007, 113, 50, false);
}
public override void ReloadTheme(string xmlPath) {}
@@ -314,7 +313,7 @@ namespace Vocaluxe.Screens
public override bool UpdateGame()
{
if (!_Animation())
if (!_Animation() && CGraphics.NextScreen != CGraphics.GetScreen(EScreen.Main))
CGraphics.FadeTo(EScreen.Main);
return true;
}
@@ -465,7 +464,7 @@ namespace Vocaluxe.Screens
}
if (_TextTimer.IsRunning)
active = _TextTimer.ElapsedMilliseconds <= 60000;
active = _TextTimer.ElapsedMilliseconds <= 500;
return active;
}
Vocaluxe/Screens/CScreenScore.cs
+1
View File
@@ -78,6 +78,7 @@ namespace Vocaluxe.Screens
_SlideShowBG = GetNewBackground();
_AddBackground(_SlideShowBG);
_SlideShowBG.Z--;
}
public override bool HandleInput(SKeyEvent keyEvent)
VocaluxeLib/Menu/CBackground.cs
+3 -1
View File
@@ -84,6 +84,8 @@ namespace VocaluxeLib.Menu
_PartyModeID = partyModeID;
ThemeLoaded = true;
LoadSkin();
}
#endregion Constructors
@@ -163,7 +165,7 @@ namespace VocaluxeLib.Menu
ok = _DrawVideo();
}
}
else if (_Theme.Type == EBackgroundTypes.SlideShow && _Theme.SlideShowTextures.Count > 0)
else if (_Theme.Type == EBackgroundTypes.SlideShow && _SlideShowTextures.Count > 0)
ok = _DrawSlideShow();
if (!String.IsNullOrEmpty(_Theme.Skin) && (_Theme.Type == EBackgroundTypes.Texture || !ok))
VocaluxeLib/Menu/CMenuPartyNameSelection.cs
+24
View File
@@ -24,6 +24,17 @@ namespace VocaluxeLib.Menu
{
public abstract class CMenuPartyNameSelection : CMenuParty
{
private bool _AllPlayerSelected
{
get
{
for (int team = 0; team < _NumTeams; team++)
if (_TeamList[team].Count < _NumPlayerTeams[team])
return false;
return true;
}
}
private bool _Teams;
protected int _NumTeams = -1;
protected int _NumPlayer = -1;
@@ -99,12 +110,14 @@ namespace VocaluxeLib.Menu
_LoadProfiles();
_UpdateButtonVisibility();
_UpdateButtonState();
_UpdateNextButtonVisibility();
}
public void SetPartyModeProfiles(List<int>[] teamProfiles)
{
_TeamList = teamProfiles;
_UpdateSlides();
_UpdateNextButtonVisibility();
}
public override bool HandleInput(SKeyEvent keyEvent)
@@ -547,6 +560,7 @@ namespace VocaluxeLib.Menu
_UpdateButtonVisibility();
_UpdateButtonState();
_UpdateNextButtonVisibility();
}
public abstract void Back();
@@ -715,6 +729,7 @@ namespace VocaluxeLib.Menu
_TeamList[team].Add(profileID);
_UpdatePlayerSlide();
_UpdateNextButtonVisibility();
}
private void _RemoveAllPlayer()
@@ -736,12 +751,16 @@ namespace VocaluxeLib.Menu
_TeamList[team].RemoveAt(index);
_NameSelections[_NameSelection].RemoveUsedProfile(id);
}
_UpdateNextButtonVisibility();
}
private void _RemovePlayer(int team, int profileID)
{
_TeamList[team].Remove(profileID);
_NameSelections[_NameSelection].RemoveUsedProfile(profileID);
_UpdateNextButtonVisibility();
}
private void _SelectRandom()
@@ -756,6 +775,11 @@ namespace VocaluxeLib.Menu
}
}
}
private void _UpdateNextButtonVisibility()
{
_Buttons[_ButtonNext].Visible = _AllPlayerSelected;
}
#endregion
}
}
VocaluxeLib/Menu/CText.cs
+1 -1
View File
@@ -261,7 +261,7 @@ namespace VocaluxeLib.Menu
float rheight = 0,
float rspace = 0) : this(partyModeID)
{
_Theme = new SThemeText {FontFamily = fontFamily, FontStyle = style, FontHeight = h, Text = text};
_Theme = new SThemeText { FontFamily = fontFamily, FontStyle = style, FontHeight = h, Text = text, Color = { A = col.A, B = col.B, G = col.G, R = col.R } };
ThemeLoaded = false;
_ButtonText = false;