diff --git a/Themes/_fallback/Graphics/Player combo/default.lua b/Themes/_fallback/Graphics/Player combo/default.lua index 45f0e8c751..d91994c988 100644 --- a/Themes/_fallback/Graphics/Player combo/default.lua +++ b/Themes/_fallback/Graphics/Player combo/default.lua @@ -85,7 +85,8 @@ local t = Def.ActorFrame { c.Number:diffuse(color("#a4ff00")); c.Number:stopeffect(); elseif param.Combo then - c.Number:diffuse(PlayerColor(player)); + c.Number:diffuse(Color("White")); +-- c.Number:diffuse(PlayerColor(player)); c.Number:stopeffect(); (cmd(diffuse,Color("White");diffusebottomedge,color("0.5,0.5,0.5,1")))(c.Label); else diff --git a/Themes/_fallback/Sounds/ScreenEvaluation try Extra1.redir b/Themes/_fallback/Sounds/ScreenEvaluation try Extra1.redir new file mode 100644 index 0000000000..1f8565ca21 --- /dev/null +++ b/Themes/_fallback/Sounds/ScreenEvaluation try Extra1.redir @@ -0,0 +1 @@ +_silent \ No newline at end of file diff --git a/Themes/_fallback/Sounds/ScreenEvaluation try Extra2.redir b/Themes/_fallback/Sounds/ScreenEvaluation try Extra2.redir new file mode 100644 index 0000000000..1f8565ca21 --- /dev/null +++ b/Themes/_fallback/Sounds/ScreenEvaluation try Extra2.redir @@ -0,0 +1 @@ +_silent \ No newline at end of file diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini index bab64a576d..25481ecac2 100644 --- a/Themes/_fallback/metrics.ini +++ b/Themes/_fallback/metrics.ini @@ -266,7 +266,7 @@ JudgmentW5Command=shadowlength,0;diffusealpha,1;zoom,1.0;vibrate;effectmagnitude JudgmentMissCommand=shadowlength,0;diffusealpha,1;zoom,1;y,-20;linear,0.8;y,20;sleep,0.8;linear,0.1;zoomy,0.5;zoomx,2;diffusealpha,0 [Protiming] -# Protiming isnt invented yet. +# Protiming isn't implemented yet. ProtimingOnCommand=y,24 ProtimingW1Command= ProtimingW2Command= @@ -2289,9 +2289,6 @@ Fallback="ScreenOptionsServiceChild" NextScreen="ScreenOptionsService" PrevScreen="ScreenOptionsService" -[DeviceList] -DeviceListOnCommand=zoom,1;shadowlength,1 - [ScreenOptionsSystemDirection] Fallback="ScreenOptionsServiceChild" PrevScreen=Branch.TitleMenu diff --git a/Themes/default/Sounds/Common Start.ogg b/Themes/default/Sounds/Common Start.ogg new file mode 100644 index 0000000000..b048f1582a Binary files /dev/null and b/Themes/default/Sounds/Common Start.ogg differ diff --git a/Themes/default/Sounds/Common invalid.ogg b/Themes/default/Sounds/Common invalid.ogg new file mode 100644 index 0000000000..66daf41465 Binary files /dev/null and b/Themes/default/Sounds/Common invalid.ogg differ diff --git a/Themes/default/Sounds/Common value.ogg b/Themes/default/Sounds/Common value.ogg new file mode 100644 index 0000000000..18134a2304 Binary files /dev/null and b/Themes/default/Sounds/Common value.ogg differ diff --git a/Themes/default/Sounds/MenuTimer tick.ogg b/Themes/default/Sounds/MenuTimer tick.ogg new file mode 100644 index 0000000000..304e1ea81e Binary files /dev/null and b/Themes/default/Sounds/MenuTimer tick.ogg differ diff --git a/Themes/default/Sounds/MusicWheel change.ogg b/Themes/default/Sounds/MusicWheel change.ogg new file mode 100644 index 0000000000..15d807a957 Binary files /dev/null and b/Themes/default/Sounds/MusicWheel change.ogg differ diff --git a/Themes/default/Sounds/_Music title (loop).ogg b/Themes/default/Sounds/_Music title (loop).ogg new file mode 100644 index 0000000000..a2319031fb Binary files /dev/null and b/Themes/default/Sounds/_Music title (loop).ogg differ diff --git a/Themes/default/Sounds/_Screen cancel.ogg b/Themes/default/Sounds/_Screen cancel.ogg new file mode 100644 index 0000000000..ac558fa977 Binary files /dev/null and b/Themes/default/Sounds/_Screen cancel.ogg differ diff --git a/Themes/default/Sounds/_common row.ogg b/Themes/default/Sounds/_common row.ogg new file mode 100644 index 0000000000..3e80d6e328 Binary files /dev/null and b/Themes/default/Sounds/_common row.ogg differ diff --git a/Themes/default/Sounds/_switch down.ogg b/Themes/default/Sounds/_switch down.ogg new file mode 100644 index 0000000000..572333cf57 Binary files /dev/null and b/Themes/default/Sounds/_switch down.ogg differ diff --git a/Themes/default/Sounds/_switch up.ogg b/Themes/default/Sounds/_switch up.ogg new file mode 100644 index 0000000000..db2273a41f Binary files /dev/null and b/Themes/default/Sounds/_switch up.ogg differ diff --git a/Themes/default/metrics.ini b/Themes/default/metrics.ini index 089b4caceb..dcfbb21e89 100644 --- a/Themes/default/metrics.ini +++ b/Themes/default/metrics.ini @@ -30,7 +30,6 @@ ShowQMarksInRandomCycle=true # + = At The Same Time [DifficultyList] CapitalizeDifficultyNames=false -ItemsSpacingY=24 NumShownItems=8 [HelpDisplay] TipShowTime=7 @@ -417,9 +416,8 @@ Fallback="StepsDisplay" [StepsDisplayListRow] # + ItemsSpacingY=24 -NumShownItems=5 -# MoveCommand=decelerate,0.3 # FrameX=