cbt24 f0d750cae1 Merge remote-tracking branch 'remotes/origin/master' into story66-collision ...

# Conflicts:
#	racevisionGame/src/main/java/mock/model/MockBoat.java
#	racevisionGame/src/main/java/mock/model/RaceLogic.java
#	racevisionGame/src/main/java/shared/model/CompoundMark.java
#	racevisionGame/src/main/java/shared/model/Race.java
#	racevisionGame/src/test/java/mock/model/MockBoatTest.java

2017-08-16 15:09:18 +12:00

..

mock

Merge remote-tracking branch 'remotes/origin/master' into story66-collision

2017-08-16 15:09:18 +12:00

network

Fixed player boat not being highlighted.

2017-08-15 22:41:43 +12:00

shared

Merge remote-tracking branch 'remotes/origin/master' into story66-collision

2017-08-16 15:09:18 +12:00

visualiser

RaceController/info table now makes a copy of the boat list, to avoid race conditions.

2017-08-15 23:10:32 +12:00