Merge remote-tracking branch 'org/master' into ReplayTest

Conflicts:
	src/itdelatrisu/opsu/GameData.java
	src/itdelatrisu/opsu/states/Game.java

src/itdelatrisu/opsu/objects/Circle.java

@@ -65,7 +65,7 @@ public class Circle implements GameObject {
 	 * @param circleSize the map's circleSize value
 	 */
 	public static void init(GameContainer container, float circleSize) {
-		diameter =  (108 - (circleSize * 8));
+		diameter =  (104 - (circleSize * 8));
 		diameter =  (diameter * HitObject.getXMultiplier());  // convert from Osupixels (640x480)
 		int diameterInt = (int)diameter;
 		GameImage.HITCIRCLE.setImage(GameImage.HITCIRCLE.getImage().getScaledCopy(diameterInt, diameterInt));

src/itdelatrisu/opsu/objects/Slider.java

@@ -117,15 +117,11 @@ public class Slider implements GameObject {
 		containerWidth = container.getWidth();
 		containerHeight = container.getHeight();
 		
-		diameter =  (108 - (circleSize * 8));
+		diameter =  (104 - (circleSize * 8));
 		diameter =  (diameter * HitObject.getXMultiplier());  // convert from Osupixels (640x480)
 		int diameterInt = (int)diameter;
 		
 		followRadius = diameter / 2 * 3f;
-		/* 
-		int diameter = (int) (104 - (circleSize * 8));
-		diameter = (int) (diameter * HitObject.getXMultiplier());  // convert from Osupixels (640x480)
-		*/
 		// slider ball
 		if (GameImage.SLIDER_BALL.hasSkinImages() ||
 		    (!GameImage.SLIDER_BALL.hasSkinImage() && GameImage.SLIDER_BALL.getImages() != null))

src/itdelatrisu/opsu/objects/Spinner.java

@@ -41,6 +41,9 @@ public class Spinner implements GameObject {
 	/** Container dimensions. */
 	private static int width, height;
 
+	/** The map's overall difficulty value. */
+	private static float overallDifficulty = 5f;
+
 	/** The number of rotation velocities to store. */
 	private int maxStoredDeltaAngles;
 
@@ -104,10 +107,12 @@ public class Spinner implements GameObject {
 	/**
 	 * Initializes the Spinner data type with images and dimensions.
 	 * @param container the game container
+	 * @param difficulty the map's overall difficulty value
 	 */
-	public static void init(GameContainer container) {
+	public static void init(GameContainer container, float difficulty) {
 		width  = container.getWidth();
 		height = container.getHeight();
+		overallDifficulty = difficulty;
 	}
 
 	/**
@@ -160,7 +165,7 @@ public class Spinner implements GameObject {
 		storedDeltaAngle = new float[maxStoredDeltaAngles];
 		
 		// calculate rotations needed
-		float spinsPerMinute = 100 + (data.getDifficulty() * 15);
+		float spinsPerMinute = 100 + (overallDifficulty * 15);
 		rotationsNeeded = spinsPerMinute * (hitObject.getEndTime() - hitObject.getTime()) / 60000f;
 	}
 
@@ -263,7 +268,6 @@ public class Spinner implements GameObject {
 		if (isSpinning && !(keyPressed || GameMod.RELAX.isActive()))
 			isSpinning = false;
 
-		System.out.println("Spinner update "+mouseX+" "+mouseY+" "+deltaOverflow);
 		// spin automatically
 		// http://osu.ppy.sh/wiki/FAQ#Spinners