diff --git a/stepmania/Themes/default/BGAnimations/ScreenAttract in.redir b/stepmania/Themes/default/BGAnimations/ScreenAttract in.redir new file mode 100644 index 0000000000..7c2c062086 --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenAttract in.redir @@ -0,0 +1 @@ +_fade in normal \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenAttract out.redir b/stepmania/Themes/default/BGAnimations/ScreenAttract out.redir new file mode 100644 index 0000000000..30cdcd3856 --- /dev/null +++ b/stepmania/Themes/default/BGAnimations/ScreenAttract out.redir @@ -0,0 +1 @@ +_fade out normal \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectDifficulty in.redir b/stepmania/Themes/default/BGAnimations/ScreenSelectDifficulty in.redir deleted file mode 100644 index 20f5042bcb..0000000000 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectDifficulty in.redir +++ /dev/null @@ -1 +0,0 @@ -_menu in \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectDifficulty out.redir b/stepmania/Themes/default/BGAnimations/ScreenSelectDifficulty out.redir deleted file mode 100644 index dbd8790a88..0000000000 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectDifficulty out.redir +++ /dev/null @@ -1 +0,0 @@ -_menu out \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectGroup in.redir b/stepmania/Themes/default/BGAnimations/ScreenSelectGroup in.redir deleted file mode 100644 index 20f5042bcb..0000000000 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectGroup in.redir +++ /dev/null @@ -1 +0,0 @@ -_menu in \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectGroup out.redir b/stepmania/Themes/default/BGAnimations/ScreenSelectGroup out.redir deleted file mode 100644 index dbd8790a88..0000000000 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectGroup out.redir +++ /dev/null @@ -1 +0,0 @@ -_menu out \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/_fade out delayed.lua b/stepmania/Themes/default/BGAnimations/_fade out delayed.lua index ee5bf8fce2..09470ebce3 100644 --- a/stepmania/Themes/default/BGAnimations/_fade out delayed.lua +++ b/stepmania/Themes/default/BGAnimations/_fade out delayed.lua @@ -1,5 +1,5 @@ -local t = Def.Quad { +local delay = ScreenMetric("OutDelay"); +return Def.Quad { InitCommand=cmd(diffuse,color("#000000");stretchto,SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM); - StartTransitioningCommand=cmd(hibernate,.8;diffusealpha,0;linear,0.3;diffusealpha,1); + StartTransitioningCommand=cmd(hibernate,delay;diffusealpha,0;linear,0.3;diffusealpha,1); }; -return t; diff --git a/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua b/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua index 2ef7a64441..eac587ca4c 100644 --- a/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua +++ b/stepmania/Themes/default/Graphics/ScreenTitleMenu scroll.lua @@ -3,7 +3,7 @@ local s = THEME:GetString( 'ScreenTitleMenu', gc:GetText() ); local t = Def.ActorFrame { LoadFont("_venacti bold 24px") ..{ InitCommand=cmd(uppercase,true;settext,s;horizalign,center;shadowlengthx,0;shadowlengthy,2;strokecolor,color("#00000044");); - OffCommand=cmd(sleep,(7-gc:GetIndex())/12;linear,.1;addy,300); + OffCommand=cmd(sleep,(7-gc:GetIndex())/20;linear,.08;addy,280); GainFocusCommand=cmd(stoptweening;diffuseshift;effectperiod,0.5;effectcolor1,0.5,1,0.5,1;effectcolor2,0.25,0.5,0.25,1;); LoseFocusCommand=cmd(stoptweening;stopeffect); DisabledCommand=cmd(diffuse,0.5,0.5,0.5,1); diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index a7cbed08e1..ae32b5a21e 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -122,6 +122,7 @@ GameLogoX=SCREEN_CENTER_X GameLogoY=SCREEN_CENTER_Y-110 GameLogoOnCommand=zoomy,0;bounceend,0.5;zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.2 GameLogoOffCommand= +OutDelay=.2 [ScreenExit] Class="ScreenExit" @@ -737,13 +738,13 @@ SongOptionsX=SCREEN_CENTER_X+0 SongOptionsY=SCREEN_CENTER_Y+230 SongOptionsOnCommand=addy,100;linear,0.5;addy,-100 SongOptionsOffCommand=linear,0.5;addy,100 -StepsDisplayP1X=SCREEN_CENTER_X-250 +StepsDisplayP1X=SCREEN_CENTER_X-240 StepsDisplayP1Y= StepsDisplayP1OnCommand= StepsDisplayP1OffCommand=linear,0.5;addx,-200 StepsDisplayP1SetReverseCommand=y,SCREEN_CENTER_Y-196;addy,-100;linear,1;addy,100 StepsDisplayP1SetNoReverseCommand=y,SCREEN_CENTER_Y+174;addy,100;linear,1;addy,-100 -StepsDisplayP2X=SCREEN_CENTER_X+250 +StepsDisplayP2X=SCREEN_CENTER_X+240 StepsDisplayP2Y= StepsDisplayP2OnCommand= StepsDisplayP2OffCommand=linear,0.5;addx,200