diff --git a/Themes/default/Fonts/Combo Numbers [numbers] 4x4.png b/Themes/default/Fonts/Combo Numbers [numbers] 4x4.png deleted file mode 100644 index 43f5b4b2ba..0000000000 Binary files a/Themes/default/Fonts/Combo Numbers [numbers] 4x4.png and /dev/null differ diff --git a/Themes/default/Fonts/Combo Numbers.ini b/Themes/default/Fonts/Combo Numbers.ini deleted file mode 100644 index 3c4c05f827..0000000000 --- a/Themes/default/Fonts/Combo Numbers.ini +++ /dev/null @@ -1,30 +0,0 @@ -[common] -Baseline=42 -Top=11 -LineSpacing=50 -DrawExtraPixelsLeft=0 -DrawExtraPixelsRight=0 -AdvanceExtraPixels=0 - -[numbers] -Line 0=0123 -Line 1=4567 -Line 2=89%. -Line 3= :x, - -0=27 -1=27 -2=27 -3=27 -4=27 -5=27 -6=27 -7=27 -8=27 -9=27 -10=31 -11=12 -12=10 -13=12 -14=23 -15=11 diff --git a/Themes/default/Fonts/Combo Numbers.redir b/Themes/default/Fonts/Combo Numbers.redir new file mode 100644 index 0000000000..850035f6f4 --- /dev/null +++ b/Themes/default/Fonts/Combo Numbers.redir @@ -0,0 +1 @@ +_roboto Bold 54px \ No newline at end of file diff --git a/Themes/default/Fonts/_roboto Bold 54px [numbers-stroke] 4x5 (doubleres).png b/Themes/default/Fonts/_roboto Bold 54px [numbers-stroke] 4x5 (doubleres).png new file mode 100644 index 0000000000..ffe1beb898 Binary files /dev/null and b/Themes/default/Fonts/_roboto Bold 54px [numbers-stroke] 4x5 (doubleres).png differ diff --git a/Themes/default/Fonts/_roboto Bold 54px [numbers] 4x5 (doubleres).png b/Themes/default/Fonts/_roboto Bold 54px [numbers] 4x5 (doubleres).png new file mode 100644 index 0000000000..ca7d3c42ce Binary files /dev/null and b/Themes/default/Fonts/_roboto Bold 54px [numbers] 4x5 (doubleres).png differ diff --git a/Themes/default/Fonts/_roboto Bold 54px.ini b/Themes/default/Fonts/_roboto Bold 54px.ini new file mode 100644 index 0000000000..fbd38fbe9b --- /dev/null +++ b/Themes/default/Fonts/_roboto Bold 54px.ini @@ -0,0 +1,35 @@ +[common] +Baseline=54 +Top=14 +LineSpacing=66 +DrawExtraPixelsLeft=0 +DrawExtraPixelsRight=0 +AdvanceExtraPixels=0 + +[numbers] +Line 0=0123 +Line 1=4567 +Line 2=89%. +Line 3= :x, +Line 4=-+ab + +0=31 +1=31 +2=31 +3=31 +4=31 +5=31 +6=31 +7=31 +8=31 +9=31 +10=40 +11=16 +12=13 +13=15 +14=28 +15=15 +16=23 +17=23 +18=0 +19=0 diff --git a/Themes/default/Graphics/Player judgment/default.lua b/Themes/default/Graphics/Player judgment/default.lua index 456c82cda6..fadfa4c747 100644 --- a/Themes/default/Graphics/Player judgment/default.lua +++ b/Themes/default/Graphics/Player judgment/default.lua @@ -166,7 +166,8 @@ t[#t+1] = Def.ActorFrame { if fTapNoteOffset ~= 1 then -- we're safe, you can push the values - tTotalJudgments[#tTotalJudgments+1] = bUseNegative and fTapNoteOffset or math.abs( fTapNoteOffset ); + tTotalJudgments[#tTotalJudgments+1] = fTapNoteOffset; +--~ tTotalJudgments[#tTotalJudgments+1] = bUseNegative and fTapNoteOffset or math.abs( fTapNoteOffset ); end self:playcommand("Reset"); @@ -176,7 +177,7 @@ t[#t+1] = Def.ActorFrame { JudgeCmds[param.TapNoteScore](c.Judgment); c.ProtimingDisplay:visible( bShowProtiming ); - c.ProtimingDisplay:settextf("%i",math.abs(fTapNoteOffset * 1000)); + c.ProtimingDisplay:settextf("%i",fTapNoteOffset * 1000); ProtimingCmds[param.TapNoteScore](c.ProtimingDisplay); c.ProtimingAverage:visible( bShowProtiming ); diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 97624f317c..d83b95976b 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -63,7 +63,7 @@ MeterHeight=40 [Combo] ShowComboAt=2 -LabelMaxZoom=0.75*1 +LabelMaxZoom=0.875*1 PulseCommand=%function(self,param) self:finishtweening(); self:diffusealpha(1); self:zoom(1.125*param.Zoom); self:linear(0.05); self:zoom(param.Zoom); self:sleep(2); self:linear(0.5); self:diffusealpha(0); end; PulseLabelCommand=%function(self,param) self:finishtweening(); self:diffusealpha(1); self:zoom(1.075*param.LabelZoom); self:linear(0.05); self:zoom(param.LabelZoom); self:sleep(2); self:linear(0.5); self:diffusealpha(0); end; diff --git a/_assets/fonts/_roboto Bold 54px [numbers] 4x5 (doubleres).psd b/_assets/fonts/_roboto Bold 54px [numbers] 4x5 (doubleres).psd new file mode 100644 index 0000000000..991868d85f Binary files /dev/null and b/_assets/fonts/_roboto Bold 54px [numbers] 4x5 (doubleres).psd differ