Merge branch 'sb'

src/itdelatrisu/opsu/objects/Circle.java

@@ -269,6 +269,7 @@ public class Circle extends GameObject {
 
 	@Override
 	public void updateColor() {
+		super.updateColor();
 		color = Dancer.colorOverride.getColor(comboColorIndex);
 		mirrorColor = Dancer.colorMirrorOverride.getColor(comboColorIndex);
 	}

src/itdelatrisu/opsu/objects/DummyObject.java

@@ -100,8 +100,4 @@ public class DummyObject extends GameObject {
 		return null;
 	}
 
-	@Override
-	public void updateColor() {
-	}
-
 }

src/itdelatrisu/opsu/objects/GameObject.java

@@ -22,6 +22,7 @@ import itdelatrisu.opsu.objects.curves.Vec2f;
 
 import org.newdawn.slick.Color;
 import org.newdawn.slick.Graphics;
+import yugecin.opsudance.ObjectColorOverrides;
 
 /**
  * Interface for hit object types used during gameplay.
@@ -33,6 +34,8 @@ public abstract class GameObject {
 
 	private int time;
 
+	private float hue;
+
 	public void updateStartEndPositions(int startTime) {
 		time = startTime;
 		start = getPointAt(startTime);
@@ -101,6 +104,14 @@ public abstract class GameObject {
 	public abstract Color getColor();
 	public abstract Color getMirroredColor();
 
-	public abstract void updateColor();
+
+	public void updateColor() {
+		hue = ObjectColorOverrides.hue;
+	}
+
+	// the hue of objectcoloroverrides at the point of this circle..... i know, shit placement... used for sb when hue inc changes / rainbow override
+	public float getHue() {
+		return hue;
+	}
 
 }

src/itdelatrisu/opsu/objects/Slider.java

@@ -714,6 +714,7 @@ public class Slider extends GameObject {
 
 	@Override
 	public void updateColor() {
+		super.updateColor();
 		color = Dancer.colorOverride.getColor(comboColorIndex);
 		mirrorColor = Dancer.colorMirrorOverride.getColor(comboColorIndex);
 	}

src/itdelatrisu/opsu/objects/Spinner.java

@@ -438,7 +438,4 @@ public class Spinner extends GameObject {
 		return null;
 	}
 
-	@Override
-	public void updateColor() {
-	}
 }