diff --git a/stepmania/Themes/default/BGAnimations/ScreenCredits overlay/credits.lua b/stepmania/Themes/default/BGAnimations/ScreenCredits overlay/credits.lua index e6c1547883..8ee9a5fc5c 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenCredits overlay/credits.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenCredits overlay/credits.lua @@ -118,9 +118,9 @@ local sections = { -- To add people or sections modify the above. local fontPath = THEME:GetPathF( "ScreenCredits", "titles" ) -local lineOn = cmd(zoom,0.5) -local sectionOn = cmd(zoom,0.5;diffuse,1,.5,.5,1) -local otherOn = cmd(zoom,0.5;diffuse,.5,.5,1,1) +local lineOn = cmd() +local sectionOn = cmd(diffuse,1,.5,.5,1) +local otherOn = cmd(diffuse,.5,.5,1,1) local t = Def.ActorScroller { SecondsPerItem = 0.40; NumItemsToDraw = 40; diff --git a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua index 37f7bb50d8..9d885e85ed 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenSelectMusic decorations/default.lua @@ -50,7 +50,7 @@ local function OptionsArea(pn) }; LoadFont("_terminator two 32" ) .. { - InitCommand=cmd(y,-4;settext,PlayerNumberToLocalizedString(pn);zoom,0.5;zoom,0.5;diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000");); + InitCommand=cmd(y,-4;settext,PlayerNumberToLocalizedString(pn);diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000");); }; }; t[#t+1] = Def.ModIconRow { @@ -80,7 +80,7 @@ t[#t+1] = Def.ActorFrame { t[#t+1] = LoadFont("Common", "normal") .. { InitCommand=cmd(x,SCREEN_CENTER_X-160;y,SCREEN_CENTER_Y+94;playcommand,"Set"); - OnCommand=cmd(zoom,0.5;shadowlength,2;diffusealpha,0;linear,0.5;diffusealpha,1); + OnCommand=cmd(shadowlength,2;diffusealpha,0;linear,0.5;diffusealpha,1); OffCommand=cmd(linear,0.5;diffusealpha,0); SetCommand=function(self) @@ -119,7 +119,7 @@ t[#t+1] = Def.ActorFrame { }; LoadFont( "_sf square head bold 28" ) .. { - InitCommand=cmd(zoom,0.5;maxwidth,300;playcommand,"Set";x,10;shadowlength,0;diffuse,color("#fbfb57");strokecolor,color("#696800");); + InitCommand=cmd(maxwidth,300;playcommand,"Set";x,10;shadowlength,0;diffuse,color("#fbfb57");strokecolor,color("#696800");); SetCommand=cmd(settext,string.upper( SortOrderToLocalizedString(GAMESTATE:GetSortOrder()) )); SortOrderChangedMessageCommand=cmd(playcommand,"Set"); }; @@ -159,7 +159,7 @@ t[#t+1] = Def.PaneDisplay { t[#t+1] = Def.BPMDisplay { File=THEME:GetPathF("BPMDisplay", "bpm"); Name="BPMDisplay"; - InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+294;y,SCREEN_CENTER_Y+1;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");zoom,0.5;); + InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+294;y,SCREEN_CENTER_Y+1;shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");); OnCommand=cmd(stoptweening;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6); OffCommand=cmd(bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6); SetCommand=function(self) self:SetFromGameState() end; @@ -193,7 +193,7 @@ t[#t+1] = LoadActor( "stop icon" ) .. { }; t[#t+1] = LoadFont("_regra 32 bold") .. { - InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X-14;y,SCREEN_CENTER_Y-14;zoom,0.5;settext,"/Senser";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");maxwidth,360); + InitCommand=cmd(horizalign,left;x,SCREEN_CENTER_X-14;y,SCREEN_CENTER_Y-14;settext,"xxxx";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");maxwidth,360); SetCommand=function(self) local s = "---"; local song = GAMESTATE:GetCurrentSong(); @@ -209,7 +209,7 @@ t[#t+1] = LoadFont("_regra 32 bold") .. { CurrentCourseChangedMessageCommand=cmd(playcommand,"Set"); }; t[#t+1] = LoadFont("_regra 32 bold") .. { - InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+228;y,SCREEN_CENTER_Y+4;zoom,0.5;settext,"_Hardcore Techno";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");); + InitCommand=cmd(horizalign,right;x,SCREEN_CENTER_X+228;y,SCREEN_CENTER_Y+4;settext,"xxxx";shadowlengthx,0;shadowlengthy,2;shadowcolor,color("#000000");); SetCommand=function(self) local s = "---"; local song = GAMESTATE:GetCurrentSong(); @@ -300,7 +300,7 @@ t[#t+1] = Def.CourseContentsList { }; LoadFont("Common","normal") .. { - OnCommand=cmd(x,SCREEN_CENTER_X-192;y,SCREEN_CENTER_Y-230;horizalign,right;zoom,0.5;shadowlength,0); + OnCommand=cmd(x,SCREEN_CENTER_X-192;y,SCREEN_CENTER_Y-230;horizalign,right;shadowlength,0); SetSongCommand=function(self, params) self:settext(params.Modifiers); end; }; @@ -344,7 +344,7 @@ t[#t+1] = Def.ActorFrame{ }; LoadFont("_venacti 24")..{ Name="NumStages"; - InitCommand=cmd(x,32;y,-4;shadowlength,0;zoom,0.5;skewx,-0.2;diffusebottomedge,color("#068EE1FF");strokecolor,color("#FF000000")); + InitCommand=cmd(x,32;y,-4;shadowlength,0;skewx,-0.2;diffusebottomedge,color("#068EE1FF");strokecolor,color("#FF000000")); SetCommand=function(self) local Song = GAMESTATE:GetCurrentSong(); local postfix = " STAGES"; @@ -401,7 +401,7 @@ if not GAMESTATE:IsCourseMode() then end; }; LoadFont( "_terminator two 32" ) .. { - InitCommand=cmd(x,-4;y,-3;settext,"P1";zoom,0.5;diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000");); + InitCommand=cmd(x,-4;y,-3;settext,"P1";diffuse,color("#baa200");shadowlength,0;strokecolor,color("#00000000");); BeginCommand=cmd(player,"PlayerNumber_P1";); PlayerJoinedMessageCommand=function(self,param ) if param.Player ~= "PlayerNumber_P1" then return end; @@ -426,7 +426,7 @@ if not GAMESTATE:IsCourseMode() then end; }; LoadFont( "_terminator two 32" ) .. { - InitCommand=cmd(x,4;y,-3;settext,"P2";zoom,0.5;diffuse,color("#83b767");shadowlength,0;strokecolor,color("#00000000");); + InitCommand=cmd(x,4;y,-3;settext,"P2";diffuse,color("#83b767");shadowlength,0;strokecolor,color("#00000000");); BeginCommand=cmd(player,"PlayerNumber_P2";); PlayerJoinedMessageCommand=function(self,param ) if param.Player ~= "PlayerNumber_P2" then return end; diff --git a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu overlay/default.lua index 46a58331ef..27e03b19c6 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenTitleMenu overlay/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenTitleMenu overlay/default.lua @@ -6,7 +6,7 @@ local t = Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X-200;y,SCREEN_TOP;vertalign,top;); }; LoadFont("Common", "normal") .. { - InitCommand=cmd(x,SCREEN_CENTER_X-266;y,SCREEN_TOP+36;horizalign,left;zoom,0.5;shadowlengthx,0;shadowlengthy,2;playcommand,"Set"); + InitCommand=cmd(x,SCREEN_CENTER_X-266;y,SCREEN_TOP+36;horizalign,left;shadowlengthx,0;shadowlengthy,2;playcommand,"Set"); SetCommand=function(self) local s = ""; local fmt = THEME:GetString( Var "LoadingScreen", "%d songs in %d groups" ); @@ -37,14 +37,14 @@ local t = Def.ActorFrame { end; }; LoadFont("Common", "normal") .. { - InitCommand=cmd(x,SCREEN_LEFT+20;y,SCREEN_TOP+36;horizalign,left;diffuse,0.6,0.6,0.6,1;zoom,0.5;shadowlength,2); + InitCommand=cmd(x,SCREEN_LEFT+20;y,SCREEN_TOP+36;horizalign,left;diffuse,0.6,0.6,0.6,1;shadowlength,2); }; Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X-250;y,SCREEN_CENTER_Y+200;); LoadActor( "stepmania logo" ) .. { }; LoadFont( "_venacti bold 24" ) .. { - InitCommand=cmd(y,-25;settext,ProductVersion() .. " " .. VersionTime();zoom,0.5;diffuse,color("#000000");shadowlength,0;); + InitCommand=cmd(y,-25;settext,ProductVersion() .. " " .. VersionTime();diffuse,color("#000000");shadowlength,0;); }; }; } diff --git a/stepmania/Themes/default/Fonts/_regra 32 bold.ini b/stepmania/Themes/default/Fonts/_regra 32 bold.ini index 9cb6ee6bdc..41a2efc896 100755 --- a/stepmania/Themes/default/Fonts/_regra 32 bold.ini +++ b/stepmania/Themes/default/Fonts/_regra 32 bold.ini @@ -5,6 +5,7 @@ LineSpacing=38 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=12 1=12 2=12 diff --git a/stepmania/Themes/default/Fonts/_regra bold 36.ini b/stepmania/Themes/default/Fonts/_regra bold 36.ini index 9a9eba319d..ec159649d4 100755 --- a/stepmania/Themes/default/Fonts/_regra bold 36.ini +++ b/stepmania/Themes/default/Fonts/_regra bold 36.ini @@ -5,6 +5,7 @@ LineSpacing=43 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns 52.ini b/stepmania/Themes/default/Fonts/_sf sports night ns 52.ini index 00c62f690a..eba3156aa6 100755 --- a/stepmania/Themes/default/Fonts/_sf sports night ns 52.ini +++ b/stepmania/Themes/default/Fonts/_sf sports night ns 52.ini @@ -6,6 +6,7 @@ DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=3 ScaleAllWidthsBy=1.2068965517241379310344827586207 +FontBaseZoom=0.5 0=4 1=4 2=4 diff --git a/stepmania/Themes/default/Fonts/_sf sports night ns upright 52.ini b/stepmania/Themes/default/Fonts/_sf sports night ns upright 52.ini index 9910cfe6f0..40fbae3e3a 100755 --- a/stepmania/Themes/default/Fonts/_sf sports night ns upright 52.ini +++ b/stepmania/Themes/default/Fonts/_sf sports night ns upright 52.ini @@ -6,6 +6,7 @@ DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=3 ScaleAllWidthsBy=1.2068965517241379310344827586207 +FontBaseZoom=0.5 0=4 1=4 2=4 diff --git a/stepmania/Themes/default/Fonts/_sf square head 52.ini b/stepmania/Themes/default/Fonts/_sf square head 52.ini index c00eceb63a..6c80054c52 100755 --- a/stepmania/Themes/default/Fonts/_sf square head 52.ini +++ b/stepmania/Themes/default/Fonts/_sf square head 52.ini @@ -5,6 +5,7 @@ LineSpacing=51 DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=7 1=7 2=7 diff --git a/stepmania/Themes/default/Fonts/_sf square head 60.ini b/stepmania/Themes/default/Fonts/_sf square head 60.ini index 2e50be6e79..0ae1f76f4b 100755 --- a/stepmania/Themes/default/Fonts/_sf square head 60.ini +++ b/stepmania/Themes/default/Fonts/_sf square head 60.ini @@ -5,6 +5,7 @@ LineSpacing=60 DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 +FontBaseZoom=0.5 0=12 1=12 2=12 diff --git a/stepmania/Themes/default/Fonts/_sf square head bold 28.ini b/stepmania/Themes/default/Fonts/_sf square head bold 28.ini index 8657966e9a..230b330eea 100755 --- a/stepmania/Themes/default/Fonts/_sf square head bold 28.ini +++ b/stepmania/Themes/default/Fonts/_sf square head bold 28.ini @@ -6,6 +6,7 @@ DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 AddToAllWidths=2 +FontBaseZoom=0.5 0=6 1=6 2=6 diff --git a/stepmania/Themes/default/Fonts/_terminator two 32.ini b/stepmania/Themes/default/Fonts/_terminator two 32.ini index 228960fa1d..f5a304249e 100755 --- a/stepmania/Themes/default/Fonts/_terminator two 32.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 32.ini @@ -5,6 +5,7 @@ LineSpacing=32 DrawExtraPixelsLeft=4 DrawExtraPixelsRight=4 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=8 1=8 2=8 diff --git a/stepmania/Themes/default/Fonts/_terminator two 40.ini b/stepmania/Themes/default/Fonts/_terminator two 40.ini index 4ddbbc8b4f..f46f41cba0 100644 --- a/stepmania/Themes/default/Fonts/_terminator two 40.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 40.ini @@ -6,6 +6,7 @@ DrawExtraPixelsRight=0 AdvanceExtraPixels=0 FontBaseZoom=0.5 DefaultStrokeColor=#FFFFFF + [numbers] Baseline=34 0=26 diff --git a/stepmania/Themes/default/Fonts/_terminator two 50.ini b/stepmania/Themes/default/Fonts/_terminator two 50.ini index 094288ef4c..f09face62c 100755 --- a/stepmania/Themes/default/Fonts/_terminator two 50.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 50.ini @@ -5,6 +5,7 @@ LineSpacing=51 DrawExtraPixelsLeft=4 DrawExtraPixelsRight=4 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=8 1=8 2=8 diff --git a/stepmania/Themes/default/Fonts/_terminator two 60.ini b/stepmania/Themes/default/Fonts/_terminator two 60.ini index 551816286d..4131dd7aa7 100755 --- a/stepmania/Themes/default/Fonts/_terminator two 60.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 60.ini @@ -5,6 +5,7 @@ LineSpacing=60 DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 +FontBaseZoom=0.5 0=24 1=24 2=24 diff --git a/stepmania/Themes/default/Fonts/_terminator two 92.ini b/stepmania/Themes/default/Fonts/_terminator two 92.ini index 1f9648f2b0..232c97c73e 100755 --- a/stepmania/Themes/default/Fonts/_terminator two 92.ini +++ b/stepmania/Themes/default/Fonts/_terminator two 92.ini @@ -5,6 +5,7 @@ LineSpacing=92 DrawExtraPixelsLeft=1 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 +FontBaseZoom=0.5 0=21 1=21 2=21 diff --git a/stepmania/Themes/default/Fonts/_terminator two stroke 60.ini b/stepmania/Themes/default/Fonts/_terminator two stroke 60.ini index ac839ef6da..9ea6367a01 100755 --- a/stepmania/Themes/default/Fonts/_terminator two stroke 60.ini +++ b/stepmania/Themes/default/Fonts/_terminator two stroke 60.ini @@ -5,6 +5,7 @@ LineSpacing=60 DrawExtraPixelsLeft=2 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 +FontBaseZoom=0.5 0=24 1=24 2=24 diff --git a/stepmania/Themes/default/Fonts/_terminator two stroke 92.ini b/stepmania/Themes/default/Fonts/_terminator two stroke 92.ini index 2114d3fb78..0d90bdae08 100755 --- a/stepmania/Themes/default/Fonts/_terminator two stroke 92.ini +++ b/stepmania/Themes/default/Fonts/_terminator two stroke 92.ini @@ -5,6 +5,7 @@ LineSpacing=92 DrawExtraPixelsLeft=2 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 +FontBaseZoom=0.5 0=21 1=21 2=21 diff --git a/stepmania/Themes/default/Fonts/_venacti 100 combo.ini b/stepmania/Themes/default/Fonts/_venacti 100 combo.ini index e857b80a22..a533e094ff 100644 --- a/stepmania/Themes/default/Fonts/_venacti 100 combo.ini +++ b/stepmania/Themes/default/Fonts/_venacti 100 combo.ini @@ -5,6 +5,7 @@ LineSpacing=120 DrawExtraPixelsLeft=8 DrawExtraPixelsRight=8 AdvanceExtraPixels=0 +FontBaseZoom=0.5 [numbers] 0=67 diff --git a/stepmania/Themes/default/Fonts/_venacti 20px.ini b/stepmania/Themes/default/Fonts/_venacti 20px.ini index be82fde473..b2498f243f 100755 --- a/stepmania/Themes/default/Fonts/_venacti 20px.ini +++ b/stepmania/Themes/default/Fonts/_venacti 20px.ini @@ -5,6 +5,7 @@ LineSpacing=24 DrawExtraPixelsLeft=2 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti 24.ini b/stepmania/Themes/default/Fonts/_venacti 24.ini index ffb8238717..e369c4c10d 100755 --- a/stepmania/Themes/default/Fonts/_venacti 24.ini +++ b/stepmania/Themes/default/Fonts/_venacti 24.ini @@ -5,6 +5,7 @@ LineSpacing=29 DrawExtraPixelsLeft=2 DrawExtraPixelsRight=0 AdvanceExtraPixels=2 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti 30 italic.ini b/stepmania/Themes/default/Fonts/_venacti 30 italic.ini index 3fe349d0a0..8b1db7a86c 100755 --- a/stepmania/Themes/default/Fonts/_venacti 30 italic.ini +++ b/stepmania/Themes/default/Fonts/_venacti 30 italic.ini @@ -5,6 +5,7 @@ LineSpacing=28 DrawExtraPixelsLeft=4 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti bold 26.ini b/stepmania/Themes/default/Fonts/_venacti bold 26.ini index 24779bbe5a..c2fe98e1ce 100755 --- a/stepmania/Themes/default/Fonts/_venacti bold 26.ini +++ b/stepmania/Themes/default/Fonts/_venacti bold 26.ini @@ -5,6 +5,7 @@ LineSpacing=31 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti bold 28.ini b/stepmania/Themes/default/Fonts/_venacti bold 28.ini index 6e7f0783b9..4e21cb78f1 100755 --- a/stepmania/Themes/default/Fonts/_venacti bold 28.ini +++ b/stepmania/Themes/default/Fonts/_venacti bold 28.ini @@ -5,6 +5,7 @@ LineSpacing=34 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti bold 30.ini b/stepmania/Themes/default/Fonts/_venacti bold 30.ini index 4b7a9536f2..a7c138ceb3 100755 --- a/stepmania/Themes/default/Fonts/_venacti bold 30.ini +++ b/stepmania/Themes/default/Fonts/_venacti bold 30.ini @@ -5,6 +5,7 @@ LineSpacing=28 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=1 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_venacti bold 32.ini b/stepmania/Themes/default/Fonts/_venacti bold 32.ini index 774ea00b58..bfaf813812 100755 --- a/stepmania/Themes/default/Fonts/_venacti bold 32.ini +++ b/stepmania/Themes/default/Fonts/_venacti bold 32.ini @@ -5,6 +5,7 @@ LineSpacing=38 DrawExtraPixelsLeft=3 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 0=0 1=0 2=0 diff --git a/stepmania/Themes/default/Fonts/_zosma 60 bold.ini b/stepmania/Themes/default/Fonts/_zosma 60 bold.ini index 2a57ee30f4..ebfc8ae57d 100755 --- a/stepmania/Themes/default/Fonts/_zosma 60 bold.ini +++ b/stepmania/Themes/default/Fonts/_zosma 60 bold.ini @@ -5,6 +5,7 @@ LineSpacing=60 DrawExtraPixelsLeft=0 DrawExtraPixelsRight=0 AdvanceExtraPixels=0 +FontBaseZoom=0.5 [numbers] Baseline=54 diff --git a/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir b/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir index 76b570e983..fb010348ff 100644 --- a/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir +++ b/stepmania/Themes/default/Graphics/ModIconSelectMusic Empty.redir @@ -1 +1 @@ -ModIconRow icon filled \ No newline at end of file +ModIcon Filled \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/OptionRow FrameExit/Focus (doubleres).png b/stepmania/Themes/default/Graphics/OptionRow FrameExit/Focus (doubleres).png new file mode 100644 index 0000000000..de101c1f9e Binary files /dev/null and b/stepmania/Themes/default/Graphics/OptionRow FrameExit/Focus (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/OptionRow FrameExit/NoFocus (doubleres).png b/stepmania/Themes/default/Graphics/OptionRow FrameExit/NoFocus (doubleres).png new file mode 100644 index 0000000000..480a79ed81 Binary files /dev/null and b/stepmania/Themes/default/Graphics/OptionRow FrameExit/NoFocus (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/OptionRow FrameExit/default.lua b/stepmania/Themes/default/Graphics/OptionRow FrameExit/default.lua new file mode 100644 index 0000000000..79617a4c34 --- /dev/null +++ b/stepmania/Themes/default/Graphics/OptionRow FrameExit/default.lua @@ -0,0 +1,10 @@ +return Def.ActorFrame { + LoadActor("focus") .. { + GainFocusCommand=cmd(visible,true;); + LoseFocusCommand=cmd(visible,false;); + }; + LoadActor("nofocus") .. { + GainFocusCommand=cmd(visible,false;); + LoseFocusCommand=cmd(visible,true;); + }; +}; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/OptionRow FrameNormal/Focus (doubleres).png b/stepmania/Themes/default/Graphics/OptionRow FrameNormal/Focus (doubleres).png new file mode 100644 index 0000000000..bd84aa0ea0 Binary files /dev/null and b/stepmania/Themes/default/Graphics/OptionRow FrameNormal/Focus (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/OptionRow FrameNormal/NoFocus (doubleres).png b/stepmania/Themes/default/Graphics/OptionRow FrameNormal/NoFocus (doubleres).png new file mode 100644 index 0000000000..9584cdc8ff Binary files /dev/null and b/stepmania/Themes/default/Graphics/OptionRow FrameNormal/NoFocus (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/OptionRow FrameNormal/default.lua b/stepmania/Themes/default/Graphics/OptionRow FrameNormal/default.lua new file mode 100644 index 0000000000..79617a4c34 --- /dev/null +++ b/stepmania/Themes/default/Graphics/OptionRow FrameNormal/default.lua @@ -0,0 +1,10 @@ +return Def.ActorFrame { + LoadActor("focus") .. { + GainFocusCommand=cmd(visible,true;); + LoseFocusCommand=cmd(visible,false;); + }; + LoadActor("nofocus") .. { + GainFocusCommand=cmd(visible,false;); + LoseFocusCommand=cmd(visible,true;); + }; +}; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua index 5b691d989c..aa3b4202b4 100755 --- a/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenSelectPlayMode icon/default.lua @@ -30,7 +30,7 @@ local t = Def.ActorFrame { InitCommand=cmd(x,94;settext,string.upper(gc:GetText());shadowlength,0;zoom,0.7;zoomtowidth,300;rotationz,-90;diffuse,c;shadowlengthx,4;shadowlengthy,0;); }; LoadFont( "_euromode 44" ) .. { - InitCommand=cmd(horizalign,right;vertalign,bottom;x,72;y,150;settext,ScreenString(gc:GetName().."Explanation");shadowlengthx,0;shadowlengthy,3;zoom,0.5;maxwidth,500;diffuse,c;strokecolor,color("#000000");); + InitCommand=cmd(horizalign,right;vertalign,bottom;x,72;y,150;settext,ScreenString(gc:GetName().."Explanation");shadowlengthx,0;shadowlengthy,3;maxwidth,500;diffuse,c;strokecolor,color("#000000");); }; }; Def.ActorFrame { @@ -46,10 +46,10 @@ local t = Def.ActorFrame { LoseFocusCommand=cmd(visible,false); }; LoadFont( "_terminator two stroke 60" ) .. { - InitCommand=cmd(y,-6;settext,string.upper(gc:GetText());shadowlength,0;zoom,0.5;maxwidth,350;diffuse,color("#000000");diffusealpha,0.35;); + InitCommand=cmd(y,-6;settext,string.upper(gc:GetText());shadowlength,0;maxwidth,350;diffuse,color("#000000");diffusealpha,0.35;); }; LoadFont( "_terminator two 60" ) .. { - InitCommand=cmd(y,-6;settext,string.upper(gc:GetText());shadowlength,0;zoom,0.5;maxwidth,350;diffuse,c;shadowlengthx,0;shadowlengthy,4;); + InitCommand=cmd(y,-6;settext,string.upper(gc:GetText());shadowlength,0;maxwidth,350;diffuse,c;shadowlengthx,0;shadowlengthy,4;); }; }; }; diff --git a/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua b/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua index e6502eb085..185832a0f2 100755 --- a/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenSelectStyle2 icon/default.lua @@ -24,16 +24,16 @@ local t = Def.ActorFrame { LoadActor( "card frame " .. st ) .. { }; LoadFont( "_sf square head 60" ) .. { - InitCommand=cmd(y,-51;settext,string.upper(gc:GetText());maxwidth,500;shadowlength,0;zoom,0.5;); + InitCommand=cmd(y,-51;settext,string.upper(gc:GetText());maxwidth,500;shadowlength,0;); }; LoadFont( "_venacti bold 32" ) .. { - InitCommand=cmd(horizalign,left;x,-12;y,-2;settext,"EACH PLAYER USES\nONE CONTROLLER";maxwidth,300;shadowlength,0;diffuse,color("#000000");zoom,0.5); + InitCommand=cmd(horizalign,left;x,-12;y,-2;settext,"EACH PLAYER USES\nONE CONTROLLER";maxwidth,300;shadowlength,0;diffuse,color("#000000");); }; LoadFont( "_venacti bold 32" ) .. { - InitCommand=cmd(horizalign,right;x,98;y,42;settext,"MAX STAGE/";maxwidth,300;shadowlength,0;diffuse,color("#32d545");zoom,0.5); + InitCommand=cmd(horizalign,right;x,98;y,42;settext,"MAX STAGE/";maxwidth,300;shadowlength,0;diffuse,color("#32d545");); }; LoadFont( "_sf square head 32" ) .. { - InitCommand=cmd(horizalign,right;x,128;y,40;settext,max_stages;maxwidth,100;shadowlength,0;zoom,0.5); + InitCommand=cmd(horizalign,right;x,128;y,40;settext,max_stages;maxwidth,100;shadowlength,0;); }; LoadActor( "card " .. pad_file ) .. { InitCommand=cmd(x,-82;y,8;); @@ -55,7 +55,7 @@ local t = Def.ActorFrame { LoseFocusCommand=cmd(stopeffect;visible,false); }; LoadFont( "_terminator two 36" ) .. { - InitCommand=cmd(y,-30;settext,string.upper(gc:GetText());shadowlength,0;zoom,0.5;maxwidth,160;strokecolor,color("#000000FF")); + InitCommand=cmd(y,-30;settext,string.upper(gc:GetText());shadowlength,0;maxwidth,160;strokecolor,color("#000000FF")); }; Def.ActorFrame { InitCommand=cmd(y,10;); diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua index 076e8d745a..bfe248733c 100644 --- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 footer/default.lua @@ -5,7 +5,7 @@ return LoadActor( THEME:GetPathB("ScreenWithMenuElements2","overlay") ) .. { OnCommand=cmd(); }; LoadFont( "_venacti bold 30" ) .. { - InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");zoom,0.5;settext,"\"JOY4\" IS NOT MAPPED";skewx,-0.1;); + InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");settext,"\"JOY4\" IS NOT MAPPED";skewx,-0.1;); }; }; Def.ActorFrame { @@ -14,7 +14,7 @@ return LoadActor( THEME:GetPathB("ScreenWithMenuElements2","overlay") ) .. { OnCommand=cmd(zoomx,-1); }; LoadFont( "_venacti bold 30" ) .. { - InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");zoom,0.5;settext,"P2: PRESS START TO JOIN\nTHIS IS 2 LINES OF TEXT";skewx,-0.1;); + InitCommand=cmd(y,-15;shadowlength,0;diffuse,color("#000000");settext,"P2: PRESS START TO JOIN\nTHIS IS 2 LINES OF TEXT";skewx,-0.1;); }; }; }; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua index cdc39c19cb..8a6e654669 100644 --- a/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua +++ b/stepmania/Themes/default/Graphics/ScreenWithMenuElements2 header/default.lua @@ -8,10 +8,10 @@ return Def.ActorFrame { InitCommand=cmd(horizalign,left;y,4); }; LoadFont( "_sf sports night ns upright 52" ) .. { - InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;zoom,0.5;settext,ScreenString("HeaderText");skewx,-0.15); + InitCommand=cmd(x,64;y,-7;horizalign,left;shadowlength,0;settext,ScreenString("HeaderText");skewx,-0.15); }; LoadFont( "_venacti 24" ) .. { - InitCommand=cmd(x,64;y,12;horizalign,left;shadowlength,0;zoom,0.5;settext,ScreenString("HeaderSubText");); + InitCommand=cmd(x,64;y,12;horizalign,left;shadowlength,0;settext,ScreenString("HeaderSubText");); }; LoadActor( "arrow" ) .. { }; diff --git a/stepmania/Themes/default/Scripts/Other.lua b/stepmania/Themes/default/Scripts/Other.lua index 0fbebcdcae..d8ae0a60be 100644 --- a/stepmania/Themes/default/Scripts/Other.lua +++ b/stepmania/Themes/default/Scripts/Other.lua @@ -112,26 +112,26 @@ function TextBannerAfterSet(self,param) --local Artist=self:GetChild("Artist"); local edge_x = 120; if Subtitle:GetText() == "" then - (cmd(zoom,0.5;maxwidth,300;x,edge_x;y,0))(Title); + (cmd(maxwidth,300;x,edge_x;y,0))(Title); (cmd(visible,false))(Subtitle); - --(cmd(zoom,0.3333;maxwidth,300;x,edge_x;y,7))(Artist); + --(cmd(zoom,0.66;maxwidth,300;x,edge_x;y,7))(Artist); else - local one_line_title_zoom = 0.5; - local one_line_sub_zoom = 0.3; + local one_line_title_zoom = 1; + local one_line_sub_zoom = 0.6; local title_width = Title:GetWidth() * one_line_title_zoom; local sub_width = Subtitle:GetWidth() * one_line_sub_zoom; local spacing = 4; local max_one_line_width = 200; if title_width + spacing + sub_width < max_one_line_width then -- subtitle to the side - (cmd(zoom,0.5;x,edge_x-sub_width-spacing;y,0))(Title); + (cmd(zoom,1;x,edge_x-sub_width-spacing;y,0))(Title); (cmd(visible,true;zoom,one_line_sub_zoom;x,edge_x;y,2))(Subtitle); - --(cmd(zoom,0.3333;maxwidth,300;x,edge_x;y,7))(Artist); + --(cmd(zoom,0.66;maxwidth,300;x,edge_x;y,7))(Artist); else -- subtitle below - (cmd(zoom,0.5;x,edge_x;y,-6;))(Title); - (cmd(visible,true;zoom,0.3;x,edge_x;y,7))(Subtitle); - --(cmd(zoom,0.3333;maxwidth,300;x,edge_x;y,9))(Artist); + (cmd(zoom,1;x,edge_x;y,-6;))(Title); + (cmd(visible,true;zoom,0.6;x,edge_x;y,7))(Subtitle); + --(cmd(zoom,0.66;maxwidth,300;x,edge_x;y,9))(Artist); end end end diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 714bb50b48..266b6dc71e 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1850,7 +1850,7 @@ Class="ScreenStatsOverlay" Fallback="Screen" StatsX=SCREEN_RIGHT-8 StatsY=SCREEN_TOP+10 -StatsOnCommand=horizalign,right;vertalign,top;zoom,0.7;shadowlength,2 +StatsOnCommand=horizalign,right;vertalign,top;shadowlength,2 [MusicWheelItem] IconX=-136 @@ -2628,7 +2628,7 @@ MountainHeight= [ModIcon] TextX=0 TextY=-2 -TextOnCommand=zoom,0.5;maxwidth,72;uppercase,true +TextOnCommand=maxwidth,72;uppercase,true [ModIconSelectMusic] Fallback="ModIcon" @@ -2638,11 +2638,11 @@ NumModIcons=6 ModIconOnCommand= SpacingX=46 SpacingY=0 -ModIconMetircsGroup="ModIcon" +ModIconMetricsGroup="ModIcon" [ModIconRowSelectMusic] Fallback="ModIconRow" -ModIconMetircsGroup="ModIconSelectMusic" +ModIconMetricsGroup="ModIconSelectMusic" [ModIconRowGameplay] Fallback="ModIconRow" diff --git a/stepmania/src/ScreenDebugOverlay.cpp b/stepmania/src/ScreenDebugOverlay.cpp index 5fe668c9d4..953fd0fd73 100644 --- a/stepmania/src/ScreenDebugOverlay.cpp +++ b/stepmania/src/ScreenDebugOverlay.cpp @@ -216,7 +216,6 @@ void ScreenDebugOverlay::Init() m_textHeader.SetHorizAlign( align_left ); m_textHeader.SetX( SCREEN_LEFT+20 ); m_textHeader.SetY( SCREEN_TOP+20 ); - m_textHeader.SetZoom( 1.0f ); m_textHeader.SetText( DEBUG_MENU ); this->AddChild( &m_textHeader ); @@ -320,11 +319,9 @@ void ScreenDebugOverlay::UpdateText() txt1.SetX( SCREEN_CENTER_X-50 ); txt1.SetY( fY ); - txt1.SetZoom( 0.7f ); txt2.SetX( SCREEN_CENTER_X-30 ); txt2.SetY( fY ); - txt2.SetZoom( 0.7f ); RString s1 = (*p)->GetDisplayTitle(); RString s2 = (*p)->GetDisplayValue(); diff --git a/stepmania/src/ScreenStatsOverlay.cpp b/stepmania/src/ScreenStatsOverlay.cpp index 1a5179b900..6c67049f27 100644 --- a/stepmania/src/ScreenStatsOverlay.cpp +++ b/stepmania/src/ScreenStatsOverlay.cpp @@ -48,7 +48,6 @@ void ScreenStatsOverlay::Init() m_textSkips[i].SetY( SCALE( i, 0, NUM_SKIPS_TO_SHOW-1, rectSkips.top + 10, rectSkips.bottom - 10 ) ); - m_textSkips[i].SetZoom( 0.6f ); m_textSkips[i].SetDiffuse( RageColor(1,1,1,0) ); m_textSkips[i].SetShadowLength( 0 ); this->AddChild( &m_textSkips[i] );