Commit Graph
5 Commits
Author SHA1 Message Date
hba56 b5bd1c9d6d updated to have main methods for the server and client
#story[778, 782]
2017-04-19 15:04:29 +12:00
hba56 43af929701 Started a new branch for the networking side of story 29, 30
-added a basic tcp server and client

#story[778, 782]
2017-04-19 15:00:52 +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