hba56
86de4e7c0c
Merge remote-tracking branch 'origin/master'
2017-09-14 16:27:54 +12:00
hba56
004aebceb5
fix null pointer when playing tutorial
2017-09-14 16:27:36 +12:00
David Wu
43ee92fb95
Created enums and bound them to zoom in, zoom out and sails toggle for key bindings so that something expected shows up for key binding descriptions when changing key bindings. #story[1197]
2017-09-14 16:23:56 +12:00
David Wu
550180f286
Removed countdown pane.
2017-09-14 14:28:42 +12:00
fjc40
afd923c9fb
Revert "Appears to fix wind arrow direction."
...
This reverts commit 8e6a720558
2017-09-14 13:22:35 +12:00
fjc40
8e6a720558
Appears to fix wind arrow direction.
2017-09-14 12:39:41 +12:00
hba56
81a04c987b
Changed the ip of the matchbrowser to that of the CI.
2017-09-13 23:50:55 +12:00
Fan-Wu Yang
1b946b6807
Removed/commented out unecessary print messages #story[1188]
2017-09-13 21:21:19 +12:00
hba56
4c52673fc1
javadoc fixes
...
#story[1188]
2017-09-13 17:12:24 +12:00
hba56
e4dbebfcac
Merge remote-tracking branch 'remotes/origin/master' into story77
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
# racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/java/visualiser/app/App.java
# settings/keyBindings.xml
2017-09-13 16:14:07 +12:00
hba56
fd120edaf9
Merge remote-tracking branch 'remotes/origin/master' into story77
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
# racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
# racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/java/visualiser/app/App.java
# settings/keyBindings.xml
2017-09-13 16:13:14 +12:00
David Wu
22b4b66049
Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
# racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
2017-09-13 15:28:13 +12:00
David Wu
cccce9002b
Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
# racevisionGame/src/main/resources/visualiser/scenes/gameLobby.fxml
2017-09-13 15:28:01 +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
David Wu
8cc4d7741c
Fixed issue where games can't be hosted if you quit as host in the lobby menu. Added more doc.#story[1188]
2017-09-13 15:17:09 +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
David Wu
06bd637460
Added documentation. #story[1188]
2017-09-13 14:42:54 +12:00
David Wu
490aab3f8d
Changes made to pre-race countdown. #story[1188]
2017-09-13 14:30:55 +12:00
hba56
079d93fc0f
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:22:46 +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
89ce8a7cc0
Pre-race countdown implementation.
2017-09-13 14:00:29 +12:00
fjc40
d29a47ec23
Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/shared/model/Constants.java
2017-09-13 13:30:51 +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
hba56
4adcd6322c
send out to every client
2017-09-13 12:05:09 +12:00
fjc40
55402136ed
Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
Also added keybindings.xml to git ignore.
#story[1185]
2017-09-13 12:04:32 +12:00
fjc40
3fa6b9200d
Finished MarkRoundingSequence class. Added MarkRoundingData class.
...
RaceState has a MarkRoundingSequenceMember.
The temporary rounding line drawing in canvas uses MarkRoundingSequence.
MockRace now uses MarkRoundingSequence.
#story[1185]
2017-09-13 00:38:58 +12:00
hba56
4dcff5c009
SeaSurface files have been added to display the surface in the lobby. Surface is now drawn in the lobby
2017-09-12 21:55:23 +12:00
Fan-Wu Yang
3301798411
Fixed boats not rotating in lobby #story[1188]
2017-09-12 21:35:10 +12:00
Connor Taylor-Brown
c94e0af69c
Removed remaining println statements
2017-09-12 17:35:51 +12:00
zwu18
b6c340614f
Tutorial text disabled on actual races. #story[1261]
2017-09-12 16:54:36 +12:00
Jessica Syder
e664619a81
Tutorial is played with tutorial map.
...
#story[1261]
2017-09-12 16:23:11 +12:00
hba56
e3ddb272c0
Merge remote-tracking branch 'remotes/origin/master' into story77
...
# Conflicts:
# racevisionGame/src/main/java/shared/model/Constants.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
2017-09-12 15:13:35 +12:00
Jessica Syder
0cb008cef7
Removed a couple of old canvas lines.
...
#story[1261]
2017-09-11 23:17:36 +12:00
Jessica Syder
9bc36ba544
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/StartController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml
# racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml
2017-09-11 23:09:48 +12:00
Jessica Syder
c30391ef23
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/java/visualiser/Controllers/MainController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/StartController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml
# racevisionGame/src/main/resources/visualiser/scenes/titleScreen.fxml
2017-09-11 23:07:53 +12:00
zwu18
fc9a4898d6
Made changes based on DoD review. Class documentation and commenting added. Removed annotation features. Removed sout commands. #story[1189]
2017-09-11 21:07:52 +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
Fan-Wu Yang
54a9140f31
lobby listener is added and removed so that the program doesn't drasticaly slow down when the lobby is connected to multiple times #story[1188]
2017-09-11 20:29:15 +12:00
Jessica Syder
669a303e9b
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/StartController.java
# racevisionGame/src/main/java/visualiser/Controllers/hostgame.fxml
# racevisionGame/src/main/java/visualiser/Controllers/lobbyHosting.fxml
# racevisionGame/src/main/java/visualiser/Controllers/main.fxml
# racevisionGame/src/main/java/visualiser/Controllers/raceView.fxml
2017-09-11 20:19:10 +12:00
Jessica Syder
108643b59d
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostGameController.java
# racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/StartController.java
# racevisionGame/src/main/java/visualiser/Controllers/hostgame.fxml
# racevisionGame/src/main/java/visualiser/Controllers/lobbyHosting.fxml
# racevisionGame/src/main/java/visualiser/Controllers/main.fxml
# racevisionGame/src/main/java/visualiser/Controllers/raceView.fxml
2017-09-11 20:05:24 +12:00
Fan-Wu Yang
df04cdf87c
Boats are now visualy removed when they leave the lobby.
2017-09-11 19:54:43 +12:00
David Wu
b976186c7d
Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189]
2017-09-11 15:31:18 +12:00
David Wu
c97706d86e
Merge branch 'master' into story70
...
# Conflicts:
# dedicatedServer/src/main/java/app/App.java
# racevisionGame/src/main/java/mock/app/Event.java
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
# racevisionGame/src/main/resources/mock/mockXML/raceThreePlayers.xml
2017-09-11 14:27:12 +12:00
fjc40
346aa148ef
Added some debug statements, and WIP MarkRoundingSequence class.
...
Temporarily disabled source id allocator time checks.
Added mark rounding stuff to race canvas to help debug.
#story[1185]
2017-09-11 11:35:11 +12:00
David Wu
c6594a0e20
Tutorial text now displays on screen when in tutorial. #story[1189]
2017-09-10 19:31:56 +12:00
David Wu
9a96131a33
Fixed issue where wind arrow, accordion, time, etc. were not being displayed. Fixed issue where zooming would crash when done outside of tutorial. #story[1189]
2017-09-10 18:11:52 +12:00
hba56
David Wu
fjc40
Fan-Wu Yang
Connor Taylor-Brown
Jessica Syder