diff --git a/Output/Readme.txt b/Output/Readme.txt index 1ec5c587..0fa1ebaa 100644 --- a/Output/Readme.txt +++ b/Output/Readme.txt @@ -1,4 +1,4 @@ -Vocaluxe 0.1 README +Vocaluxe 0.2 README ---------------------------- ================================= @@ -33,14 +33,6 @@ Supported Operating Systems / Requirements: - The program supports 32bit and 64bit (Vocaluxe_x64.exe) operating systems. -- The program uses OpenGL as the default renderer. If your graphics card driver does not or not - properly support OpenGL, you can try the Direct3D renderer by editing your Config.xml in the - application's main directory: - - - - TR_CONFIG_DIRECT3D - - To add your existing song collection to Vocaluxe, put your songs into the 'Songs' subfolder. Alternatively, you can add multiple song paths to Vocaluxe by editing your Config.xml: @@ -58,7 +50,25 @@ Supported Operating Systems / Requirements: - To add your own player avatars, simply add some picture files to the 'Profiles' subfolder. Supported file types: png, jpg (jpeg), bmp. Images should have square proportions, e.g. 400x400 px. + +- You can use your WebCam to take profile pictures in the profile screen. Activate your camera + before you start the program. If Vocaluxe detects the camera a button "Webcam" appears in the + profile screen. +- Vocaluxe supports the Wiimotion remote control from Nintendo. Connect it with your bluetooth + connection manager and start Vocaluxe. If a Wiimote is recognized it will perform two short rumbles + and the third LED will lighten up. + If you have troubles to connect the Wiimote try this: + + 1. First connect the Wiimote normally but pressing 1+2 and let the bluetooth manager detect it. + 2. Connect (a pin or password is not needed). + 3. Disconnect. + 4. Press 1+2 Again but DO NOT DO ANYTHING ELSE. Let the WIIMOTE blink, until it times out (stops blinking.) + 5. THEN click connect in the bluetooth settings, when it says looking for device PRESS A or + or Z + (it doesn't matter), just get the thing to blink. (Just don't hit 1+2 or the Sync button, this resets + the sync info.) + It will then connect. + ================================= = 3. Command-Line Parameters = @@ -86,8 +96,14 @@ or from the console: -SongPath [Path] : Deprecated, see SongFolder [Path]. This alias is provided for convenience. +-PlaylistFolder [Path] : Use [Path] as playlist folder. The path needs to be an absolute path. Vocaluxe will + load playlist from this path. + Example: + Vocaluxe.exe -PlaylistFolder D:\MyPlaylists + + Complete example: -Vocaluxe.exe -ConfigFile MyConfig.xml -ScoreFile C:\Vocaluxe\Highscores\MyHighscoreDB.sqlite -SongFolder D:\MySongCollection +Vocaluxe.exe -ConfigFile MyConfig.xml -ScoreFile C:\Vocaluxe\Highscores\MyHighscoreDB.sqlite -SongFolder D:\MySongCollection -PlaylistFolder D:\MyPlaylists ================================= @@ -105,12 +121,27 @@ Vocaluxe.exe -ConfigFile MyConfig.xml -ScoreFile C:\Vocaluxe\Highscores\MyHighsc to change the size and position of the element on the screens. You can save your changes with [S] before leaving the theme edit mode. [TAB] to open the background music controls (not on all screens). +[SHIFT] + [+] to increase volume +[SHIFT] + [-] to decrease volume -Songscreen +Song screen [CTRL] + [R] to select a random song [F3] to open/close the song search menu [A] to sing all songs -[SHIFT] + [A] to sing all songs from a category +[SHIFT] + [A] to sing all songs from a category +[SPACE] to open/close the song menu + +Name selection screen +[1]..[6] to activate player selection. +[Cursor] to select a profile. +[Enter] to confirm a selection. + +Sing screen +[P] to toggle pause. +[CTRL] + [S] to skip a song if there is another one in the playlist. +[T] to change the time format of the timer. +[I] to change view of player information. +[W] to activate the configured webcam. ================================= diff --git a/Output/x64/hidapi.dll b/Output/x64/hidapi.dll index f59be9f8..9e65d33a 100644 Binary files a/Output/x64/hidapi.dll and b/Output/x64/hidapi.dll differ diff --git a/Output/x86/hidapi.dll b/Output/x86/hidapi.dll index c6809772..b24dfb33 100644 Binary files a/Output/x86/hidapi.dll and b/Output/x86/hidapi.dll differ diff --git a/Vocaluxe/Base/CDataBase.cs b/Vocaluxe/Base/CDataBase.cs index 8cd56939..743e0a0b 100644 --- a/Vocaluxe/Base/CDataBase.cs +++ b/Vocaluxe/Base/CDataBase.cs @@ -180,7 +180,7 @@ namespace Vocaluxe.Base command.Parameters.Add("@Date", System.Data.DbType.Int64, 0).Value = player.DateTicks; command.Parameters.Add("@Medley", System.Data.DbType.Int32, 0).Value = Medley; command.Parameters.Add("@Duet", System.Data.DbType.Int32, 0).Value = Duet; - command.Parameters.Add("@ShortSong", System.Data.DbType.Int32, 0).Value = Duet; + command.Parameters.Add("@ShortSong", System.Data.DbType.Int32, 0).Value = ShortSong; command.Parameters.Add("@Difficulty", System.Data.DbType.Int32, 0).Value = (int)player.Difficulty; command.ExecuteNonQuery(); diff --git a/Vocaluxe/Base/CGame.cs b/Vocaluxe/Base/CGame.cs index 95e8d4db..81d5ffe9 100644 --- a/Vocaluxe/Base/CGame.cs +++ b/Vocaluxe/Base/CGame.cs @@ -237,6 +237,10 @@ namespace Vocaluxe.Base for (int beat = _OldBeatD + 1; beat <= _CurrentBeatD; beat++) { + if ((_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_MEDLEY && song.Medley.EndBeat == beat) || + (_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_SHORTSONG && song.ShortEnd == beat)) + _Player[p].SongFinished = true; + CLine[] lines = song.Notes.GetLines(_Player[p].LineNr).Line; int Line = -1; @@ -270,7 +274,7 @@ namespace Vocaluxe.Base Note = j; break; } - } + } if (Note >= 0) { @@ -280,17 +284,11 @@ namespace Vocaluxe.Base { if (Note == lines[Line].NoteCount - 1) { - if (notes[Note].EndBeat == beat - || (_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_MEDLEY && song.Medley.EndBeat == beat) - || (_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_SHORTSONG && song.ShortEnd == beat)) + if (notes[Note].EndBeat == beat) _Player[p].SongFinished = true; } } - if ((_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_MEDLEY && song.Medley.EndBeat == beat) || - (_GameMode.GetCurrentGameMode() == EGameMode.TR_GAMEMODE_SHORTSONG && song.ShortEnd == beat)) - _Player[p].SongFinished = true; - if (notes[Note].PointsForBeat > 0 && (CSound.RecordToneValid(p) || DEBUG_HIT)) { int Tone = notes[Note].Tone; diff --git a/Vocaluxe/Base/CSettings.cs b/Vocaluxe/Base/CSettings.cs index c5f0113e..27c65435 100644 --- a/Vocaluxe/Base/CSettings.cs +++ b/Vocaluxe/Base/CSettings.cs @@ -35,14 +35,14 @@ namespace Vocaluxe.Base public static EGameState GameState = EGameState.Start; public const string sProgramName = "Vocaluxe"; - public const string sProgramCodeName = "Test"; + public const string sProgramCodeName = "Sparkling Sky"; public const int iVersionMajor = 0; public const int iVersionMinor = 2; // milestones public const int iVersionSub = 0; // patches - public const ERevision VersionRevision = ERevision.RC; + public const ERevision VersionRevision = ERevision.Release; - public const int iBuild = 71; // Increase on every published version! Never Reset! + public const int iBuild = 72; // Increase on every published version! Never Reset! public const int iDatabaseHighscoreVersion = 2; public const int iDatabaseCoverVersion = 1; diff --git a/Vocaluxe/Doc/Roadmap.txt b/Vocaluxe/Doc/Roadmap.txt index 7a73c9ed..ccd85b0b 100644 --- a/Vocaluxe/Doc/Roadmap.txt +++ b/Vocaluxe/Doc/Roadmap.txt @@ -86,11 +86,14 @@ - Duet (full support, choose/toggle names) - Playlist-Support - Spectrum Analyzer (Record Screen and Player Selection Screen) + - WiiMote Support + + v0.3.0: + - Party Mode Support + - Party Mode: Challenge Mode (with more than 2 player at once) ----------------- just some ideas: - - WiiMote Support - Installer - More Song List Views - Tile Board: Show title and artist under each tile @@ -104,6 +107,5 @@ just some ideas: - Tournament Mode - Party Mode: Team-Battle - Party Mode: Tic, Tac, Toe - - Party Mode: 4 in a row - - Challenge Mode (with more than 2 player at once) + - Party Mode: 4 in a row - Song Editor \ No newline at end of file diff --git a/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs b/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs index 156c121c..4992a38d 100644 --- a/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs +++ b/Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs @@ -195,7 +195,7 @@ namespace Vocaluxe.Lib.Input.WiiMote if (!CHIDAPI.Init()) { CLog.LogError("WiiMoteLib: Can't initialize HID API"); - string msg = "Please install the Visual C++ Redistributable Packages 2012! You can find them at: http://www.microsoft.com/en-us/download/details.aspx?id=30679"; + string msg = "Please install the Visual C++ Redistributable Packages 2008!"; CLog.LogError(msg); _Active = false; diff --git a/VocaluxeLib/Menu/SongMenu/CSong.cs b/VocaluxeLib/Menu/SongMenu/CSong.cs index 3b42f0f6..daeffcee 100644 --- a/VocaluxeLib/Menu/SongMenu/CSong.cs +++ b/VocaluxeLib/Menu/SongMenu/CSong.cs @@ -216,6 +216,8 @@ namespace Vocaluxe.Menu.SongMenu this.PreviewStart = song.PreviewStart; this.ShortEnd = song.ShortEnd; + this.DuetPart1 = song.DuetPart1; + this.DuetPart2 = song.DuetPart2; this.Encoding = song.Encoding; this.Folder = song.Folder;