aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-03-04 21:45:53 +0000
committerbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-03-04 21:45:53 +0000
commit344f79cff25d29df8d7e4a76bc4ac51310745e56 (patch)
tree0b3968f4fd127affa11c8d3af72ac6fd92a6fe35
parent1c85543bf1c6595533af20e682f48fe48977806a (diff)
downloadusdx-344f79cff25d29df8d7e4a76bc4ac51310745e56.tar.gz
usdx-344f79cff25d29df8d7e4a76bc4ac51310745e56.tar.xz
usdx-344f79cff25d29df8d7e4a76bc4ac51310745e56.zip
fixed a bug in editor: pressing p or v leads sometimes to a crash;
released the r7 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2173 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--Game/Changelog.german.txt2
-rw-r--r--Game/Changelog.txt2
-rw-r--r--Game/Code/Screens/UScreenEditSub.pas16
-rw-r--r--Game/Code/UltraStar.dpr2
-rw-r--r--Game/Output/Changelog.german.txt2
-rw-r--r--Game/Output/Changelog.txt2
-rw-r--r--Game/Output/Skins/Deluxe/[bg-main]blue.jpgbin65305 -> 34885 bytes
-rw-r--r--Game/Output/acinerella.dllbin6466067 -> 6467603 bytes
8 files changed, 16 insertions, 10 deletions
diff --git a/Game/Changelog.german.txt b/Game/Changelog.german.txt
index 8f457506..032fc69e 100644
--- a/Game/Changelog.german.txt
+++ b/Game/Changelog.german.txt
@@ -1,4 +1,4 @@
-Ultrastar Deluxe v1.0.1a Challenge MOD r7 vom 0x.03.2010
+Ultrastar Deluxe v1.0.1a Challenge MOD r7 vom 04.03.2010
-----------------------------
New: (Allgemein) Experimentelle Karaoke-Funktion (Singstimme ausblenden, bitte nicht zu ernst nehmen): mit K ein/ausschalten
New: (Allgemein) Lautstärkeanpassung beim Abspielen der MP3 mit Bild rauf/ Bild runter
diff --git a/Game/Changelog.txt b/Game/Changelog.txt
index 15467ddf..7257c952 100644
--- a/Game/Changelog.txt
+++ b/Game/Changelog.txt
@@ -1,4 +1,4 @@
-Ultrastar Deluxe v1.0.1a Challenge MOD r7 (0x.03.2010)
+Ultrastar Deluxe v1.0.1a Challenge MOD r7 (04.03.2010)
-----------------------------
New: (General) Experimental karaoke function (tries to hide the singing voice, please don't take it too seriously): enable/disable with "K"
New: (General) MP3 volume adjustment during playback use "PAGE UP/DOWN"
diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index 70b64ad2..05e312e1 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -1969,9 +1969,10 @@ begin
begin
Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Color := 0;
AktNuta := 0;
- Inc(Czesci[0].Akt);
- if Czesci[0].Akt > Length(Czesci[0].Czesc)-1 then //useful?
- Czesci[0].Akt := 0;
+ Czesci[0].Akt := line;
+ //Inc(Czesci[0].Akt);
+ //if Czesci[0].Akt > Length(Czesci[0].Czesc)-1 then //useful?
+ // Czesci[0].Akt := 0;
Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Color := 1;
Lyric.AddCzesc(Czesci[0].Akt);
Lyric.Selected := AktNuta;
@@ -2060,8 +2061,13 @@ begin
begin
Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Color := 0;
if not LineChanged then
- Inc(AktNuta)
- else
+ begin
+ AktNuta := note;
+ Czesci[0].Akt := line;
+ //Inc(AktNuta);
+ //if AktNuta > Length(Czesci[0].Czesc[Czesci[0].Akt].Nuta)-1 then
+ // Dec(AktNuta);
+ end else
LineChanged := false;
Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Color := 2;
diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index 3bc4f936..872a6d92 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -124,7 +124,7 @@ uses
acinerella in 'lib\acinerella\acinerella.pas';
const
- Version = 'UltraStar Deluxe v1.0.1a Challenge-MOD r7 beta 6 2010-03-03';
+ Version = 'UltraStar Deluxe v1.0.1a Challenge-MOD r7 2010-03-04';
var
WndTitle: string;
diff --git a/Game/Output/Changelog.german.txt b/Game/Output/Changelog.german.txt
index 8f457506..032fc69e 100644
--- a/Game/Output/Changelog.german.txt
+++ b/Game/Output/Changelog.german.txt
@@ -1,4 +1,4 @@
-Ultrastar Deluxe v1.0.1a Challenge MOD r7 vom 0x.03.2010
+Ultrastar Deluxe v1.0.1a Challenge MOD r7 vom 04.03.2010
-----------------------------
New: (Allgemein) Experimentelle Karaoke-Funktion (Singstimme ausblenden, bitte nicht zu ernst nehmen): mit K ein/ausschalten
New: (Allgemein) Lautstärkeanpassung beim Abspielen der MP3 mit Bild rauf/ Bild runter
diff --git a/Game/Output/Changelog.txt b/Game/Output/Changelog.txt
index 15467ddf..7257c952 100644
--- a/Game/Output/Changelog.txt
+++ b/Game/Output/Changelog.txt
@@ -1,4 +1,4 @@
-Ultrastar Deluxe v1.0.1a Challenge MOD r7 (0x.03.2010)
+Ultrastar Deluxe v1.0.1a Challenge MOD r7 (04.03.2010)
-----------------------------
New: (General) Experimental karaoke function (tries to hide the singing voice, please don't take it too seriously): enable/disable with "K"
New: (General) MP3 volume adjustment during playback use "PAGE UP/DOWN"
diff --git a/Game/Output/Skins/Deluxe/[bg-main]blue.jpg b/Game/Output/Skins/Deluxe/[bg-main]blue.jpg
index 67c4cbbe..307b4ce9 100644
--- a/Game/Output/Skins/Deluxe/[bg-main]blue.jpg
+++ b/Game/Output/Skins/Deluxe/[bg-main]blue.jpg
Binary files differ
diff --git a/Game/Output/acinerella.dll b/Game/Output/acinerella.dll
index 98e4477b..ab1fcad0 100644
--- a/Game/Output/acinerella.dll
+++ b/Game/Output/acinerella.dll
Binary files differ