fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged in the changes from the master branch so that latter mergers can run smoothly

Browse Source 
#story[1087]
This commit is contained in:
hba56
2017-07-24 12:05:00 +12:00
parent 738a765a0a
commit 1ebbb8d4c7
12 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/app/App.java
-1
View File
@@ -8,7 +8,6 @@ import javafx.scene.Parent;
import javafx.scene.Scene; import javafx.scene.Scene;
import javafx.stage.Stage; import javafx.stage.Stage;
import javafx.stage.WindowEvent; import javafx.stage.WindowEvent;
import seng302.gameController.InputChecker;
public class App extends Application { public class App extends Application {
visualiser/src/main/java/seng302/gameController/InputChecker.java → racevisionGame/src/main/java/visualiser/gameController/InputChecker.java
+3 -3
View File
@@ -1,9 +1,9 @@
package seng302.gameController; package visualiser.gameController;
import javafx.animation.AnimationTimer; import javafx.animation.AnimationTimer;
import javafx.scene.Scene; import javafx.scene.Scene;
import seng302.gameController.Keys.ControlKey; import visualiser.gameController.Keys.ControlKey;
import seng302.gameController.Keys.KeyFactory; import visualiser.gameController.Keys.KeyFactory;
import java.util.HashMap; import java.util.HashMap;
visualiser/src/main/java/seng302/gameController/Keys/ControlKey.java → racevisionGame/src/main/java/visualiser/gameController/Keys/ControlKey.java
+1 -1
View File
@@ -1,4 +1,4 @@
package seng302.gameController.Keys; package visualiser.gameController.Keys;
import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCode;
visualiser/src/main/java/seng302/gameController/Keys/DownWindKey.java → racevisionGame/src/main/java/visualiser/gameController/Keys/DownWindKey.java
+1 -1
View File
@@ -1,4 +1,4 @@
package seng302.gameController.Keys; package visualiser.gameController.Keys;
import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCode;
visualiser/src/main/java/seng302/gameController/Keys/KeyFactory.java → racevisionGame/src/main/java/visualiser/gameController/Keys/KeyFactory.java
+1 -1
View File
@@ -1,4 +1,4 @@
package seng302.gameController.Keys; package visualiser.gameController.Keys;
import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCode;
visualiser/src/main/java/seng302/gameController/Keys/SailsToggleKey.java → racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java
+1 -1
View File
@@ -1,4 +1,4 @@
package seng302.gameController.Keys; package visualiser.gameController.Keys;
import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCode;
visualiser/src/main/java/seng302/gameController/Keys/TackGybeKey.java → racevisionGame/src/main/java/visualiser/gameController/Keys/TackGybeKey.java
+1 -1
View File
@@ -1,4 +1,4 @@
package seng302.gameController.Keys; package visualiser.gameController.Keys;
import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCode;
visualiser/src/main/java/seng302/gameController/Keys/UpWindKey.java → racevisionGame/src/main/java/visualiser/gameController/Keys/UpWindKey.java
+1 -1
View File
@@ -1,4 +1,4 @@
package seng302.gameController.Keys; package visualiser.gameController.Keys;
import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCode;
visualiser/src/main/java/seng302/gameController/Keys/VMGKey.java → racevisionGame/src/main/java/visualiser/gameController/Keys/VMGKey.java
+1 -1
View File
@@ -1,4 +1,4 @@
package seng302.gameController.Keys; package visualiser.gameController.Keys;
import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCode;
visualiser/src/main/java/seng302/gameController/Keys/ZoomInKey.java → racevisionGame/src/main/java/visualiser/gameController/Keys/ZoomInKey.java
+1 -1
View File
@@ -1,4 +1,4 @@
package seng302.gameController.Keys; package visualiser.gameController.Keys;
import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCode;
visualiser/src/main/java/seng302/gameController/Keys/ZoomOutKey.java → racevisionGame/src/main/java/visualiser/gameController/Keys/ZoomOutKey.java
+1 -1
View File
@@ -1,4 +1,4 @@
package seng302.gameController.Keys; package visualiser.gameController.Keys;
import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCode;
visualiser/src/test/java/seng302/GameControllerManualTest.java → racevisionGame/src/test/java/visualiser/gameController/GameControllerManualTest.java
+2 -2
View File
@@ -1,4 +1,4 @@
package seng302; package visualiser.gameController;
import javafx.application.Application; import javafx.application.Application;
import javafx.application.Platform; import javafx.application.Platform;
@@ -7,7 +7,7 @@ import javafx.scene.Scene;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import javafx.stage.Stage; import javafx.stage.Stage;
import javafx.stage.WindowEvent; import javafx.stage.WindowEvent;
import seng302.gameController.InputChecker; import visualiser.gameController.InputChecker;
/** /**
* Start to manually test the game controller * Start to manually test the game controller