- bugfix: drawing beat delimiters while/after pitch recording

- update of language files

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

8 files changed, 29 insertions, 23 deletions

diff --git a/Game/Code/Classes/UDraw.pas b/Game/Code/Classes/UDraw.pas
index 78d92717..98d5f274 100644
--- a/Game/Code/Classes/UDraw.pas
+++ b/Game/Code/Classes/UDraw.pas
@@ -199,6 +199,7 @@ begin
 

   glEnable(GL_BLEND);

   glColor4f(Skin_P1_LinesR, Skin_P1_LinesG, Skin_P1_LinesB, 0.4*Alpha);

+  glLineWidth(1);

   glBegin(GL_LINES);

   for Pet := 0 to 9 do begin

     glVertex2f(Left,  Top + Pet * Space);

@@ -220,28 +221,13 @@ begin
     Exit;

 

   CP := NrCzesci;

-  {if (Length(Czesci[CP].Czesc[Czesci[CP].Akt].Nuta)=0) then

-  begin

-    CP := (CP+1) mod 2;

-    st := Czesci[CP].Czesc[Czesci[CP].Akt].StartNote;

-    end_ := Czesci[CP].Czesc[Czesci[CP].Akt].Koniec;

-  end else

-  begin }

-    st := Czesci[CP].Czesc[Czesci[CP].Akt].StartNote;

-    end_ := Czesci[CP].Czesc[Czesci[CP].Akt].Koniec;

-    {if AktSong.isDuet and (Length(Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].Nuta)>0)then

-    begin

-      if (Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].Koniec > end_) then

-        end_ := Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].Koniec;

-

-      if (Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].StartNote < st) then

-        st := Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].StartNote;

-    end;

-  end; }

+  st := Czesci[CP].Czesc[Czesci[CP].Akt].StartNote;

+  end_ := Czesci[CP].Czesc[Czesci[CP].Akt].Koniec;

 

   TempR := (Right-Left) / (end_ - st);

 

   glEnable(GL_BLEND);

+  glLineWidth(1);

   glBegin(GL_LINES);

   for Pet := st to end_ do

   begin

diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index 989508f4..adf0d8ee 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -122,7 +122,7 @@ uses
   UVideo in 'Classes\UVideo.pas';

 

 const

-  Version = 'UltraStar Deluxe Challenge, Medley & Duet Edition r9';

+  Version = 'UltraStar Deluxe Challenge, Medley & Duet Edition r9.5';

 

 var

   WndTitle: string;

diff --git a/Game/Output/Changelog.german.txt b/Game/Output/Changelog.german.txt
index b77cb934..31c74055 100644
--- a/Game/Output/Changelog.german.txt
+++ b/Game/Output/Changelog.german.txt
@@ -1,3 +1,8 @@
+Ultrastar Deluxe Challenge, Medley & Duet Edition r9.4 vom 24.12.2010

+-----------------------------

+NEW: (Editor)    Stimmhöhen können im Editor eingesungen werden (setzen mit N).

+                 Man kann mit SHIFT+N eine Zeile, mit ALT+N das ganze Lied "einsingen". Hierbei wird eine Gesangspur hinter den Noten gelegt, an der man sich orientieren kann. Die Funktion dient dazu, um ein Lied zu überprüfen.

+

 Ultrastar Deluxe Challenge, Medley & Duet Edition r9 vom 30.11.2010

 -----------------------------

 New: (Allgemein) Mehrere Song-Ordner werden unterstützt (wie bei der 1.1).

diff --git a/Game/Output/Changelog.txt b/Game/Output/Changelog.txt
index c35f5dfd..2d8b5eb0 100644
--- a/Game/Output/Changelog.txt
+++ b/Game/Output/Changelog.txt
@@ -1,3 +1,8 @@
+Ultrastar Deluxe Challenge, Medley & Duet Edition r9.5 (24.12.2010)

+-----------------------------

+NEW: (Editor)      Voice Pitch Recording (set with N).

+                   You can record a whole line with SHIFT+N and the whole file with ALT+N.The resulting voice pitch path is usable for song check.

+

 Ultrastar Deluxe Challenge, Medley & Duet Edition r9 (30.11.2010)

 -----------------------------

 New: (General)     Support for more than one song folder (like in 1.1).

diff --git a/Game/Output/Languages/English.ini b/Game/Output/Languages/English.ini
index f906565d..ee27a924 100644
--- a/Game/Output/Languages/English.ini
+++ b/Game/Output/Languages/English.ini
@@ -497,7 +497,12 @@ KPMINUS = Decrease all notes by 1 semitone
 SHIFT_KPPLUS = Increase all notes by 12 semitones (1 octave)

 SHIFT_KPMINUS = Decrease all notes by 12 semitones (1 octave)

 #-------------------------------------------------------#

-SEC_042 = Note Position

+SEC_042 = Voice Pitch Recording

+N = Set note pitch of current note to the last detected voice pitch.

+SHIFT_N = Record voice pitch for actual line.

+ALT_N = Start voice pitch recording from current position.

+#-------------------------------------------------------#

+SEC_043 = Note Position

 SHIFT_DELETE = Delete line

 CTRL_DELETE = Delete note

 CTRL_SLASH = Divide note into two

diff --git a/Game/Output/Languages/German.ini b/Game/Output/Languages/German.ini
index 8a340542..6d9350f9 100644
--- a/Game/Output/Languages/German.ini
+++ b/Game/Output/Languages/German.ini
@@ -497,7 +497,12 @@ KPMINUS = Tonhöhe aller Noten um einen Halbtonschritt verringern
 SHIFT_KPPLUS = Tonhöhe aller Noten um eine Oktave (12 Halbtonschritte) erhöhen

 SHIFT_KPMINUS = Tonhöhe aller Noten um eine Oktave (12 Halbtonschritte) verringern

 #-------------------------------------------------------#

-SEC_042 = Notenposition

+SEC_042 = Tonhöhen singen / Aufnahme

+N = Tonhöhe der markierten Note auf die zuletzt eingesungene Höhe setzen.

+SHIFT_N = Eine Zeile einsingen.

+ALT_N = Lied ab der aktuellen Position einsingen.

+#-------------------------------------------------------#

+SEC_043 = Notenposition

 SHIFT_DELETE = Aktuelle Zeile löschen

 CTRL_DELETE = Markierte Note/Silbe löschen

 CTRL_SLASH = Note teilen

@@ -1508,4 +1513,4 @@ PAGEUP = MP3-Lautstärke erhöhen
 PAGEDOWN = MP3-Lautstärke reduzieren

 #-------------------------------------------------------#

 # ID_034: ScreenSongMenu Medley #

-#-------------------------------------------------------#
\ No newline at end of file
+#-------------------------------------------------------#

diff --git a/Game/Output/Languages/Languages.xls b/Game/Output/Languages/Languages.xls
index 5d9066ac..375d721e 100644
--- a/Game/Output/Languages/Languages.xls
+++ b/Game/Output/Languages/Languages.xls
diff --git a/Installer/settings/variables.nsh b/Installer/settings/variables.nsh
index 920a4362..b6ff0915 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.5"						; 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