Merge branch 'master' into story_speedometer

# Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java # racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
2017-09-26 16:11:14 +13:00
parent 67779eb9ad 5ed1bc1737
commit 1d95004811
136 changed files with 28971 additions and 367 deletions
@@ -84,6 +84,30 @@
            <version>0.7</version>
        </dependency>

+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20160810</version>
+        </dependency>
+
+        <dependency>
+            <groupId>JavaInteractiveMesh</groupId>
+            <artifactId>ObjImporter</artifactId>
+            <version>0.8</version>
+        </dependency>
+
+        <dependency>
+            <groupId>JavaInteractiveMesh</groupId>
+            <artifactId>X3DImporter</artifactId>
+            <version>0.4</version>
+        </dependency>
+
    </dependencies>