Zhi You Tan fda6625256 Merge remote-tracking branch 'origin/develop' into Story66_Collision ...

# Conflicts:
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/model/Yacht.java
#	src/main/java/seng302/model/mark/MarkOrder.java
#	src/main/java/seng302/visualiser/GameClient.java

2017-08-10 20:23:56 +12:00

..

CompoundMark.java

Tidied code, added MidPoint to CompoundMark class

2017-08-10 13:58:32 +12:00

Corner.java

Refactored the setup for MarkObjects (now renamed Markers) and made the CompoundMark + Mark + GeoPoint classes the standard across all classes instead of GateMark + SingleMark + Mark.

2017-07-31 02:19:19 +12:00

Mark.java

Refactored the setup for MarkObjects (now renamed Markers) and made the CompoundMark + Mark + GeoPoint classes the standard across all classes instead of GateMark + SingleMark + Mark.

2017-07-31 02:19:19 +12:00

MarkOrder.java

Merge remote-tracking branch 'origin/develop' into Story66_Collision

2017-08-10 20:23:56 +12:00