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

# Conflicts:
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/model/Yacht.java

2017-08-08 17:04:34 +12:00

..

mark

Loading course mark order from RaceXML

2017-08-04 13:20:50 +12:00

stream

Reverting some new graphics classes back to how they were on master.

2017-07-31 23:35:28 +12:00

Colors.java

Implemented boats spawning in parallel at the start line with spacing.

2017-08-05 00:31:36 +12:00

GeoPoint.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

Limit.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

Player.java

Merged with develop. Fixed many bugs in Visualiser.

2017-07-26 02:49:31 +12:00

PolarTable.java

Fixed build. (Actually this time)

2017-08-03 11:45:14 +12:00

RaceState.java

Merged with develop. Fixed many bugs in Visualiser.

2017-07-26 02:49:31 +12:00

Yacht.java

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

2017-08-08 17:04:34 +12:00