diff --git a/stepmania/Themes/default/BGAnimations/ScreenTitleJoin overlay/dp.png b/stepmania/Themes/default/BGAnimations/ScreenTitleJoin overlay/dp.png new file mode 100644 index 0000000000..e3ce1bb271 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenTitleJoin overlay/dp.png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenTitleJoin overlay/free.png b/stepmania/Themes/default/BGAnimations/ScreenTitleJoin overlay/free.png new file mode 100644 index 0000000000..017ffe4021 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenTitleJoin overlay/free.png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenTitleJoin overlay/jp.png b/stepmania/Themes/default/BGAnimations/ScreenTitleJoin overlay/jp.png new file mode 100644 index 0000000000..87dedb42b9 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenTitleJoin overlay/jp.png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenTitleJoin overlay/pay.png b/stepmania/Themes/default/BGAnimations/ScreenTitleJoin overlay/pay.png new file mode 100644 index 0000000000..36bd1e6350 Binary files /dev/null and b/stepmania/Themes/default/BGAnimations/ScreenTitleJoin overlay/pay.png differ diff --git a/stepmania/Themes/default/Graphics/ScreenTitleJoin scroll choice1.redir b/stepmania/Themes/default/Graphics/ScreenTitleJoin scroll choice1.redir new file mode 100644 index 0000000000..04b2ead777 --- /dev/null +++ b/stepmania/Themes/default/Graphics/ScreenTitleJoin scroll choice1.redir @@ -0,0 +1 @@ +_blank \ No newline at end of file diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 64317c0123..fcb929be0a 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -91,6 +91,8 @@ LifeDifficultyY= LifeDifficultyOnCommand=hidden,1 HelpX=SCREEN_CENTER_X HelpY=SCREEN_BOTTOM-40 +HelpOnCommand=zoom,0.5 +HelpOffCommand= IdleCommentSeconds=12 IdleTimeoutSeconds=30 IdleTimeoutScreen=ScreenCompany @@ -102,7 +104,7 @@ Fallback=ScreenTitleMenu ChoiceNames=1 [ScreenCaution] -PrevScreen=ScreenTitleMenu +PrevScreen=ScreenTitleBranch Class=ScreenSelectMaster Fallback=ScreenWithMenuElements ChoiceNames=1 @@ -136,11 +138,6 @@ TimerX= TimerY= TimerOnCommand=hidden,1 TimerOffCommand= -HelpX= -HelpY= -HelpOnCommand=hidden,1 -HelpOffCommand= -HelpText= ExplanationPage1X= ExplanationPage1Y= ExplanationPage1OnCommand=hidden,1 @@ -194,7 +191,7 @@ NextScreen2=ScreenSelectDifficulty NextScreen3=ScreenSelectDifficulty NextScreen4=ScreenSelectDifficulty NextScreen5=ScreenSelectDifficulty -PrevScreen=ScreenTitleMenu +PrevScreen=ScreenTitleBranch PremiumX=SCREEN_CENTER_X+230 PremiumY=SCREEN_CENTER_Y-156 PremiumOnCommand=addx,SCREEN_WIDTH*0.6;bounceend,0.5;addx,-SCREEN_WIDTH*0.6;glowshift;effectcolor1,1,1,1,0;effectcolor2,1,1,1,0.3 @@ -319,7 +316,7 @@ NextScreen5=ScreenInstructions NextScreen6=ScreenInstructions NextScreen7=ScreenInstructions NextScreen8=ScreenInstructions -PrevScreen=ScreenTitleMenu +PrevScreen=ScreenTitleBranch LockInputSeconds=0.8 SleepAfterChoiceSeconds=0.3 SleepAfterTweenOffSeconds=0.8 @@ -423,7 +420,7 @@ DisabledColor=0.2,0.2,0.2,1 [ScreenSelectGroup] NextScreen=ScreenInstructions -PrevScreen=ScreenTitleMenu +PrevScreen=ScreenTitleBranch Fallback=ScreenWithMenuElements FrameX=SCREEN_CENTER_X-140 FrameY=SCREEN_CENTER_Y-80 @@ -487,7 +484,7 @@ InitCommand=horizalign,left;vertalign,top;shadowlength,2;zoom,0.5; [ScreenInstructions] Fallback=ScreenWithMenuElements NextScreen=ScreenSelectCharacter -PrevScreen=ScreenTitleMenu +PrevScreen=ScreenTitleBranch TimerSeconds=15 StyleIcon=1 MemoryCardIcons=1 @@ -688,7 +685,7 @@ TimerSeconds=60 StyleIcon=1 MemoryCardIcons=1 SampleMusicDelay=0.25 -PrevScreen=ScreenTitleMenu +PrevScreen=ScreenTitleBranch NextScreen=ScreenBranchGameplay NextOptionsScreen=ScreenBranchFirstOptions DoRouletteOnMenuTimer=1 @@ -749,7 +746,7 @@ DefaultSort=Endless PlayerNumber=1 PasswordBG= NextScreen=ScreenNetRoom -PrevScreen=ScreenTitleMenu +PrevScreen=ScreenTitleBranch PasswordBGX=320 PasswordBGY=260 PasswordBGOnCommand= @@ -812,7 +809,7 @@ CreateRoomX=250 CreateRoomOnCommand=diffusealpha,0;linear,1;diffusealpha,1.0;zoom,0.5 CreateRoomOffCommand=linear,0.5;zoomx,0.0;zoomy,0.0 NumRoomsShow=10 -PrevScreen=ScreenTitleMenu +PrevScreen=ScreenTitleBranch NextScreen=ScreenStage Fallback=ScreenNetSelectMusic @@ -952,9 +949,9 @@ StyleIcon= MemoryCardIcons= TimerSeconds= HelpText= -PrevScreen=ScreenTitleMenu +PrevScreen=ScreenTitleBranch NextScreen=ScreenStage -NoSongsScreen=ScreenTitleMenu +NoSongsScreen=ScreenTitleBranch Fallback=ScreenWithMenuElements [ScreenEz2SelectMusic] @@ -1008,7 +1005,7 @@ DifficultyRatingY=-1000 DifficultyRatingOrientation=0 DifficultyRatingSpacing=40.0 PreviewMusicMode=0 // 0 = play music as you select, 1 = no music plays, select once and preview music plays, select again for confirm, 2 = no music plays at all, 3 = play music as select, press twice to confirm, 4 = static menu music plays, no confirm -PrevScreen=ScreenTitleMenu +PrevScreen=ScreenTitleBranch NextScreen=ScreenBranchGameplay NextOptionsScreen=ScreenBranchFirstOptions TimerSeconds=60 @@ -2292,7 +2289,7 @@ TimerSeconds=0 [ScreenJukeboxMenu] Fallback=ScreenWithMenuElements NextScreen=ScreenJukebox -PrevScreen=ScreenTitleMenu +PrevScreen=ScreenTitleBranch ExplanationX=SCREEN_CENTER_X+0 ExplanationY=SCREEN_CENTER_Y+170 ExplanationOnCommand=wrapwidthpixels,900;zoom,0.7 @@ -2618,9 +2615,9 @@ StyleIcon= MemoryCardIcons= TimerSeconds= HelpText= -PrevScreen=ScreenTitleMenu +PrevScreen=ScreenTitleBranch NextScreen=ScreenStage -NoSongsScreen=ScreenTitleMenu +NoSongsScreen=ScreenTitleBranch Fallback=ScreenWithMenuElements [HoldGhostArrow] @@ -3457,8 +3454,8 @@ Fallback=EditCoursesMenu [ScreenOptionsMenu] Fallback=ScreenOptionsSubmenu -NextScreen=ScreenTitleMenu -PrevScreen=ScreenTitleMenu +NextScreen=ScreenTitleBranch +PrevScreen=ScreenTitleBranch # "Rows" sets the number of rows; this field is required. # # "Together" forces the vertical cursor to move together for both @@ -3543,8 +3540,8 @@ TipOnCommand= [ScreenSelectGame] Fallback=ScreenOptionsSubmenu -PrevScreen=ScreenTitleMenu -NextScreen=ScreenTitleMenu +PrevScreen=ScreenTitleBranch +NextScreen=ScreenTitleBranch LineNames=1 OptionMenuFlags=together Line1=conf,Game @@ -3728,7 +3725,7 @@ SleepAfterTweenOffSeconds=0.8 TimerSeconds=40 StyleIcon=1 MemoryCardIcons=1 -PrevScreen=ScreenTitleMenu +PrevScreen=ScreenTitleBranch NextScreen=ScreenBranchSelectSongOrCourse [BeginnerHelper]