diff --git a/.appveyor/gitDescribe.ps1 b/.appveyor/gitDescribe.ps1 index 98fe26ca..2181f00e 100644 --- a/.appveyor/gitDescribe.ps1 +++ b/.appveyor/gitDescribe.ps1 @@ -1,6 +1,6 @@ if($Env:APPVEYOR_PULL_REQUEST_NUMBER) { - $Env:VersionTag = "PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER" + $Env:VersionTag = "0.0.0-na-PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER" Return $Env:VersionTag } diff --git a/.gitignore b/.gitignore index f9e43ee9..9de55a61 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,8 @@ tx.exe *.vshost.* *.userprefs *.user +*.VC.db +*.VC.opendb /*.vsp /*.ctl /Output/Config.xml @@ -65,3 +67,5 @@ tx.exe /packages /Output/x64 /Output/x86 +/PitchTracker/bin +/PitchTracker/obj diff --git a/Output/Languages/Swedish.xml b/Output/Languages/Swedish.xml index ce379ac1..3355da3a 100644 --- a/Output/Languages/Swedish.xml +++ b/Output/Languages/Swedish.xml @@ -73,7 +73,7 @@ Totalt Normal Utvidgad - Lista Alla + Lista alla Lista bästa Egen musik och bakgrundsmusik Ingen egen musik diff --git a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml index 3edf6ca5..1c67c701 100644 --- a/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml +++ b/Output/PartyModes/Challenge/Themes/Default/Screens/PartyScreenChallengeMain.xml @@ -187,7 +187,7 @@ Center Outline - 1) + 0 diff --git a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml index 371c3e14..c1279d0d 100644 --- a/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml +++ b/Output/PartyModes/ChallengeMedley/Themes/Default/Screens/PartyScreenChallengeMedleyMain.xml @@ -187,7 +187,7 @@ Center Outline - 1) + 0 diff --git a/Output/Themes/Ambient/Screens/ScreenHighscore.xml b/Output/Themes/Ambient/Screens/ScreenHighscore.xml index 4e997947..a97ba707 100644 --- a/Output/Themes/Ambient/Screens/ScreenHighscore.xml +++ b/Output/Themes/Ambient/Screens/ScreenHighscore.xml @@ -98,7 +98,7 @@ 120 160 0 - 42 + 35 0 @@ -792,4 +792,4 @@ - \ No newline at end of file + diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml index 5b3b6ec4..c546c94a 100644 --- a/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml +++ b/Output/Themes/Ambient/Screens/ScreenOptionsGame.xml @@ -2,7 +2,7 @@ ScreenOptionsGame - 2 + 3 @@ -191,6 +191,20 @@ Outline TR_SCREENOGAME_TIMERMODE + + 75 + 467 + 0 + 27 + 0 + + + Left + Center + + Outline + TR_SCREENOGAME_HIGHSCORESTYLE +