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 remote-tracking branch 'origin/develop' into 38b_LayLines

Browse Source 
# Conflicts:
#	src/main/java/seng302/models/BoatGroup.java
#	src/main/java/seng302/models/Event.java
#	src/main/java/seng302/models/mark/Mark.java
#	src/main/java/seng302/models/stream/StreamParser.java
This commit is contained in:
Michael Rausch
2017-05-25 13:56:08 +12:00
parent e72ac1def8 adbb9ffe3b
commit af81bf5891
15 changed files with 248 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/models/mark/MarkGroup.java
+1 -1
View File
@@ -11,7 +11,7 @@ import javafx.scene.shape.Line;
import seng302.GeometryUtils;
/**
* Created by CJIRWIN on 26/04/2017.
* Grouping of javaFX objects needed to represent a Mark on screen.
*/
public class MarkGroup extends Group {