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

Merge branch 'master' into MapWindRotation

Browse Source 
# Conflicts:
#	racevisionGame/src/main/java/shared/model/CompoundMark.java
#	racevisionGame/src/main/java/shared/model/Mark.java
This commit is contained in:
Fan-Wu Yang
2017-08-17 12:59:54 +12:00
parent a3fe57ed5a 96acb6251e
commit 7546c65893
29 changed files with 547 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Controllers/FinishController.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class FinishController extends Controller {
boatNameColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
//Rank/position.
boatRankColumn.setCellValueFactory(cellData -> cellData.getValue().positionProperty());
boatRankColumn.setCellValueFactory(cellData -> cellData.getValue().placingProperty());
//Winner label.
racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
+1 -2
View File
@@ -23,7 +23,6 @@ import visualiser.gameController.ControllerClient;
import visualiser.gameController.Keys.ControlKey;
import visualiser.gameController.Keys.KeyFactory;
import visualiser.model.*;
import visualiser.network.ServerConnection;
import java.net.URL;
import java.util.ResourceBundle;
@@ -293,7 +292,7 @@ public class RaceController extends Controller {
//Current place within race.
boatPlacingColumn.setCellValueFactory(
cellData -> cellData.getValue().positionProperty() );
cellData -> cellData.getValue().placingProperty() );
}