diff --git a/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg sky (doubleres).png b/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg sky (doubleres).png index 93f7b7b71f..efb78dcf78 100644 Binary files a/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg sky (doubleres).png and b/stepmania/Themes/default/BGAnimations/ScreenLogo background/bg sky (doubleres).png differ diff --git a/stepmania/Themes/default/BGAnimations/ScreenLogo background/default.lua b/stepmania/Themes/default/BGAnimations/ScreenLogo background/default.lua index 2d976dc5de..59db344850 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenLogo background/default.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenLogo background/default.lua @@ -1,20 +1,15 @@ return Def.ActorFrame { + InitCommand=cmd(fov,90;); 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;); + InitCommand=cmd(x,SCREEN_LEFT;y,SCREEN_BOTTOM;horizalign,left;vertalign,bottom;blend,"BlendMode_Add";diffusealpha,0.4;); }; - LoadActor( "cursor frame" ) .. { - InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;); + LoadActor( "ring orange" ) .. { + InitCommand=cmd(x,SCREEN_CENTER_X+50;y,SCREEN_CENTER_Y;diffusealpha,0.5;spin;rotationx,-20;rotationy,28;rotationz,20;effectmagnitude,0,0,5;); }; - LoadActor( "help pane" ) .. { - InitCommand=cmd(x,SCREEN_CENTER_X+200;y,SCREEN_BOTTOM;vertalign,bottom;); + LoadActor( "ring blue" ) .. { + InitCommand=cmd(x,SCREEN_CENTER_X-100;y,SCREEN_CENTER_Y+50;diffusealpha,0.5;spin;rotationx,-60;rotationy,-20;rotationz,-50;effectmagnitude,0,0,-5;); }; - LoadActor( "settings pane" ) .. { - InitCommand=cmd(x,SCREEN_CENTER_X-200;y,SCREEN_TOP;vertalign,top;); - }; -} \ No newline at end of file +}; \ No newline at end of file diff --git a/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua b/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua index 4ee98322a0..528fb4d034 100644 --- a/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua +++ b/stepmania/Themes/default/BGAnimations/ScreenLogo underlay.lua @@ -1,3 +1,3 @@ -return LoadActor( THEME:GetPathG('ScreenTitleMenu',GAMESTATE:GetCurrentGame():GetName()) ) .. { - OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;zoomy,0;sleep,0.5;bounceend,0.5;zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0.1;effectcolor2,1,1,1,0.3); +return Def.ActorFrame { + LoadActor( THEME:GetPathB('','_standard decoration'), "Logo", GAMESTATE:GetCurrentGame():GetName() ); }; \ No newline at end of file diff --git a/stepmania/Themes/default/Graphics/Player combo/_combo (doubleres).png b/stepmania/Themes/default/Graphics/Player combo/_combo (doubleres).png index ba4114bedf..4bb6c5a811 100644 Binary files a/stepmania/Themes/default/Graphics/Player combo/_combo (doubleres).png and b/stepmania/Themes/default/Graphics/Player combo/_combo (doubleres).png differ diff --git a/stepmania/Themes/default/Languages/de.ini b/stepmania/Themes/default/Languages/de.ini index 8b0beffda9..00bb475f50 100644 --- a/stepmania/Themes/default/Languages/de.ini +++ b/stepmania/Themes/default/Languages/de.ini @@ -1502,7 +1502,8 @@ Space=Leerzeichen HelpText=START drücken um anzufangen [ScreenTitleMenu] -%d songs in %d groups, %d courses in %d groups=%d Lieder in %d Gruppen, %d Kurse in %d Gruppen +%d songs in %d groups=%d Lieder in %d Gruppen +%d courses in %d groups=%d Kurse in %d Gruppen Announcer=Kommentator Credits=Mitwirkende Play Online=Het Spel van het netwerk diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index f278f3425d..df56833f76 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -1481,7 +1481,10 @@ Space=Space HelpText=Press START to begin [ScreenTitleMenu] -%d songs in %d groups, %d courses in %d groups=%d songs in %d groups, %d courses in %d groups +%d songs in %d groups=%d songs in %d groups +%d courses in %d groups=%d courses in %d groups +Current gametype:=Current gametype: +Difficulty:=Difficulty: Announcer=Announcer Play Online=Network Play Edit Courses=Edit Courses diff --git a/stepmania/Themes/default/Languages/es.ini b/stepmania/Themes/default/Languages/es.ini index 195122c9a3..0d9ceef528 100644 --- a/stepmania/Themes/default/Languages/es.ini +++ b/stepmania/Themes/default/Languages/es.ini @@ -1462,7 +1462,8 @@ HelpText=Presione START para comenzar [ScreenTitleMenu] Options=Opciones -%d songs in %d groups, %d courses in %d groups=las canciones %d en los grupos %d, los courses %d en los grupos %d +%d songs in %d groups=las canciones %d en los grupos %d +%d courses in %d groups=los courses %d en los grupos %d Announcer=Presentador Edit Courses=Editar Grupos Edit/Sync Songs=Editar/ Canciones sync diff --git a/stepmania/Themes/default/Languages/fr.ini b/stepmania/Themes/default/Languages/fr.ini index 436463baf3..f1604c547b 100644 --- a/stepmania/Themes/default/Languages/fr.ini +++ b/stepmania/Themes/default/Languages/fr.ini @@ -1481,7 +1481,8 @@ HelpText=Appuyez sur DEMARRER pour commencer [ScreenTitleMenu] Play Online=Jeu De Réseau -%d songs in %d groups, %d courses in %d groups=%d chansons dans %d groupes, %d courses dans %d groupes +%d songs in %d groups=%d chansons dans %d groupes +%d courses in %d groups=%d courses dans %d groupes Announcer=Annonceur Credits=Crédits Edit Courses=Editer courses diff --git a/stepmania/Themes/default/Languages/it.ini b/stepmania/Themes/default/Languages/it.ini index 05b84d2a07..7568fd166c 100644 --- a/stepmania/Themes/default/Languages/it.ini +++ b/stepmania/Themes/default/Languages/it.ini @@ -1476,7 +1476,8 @@ HelpText=Premi AVVIA per iniziare [ScreenTitleMenu] Play Online=Gioco Della Rete Options=Opzioni -%d songs in %d groups, %d courses in %d groups=%d canzoni in %d gruppi, %d percorsi in %d gruppi +%d songs in %d groups=%d canzoni in %d gruppi +%d courses in %d groups=%d percorsi in %d gruppi Announcer=Annunciatore Credits=Titoli Edit Courses=Edita corse diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 14e8ca95c4..690d89399a 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -3103,6 +3103,10 @@ Class="ScreenAttract" Fallback="ScreenAttract" NextScreen="ScreenHowToPlay" PrevScreen="ScreenCompany" +LogoX=SCREEN_CENTER_X +LogoY=SCREEN_CENTER_Y-100 +LogoOnCommand=zoomy,0;sleep,0.5;bounceend,0.5;zoomy,1;glowshift;effectperiod,2.5;effectcolor1,1,1,1,0.1;effectcolor2,1,1,1,0.3 +LogoOffCommand= [ScreenHowToPlay] Class="ScreenHowToPlay" diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 314c010e6f..cc3efa9380 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -500,7 +500,7 @@ void ScreenGameplay::Init() LOAD_ALL_COMMANDS_AND_SET_XY( m_sprLifeFrame ); this->AddChild( m_sprLifeFrame ); - m_sprStageFrame.Load( THEME->GetPathG(m_sName,bBattery?"oni stage frame":"stage frame") ); + m_sprStageFrame.Load( THEME->GetPathG(m_sName,bBattery?"oni StageFrame":"StageFrame") ); m_sprStageFrame->SetName( "StageFrame" ); LOAD_ALL_COMMANDS_AND_SET_XY( m_sprStageFrame ); this->AddChild( m_sprStageFrame );