 hba56
|
4b5ebbd9e4
|
refactored networking code from networkingTest branch
#story[778, 782]
|
2017-04-25 11:50:22 +12:00 |
|
|
hba56
|
f5472bf595
|
Merge remote-tracking branch 'remotes/origin/master' into story28
-anchors now fills stage
-added time label
# Conflicts:
# pom.xml
# src/main/java/seng302/Controllers/RaceController.java
# src/main/resources/scenes/racepane.fxml
#pair[fwy13, hba56]
#story[761]
|
2017-04-19 13:08:06 +12:00 |
|
|
hba56
|
edabe58b03
|
Merge remote-tracking branch 'remotes/origin/master' into story28
-anchors now fills stage
-added time label
# Conflicts:
# pom.xml
# src/main/java/seng302/Controllers/RaceController.java
# src/main/resources/scenes/racepane.fxml
#pair[fwy13, hba56]
#story[761]
|
2017-04-19 12:48:03 +12:00 |
|
|
hba56
|
a00b066f8d
|
Quick fix to zoneId to make it set correctly
- removed local zoneId
#story[761]
#pair[fwy13, hba56]
|
2017-04-19 11:55:11 +12:00 |
|