Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into kockout-wdata

Browse Source
This commit is contained in:
yugecin
2018-10-28 17:32:59 +01:00
parent 6076e6e9c9 559e609b81
commit 6ca1f6e800
11 changed files with 93 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/yugecin/opsudance/options/Option.java
View File

@@ -70,6 +70,9 @@ public class Option {
* @return true if this option does need to be filtered
*/
public boolean filter(String searchString) {
if (!showCondition()) {
return filtered = true;
}
if (searchString == null || searchString.length() == 0) {
filtered = false;
return false;

2
src/yugecin/opsudance/options/OptionGroups.java
View File

@@ -50,7 +50,7 @@ public class OptionGroups {
OPTION_FALLBACK_SLIDERS,
OPTION_SHRINKING_SLIDERS,
OPTION_MERGING_SLIDERS,
//OPTION_MERGING_SLIDERS_MIRROR_POOL,
OPTION_MERGING_SLIDERS_MIRROR_POOL,
OPTION_DRAW_SLIDER_ENDCIRCLES,
}),
new OptionTab("DANCING HITCIRCLES", new Option[] {

2
src/yugecin/opsudance/options/Options.java
View File

@@ -496,7 +496,7 @@ public class Options {
}
};
public static final NumericOption OPTION_MERGING_SLIDERS_MIRROR_POOL = new NumericOption("Merging sliders mirror pool", "MergingSliderMirrorPool", "Amount of mirrors to calculate for merging sliders (impacts performance)", 2, 1, 5) {
public static final NumericOption OPTION_MERGING_SLIDERS_MIRROR_POOL = new NumericOption("Mirrors", "MergingSliderMirrorPool", "Amount of mirrors to calculate for merging sliders (impacts performance)", 2, 2, 6) {
@Override
public String getValueString () {
return String.valueOf(val);