diff --git a/stepmania/Assets/header frame 3x1.psd b/stepmania/Assets/header frame 3x1.psd new file mode 100644 index 0000000000..cc2fd39941 Binary files /dev/null and b/stepmania/Assets/header frame 3x1.psd differ diff --git a/stepmania/Themes/default/BGAnimations/_frame files 3x1/headers 3x1.png b/stepmania/Themes/default/BGAnimations/_frame files 3x1/headers 3x1.png new file mode 100644 index 0000000000..01031ffea2 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/_frame files 3x1/headers 3x1.png differ diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluationStage header.lua b/stepmania/Themes/default/Graphics/ScreenEvaluationStage header.lua new file mode 100644 index 0000000000..0a26225711 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenEvaluationStage header.lua @@ -0,0 +1 @@ +return LoadActor( THEME:GetPathG("", "_header"), 'Results' ); \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenEvaluationSummary header.lua b/stepmania/Themes/default/Graphics/ScreenEvaluationSummary header.lua new file mode 100644 index 0000000000..d9c489bab3 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenEvaluationSummary header.lua @@ -0,0 +1 @@ +return LoadActor( THEME:GetPathG("", "_header"), 'Summary' ); \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenSelectCharacter header.lua b/stepmania/Themes/default/Graphics/ScreenSelectCharacter header.lua new file mode 100644 index 0000000000..342f27bfb0 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenSelectCharacter header.lua @@ -0,0 +1 @@ +return LoadActor( THEME:GetPathG("", "_header"), 'Select Character' ); \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenSelectCourse header.lua b/stepmania/Themes/default/Graphics/ScreenSelectCourse header.lua new file mode 100644 index 0000000000..07f1b8e961 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenSelectCourse header.lua @@ -0,0 +1 @@ +return LoadActor( THEME:GetPathG("", "_header"), 'Select Course' ); \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenSelectDifficulty header.lua b/stepmania/Themes/default/Graphics/ScreenSelectDifficulty header.lua new file mode 100644 index 0000000000..824dd226b8 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenSelectDifficulty header.lua @@ -0,0 +1 @@ +return LoadActor( THEME:GetPathG("", "_header"), 'Select Difficulty' ); \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenSelectMusic header.lua b/stepmania/Themes/default/Graphics/ScreenSelectMusic header.lua new file mode 100644 index 0000000000..50580fbd15 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenSelectMusic header.lua @@ -0,0 +1 @@ +return LoadActor( THEME:GetPathG("", "_header"), 'Select Music' ); \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/ScreenSelectStyle header.lua b/stepmania/Themes/default/Graphics/ScreenSelectStyle header.lua new file mode 100644 index 0000000000..7f95106630 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenSelectStyle header.lua @@ -0,0 +1 @@ +return LoadActor( THEME:GetPathG("", "_header"), 'Select Style' ); \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/_header.lua b/stepmania/Themes/default/Graphics/_header.lua new file mode 100644 index 0000000000..023c8a49f1 --- /dev/null +++ b/stepmania/Themes/default/Graphics/_header.lua @@ -0,0 +1,21 @@ +local Text = ... +assert( Text ); + +return Def.ActorFrame{ + -- main header background + LoadActor(THEME:GetPathB("","_frame 3x1"), "headers", SCREEN_WIDTH/2.5); + + -- text + LoadFont("", "_zeroesthree") ..{ + Text=THEME:GetString( 'Headers', Text ); + InitCommand=cmd(horizalign,left;shadowlength,0;x,-128); + OnCommand=cmd(linear,0.25;diffusealpha,1); + OffCommand=cmd(linear,0.25;diffusealpha,0); + }; + + -- timer background + LoadActor(THEME:GetPathB("","_frame 3x1"), "headers", 48)..{ + --InitCommand=cmd( x,SCREEN_CENTER_X+(SCREEN_WIDTH/5.35) ); + InitCommand=cmd( x,SCREEN_RIGHT-(SCREEN_WIDTH/3.1825) ); + }; +}; \ No newline at end of file diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index fdc8a953ba..bbae0e5433 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -1,4 +1,4 @@ -[Common] +[Common] WindowTitle=StepMania [Arch] @@ -132,6 +132,15 @@ CPU=CPU Player 1=Player 1 Player 2=Player 2 +[Headers] +Select Character=Select Character +Select Course=Select Course +Select Difficulty=Select Difficulty +Select Music=Select Music +Select Style=Select Style +Summary=Summary +Results=Results + [HoldNoteScore] Held=OK LetGo=NG diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 2374416588..775cb206e5 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1871,7 +1871,7 @@ StyleIcon=true ShowStage=false MemoryCardIcons=true CancelTransitionsOut=false -HeaderX=SCREEN_CENTER_X +HeaderX=SCREEN_LEFT+(SCREEN_WIDTH/4.25) HeaderY=SCREEN_TOP-11 HeaderOnCommand=draworder,95;linear,0.25;addy,33 HeaderOffCommand=linear,0.25;addy,-44; @@ -1893,7 +1893,8 @@ MemoryCardDisplayP2Y=SCREEN_CENTER_Y+220 MemoryCardDisplayP2OnCommand=draworder,97; MemoryCardDisplayP2OffCommand= //MemoryCardDisplayP2OffCommand=bouncebegin,0.5;addx,25; -TimerX=SCREEN_CENTER_X+270 +//TimerX=SCREEN_CENTER_X+270 +TimerX=SCREEN_RIGHT-60 TimerY=SCREEN_TOP-11 TimerOnCommand=draworder,97;linear,0.25;addy,33 TimerOffCommand=linear,0.25;addy,-44;