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 remote-tracking branch 'refs/remotes/origin/master'

Browse Source 
Conflicts:
	src/main/java/seng302/controllers/CanvasController.java
	src/main/java/seng302/models/Boat.java
This commit is contained in:
Peter
2017-03-23 22:17:45 +13:00
parent bf8244ce49 9872095e50
commit 7bc5c8f8a4
3 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/models/Race.java
+1 -1
View File
@@ -16,7 +16,7 @@ public class Race {
private long startTime = 0;
private double timeScale = 1;
private boolean raceFinished = false; // Race is finished
private int raceTime = -10; // Current time in the race
private int raceTime = -2; // Current time in the race
/**
* Race class containing the boats and legs in the race