Calum 5228c078bc Merge branch 'develop' into 1124_Mark_Sequence_From_RaceXML ...

# Conflicts:
#	src/main/java/seng302/gameServer/GameState.java
#	src/main/java/seng302/gameServer/server/simulator/Simulator.java
#	src/main/java/seng302/models/mark/Mark.java
#	src/main/java/seng302/visualiser/map/CanvasMap.java

2017-08-03 12:27:11 +12:00

..

controllers

Fixed connecting to hosts. Fixed issue34 and 35 to the point where they can be developed off of.

2017-08-02 00:26:57 +12:00

fxObjects

Fixed build. (Actually this time)

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

map

Merge branch 'develop' into 1124_Mark_Sequence_From_RaceXML

2017-08-03 12:27:11 +12:00

ClientToServerThread.java

Fixed build. (Actually this time)

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

GameClient.java

Fixed build. (Actually this time)

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

GameView.java

Fixed build. (Actually this time)

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