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

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

Browse Source
This commit is contained in:
lukeIam committed 2017-08-15 19:20:13 +02:00
2 parents c90c2ae89b d1d7f04757
commit 9ffedef52a
8 files changed
+43 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Languages/Czech.xml
+4
View File
@@ -73,6 +73,8 @@
<string name="TR_CONFIG_TIMERMODE_TOTAL">Celkem</string>
<string name="TR_CONFIG_TIMERLOOK_NORMAL">Normální</string>
<string name="TR_CONFIG_TIMERLOOK_EXPANDED">Rozšířené</string>
<string name="TR_CONFIG_HIGHSCORE_LIST_ALL">Uvést vše</string>
<string name="TR_CONFIG_HIGHSCORE_LIST_BEST">Uvést nejlepší</string>
<string name="TR_CONFIG_OWN_MUSIC">Vlastní hudba a hudba na pozadí</string>
<string name="TR_CONFIG_NO_OWN_MUSIC">Žádná vlastní hudba</string>
<string name="TR_CONFIG_ONLY_OWN_MUSIC">Pouze vlastní hudba</string>
@@ -183,6 +185,7 @@
<string name="TR_SCREENOGAME_TABS">Karty</string>
<string name="TR_SCREENOGAME_DIFFICULTY">Obtížnost hry</string>
<string name="TR_SCREENOGAME_TIMERMODE">Režim časomíry</string>
<string name="TR_SCREENOGAME_HIGHSCORESTYLE">Styl pro nejlepší výsledky</string>
<string name="TR_SCREENORECORD_OPTIONS">Nastavení nahrávání</string>
<string name="TR_SCREENORECORD_DEVICE">Zařízení</string>
<string name="TR_SCREENORECORD_INPUT">Vstup</string>
@@ -201,6 +204,7 @@
<string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Zdroj hudby na pozadí</string>
<string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Hlasitost ukázky</string>
<string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Hlasitost hry</string>
<string name="TR_SCREENOSOUND_KARAOKEEFFECT">Efekt Karaoke</string>
<string name="TR_SCREENOTHEME_OPTIONS">Nastavení tématu</string>
<string name="TR_SCREENOTHEME_THEME">Téma</string>
<string name="TR_SCREENOTHEME_SKIN">Vzhled</string>
Output/Languages/French.xml
+9
View File
@@ -46,6 +46,7 @@
<string name="TR_CONFIG_LEVEL2">Niveau 2</string>
<string name="TR_CONFIG_LEVEL3">Niveau 3</string>
<string name="TR_CONFIG_LEVEL_MAX">Max</string>
<string name="TR_CONFIG_LIST">Afficher</string>
<string name="TR_CONFIG_DREIDEL">Caroussel</string>
<string name="TR_CONFIG_TILE_BOARD">Damier</string>
<string name="TR_CONFIG_BOOK">Livre</string>
@@ -72,6 +73,8 @@
<string name="TR_CONFIG_TIMERMODE_TOTAL">Total</string>
<string name="TR_CONFIG_TIMERLOOK_NORMAL">Normal</string>
<string name="TR_CONFIG_TIMERLOOK_EXPANDED">Développé</string>
<string name="TR_CONFIG_HIGHSCORE_LIST_ALL">Tout afficher</string>
<string name="TR_CONFIG_HIGHSCORE_LIST_BEST">Afficher les meilleurs</string>
<string name="TR_CONFIG_OWN_MUSIC">Musique personnelle et Musique de fond</string>
<string name="TR_CONFIG_NO_OWN_MUSIC">Pas de Musique personnelle</string>
<string name="TR_CONFIG_ONLY_OWN_MUSIC">Seulement la Musique personnelle</string>
@@ -79,6 +82,10 @@
<string name="TR_CONFIG_FADEPLAYERINFO_ALL">Tout</string>
<string name="TR_CONFIG_FADEPLAYERINFO_INFO">Seulement noms et avatars</string>
<string name="TR_CONFIG_FADEPLAYERINFO_OFF">Rien</string>
<string name="TR_CONFIG_LYRICSTYLE_FILL">Remplir</string>
<string name="TR_CONFIG_LYRICSTYLE_JUMP">Sauter</string>
<string name="TR_CONFIG_LYRICSTYLE_SLIDE">Glisser</string>
<string name="TR_CONFIG_LYRICSTYLE_ZOOM">Zoomer</string>
<string name="TR_CONFIG_LYRICSPOSITION_BOTTOM">En bas</string>
<string name="TR_CONFIG_LYRICSPOSITION_TOP">En haut</string>
<string name="TR_CONFIG_LYRICSPOSITION_BOTH">En haut et en bas</string>
@@ -178,6 +185,7 @@
<string name="TR_SCREENOGAME_TABS">Dossiers</string>
<string name="TR_SCREENOGAME_DIFFICULTY">Difficulté du Jeu</string>
<string name="TR_SCREENOGAME_TIMERMODE">Mode du Minuteur</string>
<string name="TR_SCREENOGAME_HIGHSCORESTYLE">Style meilleur score</string>
<string name="TR_SCREENORECORD_OPTIONS">Options d'Enregistrement</string>
<string name="TR_SCREENORECORD_DEVICE">Appareil</string>
<string name="TR_SCREENORECORD_INPUT">Entrée</string>
@@ -196,6 +204,7 @@
<string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Source de la Musique de fond</string>
<string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Volume de la Musique de prévisualisation</string>
<string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Volume de la Musique du jeu</string>
<string name="TR_SCREENOSOUND_KARAOKEEFFECT">Effet Karaoké</string>
<string name="TR_SCREENOTHEME_OPTIONS">Options du Thème</string>
<string name="TR_SCREENOTHEME_THEME">Thème</string>
<string name="TR_SCREENOTHEME_SKIN">Environnement graphique</string>
Output/Languages/Italian.xml
+7
View File
@@ -46,6 +46,7 @@
<string name="TR_CONFIG_LEVEL2">Livello 2</string>
<string name="TR_CONFIG_LEVEL3">Livello 3</string>
<string name="TR_CONFIG_LEVEL_MAX">Max</string>
<string name="TR_CONFIG_LIST">Elenco</string>
<string name="TR_CONFIG_DREIDEL">Dreidel</string>
<string name="TR_CONFIG_TILE_BOARD">Scacchiera</string>
<string name="TR_CONFIG_BOOK">Libro</string>
@@ -72,6 +73,8 @@
<string name="TR_CONFIG_TIMERMODE_TOTAL">Totale</string>
<string name="TR_CONFIG_TIMERLOOK_NORMAL">Normale</string>
<string name="TR_CONFIG_TIMERLOOK_EXPANDED">Espanso</string>
<string name="TR_CONFIG_HIGHSCORE_LIST_ALL">Elenco tutti</string>
<string name="TR_CONFIG_HIGHSCORE_LIST_BEST">Elenco migliori</string>
<string name="TR_CONFIG_OWN_MUSIC">Musica personale e musica di sfondo</string>
<string name="TR_CONFIG_NO_OWN_MUSIC">Nessuna musica personale</string>
<string name="TR_CONFIG_ONLY_OWN_MUSIC">Solo musica personale</string>
@@ -79,6 +82,9 @@
<string name="TR_CONFIG_FADEPLAYERINFO_ALL">Tutto</string>
<string name="TR_CONFIG_FADEPLAYERINFO_INFO">Solo nomi e avatar</string>
<string name="TR_CONFIG_FADEPLAYERINFO_OFF">Niente</string>
<string name="TR_CONFIG_LYRICSTYLE_FILL">Riempi</string>
<string name="TR_CONFIG_LYRICSTYLE_JUMP">Salta</string>
<string name="TR_CONFIG_LYRICSTYLE_ZOOM">Zoom</string>
<string name="TR_CONFIG_LYRICSPOSITION_BOTTOM">Sotto</string>
<string name="TR_CONFIG_LYRICSPOSITION_TOP">Sopra</string>
<string name="TR_CONFIG_LYRICSPOSITION_BOTH">Sopra e sotto</string>
@@ -196,6 +202,7 @@
<string name="TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE">Sorgente musica di sfondo</string>
<string name="TR_SCREENOSOUND_PREVIEWMUSICVOLUME">Anteprima volume musica</string>
<string name="TR_SCREENOSOUND_GAMEMUSICVOLUME">Volume musica di gioco</string>
<string name="TR_SCREENOSOUND_KARAOKEEFFECT">Effetto karaoke</string>
<string name="TR_SCREENOTHEME_OPTIONS">Opzioni tema</string>
<string name="TR_SCREENOTHEME_THEME">Tema</string>
<string name="TR_SCREENOTHEME_SKIN">Skin</string>
Output/PartyModes/Challenge/Languages/Czech.xml
+2
View File
@@ -15,6 +15,8 @@
<string name="TR_SCREENCONFIG_NUMPLAYERS">Počet hráčů</string>
<string name="TR_SCREENCONFIG_NUMMICS">Počet mikrofonů</string>
<string name="TR_SCREENCONFIG_NUMROUNDS">Počet kol</string>
<string name="TR_SCREENCONFIG_NUMJOKERS">Počet žolíků</string>
<string name="TR_SCREENCONFIG_REFILLJOKERS">Doplnit žolíky každé kolo</string>
<string name="TR_SCREENNAMES_TITLE">Soutěžní režim: Výběr hráče</string>
<string name="TR_SCREENNAMES_BUTTON_RANDOM">Vybrat náhodně</string>
<string name="TR_SCREENMAIN_TITLE">Soutěžní režim: Přehled</string>
Output/PartyModes/Challenge/Languages/French.xml
+2
View File
@@ -15,6 +15,8 @@
<string name="TR_SCREENCONFIG_NUMPLAYERS">Nombre de joueurs</string>
<string name="TR_SCREENCONFIG_NUMMICS">Nombre de micros</string>
<string name="TR_SCREENCONFIG_NUMROUNDS">Nombre de tours</string>
<string name="TR_SCREENCONFIG_NUMJOKERS">Nombre de jokers</string>
<string name="TR_SCREENCONFIG_REFILLJOKERS">Remplir de nouveau les jokers à tour</string>
<string name="TR_SCREENNAMES_TITLE">Mode Challenge: Choix des joueurs</string>
<string name="TR_SCREENNAMES_BUTTON_RANDOM">Sélectionner au hasard</string>
<string name="TR_SCREENMAIN_TITLE">Mode Challenge: Résumé</string>
PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs
+10 -8
View File
@@ -60,7 +60,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
// ReSharper disable ClassNeverInstantiated.Global
public sealed class CPartyModeTicTacToe : CPartyMode
// ReSharper restore ClassNeverInstantiated.Global
// ReSharper restore ClassNeverInstantiated.Global
{
public override int MinMics
{
@@ -96,7 +96,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe
get { return 10; }
}
private enum EStage
public readonly EGameMode[] AvailableGameModes = { EGameMode.TR_GAMEMODE_NORMAL, EGameMode.TR_GAMEMODE_SHORTSONG, EGameMode.TR_GAMEMODE_DUET };
private enum EStage
{
Config,
Names,
@@ -119,7 +121,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
public int CategoryIndex;
public int PlaylistID;
public EGameMode GameMode;
public int GameMode;
public List<CRound> Rounds;
public List<int> Songs;
@@ -160,7 +162,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
SongSource = ESongSource.TR_ALLSONGS,
PlaylistID = 0,
CategoryIndex = 0,
GameMode = EGameMode.TR_GAMEMODE_NORMAL,
GameMode = 0,
Rounds = new List<CRound>(),
Songs = new List<int>(),
NumJokerRandom = new int[2],
@@ -432,20 +434,20 @@ namespace VocaluxeLib.PartyModes.TicTacToe
for (int i = 0; i < CBase.Playlist.GetSongCount(GameData.PlaylistID); i++)
{
int id = CBase.Playlist.GetSong(GameData.PlaylistID, i).SongID;
if (CBase.Songs.GetSongByID(id).AvailableGameModes.Contains(GameData.GameMode))
if (CBase.Songs.GetSongByID(id).AvailableGameModes.Contains(AvailableGameModes[GameData.GameMode]))
GameData.Songs.Add(id);
}
break;
case ESongSource.TR_ALLSONGS:
ReadOnlyCollection<CSong> avSongs = CBase.Songs.GetSongs();
GameData.Songs.AddRange(avSongs.Where(song => song.AvailableGameModes.Contains(GameData.GameMode)).Select(song => song.ID));
GameData.Songs.AddRange(avSongs.Where(song => song.AvailableGameModes.Contains(AvailableGameModes[GameData.GameMode])).Select(song => song.ID));
break;
case ESongSource.TR_CATEGORY:
CBase.Songs.SetCategory(GameData.CategoryIndex);
avSongs = CBase.Songs.GetVisibleSongs();
GameData.Songs.AddRange(avSongs.Where(song => song.AvailableGameModes.Contains(GameData.GameMode)).Select(song => song.ID));
GameData.Songs.AddRange(avSongs.Where(song => song.AvailableGameModes.Contains(AvailableGameModes[GameData.GameMode])).Select(song => song.ID));
CBase.Songs.SetCategory(-1);
break;
@@ -493,7 +495,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
if (isDuet)
players[1].VoiceNr = 1;
CBase.Game.AddSong(round.SongID, GameData.GameMode);
CBase.Game.AddSong(round.SongID, AvailableGameModes[GameData.GameMode]);
}
private void _SetNumJokers()
PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeConfig.cs
+4 -4
View File
@@ -160,8 +160,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_SelectSlides[_SelectSlideGameMode].Visible = true;
_SelectSlides[_SelectSlideGameMode].Clear();
_SelectSlides[_SelectSlideGameMode].SetValues<EGameMode>((int)_PartyMode.GameData.GameMode);
_SelectSlides[_SelectSlideGameMode].RemoveValue(EGameMode.TR_GAMEMODE_MEDLEY.ToString());
_SelectSlides[_SelectSlideGameMode].AddValues(_PartyMode.AvailableGameModes.Select(gm => gm.ToString()));
_SelectSlides[_SelectSlideGameMode].Selection = _PartyMode.GameData.GameMode;
}
private void _UpdateSlides()
@@ -171,9 +171,9 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_PartyMode.GameData.SongSource = (ESongSource)_SelectSlides[_SelectSlideSongSource].Selection;
_PartyMode.GameData.PlaylistID = _SelectSlides[_SelectSlidePlaylist].Selection;
_PartyMode.GameData.CategoryIndex = _SelectSlides[_SelectSlideCategory].Selection;
_PartyMode.GameData.GameMode = (EGameMode)_SelectSlides[_SelectSlideGameMode].Selection;
_PartyMode.GameData.GameMode = _SelectSlides[_SelectSlideGameMode].Selection;
EGameMode gm = _PartyMode.GameData.GameMode;
EGameMode gm = _PartyMode.AvailableGameModes[_PartyMode.GameData.GameMode];
if (_PartyMode.GameData.SongSource == ESongSource.TR_PLAYLIST)
{
Vocaluxe/Screens/CScreenMain.cs
+5
View File
@@ -57,6 +57,7 @@ namespace Vocaluxe.Screens
_Texts[_TextRelease].Visible = true;
_Statics[_StaticWarningProfiles].Visible = false;
_Texts[_TextWarningProfiles].Visible = false;
_SelectElement(_Buttons[_ButtonSing]);
}
public override bool HandleInput(SKeyEvent keyEvent)
@@ -105,6 +106,10 @@ namespace Vocaluxe.Screens
return false;
break;
case Keys.Escape:
_SelectElement(_Buttons[_ButtonExit]);
break;
}
}
return true;