Merge branch 'master' into new_issue#19

# Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
2017-08-17 17:00:39 +12:00
parent 598275591f 0490237c0c
commit 5234cdea66
48 changed files with 174 additions and 108 deletions
@@ -199,4 +199,4 @@ public class RaceLogic implements RunnableWithFramePeriod, Observer {
 //        else if(e.getBearing().degrees() > 270) System.out.println("Port");
 //        else System.out.println("Behind");
    }
-}
+}