michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into remove_observers

Browse Source 
# Conflicts:
#	src/main/java/seng302/controllers/CanvasController.java
#	src/main/java/seng302/fxObjects/BoatGroup.java
#	src/main/java/seng302/models/stream/StreamParser.java
This commit is contained in:
Calum
2017-05-25 10:25:54 +12:00
parent 3085125f3e a6d9c66fc9
commit 4d29354797
17 changed files with 250 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/fxObjects/BoatGroup.java
-6
View File
@@ -1,14 +1,9 @@
package seng302.fxObjects;
import javafx.event.EventHandler;
import javafx.geometry.Point2D;
import javafx.scene.CacheHint;
import javafx.scene.Group;
import javafx.scene.Node;
import javafx.scene.input.MouseDragEvent;
import javafx.scene.input.MouseEvent;
import javafx.scene.paint.Color;
import javafx.scene.paint.Paint;
import javafx.scene.shape.Line;
import javafx.scene.shape.Polygon;
import javafx.scene.text.Text;
@@ -147,7 +142,6 @@ public class BoatGroup extends Group {
boatPoly.setLayoutY(y);
boatAnnotations.setLayoutX(x);
boatAnnotations.setLayoutY(y);
wake.setLayoutX(x);
wake.setLayoutY(y);
wake.rotate(rotation);
src/main/java/seng302/fxObjects/MarkGroup.java
+1 -1
View File
@@ -13,7 +13,7 @@ import seng302.models.mark.MarkType;
import seng302.models.mark.SingleMark;
/**
* Created by CJIRWIN on 26/04/2017.
* Grouping of javaFX objects needed to represent a Mark on screen.
*/
public class MarkGroup extends Group {