Merge branch 'spinners' into master

2016-10-01 13:44:54 +02:00
parent e926e668b5 be599885f5
commit 376cb558cb
3 changed files with 26 additions and 1 deletions
--- a/src/itdelatrisu/opsu/states/OptionsMenu.java
+++ b/src/itdelatrisu/opsu/states/OptionsMenu.java
@@ -109,6 +109,7 @@ public class OptionsMenu extends BasicGameState {
 			GameOption.DANCE_MOVER,
 			GameOption.DANCE_MOVER_DIRECTION,
 			GameOption.DANCE_SPINNER,
+			GameOption.DANCE_SPINNER_DELAY,
 			GameOption.DANCE_LAZY_SLIDERS,
 			GameOption.DANCE_CIRCLE_STREAMS,
 			GameOption.DANCE_ONLY_CIRCLE_STACKS,