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

Compare commits

merge into: Projects/Vocaluxe:ui_study_yoga
Projects/Vocaluxe:develop Projects/Vocaluxe:feature/song-server Projects/Vocaluxe:translations/b39ec09ee7 Projects/Vocaluxe:gh-pages Projects/Vocaluxe:release-0.5 Projects/Vocaluxe:master Projects/Vocaluxe:ui_study_yoga
Projects/Vocaluxe:Nightly Projects/Vocaluxe:0.5.0.rc Projects/Vocaluxe:0.4.1 Projects/Vocaluxe:0.4.0 Projects/Vocaluxe:0.4.0.beta2 Projects/Vocaluxe:0.4.0.beta1 Projects/Vocaluxe:0.3.0.83
...
pull from: Projects/Vocaluxe:master
Projects/Vocaluxe:feature/song-server Projects/Vocaluxe:translations/b39ec09ee7 Projects/Vocaluxe:gh-pages Projects/Vocaluxe:develop Projects/Vocaluxe:release-0.5 Projects/Vocaluxe:master Projects/Vocaluxe:ui_study_yoga
Projects/Vocaluxe:Nightly Projects/Vocaluxe:0.5.0.rc Projects/Vocaluxe:0.4.1 Projects/Vocaluxe:0.4.0 Projects/Vocaluxe:0.4.0.beta2 Projects/Vocaluxe:0.4.0.beta1 Projects/Vocaluxe:0.3.0.83
25 Commits
ui_study_yoga ... master
Author SHA1 Message Date
Stefan 81c323363a Release 0.4.1 
Release 0.4.1
 2020-03-10 07:52:34 +01:00
Stefan 1356b61383 Merge pull request #507 from lukeIam/release-0.4.1 
Fix: replace invalid github tokens in 0.4.1 branch
 2020-03-09 19:17:58 +01:00
Stefan 3806c77d98 Merge branch 'release-0.4.1' into release-0.4.1 2020-03-09 19:02:37 +01:00
lukeIam a6c5766138 Fix: replace invalid github tokens in 0.4.1 branch 2020-03-09 18:24:20 +01:00
Stefan 3bbcb2d56a Merge pull request #328 from Vocaluxe/release-0.4.1 
Bugfix release 0.4.1
 2020-03-08 17:24:28 +01:00
daggeg 25fd140b3e Merge pull request #497 from Vocaluxe/Readme-patch-1 
Update Readme.txt
 2020-02-11 13:01:00 +01:00
Stefan 5e481878f5 Update Readme.txt 2020-02-11 06:32:26 +01:00
Stefan c05f2ab548 Merge pull request #495 from Vocaluxe/FixSubLineAlphaCalculation_release-0.4.1 
Fix alpha calculation for last sub line (release-0.4.1)
 2020-02-09 20:23:54 +01:00
Stefan 919ab803d1 Fix alpha calculation for last sub line (release-0.4.1) 
Sub line was displayed wrong, if the last lyric line has a bigger distance to the second last line. Alpha calculation for sub lines stopped one line to early and might be visible even if it shouldn't be.
 2020-02-09 20:02:59 +01:00
daggeg dd7be5c575 Merge pull request #489 from Vocaluxe/FixPlaylistScrollOffset_release-0.4.1 
Scroll offset was ignored while singing a single playlist song (fix #487 for release-0.4.1)
 2020-02-08 11:19:50 +01:00
Stefan 546ccf4748 Scroll offset was ignored while singing a single playlist song (fix #487 for release-0.4.1) 2020-02-07 21:17:36 +01:00
Stefan d457c6c66f Merge pull request #481 from Vocaluxe/RelativeSongPathFix-0.4.1 
Relative song paths will now be converted to absolute song paths (release-0.4.1)
 2020-02-04 14:10:09 +01:00
Stefan cfc6bfa738 Relative song paths will now be converted to absolute song paths 
Same fix from GaryCXJk for release-0.4.1
 2020-02-04 08:46:48 +01:00
daggeg de80eeb823 Merge pull request #448 from Vocaluxe/VideoPreviewFix-release0.4.1 
Fix release-0.4.1: Config.Video.VideoPreview is ignored (fixes #391)
 2020-01-17 17:32:28 +01:00
Stefan 2bb2819b33 Merge branch 'release-0.4.1' into VideoPreviewFix-release0.4.1 2020-01-16 22:01:16 +01:00
daggeg c0e2281b74 Merge pull request #451 from Vocaluxe/JumpTo_FolderSort-fix0.4.1 
Fix release-0.4.1: JumpTo not working correctly on folder sort (fix #449)
 2020-01-16 08:28:43 +01:00
Stefan 9e8952157a Fix release-0.4.1: JumpTo not working correctly on folder sort (fix #449) 2020-01-16 07:15:23 +01:00
Stefan e2dcbc2ecf Fix release-0.4.1: Config.Video.VideoPreview is ignored (fixes #391) 2020-01-15 23:46:01 +01:00
Stefan 4c76c88074 Fix release-0.4.1: Config.Video.VideoPreview is ignored (fixes #391) 2020-01-15 23:44:49 +01:00
lukeIam 890e6d84fb Merge pull request #380 from lukeIam/release-0.4.1 
Use TLS 1.2 for downloading GStreamer
 2018-03-01 17:21:29 +01:00
lukeIam cd5ab37afd Use TLS 1.2 for downloading GStreamer 
(cherry picked from commit 617cf70bf8)
 2018-03-01 11:24:50 +01:00
Florian Küpper 5adde7b9c4 Merge pull request #373 from lukeIam/release-0.4.1 
New PortAudio
 2018-02-04 16:24:11 +01:00
lukeIam 61dcfc3aeb Upgrade PortAudio to version pa_stable_v190600_20161030 
(cherry picked from commit 16f9ef2c88)
 2018-02-04 16:04:16 +01:00
lukeIam 342123dc4e Removed useless metapackage vocaluxe.dependencies 
(cherry picked from commit 20d13d9f06)

# Conflicts:
#	Vocaluxe/packages.config
 2018-02-04 16:04:14 +01:00
Florian Küpper c55f779dba Merge pull request #358 from flokuep/release-0.4.1 
Release 0.4.1
 2017-12-26 16:33:49 +01:00
10 changed files with 30 additions and 28 deletions
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
----------------------------
=================================
@@ -168,7 +168,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
+2 -2
View File
@@ -633,7 +633,7 @@ namespace Vocaluxe.Base
{
//Check if folder exists
if (Directory.Exists(folder))
SongFolders.Add(folder);
SongFolders.Add(Path.GetFullPath(folder));
}
}
@@ -803,4 +803,4 @@ namespace Vocaluxe.Base
}
}
}
}
}
Vocaluxe/Screens/CScreenSing.cs
+2 -2
View File
@@ -1114,7 +1114,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;
@@ -1371,4 +1371,4 @@ namespace Vocaluxe.Screens
}
}
}
}
}
Vocaluxe/Screens/CScreenSong.cs
+2 -2
View File
@@ -1067,7 +1067,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)
@@ -1380,4 +1380,4 @@ namespace Vocaluxe.Screens
}
#endregion Playlist Actions
}
}
}
Vocaluxe/Vocaluxe.csproj
+6 -7
View File
@@ -31,7 +31,8 @@
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<NuGetPackageImportStamp>3d91144f</NuGetPackageImportStamp>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -542,12 +543,11 @@
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets'))" />
<Error Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND !Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.2\build\vocaluxe.dependencies.portaudiosharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.portaudiosharp.1.0.2\build\vocaluxe.dependencies.portaudiosharp.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets'))" />
<Error Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND !Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.1.0.11\build\vocaluxe.dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.1.0.11\build\vocaluxe.dependencies.targets'))" />
<Error Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND !Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.3\build\vocaluxe.dependencies.gstreamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamer.1.0.3\build\vocaluxe.dependencies.gstreamer.targets'))" />
<Error Condition="!Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.3\build\vocaluxe.dependencies.portaudiosharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.portaudiosharp.1.0.3\build\vocaluxe.dependencies.portaudiosharp.targets'))" />
</Target>
<Import Project="..\packages\vocaluxe.dependencies.acinerella.1.0.5\build\vocaluxe.dependencies.acinerella.targets" Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.5\build\vocaluxe.dependencies.acinerella.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets" Condition="Exists('..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets')" />
@@ -556,10 +556,9 @@
<Import Project="..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets" Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.4\build\vocaluxe.dependencies.hidapi.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets" Condition="Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.portaudiosharp.1.0.2\build\vocaluxe.dependencies.portaudiosharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.2\build\vocaluxe.dependencies.portaudiosharp.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets" Condition="Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets" Condition="Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets" Condition="Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets" Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.2\build\vocaluxe.dependencies.gstreamer.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.1.0.11\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.11\build\vocaluxe.dependencies.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.gstreamer.1.0.3\build\vocaluxe.dependencies.gstreamer.targets" Condition="'$(Configuration)' != 'ReleaseLinux' AND '$(Configuration)' != 'DebugLinux' AND Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.3\build\vocaluxe.dependencies.gstreamer.targets')" />
<Import Project="..\packages\vocaluxe.dependencies.portaudiosharp.1.0.3\build\vocaluxe.dependencies.portaudiosharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.3\build\vocaluxe.dependencies.portaudiosharp.targets')" />
</Project>
Vocaluxe/packages.config
+3 -3
View File
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="vocaluxe.dependencies" version="1.0.11" targetFramework="net40" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net471" />
<package id="vocaluxe.dependencies.acinerella" version="1.0.5" targetFramework="net40" />
<package id="vocaluxe.dependencies.aforgevideo" version="1.0.1" targetFramework="net40" />
<package id="vocaluxe.dependencies.csharpsqlite" version="1.0.1" targetFramework="net40" />
<package id="vocaluxe.dependencies.ffmpeg" version="1.0.4" targetFramework="net40" />
<package id="vocaluxe.dependencies.gstreamer" version="1.0.2" targetFramework="net40" />
<package id="vocaluxe.dependencies.gstreamer" version="1.0.3" targetFramework="net40" />
<package id="vocaluxe.dependencies.gstreamersharp" version="1.0.1" targetFramework="net40" />
<package id="vocaluxe.dependencies.hidapi" version="1.0.4" targetFramework="net40" />
<package id="vocaluxe.dependencies.opentk" version="1.0.1" targetFramework="net40" />
<package id="vocaluxe.dependencies.portaudiosharp" version="1.0.2" targetFramework="net40" />
<package id="vocaluxe.dependencies.portaudiosharp" version="1.0.3" targetFramework="net40" />
<package id="vocaluxe.dependencies.qrcoder" version="1.0.1" targetFramework="net40" />
<package id="vocaluxe.dependencies.slimdx" version="1.0.1" targetFramework="net40" />
<package id="vocaluxe.dependencies.sqlite" version="1.0.1" targetFramework="net40" />
VocaluxeLib/Menu/CPlaylist.cs
+3 -3
View File
@@ -554,7 +554,7 @@ namespace VocaluxeLib.Menu
break;
case Keys.Enter:
_StartPlaylistSong(_CurrentPlaylistElement);
_StartPlaylistSong(_CurrentPlaylistElement + _Offset);
break;
case Keys.Add: //move the selected song up
@@ -880,7 +880,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)
@@ -1259,4 +1259,4 @@ namespace VocaluxeLib.Menu
}
#endregion ThemeEdit
}
}
}
VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
+4 -2
View File
@@ -541,7 +541,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)
{
@@ -683,4 +685,4 @@ namespace VocaluxeLib.Menu.SongMenu
base.LoadSkin();
}
}
}
}
VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+4 -2
View File
@@ -515,7 +515,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)
{
@@ -638,4 +640,4 @@ namespace VocaluxeLib.Menu.SongMenu
Init();
}
}
}
}
appveyor.yml
+3 -3
View File
@@ -9,7 +9,7 @@ platform:
clone_depth: 15
environment:
GitHubKey:
secure: JSlN/em0JdspVn8jwaQ4IjugY6OQi0au4Qq0rhctJmcfGMaEGnUAOmDFULI48REW
secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE
install:
- ps: |
$Env:CurrentCommitSha = "$(git rev-parse --verify HEAD)"
@@ -88,7 +88,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:
@@ -100,7 +100,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: