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

Merge branch 'develop' of git://github.com/Vocaluxe/Vocaluxe into develop

Browse Source
This commit is contained in:
Flamefire committed 2014-12-07 22:48:00 +01:00
2 parents c1131cc747 b33cf54f1e
commit 3402c7b4c4
58 files changed
+929 -175
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/CConfig.cs
+1 -1
View File
@@ -96,7 +96,7 @@ namespace Vocaluxe.Base
{
[XmlElement("Name"), DefaultValue("Ambient")] public string Theme;
[DefaultValue("Blue")] public string Skin;
[XmlElement("Cover"), DefaultValue("Blue")] public string CoverTheme;
[XmlElement("Cover"), DefaultValue("Ambient Blue")] public string CoverTheme;
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn DrawNoteLines;
[DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn DrawToneHelper;
[DefaultValue(ETimerLook.TR_CONFIG_TIMERLOOK_EXPANDED)] public ETimerLook TimerLook;
Vocaluxe/Base/Server/CVocaluxeServer.cs
+2
View File
@@ -88,6 +88,8 @@ namespace Vocaluxe.Base.Server
CServer.RemovePlaylist = _RemovePlaylist;
CServer.AddPlaylist = _AddPlaylist;
Start();
//_Discover = new CDiscover(CConfig.ServerPort, CCommands.BroadcastKeyword);
}
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/CScreenNames.cs
+1 -1
View File
@@ -261,6 +261,7 @@ namespace Vocaluxe.Screens
//Reset all values
_SelectingFastPlayerNr = 0;
_SelectingKeyboardActive = false;
_SelectElement(_SelectSlides[_SelectSlidePlayerNumber]);
_NameSelections[_NameSelection].FastSelection(false, -1);
}
else if (numberPressed <= CConfig.Config.Game.NumPlayers)
@@ -333,7 +334,6 @@ namespace Vocaluxe.Screens
if (_NameSelections[_NameSelection].Selected && !_SelectingKeyboardActive)
{
_SelectingKeyboardActive = true;
_ResetPlayerSelections();
_SelectingFast = true;
_SelectingFastPlayerNr = 1;
_SelectingKeyboardActive = true;
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)
Vocaluxe/Screens/CScreenSing.cs
+4
View File
@@ -894,6 +894,10 @@ namespace Vocaluxe.Screens
_Statics[_StaticLyricsDuet].Alpha = 0f;
_Statics[_StaticLyricHelperDuet].Alpha = 0f;
_Statics[_StaticTimeLine].Visible = CConfig.Config.Theme.TimerLook == ETimerLook.TR_CONFIG_TIMERLOOK_NORMAL;
_Statics[_StaticTimeLineExpandedHighlighted].Visible = false;
_Statics[_StaticTimeLineExpandedNormal].Visible = false;
}
private void _UpdateMedleyCountdown()
Vocaluxe/Website/locales/cs.json
+7 -1
View File
@@ -76,5 +76,11 @@
"discoverConnectServerAddress": "Adresa serveru:",
"discoverConnectButton": "Připojit se",
"Checking...": "Ověřuje se...",
"timeout": "Překročení časového omezení"
"timeout": "Překročení časového omezení",
"keyboardButtonShift": "Shift",
"keyboardButtonAlt": "Alt",
"keyboardButtonCtrl": "Control",
"keyboardButtonBackspace": "Backspace",
"keyboardAutoSend": "Auto send keys",
"keyboardButtonSend": "Send"
}
Vocaluxe/Website/locales/de.json
+5 -5
View File
@@ -77,10 +77,10 @@
"discoverConnectButton": "Verbinden",
"Checking...": "Prüfen...",
"timeout": "Zeitüberschreitung",
"keyboardButtonShift": "Umschalt",
"keyboardButtonAlt": "Alt",
"keyboardButtonShift": "Shift",
"keyboardButtonAlt": "Alt",
"keyboardButtonCtrl": "Steuerung",
"keyboardButtonBackspace": "Rücktaste",
"keyboardAutoSend": "Tasten autom. senden",
"keyboardButtonSend": "Senden"
"keyboardButtonBackspace": "Backspace",
"keyboardAutoSend": "Automatisch Tasten senden",
"keyboardButtonSend": "Senden"
}
Vocaluxe/Website/locales/es.json
+7 -1
View File
@@ -76,5 +76,11 @@
"discoverConnectServerAddress": "Dirección del servidor:",
"discoverConnectButton": "Conectar",
"Checking...": "Comprobando...",
"timeout": "Tiempo de espera"
"timeout": "Tiempo de espera",
"keyboardButtonShift": "Shift",
"keyboardButtonAlt": "Alt",
"keyboardButtonCtrl": "Control",
"keyboardButtonBackspace": "Backspace",
"keyboardAutoSend": "Auto send keys",
"keyboardButtonSend": "Send"
}
Vocaluxe/Website/locales/fr.json
+9 -3
View File
@@ -17,7 +17,7 @@
"mainPageTakePhotoLink": "Prendre une photo",
"mainPageTakePhotoLinkDesc": "Prends une photo et l'affiche à la fin de la partie actuelle",
"mainPageKeyboard": "Clavier",
"mainPageKeyboardDesc": "Envoyer la clé",
"mainPageKeyboardDesc": "Envoyer les caractères",
"mainPageSelectUserAdmin": "Administration",
"mainPageSelectUserAdminDesc": "Configurer les droits administrateurs",
"mainPageLogoutLink": "Se déconnecter",
@@ -50,7 +50,7 @@
"keyboardButtonEscape": "echappe",
"keyboardButtonTab": "tabulation",
"keyboardButtonReturn": "Retour",
"keyboardButtonKeys": "Pour envoyer d'autres clé, taper ici :",
"keyboardButtonKeys": "Pour envoyer d'autres caractères, taper ici :",
"selectUserAdminHeader": "Tous les profils",
"displayUserAdminHeader": "Profil",
"displayUserAdminContentSaveButton": "Sauvegarder",
@@ -76,5 +76,11 @@
"discoverConnectServerAddress": "Adresse du serveur :",
"discoverConnectButton": "Connecter",
"Checking...": "Vérification",
"timeout": "Temps dépassé"
"timeout": "Temps dépassé",
"keyboardButtonShift": "Maj.",
"keyboardButtonAlt": "Alt",
"keyboardButtonCtrl": "Controle",
"keyboardButtonBackspace": "Retour",
"keyboardAutoSend": "Envoyer la saisie automatiquement",
"keyboardButtonSend": "Envoyer"
}
Vocaluxe/Website/locales/it.json
+7 -1
View File
@@ -76,5 +76,11 @@
"discoverConnectServerAddress": "Indirizzo server:",
"discoverConnectButton": "Connetti",
"Checking...": "Controllo...",
"timeout": "Timeout"
"timeout": "Timeout",
"keyboardButtonShift": "Shift",
"keyboardButtonAlt": "Alt",
"keyboardButtonCtrl": "Control",
"keyboardButtonBackspace": "Backspace",
"keyboardAutoSend": "Auto send keys",
"keyboardButtonSend": "Send"
}
Vocaluxe/Website/locales/sv.json
+7 -1
View File
@@ -76,5 +76,11 @@
"discoverConnectServerAddress": "serveradress:",
"discoverConnectButton": "Anslut",
"Checking...": "Kontrollerar...",
"timeout": "Timeout"
"timeout": "Timeout",
"keyboardButtonShift": "Shift",
"keyboardButtonAlt": "Alt",
"keyboardButtonCtrl": "Control",
"keyboardButtonBackspace": "Backspace",
"keyboardAutoSend": "Auto send keys",
"keyboardButtonSend": "Send"
}