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 'origin/develop' into issue#5_fix_pre-race_boats_on_leaderboard

Browse Source 
# Conflicts:
#	src/main/java/seng302/controllers/RaceController.java
#	src/main/java/seng302/controllers/StartScreenController.java
This commit is contained in:
Zhi You Tan
2017-05-23 11:31:18 +12:00
parent 6f9a8e5581 6f1b0b06c3
commit ffd40fef6d
34 changed files with 744 additions and 1750 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/models/Yacht.java
+1 -1
View File
@@ -159,7 +159,7 @@ public class Yacht {
this.colour = colour;
}
public double getVelocity() {
public Double getVelocity() {
return velocity;
}