 Calum
|
f9e6df46c1
|
Fixed issues caused by merge.
#bug
|
2017-08-03 13:23:43 +12:00 |
|
|
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 |
|
 William Muir
|
c655cb3fab
|
Fixed build. (Actually this time)
All doc string annotations were required to be fixed for all methods
tags: #issue[34]
|
2017-08-03 11:45:14 +12:00 |
|
|
Calum
|
87ef37a689
|
Fixed connecting to hosts. Fixed issue34 and 35 to the point where they can be developed off of.
#refactor #bug #issue[34, 35]
|
2017-08-02 00:26:57 +12:00 |
|