From d4f3e66b8da3704e80129b5e40e38101de606a27 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 20 Aug 2006 04:46:32 +0000 Subject: [PATCH] DifficultyDisplay --- .../_DifficultyDisplay 6x1.png | Bin 0 -> 4299 bytes stepmania/Themes/default/metrics.ini | 8 -------- stepmania/src/Makefile.am | 2 +- stepmania/src/StepMania-net2003.vcproj | 6 ------ 4 files changed, 1 insertion(+), 15 deletions(-) create mode 100644 stepmania/Themes/default/BGAnimations/ScreenSelectMusic overlay/_DifficultyDisplay 6x1.png diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic overlay/_DifficultyDisplay 6x1.png b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic overlay/_DifficultyDisplay 6x1.png new file mode 100644 index 0000000000000000000000000000000000000000..0283d7b1bfba76a67743a67c6ec034ece94aa6c2 GIT binary patch literal 4299 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 literal 0 HcmV?d00001 diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index e9e98001ca..b46985fcc2 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -469,10 +469,6 @@ CDTitleFrontCommand=roll,1;spin;effectmagnitude,0,150,0;cullmode,back; CDTitleBackCommand=roll,1;spin;effectmagnitude,0,150,0;cullmode,front;diffuse,#606060; CDTitleOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6 CDTitleOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 -DifficultyDisplayX=SCREEN_CENTER_X-35-SCREEN_WIDTH*0.6 -DifficultyDisplayY=SCREEN_CENTER_Y-70 -DifficultyDisplayOnCommand=bounceend,0.5;addx,SCREEN_WIDTH*0.6 -DifficultyDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 ScoreFrameP1X=SCREEN_CENTER_X-262+SCREEN_WIDTH*0.6 ScoreFrameP1Y=SCREEN_CENTER_Y+92 ScoreFrameP1OnCommand=bounceend,0.5;addx,-SCREEN_WIDTH*0.6 @@ -3681,10 +3677,6 @@ ModifiersX=SCREEN_CENTER_X-192 ModifiersY=SCREEN_CENTER_Y-230 ModifiersOnCommand=horizalign,right;zoom,0.5;shadowlength,0 -[DifficultyDisplay] -IconOnCommand=stoptweening;linear,0.1;diffusealpha,1 -IconOffCommand=stoptweening;linear,0.1;diffusealpha,0 - [ArtistDisplay] TipShowTime=1 TipOnCommand= diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index 3cfb50952c..c0a7853c03 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -268,7 +268,7 @@ ActorsInMenus = \ ActiveAttackList.cpp ActiveAttackList.h BPMDisplay.cpp BPMDisplay.h ComboGraph.cpp ComboGraph.h \ CourseContentsList.cpp CourseContentsList.h \ CourseEntryDisplay.cpp CourseEntryDisplay.h \ -DifficultyDisplay.cpp DifficultyDisplay.h DifficultyList.cpp DifficultyList.h \ +DifficultyList.cpp DifficultyList.h \ DifficultyMeter.cpp DifficultyMeter.h DifficultyRating.cpp DifficultyRating.h \ DualScrollBar.cpp DualScrollBar.h \ EditMenu.cpp EditMenu.h FadingBanner.cpp FadingBanner.h \ diff --git a/stepmania/src/StepMania-net2003.vcproj b/stepmania/src/StepMania-net2003.vcproj index 49a72b983f..a2e7ebbc39 100644 --- a/stepmania/src/StepMania-net2003.vcproj +++ b/stepmania/src/StepMania-net2003.vcproj @@ -1739,12 +1739,6 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ - - - -