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

This commit is contained in:
Florian Küpper committed 2013-01-06 14:38:36 +01:00
commit 0b47218bfb
5 files changed
+13 -3

No files matched your search

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

+12 -2
View File
@@ -91,6 +91,8 @@
+ v0.3.0:
- Party Mode Support
- Party Mode: Challenge Mode (with more than 2 player at once)
- Party Mode: Challenge Medley Mode
- Party Mode: Tic, Tac, Toe
-----------------
just some ideas:
@@ -106,6 +108,14 @@ just some ideas:
- Jukebox
- Tournament Mode
- Party Mode: Team-Battle
- Party Mode: Tic, Tac, Toe
- Party Mode: 4 in a row
- Song Editor
- Song Editor
-----------------
some feature wishes:
- Medley:
* add a countdown
- Party Modes:
* add sing modes: hide notes, hide lyrics, ...
* add a party mode where you can assign song categories and/or playlists to the profiles
+1 -1
View File
@@ -1016,7 +1016,7 @@ namespace Vocaluxe.Menu.SongMenu
}
//Calculate length of singing
int stop = (lines.Line[lines.Line.Length - 1].LastNoteBeat - lines.Line[0].FirstNoteBeat) / 2;
int stop = (lines.Line[lines.Line.Length - 1].LastNoteBeat - lines.Line[0].FirstNoteBeat) / 2 + lines.Line[0].StartBeat;
//Check if stop is in series
for (int i = 0; i < series.Count; i++)