From 98064a98a09952a19cafeed3ce656e91db8c6f7e Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 23 Sep 2021 03:02:42 +0200 Subject: [PATCH 1/7] Fix reloading songs with F5 & CTRL+R key shortcuts --- Vocaluxe/Screens/CScreenSing.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 8e237bdd..8b2f8734 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -328,21 +328,21 @@ namespace Vocaluxe.Screens song.Save(); break; - // Restart Round and reload song file header + // Restart Song and reload song from disk (not in party modes with multiple rounds) case Keys.R: - if (keyEvent.Mod == EModifier.Ctrl && _Pause) + if (keyEvent.Mod == EModifier.Ctrl && _Pause && CGame.NumRounds == 1) { + _RestartGame(); _SetPause(false); - _RestartRound(); } break; - // Restart Round and reload song file header + // Restart Song and reload song from disk (not in party modes with multiple rounds) case Keys.F5: - if (_Pause) + if (_Pause && CGame.NumRounds == 1) { + _RestartGame(); _SetPause(false); - _RestartRound(); } break; From 30cf1c356d0e55755e3bc74e126dbeb0cf06f6cf Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 23 Sep 2021 03:52:15 +0200 Subject: [PATCH 2/7] Fix crash on an ArgumentException from Party Modes --- Vocaluxe/Screens/CScreenSing.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 8e237bdd..42a9230b 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -430,7 +430,13 @@ namespace Vocaluxe.Screens _SetPause(false); _TimeRects.Clear(); - _Sso = CParty.GetSongSelectionOptions(); + try + { + _Sso = CParty.GetSongSelectionOptions(); + } + catch (ArgumentException) + { + } _SingNotes[_SingBars].Init(0); _AssignPlayerElements(); From 45b6a39754c5cfcc75bf3b200b887fc0dffc41b8 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 23 Sep 2021 19:50:12 +0200 Subject: [PATCH 3/7] Assuming playing party mode on ArgumentException If getting an ArgumentException while requesting song selection options (which the TicTacToe party mode do), I assume that Vocaluxe is playing a party mode. This allows detection of a running party mode in CScreenSing, to prevent song skipping (Shift/CTRL + Arrow Right) while playing party modes. --- Vocaluxe/Screens/CScreenSing.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 28adc43e..c1add464 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -436,6 +436,8 @@ namespace Vocaluxe.Screens } catch (ArgumentException) { + // Workaround to assume party mode here (TicTacToe game mode throw the ArgumentException) / Stefan1200 + _Sso.Selection.PartyMode = true; } _SingNotes[_SingBars].Init(0); From 601c4b6d7e40ac1025764e45921456dfef6e1a38 Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 23 Sep 2021 19:52:44 +0200 Subject: [PATCH 4/7] Update CScreenSing.cs --- Vocaluxe/Screens/CScreenSing.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index c1add464..1f29a202 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -436,7 +436,7 @@ namespace Vocaluxe.Screens } catch (ArgumentException) { - // Workaround to assume party mode here (TicTacToe game mode throw the ArgumentException) / Stefan1200 + // Workaround to assume party mode here (TicTacToe party mode throw the ArgumentException) / Stefan1200 _Sso.Selection.PartyMode = true; } From 45b8b51a4c7f973f569f5889d92a91b3f8a3e21e Mon Sep 17 00:00:00 2001 From: JanK118 <60331177+JanK118@users.noreply.github.com> Date: Mon, 3 Jan 2022 15:30:41 +0100 Subject: [PATCH 5/7] Update README.md As a solution for issues like https://github.com/Vocaluxe/Vocaluxe/issues/567 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8c0b75a6..cdc72c1b 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Supported Operating Systems / Requirements: - Windows Vista, Windows 7, Windows 8, Windows 8.1 and Windows 10 with .NET 4.0 - *Linux* (no official support) - 1 GHz CPU, 512 MB RAM, Graphics card with OpenGL 2.1 or DirectX 9.0 support -- Visual C++ Redistributable Package 2010 +- Visual C++ Redistributable Package 2010 (2015-2022 is required for the nightly builds) ## 2. Download From 21991db629353ecd885b370abb0b2f18795f11c6 Mon Sep 17 00:00:00 2001 From: JanK118 <60331177+JanK118@users.noreply.github.com> Date: Mon, 3 Jan 2022 15:36:59 +0100 Subject: [PATCH 6/7] Update Readme.txt --- Output/Readme.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Output/Readme.txt b/Output/Readme.txt index edea3878..c0d408a1 100644 --- a/Output/Readme.txt +++ b/Output/Readme.txt @@ -26,7 +26,7 @@ Supported Operating Systems / Requirements: - Windows Vista, Windows 7, Windows 8 or Windows 10 with .NET 4.0 - Linux (no official support) - 1 GHz CPU, 512 MB RAM, Graphics card with OpenGL 2.1 or DirectX 9.0 support -- Visual C++ Redistributable Package 2010 +- Visual C++ Redistributable Package 2010 (2015-2022 is required for the nightly builds) ================================= @@ -176,7 +176,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/ From 79464db984f3b0c3e7cd9bc30a623b8a335db58f Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Sun, 16 Jan 2022 15:31:09 +0100 Subject: [PATCH 7/7] update git tokens --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ae906561..e4635c95 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ platform: clone_depth: 15 environment: GitHubKey: - secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE + secure: jBeNVwHNcDfeTHvEfCFFDZi7FW43xwTbjJhMTHtlQQIvj9t4GaIpif5pzbk24UO1 init: - git config --global core.autocrlf true install: @@ -136,7 +136,7 @@ deploy: release: $(APPVEYOR_REPO_TAG_NAME) description: $(APPVEYOR_REPO_COMMIT) auth_token: - secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE + secure: jBeNVwHNcDfeTHvEfCFFDZi7FW43xwTbjJhMTHtlQQIvj9t4GaIpif5pzbk24UO1 artifact: ReleaseZip prerelease: $(IS_BETA_RELEASE) on: @@ -148,7 +148,7 @@ deploy: release: Latest Nightly build description: $(APPVEYOR_REPO_COMMIT) auth_token: - secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE + secure: jBeNVwHNcDfeTHvEfCFFDZi7FW43xwTbjJhMTHtlQQIvj9t4GaIpif5pzbk24UO1 artifact: ReleaseZip prerelease: true on: