- correct drawing of short notes in 4/6-player mode on one screen

- rimshot022b.mp3 + 15db
- changed fonts: higher resolution esp. for medley countdown
- some other bugfixes and corrections
- update of installer files 

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2699 b956fd51-792f-4845-bead-9b4dfca2ff2c

6 files changed, 64 insertions, 4 deletions

diff --git a/Installer/UltraStar Deluxe CMD Edition.nsi b/Installer/UltraStar Deluxe CMD Edition.nsi
index c1151ad3..a4417747 100644
--- a/Installer/UltraStar Deluxe CMD Edition.nsi
+++ b/Installer/UltraStar Deluxe CMD Edition.nsi
@@ -67,7 +67,7 @@ Brandingtext "${p_name} Installation"
 OutFile "USdx CMD Edition-${version}-Installer.exe"

 !define ins_name "Install ${p_name} ${version}.exe"

 

-InstallDir "$PROGRAMFILES\${p_name}"

+InstallDir "C:\${p_name}"

 

 ShowInstDetails show

 ShowUnInstDetails show

diff --git a/Installer/settings/files_in.nsh b/Installer/settings/files_in.nsh
index 91d8f59f..9b01e140 100644
--- a/Installer/settings/files_in.nsh
+++ b/Installer/settings/files_in.nsh
@@ -3,6 +3,7 @@
 ; Create required directories:

   

   CreateDirectory "$INSTDIR\Covers"

+  CreateDirectory "$INSTDIR\Fonts"

   CreateDirectory "$INSTDIR\Languages"

   CreateDirectory "$INSTDIR\Plugins"

   CreateDirectory "$INSTDIR\Skins"

@@ -40,6 +41,34 @@ ${EndIf}
   SetOutPath "$INSTDIR\Covers\"

   File "..\Game\Output\Covers\Covers.ini"

   File "..\Game\Output\Covers\NoCover.jpg"

+  

+  SetOutPath "$INSTDIR\Fonts\"

+  File "..\Game\Output\Fonts\Bold.fnt"

+  File "..\Game\Output\Fonts\Bold_0.png"

+  File "..\Game\Output\Fonts\Bold_1.png"

+  File "..\Game\Output\Fonts\FontO.fnt"

+  File "..\Game\Output\Fonts\FontO2.fnt"

+  File "..\Game\Output\Fonts\FontO2_0.png"

+  File "..\Game\Output\Fonts\FontO2_1.png"

+  File "..\Game\Output\Fonts\FontO2_2.png"

+  File "..\Game\Output\Fonts\FontO2_3.png"

+  File "..\Game\Output\Fonts\FontO2_4.png"

+  ;File "..\Game\Output\Fonts\FontO2_5.png"

+  ;File "..\Game\Output\Fonts\FontO2_6.png"

+  File "..\Game\Output\Fonts\FontO_0.png"

+  File "..\Game\Output\Fonts\FontO_1.png"

+  File "..\Game\Output\Fonts\FontO_2.png"

+  File "..\Game\Output\Fonts\FontO_3.png"

+  File "..\Game\Output\Fonts\FontO_4.png"

+  File "..\Game\Output\Fonts\FontO_5.png"

+  File "..\Game\Output\Fonts\HighResNumbersO.fnt"

+  File "..\Game\Output\Fonts\HighResNumbersO_0.png"

+  File "..\Game\Output\Fonts\HighResNumbersO_1.png"

+  File "..\Game\Output\Fonts\HighResNumbersO_2.png"

+  File "..\Game\Output\Fonts\HighResNumbersO_3.png"

+  File "..\Game\Output\Fonts\HighResNumbersO_4.png"

+  File "..\Game\Output\Fonts\Normal.fnt"

+  File "..\Game\Output\Fonts\Normal_0.png"

 

   SetOutPath "$INSTDIR\Languages\"

 

diff --git a/Installer/settings/files_un.nsh b/Installer/settings/files_un.nsh
index 1025e2ce..a361c9ce 100644
--- a/Installer/settings/files_un.nsh
+++ b/Installer/settings/files_un.nsh
@@ -31,6 +31,34 @@ ${EndIf}
 ; Delete provided Covers 

  Delete "$INSTDIR\Covers\Covers.ini"

  Delete "$INSTDIR\Covers\NoCover.jpg"

+ 

+; Delete provided Fonts

+  Delete "$INSTDIR\Fonts\Bold.fnt"

+  Delete "$INSTDIR\Fonts\Bold_0.png"

+  Delete "$INSTDIR\Fonts\Bold_1.png"

+  Delete "$INSTDIR\Fonts\FontO.fnt"

+  Delete "$INSTDIR\Fonts\FontO2.fnt"

+  Delete "$INSTDIR\Fonts\FontO2_0.png"

+  Delete "$INSTDIR\Fonts\FontO2_1.png"

+  Delete "$INSTDIR\Fonts\FontO2_2.png"

+  Delete "$INSTDIR\Fonts\FontO2_3.png"

+  Delete "$INSTDIR\Fonts\FontO2_4.png"

+  ;Delete "$INSTDIR\Fonts\FontO2_5.png"

+  ;Delete "$INSTDIR\Fonts\FontO2_6.png"

+  Delete "$INSTDIR\Fonts\FontO_0.png"

+  Delete "$INSTDIR\Fonts\FontO_1.png"

+  Delete "$INSTDIR\Fonts\FontO_2.png"

+  Delete "$INSTDIR\Fonts\FontO_3.png"

+  Delete "$INSTDIR\Fonts\FontO_4.png"

+  Delete "$INSTDIR\Fonts\FontO_5.png"

+  Delete "$INSTDIR\Fonts\HighResNumbersO.fnt"

+  Delete "$INSTDIR\Fonts\HighResNumbersO_0.png"

+  Delete "$INSTDIR\Fonts\HighResNumbersO_1.png"

+  Delete "$INSTDIR\Fonts\HighResNumbersO_2.png"

+  Delete "$INSTDIR\Fonts\HighResNumbersO_3.png"

+  Delete "$INSTDIR\Fonts\HighResNumbersO_4.png"

+  Delete "$INSTDIR\Fonts\Normal.fnt"

+  Delete "$INSTDIR\Fonts\Normal_0.png" 

 

 ; Delete provided languages

  Delete "$INSTDIR\Languages\readme.txt"

@@ -422,6 +450,9 @@ ${EndIf}
 StrCpy $0 "$INSTDIR\Covers"

 Call un.DeleteIfEmpty

 

+StrCpy $0 "$INSTDIR\Fonts"

+Call un.DeleteIfEmpty

+

 StrCpy $0 "$INSTDIR\Languages"

 Call un.DeleteIfEmpty

 

diff --git a/Installer/settings/settings-1031.ini b/Installer/settings/settings-1031.ini
index f2bdf5f0..e1882ce3 100644
--- a/Installer/settings/settings-1031.ini
+++ b/Installer/settings/settings-1031.ini
@@ -59,7 +59,7 @@ Bottom=62
 

 [Field 8]

 Type=Droplist

-ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200

+ListItems=320x200|640x480|800x600|1024x600|1024x768|1280x720|1280x800|1280x1024|1440x900|1600x1200|1680x1050|1920x1080|1920x1200

 Left=71

 Right=161

 Top=72

diff --git a/Installer/settings/settings-1033.ini b/Installer/settings/settings-1033.ini
index 7ce54ff3..5091ca02 100644
--- a/Installer/settings/settings-1033.ini
+++ b/Installer/settings/settings-1033.ini
@@ -59,7 +59,7 @@ Bottom=60
 

 [Field 8]

 Type=Droplist

-ListItems=320x200|640x480|800x600|1024x768|1280x1024|1440x900|1680x1050|1920x1200

+ListItems=320x200|640x480|800x600|1024x600|1024x768|1280x720|1280x800|1280x1024|1440x900|1600x1200|1680x1050|1920x1080|1920x1200

 Left=70

 Right=160

 Top=72

diff --git a/Installer/settings/variables.nsh b/Installer/settings/variables.nsh
index e456d743..e07c8f06 100644
--- a/Installer/settings/variables.nsh
+++ b/Installer/settings/variables.nsh
@@ -1,7 +1,7 @@
 ; These are the common used variables

 ; for the USdx Challenge, Medley & Duet Edition Installation Wizard

 

-!define version "r9"						; Current version of UltraStar Deluxe Challenge, Medley & Duet Edition

+!define version "r9 RC6.1"						; Current version of UltraStar Deluxe Challenge, Medley & Duet Edition

 !define p_name "UltraStar Deluxe CMD Edition" 				; Just the name of the program

 !define publisher "USDX Team"					; Publisher

 !define homepage "http://www.ultrastardeluxe.org/"		; Project Homepage