From 6f3a60df3ada6bec8e995d371c608deaa1334f1c Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Wed, 22 Feb 2012 16:52:53 +0100 Subject: [PATCH 1/5] opened release 0.1 branch --- Vocaluxe/Base/CSettings.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vocaluxe/Base/CSettings.cs b/Vocaluxe/Base/CSettings.cs index 2202638c..c0063399 100644 --- a/Vocaluxe/Base/CSettings.cs +++ b/Vocaluxe/Base/CSettings.cs @@ -29,9 +29,9 @@ namespace Vocaluxe.Base public const int iVersionMajor = 0; public const int iVersionMinor = 1; // milestones public const int iVersionSub = 0; // steps - public const ERevision VersionRevision = ERevision.Alpha; + public const ERevision VersionRevision = ERevision.Beta; - public const int iBuild = 50; // Increase on every published version! Never Reset! + public const int iBuild = 51; // Increase on every published version! Never Reset! public const int iDatabaseHighscoreVersion = 1; public const int iDatabaseCoverVersion = 1; From 175ae1963ce139897a510c6958d2d65e3aa420b9 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Wed, 22 Feb 2012 17:22:47 +0100 Subject: [PATCH 2/5] add screenshots folder if not exists --- Vocaluxe/Lib/Draw/CDirect3D.cs | 2 ++ Vocaluxe/Lib/Draw/CDrawWinForm.cs | 2 ++ Vocaluxe/Lib/Draw/COpenGL.cs | 2 ++ 3 files changed, 6 insertions(+) diff --git a/Vocaluxe/Lib/Draw/CDirect3D.cs b/Vocaluxe/Lib/Draw/CDirect3D.cs index d685857d..0715d792 100644 --- a/Vocaluxe/Lib/Draw/CDirect3D.cs +++ b/Vocaluxe/Lib/Draw/CDirect3D.cs @@ -461,6 +461,8 @@ namespace Vocaluxe.Lib.Draw { string file = "Screenshot_"; string path = Path.Combine(Environment.CurrentDirectory, CSettings.sFolderScreenshots); + if (!Directory.Exists(path)) + Directory.CreateDirectory(path); int i = 0; while (File.Exists(Path.Combine(path, file + i.ToString("00000") + ".bmp"))) diff --git a/Vocaluxe/Lib/Draw/CDrawWinForm.cs b/Vocaluxe/Lib/Draw/CDrawWinForm.cs index 6e71cca8..6b64e1fc 100644 --- a/Vocaluxe/Lib/Draw/CDrawWinForm.cs +++ b/Vocaluxe/Lib/Draw/CDrawWinForm.cs @@ -300,6 +300,8 @@ namespace Vocaluxe.Lib.Draw { string file = "Screenshot_"; string path = Path.Combine(Environment.CurrentDirectory, CSettings.sFolderScreenshots); + if (!Directory.Exists(path)) + Directory.CreateDirectory(path); int i = 0; while (File.Exists(Path.Combine(path, file + i.ToString("00000") + ".png"))) diff --git a/Vocaluxe/Lib/Draw/COpenGL.cs b/Vocaluxe/Lib/Draw/COpenGL.cs index 5be7ac4d..88f8cb18 100644 --- a/Vocaluxe/Lib/Draw/COpenGL.cs +++ b/Vocaluxe/Lib/Draw/COpenGL.cs @@ -556,6 +556,8 @@ namespace Vocaluxe.Lib.Draw { string file = "Screenshot_"; string path = Path.Combine(Environment.CurrentDirectory, CSettings.sFolderScreenshots); + if (!Directory.Exists(path)) + Directory.CreateDirectory(path); int i = 0; while (File.Exists(Path.Combine(path, file + i.ToString("00000") + ".bmp"))) From 9103da402c3bc93a27c5a1b61b49f7e94c213d3b Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Wed, 22 Feb 2012 18:12:46 +0100 Subject: [PATCH 3/5] fixed config options handling if no config file exists --- Vocaluxe/Base/CConfig.cs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs index 91e26b31..45ec4a5e 100644 --- a/Vocaluxe/Base/CConfig.cs +++ b/Vocaluxe/Base/CConfig.cs @@ -224,14 +224,10 @@ namespace Vocaluxe.Base MicConfig = new SMicConfig[CSettings.MaxNumPlayer]; // Init config file - if (File.Exists(CSettings.sFileConfig)) - { - LoadConfig(); - } - else - { + if (!File.Exists(CSettings.sFileConfig)) SaveConfig(); - } + + LoadConfig(); } public static bool LoadConfig() From fda9ffd21fddc7a35d14e69b2616389d934c23f8 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Wed, 22 Feb 2012 22:17:38 +0100 Subject: [PATCH 4/5] fixed typo --- Output/Languages/English.xml | 10 +++++----- Output/Languages/French.xml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Output/Languages/English.xml b/Output/Languages/English.xml index 25d2537b..50a87ba8 100644 --- a/Output/Languages/English.xml +++ b/Output/Languages/English.xml @@ -86,8 +86,8 @@ Expanded Own Music and Background Music - No own Musik - Only own Musik + No own Music + Only own Music Loading @@ -163,9 +163,9 @@ Delay Test Options Sound - Backgroundmusic - Backgroundmusic Volume - Backgroundmusic Source + Background Music + Background Music Volume + Background Music Source Theme Options Theme diff --git a/Output/Languages/French.xml b/Output/Languages/French.xml index fd473b6a..0e877864 100644 --- a/Output/Languages/French.xml +++ b/Output/Languages/French.xml @@ -86,8 +86,8 @@ Développé TODO: Own Music and Background Music - TODO: No own Musik - TODO: Only own Musik + TODO: No own Music + TODO: Only own Music Chargement @@ -163,9 +163,9 @@ Test du Retard Options du Son - TODO: Backgroundmusic - TODO: Backgroundmusic Volume - TODO: Backgroundmusic Source + TODO: Background Music + TODO: Background Music Volume + TODO: Background Music Source Options du Thème Thème From 3203e60ac36f122df477e155f5384b368572b34c Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Wed, 22 Feb 2012 23:13:27 +0100 Subject: [PATCH 5/5] update to build 0052 --- Vocaluxe/Base/CSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vocaluxe/Base/CSettings.cs b/Vocaluxe/Base/CSettings.cs index c0063399..14366d44 100644 --- a/Vocaluxe/Base/CSettings.cs +++ b/Vocaluxe/Base/CSettings.cs @@ -31,7 +31,7 @@ namespace Vocaluxe.Base public const int iVersionSub = 0; // steps public const ERevision VersionRevision = ERevision.Beta; - public const int iBuild = 51; // Increase on every published version! Never Reset! + public const int iBuild = 52; // Increase on every published version! Never Reset! public const int iDatabaseHighscoreVersion = 1; public const int iDatabaseCoverVersion = 1;