Commit Graph
30 Commits
Author SHA1 Message Date
Fan-Wu Yang ac5423263c Merge remote-tracking branch 'origin/scale_maps_spike' into newHostServer 2017-09-20 14:29:44 +12:00
Fan-Wu Yang 928f5e31f0 Hopefully final version of Hosting #story[1188] 2017-09-19 02:15:34 +12:00
Fan-Wu Yang f7da497743 Resizing maps to time taking now works #story[1323] 2017-09-18 18:22:20 +12:00
Fan-Wu Yang 9d1145b298 Changed back to CI IP to test on CI 2017-09-18 02:03:25 +12:00
Fan-Wu Yang 0348b0c642 Merged in master 2017-09-15 02:50:06 +12:00
Fan-Wu Yang 34a803f92e More changes 2017-09-15 02:39:47 +12:00
Fan-Wu Yang 22e9db473e Removed test that took a manditory socket 2017-09-15 02:28:09 +12:00
Fan-Wu Yang f541a13235 Tried to get lobby working #story[1188] 2017-09-14 15:54:48 +12:00
hba56 81a04c987b Changed the ip of the matchbrowser to that of the CI. 2017-09-13 23:50:55 +12:00
hba56 4c52673fc1 javadoc fixes
#story[1188]
2017-09-13 17:12:24 +12:00
hba56 00780e17e9 Merge remote-tracking branch 'remotes/origin/temp77' into story77
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
#	racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
#	racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
2017-09-13 15:17:37 +12:00
hba56 aafc0dc9db Merge remote-tracking branch 'remotes/origin/temp77' into story77
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
#	racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
#	racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
2017-09-13 15:16:06 +12:00
hba56 70ccb4cf1c Merge remote-tracking branch 'remotes/origin/master' into story77
# Conflicts:
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/visualiser/Controllers/HostController.java
#	racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
#	racevisionGame/src/main/java/visualiser/Controllers/MainController.java
#	racevisionGame/src/main/resources/visualiser/scenes/main.fxml
#	settings/keyBindings.xml
2017-09-13 14:00:40 +12:00
David Wu c750b806e0 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 2017-09-13 13:00:34 +12:00
hba56 2c06a46ad2 send out to every client fix 2017-09-13 12:59:49 +12:00
David Wu 42a5d8ddc4 Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77 2017-09-13 12:49:11 +12:00
hba56 5fb24307ec send out to every client fix 2017-09-13 12:48:47 +12:00
David Wu 7cea1fb11c Reworking fxml for lobby. 2017-09-13 12:20:42 +12:00
Fan-Wu Yang 2cda5ea70d Lobby no longer glitches out when a person disconnects and reconnects without restarting the program #story[1188] 2017-09-11 20:34:34 +12:00
Joseph f1c07bca46 Linked table to show games from received packets. #story[1188] 2017-09-04 09:53:26 +12:00
Joseph f8e1a539c2 Linked table to show games from received packets. #story[1188] 2017-09-04 09:46:13 +12:00
hba56 5676d435b0 hosts now send info then wait rather than wait then send
#story[1188]
2017-09-01 12:20:48 +12:00
hba56 d1c0797db7 hosting a game now continues to send out the info of the race
#story[1188]
2017-08-31 15:06:43 +12:00
hba56 9161f69547 updating match table to store ip and port of clients and hosts
#story[1188]
2017-08-31 13:45:04 +12:00
hba56 83f756d7d8 packets can now be sent from client to match server
#story[1188]
2017-08-30 15:26:54 +12:00
hba56 b2bd4fdc1c network interface 2017-08-30 12:13:17 +12:00
fjc40 a9fde95b39 Updated maven version to 2.0.
Added a dedicatedServer module.
Removed Visualiser module.
Removed mock module.
Removed network module.
Fixed weird exception non-handling that appeared for some reason.
2017-08-18 22:55:50 +12:00
David Wu c08bafa566 Fixed most of issue #19 with new master? 2017-08-17 13:49:43 +12:00
fjc40 7366aba5ec Added empty data sources, to be used by VisualiserRace.
Created FrameRateTracker which can be used to track framerate.
Updated RequestToJoinEnum and JoinAcceptanceEnum to match the agreed connection API.
Added AssignPlayerBoat message, which is used internally on the client to assign the player a source ID once they have connected.
Fixed some race conditions in the MessageRouter.
Updated ConnectionAcceptor.CheckClientConnection to wait slightly longer before removing connection (there was a slight race condition before).
Race no longer has a reference to LatestMessages. LatestMessages no longer has specific messages types in it.
Created RaceState class, which contains the state that is shared between VisualiserRaceState and MockRaceState (currently only used on visualiser).
Split VisualiserRace into VisualiserRaceState and VisualiserRaceService.
Added the VisualiserRace commands (BoatLocatonCommand, RaceStatusCommand, etc...).
Slightly increased the preferred width of race.fxml table columns.
issues #27 #37 #35
#story[1095]
2017-08-14 00:53:05 +12:00
fjc40 89b0aa8b77 Implemented MessageRouter.
Added ConnectionToServerCommandFactory, and JoinSuccessfulCommand, RaceParticipantsFullCOmmand, ServerFullCommand.
Added IncomingHeartBeatCommandFactory, and IncomingHeartBeatCommand.
Added ConnectionToServerState, which represents the client's connection state to server.
Renamed VisualiserInput to VisualiserRaceController.
Added ConnectionToServer, which tracks the client's connection to server.
Added ConnectionToServerController, which accepts JoinAcceptance messages, turns them into commands, and passes them to ConnectionToServer.
Added IncomingHeartBeatService, which tracks the heart beat status of the connection.
Added IncomingHeartBeatController, which accepts HeartBeat messages, turns them into commands, and passes them to IncomingHeartBeatService.
Refactored ServerConnection a bit.
#story[1095]
2017-08-12 19:58:47 +12:00