Merge branch 'release-0.4.1' into release-0.4.1
This commit is contained in:
7 files changed
+12
-9
No files matched your search
+1
-2
@@ -1,4 +1,4 @@
|
|||||||
Vocaluxe 0.4 README
|
Vocaluxe 0.4.1 README
|
||||||
----------------------------
|
----------------------------
|
||||||
|
|
||||||
=================================
|
=================================
|
||||||
@@ -168,7 +168,6 @@ Vocaluxe Homepage: https://vocaluxe.org
|
|||||||
Bug Tracker: https://github.com/Vocaluxe/Vocaluxe/issues
|
Bug Tracker: https://github.com/Vocaluxe/Vocaluxe/issues
|
||||||
Translations: https://www.transifex.com/projects/p/vocaluxe/
|
Translations: https://www.transifex.com/projects/p/vocaluxe/
|
||||||
GitHub Wiki: https://github.com/Vocaluxe/Vocaluxe/wiki
|
GitHub Wiki: https://github.com/Vocaluxe/Vocaluxe/wiki
|
||||||
Support Forum (German): http://www.ultra-star.de
|
|
||||||
Song-DataBase (USDB): http://usdb.animux.de/
|
Song-DataBase (USDB): http://usdb.animux.de/
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -633,7 +633,7 @@ namespace Vocaluxe.Base
|
|||||||
{
|
{
|
||||||
//Check if folder exists
|
//Check if folder exists
|
||||||
if (Directory.Exists(folder))
|
if (Directory.Exists(folder))
|
||||||
SongFolders.Add(folder);
|
SongFolders.Add(Path.GetFullPath(folder));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1114,7 +1114,7 @@ namespace Vocaluxe.Screens
|
|||||||
}
|
}
|
||||||
|
|
||||||
// sub
|
// sub
|
||||||
if (currentLineSub < lines.Length - 2)
|
if ((currentLineSub + 1) < lines.Length)
|
||||||
{
|
{
|
||||||
float diff = CGame.GetTimeFromBeats(lines[currentLineSub + 1].FirstNoteBeat, song.BPM) - currentTime;
|
float diff = CGame.GetTimeFromBeats(lines[currentLineSub + 1].FirstNoteBeat, song.BPM) - currentTime;
|
||||||
|
|
||||||
|
|||||||
@@ -1067,7 +1067,7 @@ namespace Vocaluxe.Screens
|
|||||||
case ESongSorting.TR_CONFIG_FOLDER:
|
case ESongSorting.TR_CONFIG_FOLDER:
|
||||||
if (curSelected >= 0 && curSelected < ct - 1 && songs[curSelected].Folder.StartsWith(letter.ToString(), StringComparison.OrdinalIgnoreCase))
|
if (curSelected >= 0 && curSelected < ct - 1 && songs[curSelected].Folder.StartsWith(letter.ToString(), StringComparison.OrdinalIgnoreCase))
|
||||||
start = curSelected + 1;
|
start = curSelected + 1;
|
||||||
visibleID = _FindIndex(songs, start, element => element.Folder.StartsWith(letter.ToString(), StringComparison.OrdinalIgnoreCase));
|
visibleID = _FindIndex(songs, start, element => element.FolderName.StartsWith(letter.ToString(), StringComparison.OrdinalIgnoreCase));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (visibleID > -1)
|
if (visibleID > -1)
|
||||||
|
|||||||
@@ -554,7 +554,7 @@ namespace VocaluxeLib.Menu
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case Keys.Enter:
|
case Keys.Enter:
|
||||||
_StartPlaylistSong(_CurrentPlaylistElement);
|
_StartPlaylistSong(_CurrentPlaylistElement + _Offset);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Keys.Add: //move the selected song up
|
case Keys.Add: //move the selected song up
|
||||||
@@ -880,7 +880,7 @@ namespace VocaluxeLib.Menu
|
|||||||
|
|
||||||
//Start selected song with double click
|
//Start selected song with double click
|
||||||
if (mouseEvent.LD && _CurrentPlaylistElement != -1)
|
if (mouseEvent.LD && _CurrentPlaylistElement != -1)
|
||||||
_StartPlaylistSong(_CurrentPlaylistElement);
|
_StartPlaylistSong(_CurrentPlaylistElement + _Offset);
|
||||||
|
|
||||||
//Change order with holding LB
|
//Change order with holding LB
|
||||||
if (mouseEvent.LBH && _CurrentPlaylistElement != -1 && _PlaylistElementContents.Count > 0 && DragAndDropSongID == -1)
|
if (mouseEvent.LBH && _CurrentPlaylistElement != -1 && _PlaylistElementContents.Count > 0 && DragAndDropSongID == -1)
|
||||||
|
|||||||
@@ -541,7 +541,9 @@ namespace VocaluxeLib.Menu.SongMenu
|
|||||||
}
|
}
|
||||||
_TextBG.Draw();
|
_TextBG.Draw();
|
||||||
|
|
||||||
CTextureRef vidtex = CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null;
|
CTextureRef vidtex = null;
|
||||||
|
if (CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON)
|
||||||
|
vidtex = (CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null);
|
||||||
|
|
||||||
if (vidtex != null)
|
if (vidtex != null)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -515,7 +515,9 @@ namespace VocaluxeLib.Menu.SongMenu
|
|||||||
|
|
||||||
_TextBG.Draw();
|
_TextBG.Draw();
|
||||||
|
|
||||||
CTextureRef vidtex = CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null;
|
CTextureRef vidtex = null;
|
||||||
|
if (CBase.Config.GetVideoPreview() == EOffOn.TR_CONFIG_ON)
|
||||||
|
vidtex = (CBase.BackgroundMusic.IsPlayingPreview() ? CBase.BackgroundMusic.GetVideoTexture() : null);
|
||||||
|
|
||||||
if (vidtex != null)
|
if (vidtex != null)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user