diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/banner frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/banner frame (doubleres).png new file mode 100644 index 0000000000..4678cec17c Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/banner frame (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/combo graph empty (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/combo graph empty (doubleres).png new file mode 100644 index 0000000000..eb669ca82c Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/combo graph empty (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/combo graph filled (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/combo graph filled (doubleres).png new file mode 100644 index 0000000000..81fab2d1fc Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/combo graph filled (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/detail frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/detail frame (doubleres).png new file mode 100644 index 0000000000..351bd5dc78 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/detail frame (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/difficulty setting bar (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/difficulty setting bar (doubleres).png new file mode 100644 index 0000000000..7b161dfc24 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/difficulty setting bar (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/grade frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/grade frame (doubleres).png new file mode 100644 index 0000000000..85337b4f58 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/grade frame (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/judge row frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/judge row frame (doubleres).png new file mode 100644 index 0000000000..7e14926307 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/judge row frame (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/life graph (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/life graph (doubleres).png new file mode 100644 index 0000000000..d3c1a7c76e Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenEvaluationStage overlay/life graph (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay failed/failed (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenGameplay failed/failed (doubleres).png new file mode 100644 index 0000000000..a505479cd1 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenGameplay failed/failed (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay failed/failed.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay failed/failed.png deleted file mode 100644 index 96b7c9744c..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenGameplay failed/failed.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay go/go (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenGameplay go/go (doubleres).png new file mode 100644 index 0000000000..d3e53197f7 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenGameplay go/go (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay go/go.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay go/go.png deleted file mode 100644 index f75093db56..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenGameplay go/go.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay out/cleared (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenGameplay out/cleared (doubleres).png new file mode 100644 index 0000000000..df15b2cbc2 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenGameplay out/cleared (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay out/cleared.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay out/cleared.png deleted file mode 100644 index 52eb48f613..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenGameplay out/cleared.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/_score frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/_score frame (doubleres).png new file mode 100644 index 0000000000..358ad9c4ab Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/_score frame (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/_score frame.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/_score frame.png deleted file mode 100644 index e115400d89..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/_score frame.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/bumper.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/bumper.png new file mode 100644 index 0000000000..97fc0a1a53 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/bumper.png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua index 0311def935..a123c1c4b0 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/default.lua @@ -1,6 +1,6 @@ -local font = LoadFont( "_zeroesthree" ); +local font = LoadFont( "common normal" ); local frame = LoadActor( "_score frame" ); -local text = GAMESTATE:GetPlayMode() == 'PlayMode_Oni' and "time" or "score"; +--local text = GAMESTATE:GetPlayMode() == 'PlayMode_Oni' and "time" or "score"; local function DifficultyLabelText(pn) local yNormal = SCREEN_CENTER_Y+175; @@ -59,28 +59,4 @@ return Def.ActorFrame { -- text on difficulty labels DifficultyLabelText(PLAYER_1); DifficultyLabelText(PLAYER_2); - - -- text on bottom of score frames - Def.ActorFrame { - frame; - font .. { - Text = "player 1 " .. text; - InitCommand = cmd(horizalign,left;addy,16;addx,-80;zoom,0.75;shadowlength,0); - }; - InitCommand = cmd(x,SCREEN_LEFT-100;y,SCREEN_CENTER_Y+202); - OnCommand = cmd(linear,1;x,SCREEN_CENTER_X-208); - OffCommand = cmd(linear,1;x,SCREEN_LEFT-100); - Condition=GAMESTATE:IsSideJoined(PLAYER_1) == true or GAMESTATE:GetPlayMode() == 'PlayMode_Rave'; - }; - Def.ActorFrame { - frame; - font .. { - Text = "player 2 " .. text; - InitCommand = cmd(horizalign,right;addy,16;addx,80;zoom,0.75;shadowlength,0); - }; - InitCommand = cmd(x,SCREEN_RIGHT+100;y,SCREEN_CENTER_Y+202); - OnCommand = cmd(linear,1;x,SCREEN_CENTER_X+210); - OffCommand = cmd(linear,1;x,SCREEN_RIGHT+100); - Condition=GAMESTATE:IsSideJoined(PLAYER_2) == true or GAMESTATE:GetPlayMode() == 'PlayMode_Rave'; - } }; diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/difficulty bar.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/difficulty bar.png new file mode 100644 index 0000000000..dc0f3d0654 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/difficulty bar.png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/mod bar.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/mod bar.png new file mode 100644 index 0000000000..4c8f3b705d Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenGameplay overlay/mod bar.png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay ready/ready (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenGameplay ready/ready (doubleres).png new file mode 100644 index 0000000000..d8f60b89f7 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenGameplay ready/ready (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenGameplay ready/ready.png b/stepmania/Themes/default/BGAnimations/ScreenGameplay ready/ready.png deleted file mode 100644 index 22036f0d41..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenGameplay ready/ready.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg rainbow (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg rainbow (doubleres).png new file mode 100644 index 0000000000..e128291052 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg rainbow (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg ring (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg ring (doubleres).png new file mode 100644 index 0000000000..485707baae Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg ring (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg sky (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg sky (doubleres).png new file mode 100644 index 0000000000..93f7b7b71f Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg sky (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg.png b/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg.png deleted file mode 100755 index 8e3727fcff..0000000000 Binary files a/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg.png and /dev/null differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenLogo background/cursor frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenLogo background/cursor frame (doubleres).png new file mode 100644 index 0000000000..0601da7c0e Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenLogo background/cursor frame (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenLogo background/default.lua b/stepmania/Themes/default/BGAnimations/ScreenLogo background/default.lua index 90844450eb..2d976dc5de 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenLogo background/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenLogo background/default.lua @@ -1,3 +1,20 @@ -return LoadActor( "bg.png" ) .. { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;scale_or_crop_background); -} +return Def.ActorFrame { + LoadActor( "bg sky" ) .. { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); + }; + LoadActor( "bg ring" ) .. { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); + }; + LoadActor( "bg rainbow" ) .. { + InitCommand=cmd(x,SCREEN_LEFT;y,SCREEN_BOTTOM;horizalign,left;vertalign,bottom;); + }; + LoadActor( "cursor frame" ) .. { + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;); + }; + LoadActor( "help pane" ) .. { + InitCommand=cmd(x,SCREEN_CENTER_X+200;y,SCREEN_BOTTOM;vertalign,bottom;); + }; + LoadActor( "settings pane" ) .. { + InitCommand=cmd(x,SCREEN_CENTER_X-200;y,SCREEN_TOP;vertalign,top;); + }; +} \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenLogo background/help pane (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenLogo background/help pane (doubleres).png new file mode 100644 index 0000000000..f42e5f120a Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenLogo background/help pane (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenLogo background/settings pane (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenLogo background/settings pane (doubleres).png new file mode 100644 index 0000000000..d5fa4e46a4 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenLogo background/settings pane (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/cursor p1 (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/cursor p1 (doubleres).png new file mode 100644 index 0000000000..493d4b2c47 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/cursor p1 (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/cursor p2 (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/cursor p2 (doubleres).png new file mode 100644 index 0000000000..d09ac1c468 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/cursor p2 (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/done frame (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/done frame (doubleres).png new file mode 100644 index 0000000000..097cdbe195 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/done frame (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/row focus (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/row focus (doubleres).png new file mode 100644 index 0000000000..b82cf9a94d Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/row focus (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/row nofocus (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/row nofocus (doubleres).png new file mode 100644 index 0000000000..ae8ee4e29b Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/row nofocus (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/underline p1 (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/underline p1 (doubleres).png new file mode 100644 index 0000000000..188de6bb60 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/underline p1 (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/underline p2 (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/underline p2 (doubleres).png new file mode 100644 index 0000000000..fbae2ebfae Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenOptions overlay/underline p2 (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/Player combo/_combo (doubleres).png b/stepmania/Themes/default/Graphics/Player combo/_combo (doubleres).png new file mode 100644 index 0000000000..ba4114bedf Binary files /dev/null and b/stepmania/Themes/default/Graphics/Player combo/_combo (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/Player combo/_combo.png b/stepmania/Themes/default/Graphics/Player combo/_combo.png deleted file mode 100644 index 650bf41ffe..0000000000 Binary files a/stepmania/Themes/default/Graphics/Player combo/_combo.png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/Player judgment/_judgments 2x6 (doubleres).png b/stepmania/Themes/default/Graphics/Player judgment/_judgments 2x6 (doubleres).png new file mode 100644 index 0000000000..57154d0c20 Binary files /dev/null and b/stepmania/Themes/default/Graphics/Player judgment/_judgments 2x6 (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/Player judgment/_judgments 2x6.png b/stepmania/Themes/default/Graphics/Player judgment/_judgments 2x6.png deleted file mode 100644 index 8e80571f68..0000000000 Binary files a/stepmania/Themes/default/Graphics/Player judgment/_judgments 2x6.png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenGameplay life frame (doubleres).png b/stepmania/Themes/default/Graphics/ScreenGameplay life frame (doubleres).png new file mode 100644 index 0000000000..1a5ce47994 Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenGameplay life frame (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenGameplay life frame.png b/stepmania/Themes/default/Graphics/ScreenGameplay life frame.png deleted file mode 100644 index 2f5675508e..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenGameplay life frame.png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenGameplay oni gameover (doubleres).png b/stepmania/Themes/default/Graphics/ScreenGameplay oni gameover (doubleres).png new file mode 100644 index 0000000000..94588ba087 Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenGameplay oni gameover (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenGameplay oni gameover.png b/stepmania/Themes/default/Graphics/ScreenGameplay oni gameover.png deleted file mode 100644 index fde6af82e0..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenGameplay oni gameover.png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenGameplay stage frame (doubleres).png b/stepmania/Themes/default/Graphics/ScreenGameplay stage frame (doubleres).png new file mode 100644 index 0000000000..7087d1b347 Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenGameplay stage frame (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenLogo dance (dither).png b/stepmania/Themes/default/Graphics/ScreenLogo dance (dither).png deleted file mode 100644 index eaf7c51ba5..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenLogo dance (dither).png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenLogo dance (doubleres).png b/stepmania/Themes/default/Graphics/ScreenLogo dance (doubleres).png new file mode 100644 index 0000000000..3925d0789d Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenLogo dance (doubleres).png differ