Merge branch 'master' into rap

Output/Readme.txt

@@ -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
 Translations:			https://www.transifex.com/projects/p/vocaluxe/
 GitHub Wiki:			https://github.com/Vocaluxe/Vocaluxe/wiki
-Support Forum (German):		http://www.ultra-star.de
 Song-DataBase (USDB):		http://usdb.animux.de/
 
 

Vocaluxe/Base/CConfig.cs

@@ -688,7 +688,7 @@ namespace Vocaluxe.Base
                 {
                     //Check if folder exists
                     if (Directory.Exists(folder))
-                        SongFolders.Add(folder);
+                        SongFolders.Add(Path.GetFullPath(folder));
                 }
             }
             
@@ -853,4 +853,4 @@ namespace Vocaluxe.Base
             }
         }
     }
-}
+}

Vocaluxe/Screens/CScreenSing.cs

@@ -1399,7 +1399,7 @@ namespace Vocaluxe.Screens
                 }
 
                 // sub
-                if (currentLineSub < lines.Length - 2)
+                if ((currentLineSub + 1) < lines.Length)
                 {
                     float diff = CGame.GetTimeFromBeats(lines[currentLineSub + 1].FirstNoteBeat, song.BPM) - currentTime;
 
@@ -1828,4 +1828,4 @@ namespace Vocaluxe.Screens
             }
         }
     }
-}
+}

Vocaluxe/Screens/CScreenSong.cs

@@ -1082,7 +1082,7 @@ namespace Vocaluxe.Screens
                     case ESongSorting.TR_CONFIG_FOLDER:
                         if (curSelected >= 0 && curSelected < ct - 1 && songs[curSelected].Folder.StartsWith(letter.ToString(), StringComparison.OrdinalIgnoreCase))
                             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;
                 }
                 if (visibleID > -1)
@@ -1395,4 +1395,4 @@ namespace Vocaluxe.Screens
         }
         #endregion Playlist Actions
     }
-}
+}

VocaluxeLib/Menu/CPlaylist.cs

@@ -492,7 +492,7 @@ namespace VocaluxeLib.Menu
                         break;
 
                     case Keys.Enter:
-                        _StartPlaylistSong(_CurrentPlaylistElement);
+                        _StartPlaylistSong(_CurrentPlaylistElement + _Offset);
                         break;
 
                     case Keys.Add: //move the selected song up
@@ -818,7 +818,7 @@ namespace VocaluxeLib.Menu
 
                         //Start selected song with double click
                         if (mouseEvent.LD && _CurrentPlaylistElement != -1)
-                            _StartPlaylistSong(_CurrentPlaylistElement);
+                            _StartPlaylistSong(_CurrentPlaylistElement + _Offset);
 
                         //Change order with holding LB
                         if (mouseEvent.LBH && _CurrentPlaylistElement != -1 && _PlaylistElementContents.Count > 0 && DragAndDropSongID == -1)
@@ -1197,4 +1197,4 @@ namespace VocaluxeLib.Menu
         }
         #endregion ThemeEdit
     }
-}
+}

VocaluxeLib/Menu/SongMenu/CSongMenuList.cs

@@ -511,7 +511,9 @@ namespace VocaluxeLib.Menu.SongMenu
             }
             _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)
             {
@@ -653,4 +655,4 @@ namespace VocaluxeLib.Menu.SongMenu
             base.LoadSkin();
         }
     }
-}
+}

VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs

@@ -485,7 +485,9 @@ namespace VocaluxeLib.Menu.SongMenu
 
             _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)
             {
@@ -608,4 +610,4 @@ namespace VocaluxeLib.Menu.SongMenu
             Init();
         }
     }
-}
+}

appveyor.yml

@@ -9,9 +9,7 @@ platform:
 clone_depth: 15
 environment:
   GitHubKey:
-    secure: JSlN/em0JdspVn8jwaQ4IjugY6OQi0au4Qq0rhctJmcfGMaEGnUAOmDFULI48REW
+    secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE
-init:
-- git config --global core.autocrlf true
 install:
 - ps: |
     $Env:VOCALUXE_SKIP_POSTBUILD = $true
@@ -135,7 +133,7 @@ deploy:
   release: $(APPVEYOR_REPO_TAG_NAME)
   description: $(APPVEYOR_REPO_COMMIT)
   auth_token:
-    secure: JSlN/em0JdspVn8jwaQ4IjugY6OQi0au4Qq0rhctJmcfGMaEGnUAOmDFULI48REW
+    secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE
   artifact: ReleaseZip
   prerelease: $(IS_BETA_RELEASE)
   on:
@@ -147,7 +145,7 @@ deploy:
   release: Latest Nightly build
   description: $(APPVEYOR_REPO_COMMIT)
   auth_token:
-    secure: JSlN/em0JdspVn8jwaQ4IjugY6OQi0au4Qq0rhctJmcfGMaEGnUAOmDFULI48REW
+    secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE
   artifact: ReleaseZip
   prerelease: true
   on: