diff --git a/stepmania/Themes/default/BGAnimations/ScreenSMOnlineLogin overlay.lua b/stepmania/Themes/default/BGAnimations/ScreenSMOnlineLogin overlay.lua index 80beac266a..5214cd4552 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenSMOnlineLogin overlay.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenSMOnlineLogin overlay.lua @@ -1,22 +1,12 @@ +local FontName = "_venacti Bold 15px"; local OffCommand = cmd(accelerate,0.3;addx,SCREEN_WIDTH); + local t = Def.ActorFrame { - LoadFont( "_zeroesthree" ) .. { - Text = "Depending on the server you're connected to,"; - InitCommand=cmd(zoom,.75;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+90); + LoadFont( FontName ) .. { + Text = ScreenString("Depending on the server you're connected to, you may have to register for an account on their website."); + InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+70;shadowlength,1;wrapwidthpixels,SCREEN_WIDTH*0.75); OnCommand=cmd(cropright,1;linear,.5;cropright,0); OffCommand=OffCommand; }; - LoadFont( "_zeroesthree" ) .. { - Text="you may have to register for an account"; - InitCommand=cmd(zoom,.75;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+107); - OnCommand=cmd(cropright,1;sleep,.5;linear,.38;cropright,0); - OffCommand=OffCommand; - }; - LoadFont( "_zeroesthree" ) .. { - Text="on their website."; - InitCommand=cmd(zoom,.75;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y+124); - OnCommand=cmd(cropright,1;sleep,.9;linear,.25;cropright,0); - OffCommand=OffCommand; - }; } return t diff --git a/stepmania/Themes/default/Graphics/ScreenNetRoom ChatInputBox (doubleres).png b/stepmania/Themes/default/Graphics/ScreenNetRoom ChatInputBox (doubleres).png new file mode 100644 index 0000000000..138d4c451f Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenNetRoom ChatInputBox (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenNetRoom ChatInputBox.png b/stepmania/Themes/default/Graphics/ScreenNetRoom ChatInputBox.png deleted file mode 100644 index 4a7864b6e5..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenNetRoom ChatInputBox.png and /dev/null differ diff --git a/stepmania/Themes/default/Graphics/ScreenNetRoom ChatOutputBox (doubleres).png b/stepmania/Themes/default/Graphics/ScreenNetRoom ChatOutputBox (doubleres).png new file mode 100644 index 0000000000..c2c68c9d60 Binary files /dev/null and b/stepmania/Themes/default/Graphics/ScreenNetRoom ChatOutputBox (doubleres).png differ diff --git a/stepmania/Themes/default/Graphics/ScreenNetRoom ChatOutputBox.png b/stepmania/Themes/default/Graphics/ScreenNetRoom ChatOutputBox.png deleted file mode 100644 index 8fbab4cdab..0000000000 Binary files a/stepmania/Themes/default/Graphics/ScreenNetRoom ChatOutputBox.png and /dev/null differ diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index 4fd6e0ec62..a8bf45b328 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -1295,6 +1295,7 @@ You are logging on as:=You are logging on as: You must define a Profile.=You must define a Profile. HeaderText=Online Login HeaderSubText=Select a login profile +Depending on the server you're connected to, you may have to register for an account on their website.=Depending on the server you're connected to, you may have to register for an account on their website. [ScreenSaveSync] Choosing NO will discard your changes.=Choosing NO will discard your changes. @@ -1320,7 +1321,7 @@ HelpTextTestLights=Press &MENULEFT;&MENURIGHT; to cycle lights. Press ESCAPE wh HelpTextTextEntry=Type a value using the keyboard. Press Enter to finish. HelpTextMapControllers=Use arrow keys to move, ENTER to assign, SPACE to clear::Press ESCAPE when done HelpTextOnline=smonline.us to connect to official Stepmania Online Server::Check out Stepmaniaonline.com for more information -HelpTextNetSelectMusic=Ctrl + Enter to enter room/select song +HelpTextNetSelectMusic=Ctrl + Enter to enter room/select song::&UP; for Player Options HelpTextBookkeeping=Press &MENULEFT;&MENURIGHT; to cycle data. Press ESCAPE when done. [ScreenSelectGroup] diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 5e2e368310..6ce14b9fc7 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -475,8 +475,8 @@ HelpText="" OpenRoomColor=color("1.0,1.0,1.0,1.0") PasswdRoomColor=color("1.0,0.5,0.5,1.0") InGameRoomColor=color("1.0,0.1,0.1,1.0") -RoomWheelX=SCREEN_CENTER_X+160 -RoomWheelY=SCREEN_CENTER_Y+4 +RoomWheelX=SCREEN_CENTER_X-178 +RoomWheelY=SCREEN_CENTER_Y-10 RoomWheelOnCommand=draworder,-100 RoomInfoDisplayX=SCREEN_CENTER_X RoomInfoDisplayY=SCREEN_CENTER_Y @@ -492,44 +492,44 @@ Fallback="ScreenWithMenuElements" Class="ScreenNetSelectMusic" BannerWidth=0 // These dont do anything but prevent crashes BannerHeight=0 -MusicWheelX=SCREEN_CENTER_X+160 -MusicWheelY=SCREEN_CENTER_Y+4 -MusicWheelOnCommand=draworder,-1 +MusicWheelX=SCREEN_CENTER_X-178 +MusicWheelY=SCREEN_CENTER_Y-10 +MusicWheelOnCommand=draworder,-100 MusicWheelOffCommand= TimerStealth=true -BPMDisplayX=SCREEN_CENTER_X-120 -BPMDisplayY=SCREEN_CENTER_Y+185 -BPMDisplayOnCommand=horizalign,right;shadowlength,0;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 +BPMDisplayX=SCREEN_CENTER_X*0.3 +BPMDisplayY=SCREEN_CENTER_Y+120 +BPMDisplayOnCommand=horizalign,right;shadowlength,1;addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 BPMDisplayOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 -ModIconsP1X=SCREEN_CENTER_X-220 +ModIconsP1X=SCREEN_CENTER_X+144 ModIconsP1Y=SCREEN_CENTER_Y-165 ModIconsP1OnCommand=zoomy,0;linear,0.5;zoomy,1 ModIconsP1OffCommand=linear,0.5;zoomy,0 -ModIconsP2X=SCREEN_CENTER_X-300 +ModIconsP2X=SCREEN_CENTER_X+144 ModIconsP2Y=SCREEN_CENTER_Y-164 ModIconsP2OnCommand=zoomy,0;linear,0.5;zoomy,1 ModIconsP2OffCommand=linear,0.5;zoomy,0 -ChatInputBoxY=SCREEN_CENTER_Y+110 -ChatInputBoxX=SCREEN_CENTER_X-152 -ChatInputBoxOnCommand=addx,-SCREEN_WIDTH*0.6;bounceend,0.5;addx,SCREEN_WIDTH*0.6 -ChatInputBoxOffCommand=bouncebegin,0.5;addx,-SCREEN_WIDTH*0.6 +ChatInputBoxX=SCREEN_CENTER_X+144 +ChatInputBoxY=SCREEN_CENTER_Y+112 +ChatInputBoxOnCommand=addx,SCREEN_WIDTH*0.6;bounceend,0.5;addx,-SCREEN_WIDTH*0.6 +ChatInputBoxOffCommand=bouncebegin,0.5;addx,SCREEN_WIDTH*0.6 ChatInputBoxWidth=310 ChatInputBoxHeight=60 ChatInputBoxColor=color("0.5,0.5,1.0,0.7") //transparent cyan +ChatOutputBoxX=SCREEN_CENTER_X+144 ChatOutputBoxY=SCREEN_CENTER_Y-37 -ChatOutputBoxX=SCREEN_CENTER_X-152 -ChatOutputBoxOnCommand=zoomy,1.1;diffusealpha,0;linear,0.5;diffusealpha,1 -ChatOutputBoxOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0;zoomx,0.0;zoomy,0.0 +ChatOutputBoxOnCommand=zoomy,1.1;addx,SCREEN_WIDTH*0.6;bounceend,0.5;diffusealpha,1;addx,-SCREEN_WIDTH*0.6 +ChatOutputBoxOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0;zoom,0; ChatOutputBoxWidth=310 ChatOutputBoxHeight=210 ChatOutputBoxColor=color("1.0,0.5,0.5,0.7") //transparent reddish -ChatInputY=SCREEN_CENTER_Y+87 -ChatInputX=SCREEN_CENTER_X-302 -ChatInputOnCommand=diffusealpha,0;linear,0.5;diffusealpha,0.8 +ChatInputX=SCREEN_CENTER_X-2 +ChatInputY=SCREEN_CENTER_Y+90 +ChatInputOnCommand=diffusealpha,0;linear,0.55;diffusealpha,1 ChatInputOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0 -ChatOutputY=SCREEN_CENTER_Y+71 -ChatOutputX=SCREEN_CENTER_X-302 -ChatOutputOnCommand=diffusealpha,0;linear,0.5;diffusealpha,0.8 +ChatOutputX=SCREEN_CENTER_X-2 +ChatOutputY=SCREEN_CENTER_Y+68 +ChatOutputOnCommand=diffusealpha,0;linear,0.55;diffusealpha,1 ChatOutputOffCommand=diffusealpha,1;linear,0.5;diffusealpha,0 UsersX=SCREEN_CENTER_X-265 UsersY=SCREEN_CENTER_Y+172 @@ -580,7 +580,7 @@ DifficultyIconP1X=SCREEN_CENTER_X+50 DifficultyIconP1Y=SCREEN_BOTTOM-54 DifficultyIconP2X=SCREEN_CENTER_X+80 DifficultyIconP2Y=SCREEN_BOTTOM-50 -HelpText="" +HelpText=ScreenString("HelpTextNetSelectMusic"); [ScreenSplash] Class="ScreenSplash" @@ -1720,7 +1720,7 @@ UseEasyMarkerFlag=false Fallback="MusicWheel" RoomWheelItemStartOnCommand= RoomWheelItemFinishOnCommand= -CreateRoomColor=color("0.0,0.8,0.3,1.0") +CreateRoomColor=color("0.0,0.9,0.25,1.0") ScrollBarOnCommand=visible,false [RoomInfoDisplay] @@ -1742,13 +1742,13 @@ PlayerListElementOffsetY=11 PlayerListElementOnCommand=zoom,0.75 [RoomWheelItem] -TextOnCommand=zoom,0.6 +TextOnCommand=zoom,0.6;strokecolor,color("#000000FF") TextX=-110 -TextY=-10 +TextY=-8 TextWidth=200 DescX=-100 -DescY=5 -DescOnCommand=zoom,0.4 +DescY=6 +DescOnCommand=zoom,0.4;strokecolor,color("#000000FF") DescWidth=400 [LifeMeterBar]