diff --git a/Installer/setup.aip b/Installer/setup.aip index b9220c2c..246b2193 100644 --- a/Installer/setup.aip +++ b/Installer/setup.aip @@ -19,7 +19,7 @@ - + @@ -35,9 +35,12 @@ + + + + - @@ -64,7 +67,10 @@ - + + + + @@ -97,13 +103,16 @@ + + + + + - - @@ -158,6 +167,14 @@ + + + + + + + + @@ -180,7 +197,10 @@ - + + + + @@ -223,7 +243,6 @@ - @@ -238,7 +257,6 @@ - @@ -247,26 +265,27 @@ - - - - - + + + + + - + + + + - - @@ -274,7 +293,6 @@ - @@ -316,8 +334,7 @@ - - + @@ -331,26 +348,20 @@ - - - + - - - - @@ -361,23 +372,16 @@ - - - - - - - @@ -386,21 +390,29 @@ - - - + + + + + + + + + + + + - @@ -417,7 +429,6 @@ - @@ -426,10 +437,8 @@ - - @@ -440,8 +449,7 @@ - - + @@ -486,7 +494,6 @@ - @@ -498,7 +505,6 @@ - @@ -513,8 +519,6 @@ - - @@ -524,17 +528,13 @@ - - - - @@ -551,7 +551,6 @@ - @@ -575,8 +574,6 @@ - - @@ -585,7 +582,6 @@ - @@ -595,7 +591,6 @@ - @@ -739,8 +734,6 @@ - - @@ -782,6 +775,14 @@ + + + + + + + + @@ -824,6 +825,7 @@ + @@ -889,8 +891,6 @@ - - @@ -931,6 +931,14 @@ + + + + + + + + diff --git a/Output/Cover/Ambient Blue.xml b/Output/Cover/Ambient Blue.xml new file mode 100644 index 00000000..f1f91328 --- /dev/null +++ b/Output/Cover/Ambient Blue.xml @@ -0,0 +1,166 @@ + + + + Ambient Blue + Ambient Blue + flokuep + + + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.675 + 0.890 + 0.969 + 0.8 + + + + 24 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.675 + 0.890 + 0.969 + 0.8 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.675 + 0.890 + 0.969 + 0.8 + + + + 150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 120 + + + + + 0.675 + 0.890 + 0.969 + 0.8 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + diff --git a/Output/Cover/Ambient Blue/No Cover.png b/Output/Cover/Ambient Blue/No Cover.png new file mode 100644 index 00000000..73a0e4b1 Binary files /dev/null and b/Output/Cover/Ambient Blue/No Cover.png differ diff --git a/Output/Cover/Ambient Blue/Normal.png b/Output/Cover/Ambient Blue/Normal.png new file mode 100644 index 00000000..73a0e4b1 Binary files /dev/null and b/Output/Cover/Ambient Blue/Normal.png differ diff --git a/Output/Cover/Ambient Blue/Resources/Normal.psd b/Output/Cover/Ambient Blue/Resources/Normal.psd new file mode 100644 index 00000000..5cc517a3 Binary files /dev/null and b/Output/Cover/Ambient Blue/Resources/Normal.psd differ diff --git a/Output/Cover/Ambient Green.xml b/Output/Cover/Ambient Green.xml new file mode 100644 index 00000000..3e652377 --- /dev/null +++ b/Output/Cover/Ambient Green.xml @@ -0,0 +1,166 @@ + + + + Ambient Green + Ambient Green + flokuep + + + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.709 + 0.968 + 0.674 + 0.9 + + + + 24 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.709 + 0.968 + 0.674 + 0.9 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.709 + 0.968 + 0.674 + 0.9 + + + + 150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 120 + + + + + 0.709 + 0.968 + 0.674 + 0.9 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + diff --git a/Output/Cover/Ambient Green/No Cover.png b/Output/Cover/Ambient Green/No Cover.png new file mode 100644 index 00000000..2a1612cb Binary files /dev/null and b/Output/Cover/Ambient Green/No Cover.png differ diff --git a/Output/Cover/Ambient Green/Normal.png b/Output/Cover/Ambient Green/Normal.png new file mode 100644 index 00000000..2a1612cb Binary files /dev/null and b/Output/Cover/Ambient Green/Normal.png differ diff --git a/Output/Cover/Ambient Green/Resources/Normal.psd b/Output/Cover/Ambient Green/Resources/Normal.psd new file mode 100644 index 00000000..8f973d02 Binary files /dev/null and b/Output/Cover/Ambient Green/Resources/Normal.psd differ diff --git a/Output/Cover/Ambient Red.xml b/Output/Cover/Ambient Red.xml new file mode 100644 index 00000000..fa65f01d --- /dev/null +++ b/Output/Cover/Ambient Red.xml @@ -0,0 +1,166 @@ + + + + Ambient Red + Ambient Red + flokuep + + + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.968 + 0.674 + 0.674 + 0.9 + + + + 24 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.968 + 0.674 + 0.674 + 0.9 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.968 + 0.674 + 0.674 + 0.9 + + + + 150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 120 + + + + + 0.968 + 0.674 + 0.674 + 0.9 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + diff --git a/Output/Cover/Ambient Red/No Cover.png b/Output/Cover/Ambient Red/No Cover.png new file mode 100644 index 00000000..1bf01057 Binary files /dev/null and b/Output/Cover/Ambient Red/No Cover.png differ diff --git a/Output/Cover/Ambient Red/Normal.png b/Output/Cover/Ambient Red/Normal.png new file mode 100644 index 00000000..1bf01057 Binary files /dev/null and b/Output/Cover/Ambient Red/Normal.png differ diff --git a/Output/Cover/Ambient Red/Resources/Normal.psd b/Output/Cover/Ambient Red/Resources/Normal.psd new file mode 100644 index 00000000..db9fb4ed Binary files /dev/null and b/Output/Cover/Ambient Red/Resources/Normal.psd differ diff --git a/Output/Cover/Ambient Yellow.xml b/Output/Cover/Ambient Yellow.xml new file mode 100644 index 00000000..7636b2fa --- /dev/null +++ b/Output/Cover/Ambient Yellow.xml @@ -0,0 +1,166 @@ + + + + Ambient Yellow + Ambient Yellow + flokuep + + + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.968 + 0.956 + 0.674 + 0.9 + + + + 24 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 550 + + + + + 0.968 + 0.956 + 0.674 + 0.9 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Outline + + + + 550 + + + + + 0.968 + 0.956 + 0.674 + 0.9 + + + + 150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + + + + %TEXT% + + Normal + + + + 120 + + + + + 0.968 + 0.956 + 0.674 + 0.9 + + + + -150 + + + 100 + + + 1 + 1 + 1 + 1 + + + Normal.png + + 1.0 + + True + + diff --git a/Output/Cover/Ambient Yellow/No Cover.png b/Output/Cover/Ambient Yellow/No Cover.png new file mode 100644 index 00000000..e7be3e62 Binary files /dev/null and b/Output/Cover/Ambient Yellow/No Cover.png differ diff --git a/Output/Cover/Ambient Yellow/Normal.png b/Output/Cover/Ambient Yellow/Normal.png new file mode 100644 index 00000000..e7be3e62 Binary files /dev/null and b/Output/Cover/Ambient Yellow/Normal.png differ diff --git a/Output/Cover/Ambient Yellow/Resources/Normal.psd b/Output/Cover/Ambient Yellow/Resources/Normal.psd new file mode 100644 index 00000000..ebc648a0 Binary files /dev/null and b/Output/Cover/Ambient Yellow/Resources/Normal.psd differ diff --git a/Output/Cover/Blue.xml b/Output/Cover/Blue.xml deleted file mode 100644 index 6340b747..00000000 --- a/Output/Cover/Blue.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - Blue - Blue - flokuep - - - - - - - %TEXT% - - Normal - - - - 500 - - - - - 1 - 1 - 1 - 0.8 - - - - 24 - - - 100 - - - 1 - 1 - 1 - 1 - - - EmptyCover.png - - 0.75 - - True - - \ No newline at end of file diff --git a/Output/Cover/Blue/EmptyCover.png b/Output/Cover/Blue/EmptyCover.png deleted file mode 100644 index 048a8dc0..00000000 Binary files a/Output/Cover/Blue/EmptyCover.png and /dev/null differ diff --git a/Output/Cover/Blue/No Cover.png b/Output/Cover/Blue/No Cover.png deleted file mode 100644 index d57d9e73..00000000 Binary files a/Output/Cover/Blue/No Cover.png and /dev/null differ diff --git a/Output/Cover/Blue/Resources/decades.xcf b/Output/Cover/Blue/Resources/decades.xcf deleted file mode 100644 index 4b951b1f..00000000 Binary files a/Output/Cover/Blue/Resources/decades.xcf and /dev/null differ diff --git a/Output/Cover/Blue/Resources/language.xcf b/Output/Cover/Blue/Resources/language.xcf deleted file mode 100644 index 4c7b6a7c..00000000 Binary files a/Output/Cover/Blue/Resources/language.xcf and /dev/null differ diff --git a/Output/Cover/Blue/Resources/letter.xcf b/Output/Cover/Blue/Resources/letter.xcf deleted file mode 100644 index e58b2f5f..00000000 Binary files a/Output/Cover/Blue/Resources/letter.xcf and /dev/null differ diff --git a/Output/Cover/Blue/Resources/no_cover.xcf b/Output/Cover/Blue/Resources/no_cover.xcf deleted file mode 100644 index b1ea09eb..00000000 Binary files a/Output/Cover/Blue/Resources/no_cover.xcf and /dev/null differ diff --git a/Output/CreditsRessourcesDB.sqlite b/Output/CreditsRessourcesDB.sqlite index 5701709f..d5dbafb9 100644 Binary files a/Output/CreditsRessourcesDB.sqlite and b/Output/CreditsRessourcesDB.sqlite differ diff --git a/Output/Languages/Czech.xml b/Output/Languages/Czech.xml index b1a67a15..89639fd6 100644 --- a/Output/Languages/Czech.xml +++ b/Output/Languages/Czech.xml @@ -76,6 +76,7 @@ Vlastní hudba a hudba na pozadí Žádná vlastní hudba Pouze vlastní hudba + Jen vybraná píseň Vše Pouze jména a zastupující obrázky Nic @@ -210,8 +211,6 @@ Kamery Rozlišení kamery Přizpůsobení obrazovky - Stiskněte Ctrl + Alt + Shift + šipky pro upravení obrazovky - Ctrl + Alt + Shift + 0 pro vrácení úprav zpět na výchozí hodnoty Nahoře vlevo Nahoře vpravo Dole vlevo diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml index 6231e96b..a847b5d2 100644 --- a/Output/Languages/English.xml +++ b/Output/Languages/English.xml @@ -212,7 +212,7 @@ Webcams Webcam-Resolution Screen adjustments - Press CTR + ALT (+ SHIFT) + Arrows|"+" to adjust screen + Press CTR + ALT (+ SHIFT) + Arrows|\"+\" to adjust screen CTR + ALT + 0 to reset Top left Top right diff --git a/Output/Languages/French.xml b/Output/Languages/French.xml index f42b5ac4..6261dd64 100644 --- a/Output/Languages/French.xml +++ b/Output/Languages/French.xml @@ -30,7 +30,7 @@ Invité Utilisateur normal Administrateur - Clavier d\'Utilisateur + Clavier d'Utilisateur Logiciel OpenGL Direct3D @@ -57,7 +57,7 @@ Aléatoire Dossier Artiste - Initiale d\'Artiste + Initiale d'Artiste Initiale de Titre Edition Genre @@ -93,16 +93,17 @@ Mode Fête Options Profils + Aucun profil trouvé ! Sélection du mode Fête Mode Fête Description Auteur Version Impossible de charger ce mode Fête. - Aucun micro n\'est configuré ! + Aucun micro n'est configuré ! Personnes visées - Pas d\'équipes - Nombre d\'équipes + Pas d'équipes + Nombre d'équipes Nombre de joueurs Sélection des joueurs Joueur @@ -112,10 +113,10 @@ 4 joueurs 5 joueurs 6 joueurs - Attention: Aucun micro n\'est assigné au joueur %v! - Attention: Aucun micro n\'est assigné aux joueurs %v! - Attention: Aucun profil n\'est assigné au joueur %v! - Attention: Aucun profil n\'est assigné aux joueurs %v! + Attention: Aucun micro n'est assigné au joueur %v! + Attention: Aucun micro n'est assigné aux joueurs %v! + Attention: Aucun profil n'est assigné au joueur %v! + Attention: Aucun profil n'est assigné aux joueurs %v! Choix de la chanson Chanter Ajouter à la playlist @@ -132,9 +133,9 @@ Options de la chanson Rechercher: Pas de Langue - Pas d\'Année + Pas d'Année Pas de Genre - Pas d\'Edition + Pas d'Edition Toutes les chansons (%v Chansons) (%v Chanson) @@ -153,7 +154,7 @@ Nom du Joueur Difficulté du jeu Avatar - Role de l\'utilisateur + Role de l'utilisateur Actif Nouveau Supprimer @@ -177,7 +178,7 @@ Dossiers Difficulté du Jeu Mode du Minuteur - Options d\'Enregistrement + Options d'Enregistrement Appareil Entrée Canal 1 @@ -196,7 +197,7 @@ Environnement graphique Thème des Couvertures Afficher les portées - Afficher l\'aide pour la Tonalité + Afficher l'aide pour la Tonalité Apparence du Minuteur Dégradé des infos des joueurs Chargement des couvertures @@ -206,13 +207,13 @@ Options Vidéo Vidéo en arrière plan Prévisualisation des Vidéos - Vidéos pendant que l\'on chante + Vidéos pendant que l'on chante Afficher la vidéo de la musique de fond Webcams Résolution de la Webcam - Ajustements de l\'écran - Appuyer sur CTR + ALT + SHIFT + Flèches pour ajuster l\'écran - CTR + ALT + SHIFT + 0 pour réinitialiser + Ajustements de l'écran + Appuyer sur CTRL + ALT (+ Maj) + Flèches|"+" pour ajuster l'écran + CTRL + ALT + 0 pour annuler Haut gauche Haut droit Bas gauche diff --git a/Output/Languages/German.xml b/Output/Languages/German.xml index 751bf476..968b2f79 100644 --- a/Output/Languages/German.xml +++ b/Output/Languages/German.xml @@ -76,6 +76,7 @@ Eigene Musik und Hintergrundmusik Keine eigene Musik Nur eigene Musik + Nur bei gewähltem Song Alle Nur Namen und Avatar Keine @@ -211,8 +212,8 @@ Webcams Webcam-Auflösung Anzeigeanpassungen - STRG + ALT (+ SHIFT) + Pfeiltasten|"+" drücken um den Bildschirm anzupassen - STRG + ALT + 0 um die Anpassungen zurückzusetzen + STRG + ALT (+ SHIFT) + Pfeiltasten oder "+" drücken um den Bildschirm zu justieren. + STRG + ALT + 0 um die Änderungen zurückzusetzen. Oben links Oben rechts Unten links diff --git a/Output/Languages/Italian.xml b/Output/Languages/Italian.xml index 8c899d6e..ca474c09 100644 --- a/Output/Languages/Italian.xml +++ b/Output/Languages/Italian.xml @@ -14,6 +14,7 @@ Volume massimo Canzoni caricate Mouse + Uso della Memoria Normale Duetto Medley @@ -29,6 +30,7 @@ Ospite Utente normale Amministratore + Tasti Utente Software OpenGL Direct3D @@ -46,6 +48,7 @@ Max Elenco Dreidel + Scacchiera Libro Su richiesta All\'avvio @@ -61,6 +64,7 @@ Anno Decade Lingua + Inserimento Data Facile Normale Difficile @@ -72,9 +76,13 @@ Musica personale e musica di sfondo Nessuna musica personale Solo musica personale + Solo la canzone selezionata Tutto Solo nomi e avatar Niente + Sotto + Sopra + Sopra e sotto Dinamico Caricamento Totale @@ -91,6 +99,7 @@ Autore Versione Impossibile caricare questa modalità festa. + Nessun microfono configurato! Target di riferimento Nessuna squadra Numero di squadre @@ -116,6 +125,7 @@ Canta tutte le canzoni Canta tutte le canzoni visibili Apri playlist + Selezione Canta un medley casuale Canta canzoni medley Nuova playlist @@ -188,11 +198,24 @@ Mostra note-linee Mostra Aiuto-Tono Look timer + Aumenta-Diminuisci info Giocatore + Modo di Caricamento Cover Opzioni testi Stile Posizione testi Opzioni video + Video di Sfondo Anteprima video + Video durante il canto + Mostra il video attuale sullo sfondo + Webcam + Risoluzione-Webcam + Sistemazione schermo + Sopra a sinistra + Sopra a destra + Sotto a sinistra + Sotto a destra Volume Indirizzo server + Il server non sta funzionando. Per favore controlla il file config.xml! diff --git a/Output/PartyModes/Challenge/Languages/Italian.xml b/Output/PartyModes/Challenge/Languages/Italian.xml index 936ed185..8bb7714c 100644 --- a/Output/PartyModes/Challenge/Languages/Italian.xml +++ b/Output/PartyModes/Challenge/Languages/Italian.xml @@ -1,18 +1,30 @@ Italiano + Modalità Sfida + Gioca alcuni turni di sfida. + Per tutti quelli interessati ai duelli. Prossimo Indietro Inizia Esci Si No + Prossimo Turno + Modalità Sfida: Configurazione Numero di giocatori Numero di microfoni + Numero di turni + Modalità Sfida: Scegli il Giocatore Selezione casuale + Modalità Sfida: Panoramica Pos Nome + Turni Vittorie + Punti Canto Punteggio Vuoi davvero uscire? + Giocatore del prossimo turno: + Tutti i turni di canto completati! E il vincitore è... diff --git a/Output/PartyModes/ChallengeMedley/Languages/Italian.xml b/Output/PartyModes/ChallengeMedley/Languages/Italian.xml index 7247406d..b3beee0e 100644 --- a/Output/PartyModes/ChallengeMedley/Languages/Italian.xml +++ b/Output/PartyModes/ChallengeMedley/Languages/Italian.xml @@ -1,16 +1,30 @@ Italiano + Sfida in Modalità Medley + Gioca alcuni turni di sfida usando solo un gruppo di 5 canzoni come Medley. + Per tutti quelli interessati a scontrarsi con duelli di Medley. Prossimo Indietro Inizia Esci Si No + Prossimo Turno + Sfida in Modalità Medley: Configurazione + Numero di giocatori + Numero di microfoni + Numero di Turni + Sfida in Modalità Medley: Scegli il Giocatore Selezione casuale + Sfida in Modalità Medley: Panoramica Pos Nome + Turni Vittorie + Punti Canto Punteggio Vuoi davvero uscire? + Giocatore del prossimo turno: + Tutti i turni di canto completati! E il vincitore è... diff --git a/Output/PartyModes/TicTacToe/Languages/Italian.xml b/Output/PartyModes/TicTacToe/Languages/Italian.xml index 9ef9c84b..b299e22a 100644 --- a/Output/PartyModes/TicTacToe/Languages/Italian.xml +++ b/Output/PartyModes/TicTacToe/Languages/Italian.xml @@ -1,7 +1,13 @@ Italiano - Tic-Tac-Toe + Tris + Gioca a Tris in un modo speciale + Turni di gioco divertenti per strategia, abilità e fortuna + Prossimo + Indietro + Inizia + Esci Si No Inizia @@ -10,8 +16,20 @@ Playlist Categoria Tutte le canzoni + Tris: Configurazione + Numero di giocatori della squadra 1 + Numero di giocatori della squadra 2 + Numero di caselle + Sorgente della Canzone + Modalità di Gioco + Tris: Scegli il Giocatore Squadra 1 Squadra 2 Selezione casuale - Tic-Tac-Toe + Tris + Scegli una casella. + Prossimo giocatore + Vuoi veramente uscire dal Tris? + E il vincitore è... + Non c\'è nessun vincitore in questo turno... diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml index 0058725e..cd75ed75 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml @@ -16,7 +16,7 @@ Menu - + 40 40 @@ -526,4 +526,4 @@ - \ No newline at end of file + diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml index f7e99edf..f5696725 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml @@ -16,7 +16,7 @@ Menu - + 40 40 diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml index 8d43038f..b5740cc5 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml @@ -16,7 +16,7 @@ Menu - + 40 40 @@ -504,4 +504,4 @@ - \ No newline at end of file + diff --git a/Output/Themes/Ambient/Screens/ScreenProfiles.xml b/Output/Themes/Ambient/Screens/ScreenProfiles.xml index 1b052f4a..ca84426b 100644 --- a/Output/Themes/Ambient/Screens/ScreenProfiles.xml +++ b/Output/Themes/Ambient/Screens/ScreenProfiles.xml @@ -16,7 +16,7 @@ Menu - + 40 40 @@ -691,4 +691,4 @@ - \ No newline at end of file + diff --git a/Output/Themes/Ambient/Screens/ScreenSing.xml b/Output/Themes/Ambient/Screens/ScreenSing.xml index aee9420a..ed9bcb15 100644 --- a/Output/Themes/Ambient/Screens/ScreenSing.xml +++ b/Output/Themes/Ambient/Screens/ScreenSing.xml @@ -78,7 +78,7 @@ TimeLine - 44 + 50 702 1090 10 @@ -89,7 +89,7 @@ TimeLine - 44 + 50 696 1090 9 @@ -100,7 +100,7 @@ TimeLine - 44 + 50 696 1090 9 @@ -1900,4 +1900,4 @@ - \ No newline at end of file + diff --git a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs index 5d76b077..db882cd4 100644 --- a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs +++ b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs @@ -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); diff --git a/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs b/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs index 78dacac6..ec9429f9 100644 --- a/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs +++ b/PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs @@ -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); diff --git a/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs b/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs index bfbde42a..5929e1ff 100644 --- a/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs +++ b/PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs @@ -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); diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs index f01abaa2..2c8cbd51 100644 --- a/Vocaluxe/Base/CConfig.cs +++ b/Vocaluxe/Base/CConfig.cs @@ -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; diff --git a/Vocaluxe/Base/Server/CVocaluxeServer.cs b/Vocaluxe/Base/Server/CVocaluxeServer.cs index ca21b90e..878bbc37 100644 --- a/Vocaluxe/Base/Server/CVocaluxeServer.cs +++ b/Vocaluxe/Base/Server/CVocaluxeServer.cs @@ -88,6 +88,8 @@ namespace Vocaluxe.Base.Server CServer.RemovePlaylist = _RemovePlaylist; CServer.AddPlaylist = _AddPlaylist; + Start(); + //_Discover = new CDiscover(CConfig.ServerPort, CCommands.BroadcastKeyword); } diff --git a/Vocaluxe/Lib/Database/CResourceDB.cs b/Vocaluxe/Lib/Database/CResourceDB.cs index 77d9c455..0da33eb9 100644 --- a/Vocaluxe/Lib/Database/CResourceDB.cs +++ b/Vocaluxe/Lib/Database/CResourceDB.cs @@ -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) {} diff --git a/Vocaluxe/Screens/CScreenCredits.cs b/Vocaluxe/Screens/CScreenCredits.cs index bf585e2f..7b9eb5cd 100644 --- a/Vocaluxe/Screens/CScreenCredits.cs +++ b/Vocaluxe/Screens/CScreenCredits.cs @@ -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; } diff --git a/Vocaluxe/Screens/CScreenNames.cs b/Vocaluxe/Screens/CScreenNames.cs index 8b854d28..bd04a3ab 100644 --- a/Vocaluxe/Screens/CScreenNames.cs +++ b/Vocaluxe/Screens/CScreenNames.cs @@ -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; diff --git a/Vocaluxe/Screens/CScreenScore.cs b/Vocaluxe/Screens/CScreenScore.cs index e82fea39..4f8a7aff 100644 --- a/Vocaluxe/Screens/CScreenScore.cs +++ b/Vocaluxe/Screens/CScreenScore.cs @@ -78,6 +78,7 @@ namespace Vocaluxe.Screens _SlideShowBG = GetNewBackground(); _AddBackground(_SlideShowBG); + _SlideShowBG.Z--; } public override bool HandleInput(SKeyEvent keyEvent) diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 765ccb93..24584cd1 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -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() diff --git a/Vocaluxe/Website/locales/cs.json b/Vocaluxe/Website/locales/cs.json index 152a6b32..b35ca179 100644 --- a/Vocaluxe/Website/locales/cs.json +++ b/Vocaluxe/Website/locales/cs.json @@ -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" } \ No newline at end of file diff --git a/Vocaluxe/Website/locales/de.json b/Vocaluxe/Website/locales/de.json index d9f2420a..4d9812c3 100644 --- a/Vocaluxe/Website/locales/de.json +++ b/Vocaluxe/Website/locales/de.json @@ -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" } \ No newline at end of file diff --git a/Vocaluxe/Website/locales/es.json b/Vocaluxe/Website/locales/es.json index 35b38409..044e18fd 100644 --- a/Vocaluxe/Website/locales/es.json +++ b/Vocaluxe/Website/locales/es.json @@ -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" } \ No newline at end of file diff --git a/Vocaluxe/Website/locales/fr.json b/Vocaluxe/Website/locales/fr.json index 3e89e528..4ab27121 100644 --- a/Vocaluxe/Website/locales/fr.json +++ b/Vocaluxe/Website/locales/fr.json @@ -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" } \ No newline at end of file diff --git a/Vocaluxe/Website/locales/it.json b/Vocaluxe/Website/locales/it.json index a757def3..c055b460 100644 --- a/Vocaluxe/Website/locales/it.json +++ b/Vocaluxe/Website/locales/it.json @@ -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" } \ No newline at end of file diff --git a/Vocaluxe/Website/locales/sv.json b/Vocaluxe/Website/locales/sv.json index 1a67d61b..dafc5bcc 100644 --- a/Vocaluxe/Website/locales/sv.json +++ b/Vocaluxe/Website/locales/sv.json @@ -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" } \ No newline at end of file diff --git a/VocaluxeLib/Menu/CBackground.cs b/VocaluxeLib/Menu/CBackground.cs index efbbccd9..c6892bf6 100644 --- a/VocaluxeLib/Menu/CBackground.cs +++ b/VocaluxeLib/Menu/CBackground.cs @@ -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)) diff --git a/VocaluxeLib/Menu/CMenuPartyNameSelection.cs b/VocaluxeLib/Menu/CMenuPartyNameSelection.cs index 8a07a99b..6e3d1090 100644 --- a/VocaluxeLib/Menu/CMenuPartyNameSelection.cs +++ b/VocaluxeLib/Menu/CMenuPartyNameSelection.cs @@ -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[] 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(); @@ -716,6 +730,7 @@ namespace VocaluxeLib.Menu _TeamList[team].Add(profileID); _UpdatePlayerSlide(); + _UpdateNextButtonVisibility(); } private void _RemoveAllPlayer() @@ -737,12 +752,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() @@ -757,6 +776,11 @@ namespace VocaluxeLib.Menu } } } + + private void _UpdateNextButtonVisibility() + { + _Buttons[_ButtonNext].Visible = _AllPlayerSelected; + } #endregion } } \ No newline at end of file diff --git a/VocaluxeLib/Menu/CText.cs b/VocaluxeLib/Menu/CText.cs index 4f63e1e6..3a923a6d 100644 --- a/VocaluxeLib/Menu/CText.cs +++ b/VocaluxeLib/Menu/CText.cs @@ -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; diff --git a/VocaluxeLib/Profile/CProfile.cs b/VocaluxeLib/Profile/CProfile.cs index 45afbb81..2e168b97 100644 --- a/VocaluxeLib/Profile/CProfile.cs +++ b/VocaluxeLib/Profile/CProfile.cs @@ -139,7 +139,7 @@ namespace VocaluxeLib.Profile if (filename == "") filename = "1"; - FilePath = Path.Combine(CBase.Settings.GetDataPath(), CBase.Settings.GetFolderProfiles(), CHelper.GetUniqueFileName(FilePath, filename + ".xml", false)); + FilePath = CHelper.GetUniqueFileName(Path.Combine(CBase.Settings.GetDataPath(), CBase.Settings.GetFolderProfiles()), filename + ".xml"); } var xml = new CXmlSerializer();