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

Merge branch 'master' into rap

Browse Source
This commit is contained in:
Gary Kertopermono committed 2020-03-31 23:57:19 +02:00
2 parents 26655b84dc 81c323363a
commit 8d7116706d
8 files changed
+15 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Readme.txt
+1 -2
View File
@@ -1,4 +1,4 @@
Vocaluxe 0.4 README Vocaluxe 0.4.1 README
---------------------------- ----------------------------
================================= =================================
@@ -165,7 +165,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/
Vocaluxe/Base/CConfig.cs
+1 -1
View File
@@ -688,7 +688,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));
} }
} }
Vocaluxe/Screens/CScreenSing.cs
+1 -1
View File
@@ -1399,7 +1399,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;
Vocaluxe/Screens/CScreenSong.cs
+1 -1
View File
@@ -1082,7 +1082,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)
VocaluxeLib/Menu/CPlaylist.cs
+2 -2
View File
@@ -492,7 +492,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
@@ -818,7 +818,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)
VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
+3 -1
View File
@@ -511,7 +511,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)
{ {
VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+3 -1
View File
@@ -485,7 +485,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)
{ {
appveyor.yml
+3 -5
View File
@@ -9,9 +9,7 @@ platform:
clone_depth: 15 clone_depth: 15
environment: environment:
GitHubKey: GitHubKey:
secure: JSlN/em0JdspVn8jwaQ4IjugY6OQi0au4Qq0rhctJmcfGMaEGnUAOmDFULI48REW secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE
init:
- git config --global core.autocrlf true
install: install:
- ps: | - ps: |
$Env:VOCALUXE_SKIP_POSTBUILD = $true $Env:VOCALUXE_SKIP_POSTBUILD = $true
@@ -135,7 +133,7 @@ deploy:
release: $(APPVEYOR_REPO_TAG_NAME) release: $(APPVEYOR_REPO_TAG_NAME)
description: $(APPVEYOR_REPO_COMMIT) description: $(APPVEYOR_REPO_COMMIT)
auth_token: auth_token:
secure: JSlN/em0JdspVn8jwaQ4IjugY6OQi0au4Qq0rhctJmcfGMaEGnUAOmDFULI48REW secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE
artifact: ReleaseZip artifact: ReleaseZip
prerelease: $(IS_BETA_RELEASE) prerelease: $(IS_BETA_RELEASE)
on: on:
@@ -147,7 +145,7 @@ deploy:
release: Latest Nightly build release: Latest Nightly build
description: $(APPVEYOR_REPO_COMMIT) description: $(APPVEYOR_REPO_COMMIT)
auth_token: auth_token:
secure: JSlN/em0JdspVn8jwaQ4IjugY6OQi0au4Qq0rhctJmcfGMaEGnUAOmDFULI48REW secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE
artifact: ReleaseZip artifact: ReleaseZip
prerelease: true prerelease: true
on: on: