Calum 7894e31926 Merge branch 'develop' into story61_player_perspective ...

# Conflicts:
#	src/main/java/seng302/App.java
#	src/main/java/seng302/client/ClientPacketParser.java
#	src/main/java/seng302/client/ClientState.java
#	src/main/java/seng302/client/ClientStateQueryingRunnable.java
#	src/main/java/seng302/controllers/Controller.java
#	src/main/java/seng302/controllers/LobbyController.java
#	src/main/java/seng302/controllers/RaceViewController.java
#	src/main/java/seng302/controllers/StartScreenController.java
#	src/main/java/seng302/fxObjects/BoatAnnotations.java
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/gameServer/MainServerThread.java
#	src/main/java/seng302/model/Yacht.java
#	src/main/java/seng302/model/stream/StreamReceiver.java
#	src/main/java/seng302/visualiser/ClientToServerThread.java
#	src/main/java/seng302/visualiser/GameView.java
#	src/main/java/seng302/visualiser/fxObjects/BoatObject.java
#	src/test/java/seng302/model/stream/StreamReceiverTest.java

2017-07-30 18:07:28 +12:00

..

model

Changed package heirachy. Merged Controller and StartScreenController.

2017-07-21 09:22:55 +12:00

models

Merge branch 'develop' into story61_player_perspective

2017-07-30 18:07:28 +12:00

server

Removed unnecessary Position and GeoPoint classes to clear the code base.

2017-07-10 23:51:01 +12:00

visualizer/annotations

Changed package heirachy. Merged Controller and StartScreenController.

2017-07-21 09:22:55 +12:00

BoatTest.java

Changed package heirachy. Merged Controller and StartScreenController.

2017-07-21 09:22:55 +12:00

ColorsTest.java

Changed package heirachy. Merged Controller and StartScreenController.

2017-07-21 09:22:55 +12:00

TestGeoUtils.java

Merged GeoUtility and GeometryUtils classes

2017-07-16 21:58:40 +12:00

TestRaceTimer.java

Merged with develop. Fixed many bugs in Visualiser.

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