Merge branch 'develop' into new_meshes

src/main/java/seng302/visualiser/fxObjects/assets_3D/BoatMeshType.java

@@ -2,7 +2,7 @@ package seng302.visualiser.fxObjects.assets_3D;
 
 /**
  * Enum for boat meshes. Enum values should be of the form :
- * ENUM_VALUE (hull file, mast file, X offset of mast CoR from origin, sail file, X offset of sail CoR from origin)
+ * ENUM_VALUE (hull file, mast file, Y offset of mast CoR from origin, sail file, Y offset of sail CoR from origin)
  * Files must be valid .stl files.
  */
 public enum BoatMeshType {

src/main/java/seng302/visualiser/fxObjects/assets_3D/ModelFactory.java

@@ -78,7 +78,6 @@ public class ModelFactory {
     public static BoatModel boatGameView(BoatMeshType boatType, Color primaryColour) {
         Group boatAssets = getUnmodifiedBoatModel(boatType, primaryColour);
         boatAssets.getTransforms().setAll(
-            new Rotate(-90, new Point3D(0,0,1)),
             new Scale(0.3, 0.3, 0.3)
         );
         return new BoatModel(boatAssets, null, boatType);