diff --git a/NoteSkins/dance/midi-note/Down Tap Explosion Bright.png b/NoteSkins/dance/midi-note/Down Tap Explosion Bright.png index cea2d09f6e..0b667ff40e 100644 Binary files a/NoteSkins/dance/midi-note/Down Tap Explosion Bright.png and b/NoteSkins/dance/midi-note/Down Tap Explosion Bright.png differ diff --git a/NoteSkins/dance/midi-note/Down Tap Explosion Dim.png b/NoteSkins/dance/midi-note/Down Tap Explosion Dim.png index 843dab4e25..4b0c1e5d24 100644 Binary files a/NoteSkins/dance/midi-note/Down Tap Explosion Dim.png and b/NoteSkins/dance/midi-note/Down Tap Explosion Dim.png differ diff --git a/NoteSkins/dance/midi-note/Down Tap Note.lua b/NoteSkins/dance/midi-note/Down Tap Note.lua index 9de3db7f01..8d6806a0d2 100644 --- a/NoteSkins/dance/midi-note/Down Tap Note.lua +++ b/NoteSkins/dance/midi-note/Down Tap Note.lua @@ -1,8 +1,4 @@ return Def.Sprite { Texture=NOTESKIN:GetPath( '_down', 'tap note' ); Frames = Sprite.LinearFrames( 8, 1 ); - InitCommand=cmd(setstate,2); - DrawTapNoteMessageCommand=function(self,parent) - parent:spin(); - end; }; diff --git a/NoteSkins/dance/midi-note/metrics.ini b/NoteSkins/dance/midi-note/metrics.ini index 74a3c5f949..a7d6e904b3 100644 --- a/NoteSkins/dance/midi-note/metrics.ini +++ b/NoteSkins/dance/midi-note/metrics.ini @@ -5,8 +5,8 @@ FallbackNoteSkin=default TapNoteAnimationIsVivid=0 HoldHeadAnimationIsVivid=0 DrawHoldHeadForTapsOnSameRow=0 -TapNoteAnimationLength=4 -TapAdditionAnimationLength=4 +TapNoteAnimationLength=2 +TapAdditionAnimationLength=2 TapMineAnimationLength=1 TapLiftAnimationLength=4 HoldHeadAnimationLength=1 // doesn't matter. Only 1 frame anyway. diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 2e2d5ffd50..57cb18e210 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -1251,6 +1251,7 @@ Could not find '%s'.=Could not find '%s'. [Screen] HeaderText= HeaderSubText= +HelpText= [ScreenAppearanceOptions] HeaderText=Appearance HeaderSubText=Customize your game diff --git a/Themes/_fallback/Scripts/02 Colors.lua b/Themes/_fallback/Scripts/02 Colors.lua index 6b0f3a7962..1dcfd51621 100644 --- a/Themes/_fallback/Scripts/02 Colors.lua +++ b/Themes/_fallback/Scripts/02 Colors.lua @@ -15,6 +15,18 @@ Color = { Outline = color("0,0,0,0.5"), Invisible = color("1,1,1,0"), Stealth = color("0,0,0,0"), +-- Android Design Stencil Colors +-- https://developer.android.com/design/style/color.html + HoloBlue = color("#33B5E5"), + HoloDarkBlue = color("#0099CC"), + HoloPurple = color("#AA66CC"), + HoloDarkPurple = color("#9933CC"), + HoloGreen = color("#99CC00"), + HoloDarkGreen = color("#669900"), + HoloOrange = color("#FFBB33"), + HoloDarkOrange = color("#FF8800"), + HoloRed = color("#FF4444"), + HoloDarkRed = color("#CC0000"), -- Color Functions -- These functions alter colors in a certain way so that you can make -- new ones without having to copy a color or find a new one. diff --git a/_assets/NoteSkins/dance/midi-note/res/Explosion.psd b/_assets/NoteSkins/dance/midi-note/res/Explosion.psd index 01d56fb72f..c8236e8e30 100644 Binary files a/_assets/NoteSkins/dance/midi-note/res/Explosion.psd and b/_assets/NoteSkins/dance/midi-note/res/Explosion.psd differ diff --git a/_assets/NoteSkins/dance/midi-note/res/Resource.psd b/_assets/NoteSkins/dance/midi-note/res/Resource.psd index 2ebcfdd717..b039d3848d 100644 Binary files a/_assets/NoteSkins/dance/midi-note/res/Resource.psd and b/_assets/NoteSkins/dance/midi-note/res/Resource.psd differ