Merge pull request #11 from Vocaluxe/release-0.1
merge Release 0.1 branch changes into develop branch
This commit is contained in:
commit
b912c26c47
7 files changed
+21
-19
No files matched your search
@@ -86,8 +86,8 @@
|
|||||||
<TR_CONFIG_TIMERLOOK_EXPANDED>Expanded</TR_CONFIG_TIMERLOOK_EXPANDED>
|
<TR_CONFIG_TIMERLOOK_EXPANDED>Expanded</TR_CONFIG_TIMERLOOK_EXPANDED>
|
||||||
<!--Config: Background-Music-Source-->
|
<!--Config: Background-Music-Source-->
|
||||||
<TR_CONFIG_OWN_MUSIC>Own Music and Background Music</TR_CONFIG_OWN_MUSIC>
|
<TR_CONFIG_OWN_MUSIC>Own Music and Background Music</TR_CONFIG_OWN_MUSIC>
|
||||||
<TR_CONFIG_NO_OWN_MUSIC>No own Musik</TR_CONFIG_NO_OWN_MUSIC>
|
<TR_CONFIG_NO_OWN_MUSIC>No own Music</TR_CONFIG_NO_OWN_MUSIC>
|
||||||
<TR_CONFIG_ONLY_OWN_MUSIC>Only own Musik</TR_CONFIG_ONLY_OWN_MUSIC>
|
<TR_CONFIG_ONLY_OWN_MUSIC>Only own Music</TR_CONFIG_ONLY_OWN_MUSIC>
|
||||||
<!--Screens-->
|
<!--Screens-->
|
||||||
<!--ScreenLoad-->
|
<!--ScreenLoad-->
|
||||||
<TR_SCREENLOAD_LOADING>Loading</TR_SCREENLOAD_LOADING>
|
<TR_SCREENLOAD_LOADING>Loading</TR_SCREENLOAD_LOADING>
|
||||||
@@ -163,9 +163,9 @@
|
|||||||
<TR_SCREENORECORD_BUTTON_DELAYTEST>Delay Test</TR_SCREENORECORD_BUTTON_DELAYTEST>
|
<TR_SCREENORECORD_BUTTON_DELAYTEST>Delay Test</TR_SCREENORECORD_BUTTON_DELAYTEST>
|
||||||
<!--ScreenOptionsSound-->
|
<!--ScreenOptionsSound-->
|
||||||
<TR_SCREENOSOUND_OPTIONS>Options Sound</TR_SCREENOSOUND_OPTIONS>
|
<TR_SCREENOSOUND_OPTIONS>Options Sound</TR_SCREENOSOUND_OPTIONS>
|
||||||
<TR_SCREENOSOUND_BACKGROUNDMUSIC>Backgroundmusic</TR_SCREENOSOUND_BACKGROUNDMUSIC>
|
<TR_SCREENOSOUND_BACKGROUNDMUSIC>Background Music</TR_SCREENOSOUND_BACKGROUNDMUSIC>
|
||||||
<TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME>Backgroundmusic Volume</TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME>
|
<TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME>Background Music Volume</TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME>
|
||||||
<TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE>Backgroundmusic Source</TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE>
|
<TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE>Background Music Source</TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE>
|
||||||
<!--ScreenOptionsTheme-->
|
<!--ScreenOptionsTheme-->
|
||||||
<TR_SCREENOTHEME_OPTIONS>Theme Options</TR_SCREENOTHEME_OPTIONS>
|
<TR_SCREENOTHEME_OPTIONS>Theme Options</TR_SCREENOTHEME_OPTIONS>
|
||||||
<TR_SCREENOTHEME_THEME>Theme</TR_SCREENOTHEME_THEME>
|
<TR_SCREENOTHEME_THEME>Theme</TR_SCREENOTHEME_THEME>
|
||||||
|
|||||||
@@ -86,8 +86,8 @@
|
|||||||
<TR_CONFIG_TIMERLOOK_EXPANDED>Développé</TR_CONFIG_TIMERLOOK_EXPANDED>
|
<TR_CONFIG_TIMERLOOK_EXPANDED>Développé</TR_CONFIG_TIMERLOOK_EXPANDED>
|
||||||
<!--Config: Background-Music-Source-->
|
<!--Config: Background-Music-Source-->
|
||||||
<TR_CONFIG_OWN_MUSIC>TODO: Own Music and Background Music</TR_CONFIG_OWN_MUSIC>
|
<TR_CONFIG_OWN_MUSIC>TODO: Own Music and Background Music</TR_CONFIG_OWN_MUSIC>
|
||||||
<TR_CONFIG_NO_OWN_MUSIC>TODO: No own Musik</TR_CONFIG_NO_OWN_MUSIC>
|
<TR_CONFIG_NO_OWN_MUSIC>TODO: No own Music</TR_CONFIG_NO_OWN_MUSIC>
|
||||||
<TR_CONFIG_ONLY_OWN_MUSIC>TODO: Only own Musik</TR_CONFIG_ONLY_OWN_MUSIC>
|
<TR_CONFIG_ONLY_OWN_MUSIC>TODO: Only own Music</TR_CONFIG_ONLY_OWN_MUSIC>
|
||||||
<!--Screens-->
|
<!--Screens-->
|
||||||
<!--ScreenLoad-->
|
<!--ScreenLoad-->
|
||||||
<TR_SCREENLOAD_LOADING>Chargement</TR_SCREENLOAD_LOADING>
|
<TR_SCREENLOAD_LOADING>Chargement</TR_SCREENLOAD_LOADING>
|
||||||
@@ -163,9 +163,9 @@
|
|||||||
<TR_SCREENORECORD_BUTTON_DELAYTEST>Test du Retard</TR_SCREENORECORD_BUTTON_DELAYTEST>
|
<TR_SCREENORECORD_BUTTON_DELAYTEST>Test du Retard</TR_SCREENORECORD_BUTTON_DELAYTEST>
|
||||||
<!--ScreenOptionsSound-->
|
<!--ScreenOptionsSound-->
|
||||||
<TR_SCREENOSOUND_OPTIONS>Options du Son</TR_SCREENOSOUND_OPTIONS>
|
<TR_SCREENOSOUND_OPTIONS>Options du Son</TR_SCREENOSOUND_OPTIONS>
|
||||||
<TR_SCREENOSOUND_BACKGROUNDMUSIC>TODO: Backgroundmusic</TR_SCREENOSOUND_BACKGROUNDMUSIC>
|
<TR_SCREENOSOUND_BACKGROUNDMUSIC>TODO: Background Music</TR_SCREENOSOUND_BACKGROUNDMUSIC>
|
||||||
<TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME>TODO: Backgroundmusic Volume</TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME>
|
<TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME>TODO: Background Music Volume</TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME>
|
||||||
<TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE>TODO: Backgroundmusic Source</TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE>
|
<TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE>TODO: Background Music Source</TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE>
|
||||||
<!--ScreenOptionsTheme-->
|
<!--ScreenOptionsTheme-->
|
||||||
<TR_SCREENOTHEME_OPTIONS>Options du Thème</TR_SCREENOTHEME_OPTIONS>
|
<TR_SCREENOTHEME_OPTIONS>Options du Thème</TR_SCREENOTHEME_OPTIONS>
|
||||||
<TR_SCREENOTHEME_THEME>Thème</TR_SCREENOTHEME_THEME>
|
<TR_SCREENOTHEME_THEME>Thème</TR_SCREENOTHEME_THEME>
|
||||||
|
|||||||
@@ -224,14 +224,10 @@ namespace Vocaluxe.Base
|
|||||||
MicConfig = new SMicConfig[CSettings.MaxNumPlayer];
|
MicConfig = new SMicConfig[CSettings.MaxNumPlayer];
|
||||||
|
|
||||||
// Init config file
|
// Init config file
|
||||||
if (File.Exists(CSettings.sFileConfig))
|
if (!File.Exists(CSettings.sFileConfig))
|
||||||
{
|
|
||||||
LoadConfig();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
SaveConfig();
|
SaveConfig();
|
||||||
}
|
|
||||||
|
LoadConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static bool LoadConfig()
|
public static bool LoadConfig()
|
||||||
|
|||||||
@@ -29,9 +29,9 @@ namespace Vocaluxe.Base
|
|||||||
public const int iVersionMajor = 0;
|
public const int iVersionMajor = 0;
|
||||||
public const int iVersionMinor = 1; // milestones
|
public const int iVersionMinor = 1; // milestones
|
||||||
public const int iVersionSub = 0; // steps
|
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 = 52; // Increase on every published version! Never Reset!
|
||||||
|
|
||||||
public const int iDatabaseHighscoreVersion = 1;
|
public const int iDatabaseHighscoreVersion = 1;
|
||||||
public const int iDatabaseCoverVersion = 1;
|
public const int iDatabaseCoverVersion = 1;
|
||||||
|
|||||||
@@ -554,6 +554,8 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
{
|
{
|
||||||
string file = "Screenshot_";
|
string file = "Screenshot_";
|
||||||
string path = Path.Combine(Environment.CurrentDirectory, CSettings.sFolderScreenshots);
|
string path = Path.Combine(Environment.CurrentDirectory, CSettings.sFolderScreenshots);
|
||||||
|
if (!Directory.Exists(path))
|
||||||
|
Directory.CreateDirectory(path);
|
||||||
|
|
||||||
int i = 0;
|
int i = 0;
|
||||||
while (File.Exists(Path.Combine(path, file + i.ToString("00000") + ".bmp")))
|
while (File.Exists(Path.Combine(path, file + i.ToString("00000") + ".bmp")))
|
||||||
|
|||||||
@@ -300,6 +300,8 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
{
|
{
|
||||||
string file = "Screenshot_";
|
string file = "Screenshot_";
|
||||||
string path = Path.Combine(Environment.CurrentDirectory, CSettings.sFolderScreenshots);
|
string path = Path.Combine(Environment.CurrentDirectory, CSettings.sFolderScreenshots);
|
||||||
|
if (!Directory.Exists(path))
|
||||||
|
Directory.CreateDirectory(path);
|
||||||
|
|
||||||
int i = 0;
|
int i = 0;
|
||||||
while (File.Exists(Path.Combine(path, file + i.ToString("00000") + ".png")))
|
while (File.Exists(Path.Combine(path, file + i.ToString("00000") + ".png")))
|
||||||
|
|||||||
@@ -556,6 +556,8 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
{
|
{
|
||||||
string file = "Screenshot_";
|
string file = "Screenshot_";
|
||||||
string path = Path.Combine(Environment.CurrentDirectory, CSettings.sFolderScreenshots);
|
string path = Path.Combine(Environment.CurrentDirectory, CSettings.sFolderScreenshots);
|
||||||
|
if (!Directory.Exists(path))
|
||||||
|
Directory.CreateDirectory(path);
|
||||||
|
|
||||||
int i = 0;
|
int i = 0;
|
||||||
while (File.Exists(Path.Combine(path, file + i.ToString("00000") + ".bmp")))
|
while (File.Exists(Path.Combine(path, file + i.ToString("00000") + ".bmp")))
|
||||||
|
|||||||
Reference in new issue
Block a user