diff --git a/Themes/default/Scripts/02 Lyrics.lua b/Themes/default/Scripts/02 Lyrics.lua index d61a1031ee..66bfc6088c 100644 --- a/Themes/default/Scripts/02 Lyrics.lua +++ b/Themes/default/Scripts/02 Lyrics.lua @@ -1,4 +1,5 @@ function Actor:LyricCommand(side) + self:draworder(DrawOrder.Screen+1); self:settext(Var "LyricText") self:stoptweening() diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index f98d69e5eb..1435f2789c 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -522,7 +522,7 @@ PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ self:effectcolor2(color("1,1,1,1")); \ self:effectcolor1(color("0.5,0.5,0.5,1")); \ self:effectclock('beat'); \ - self:effecttiming(rate*0.25,rate*0.75,rate*0.25,rate*0.75); \ + self:effecttiming(rate*0.75,rate*0.125,rate*0.125,0); \ self:effectoffset(1.25-offset); \ end; # PillTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) \ @@ -1431,7 +1431,7 @@ BPMDisplayOffCommand=bounceend,0.25;zoom,0 ShowStageDisplay=true StageDisplayX=SCREEN_CENTER_X StageDisplayY=Center1Player() and SCREEN_BOTTOM-76 or SCREEN_BOTTOM-50 -StageDisplayOnCommand=draworder,102 +StageDisplayOnCommand=draworder,DrawOrder.Screen StageDisplayOffCommand=bounceend,0.25;zoom,0 StageDisplayUseShortString=true # diff --git a/Themes/home/metrics.ini b/Themes/home/metrics.ini index 3531cb3c0f..56c7eecfa5 100644 --- a/Themes/home/metrics.ini +++ b/Themes/home/metrics.ini @@ -4,4 +4,6 @@ FallbackTheme=default # Now you can edit or add things. ############################################## [ScreenEdit] -EditModifiers="midi-note" \ No newline at end of file +EditModifiers="midi-note" + +[MusicWheel] \ No newline at end of file diff --git a/src/ProductInfo.h b/src/ProductInfo.h index f13507095b..887f12809e 100644 --- a/src/ProductInfo.h +++ b/src/ProductInfo.h @@ -30,7 +30,7 @@ * */ #ifndef PRODUCT_VER_BARE -#define PRODUCT_VER_BARE v5.0 beta 2a +#define PRODUCT_VER_BARE v5.0 beta 2b #endif /**