Michael Rausch af81bf5891 Merge remote-tracking branch 'origin/develop' into 38b_LayLines ...

# 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

2017-05-25 13:56:08 +12:00

..

models

Merge remote-tracking branch 'origin/develop' into 38b_LayLines

2017-05-25 13:56:08 +12:00

server

Added tests for reverse and intToBytes

2017-04-30 23:54:32 +12:00

visualizer/annotations

Important annotations are displayed correctly when updated.

2017-05-14 20:27:25 +12:00

BoatTest.java

Reimplemented race position in the race view. Removed Boat class and Yacht class is replaced completely. Race position "-" shows properly on start screen. Removed BoatTest and TeamsParserTest. Fixed estimated time till finish on server.

2017-05-04 13:50:06 +12:00

ColorsTest.java

Fixed failing ColorsTest

2017-05-19 20:57:40 +12:00

TestGeoUtils.java

Calculation of upwind downwind leg given a boat, wind and next mark now works. created GeometryUtils class

2017-05-24 14:57:22 +12:00

TestRaceTimer.java

Merged the mock server to visualisation.

2017-05-01 17:42:07 +12:00