michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into wind_arrow

Browse Source 
# Conflicts:
#	src/main/java/seng302/visualiser/controllers/RaceViewController.java
#	src/main/resources/views/RaceView.fxml
This commit is contained in:
Zhi You Tan
2017-09-28 16:36:34 +13:00
parent d436d2a6e4 27379ae96d
commit 6fafb02a8f
63 changed files with 659 additions and 1583 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/GameState.java
+3 -3
View File
@@ -242,7 +242,7 @@ public class GameState implements Runnable {
if (System.currentTimeMillis() > startTime) {
startSpawningTokens();
startUpdatingWind();
GameState.setCurrentStage(GameStages.RACING);
GameState.currentStage = GameStages.RACING;
}
}
if (currentStage == GameStages.RACING) {
@@ -303,8 +303,8 @@ public class GameState implements Runnable {
windSpeed += random.nextInt(500);
}
GameState.setWindSpeed(Double.valueOf(windSpeed));
GameState.setWindDirection(direction.doubleValue());
GameState.windSpeed = Double.valueOf(windSpeed);
GameState.windDirection = direction.doubleValue();
}