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
b59d36f4e5
Actually fixed the wind arrow direction.
2017-09-14 13:32:23 +12:00
fjc40
afd923c9fb
Revert "Appears to fix wind arrow direction."
...
This reverts commit 8e6a720558
2017-09-14 13:22:35 +12:00
fjc40
e0278fdb85
Merge remote-tracking branch 'origin/master' into wind_arrow_direction_5
2017-09-14 12:40:23 +12:00
fjc40
8e6a720558
Appears to fix wind arrow direction.
2017-09-14 12:39:41 +12:00
Joseph Gardner
a6eea88524
Fixed collisions #fix #story[1196]
2017-09-14 11:58:40 +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
92500e13ee
Added in windangle for rotated map as it had been lost through merge. #story[1188]
2017-09-13 21:30:16 +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
Fan-Wu Yang
7b97e93d3a
Merge branch 'merge_fix_story51'
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
2017-09-13 15:51:59 +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
Fan-Wu Yang
1cbb24e9fd
Merged in master #story[1185]
2017-09-13 15:05:36 +12:00
Fan-Wu Yang
3760a43cfc
Merge branch 'master' into HEAD
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
2017-09-13 14:56:52 +12:00
fjc40
b655b3e233
Fixed merge bug, and an unrelated null pointer exception.
2017-09-13 14:52:21 +12:00
fjc40
6761778dd4
Merge remote-tracking branch 'origin/master' into story_51_rounding_fix
...
# Conflicts:
# racevisionGame/src/main/java/mock/app/Event.java
2017-09-13 14:43:49 +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
Fan-Wu Yang
e87173ee39
Fixed Tutorial not being able to run #story[1185]
2017-09-13 14:29:48 +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
f926355d1c
Merge branch 'story77' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story77
2017-09-13 14:00:36 +12:00
David Wu
89ce8a7cc0
Pre-race countdown implementation.
2017-09-13 14:00:29 +12:00
hba56
731c0b0e61
send out to every client fix
2017-09-13 13:34:26 +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
fjc40
070654a95c
Javadoc fix.
2017-09-13 13:07:13 +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
fjc40
2ad947b57d
The start time of the race is no longer scaled by the race speed scalar.
...
Changed the prestart time to 30 seconds (was 3 minutes).
Changed the preparatory time to 10 seconds (was 1 minute).
Phases: player list +prestart > warning > race view + preparatory + no more joining > started > finished.
2017-09-13 12:59:51 +12:00
hba56
2c06a46ad2
send out to every client fix
2017-09-13 12:59:49 +12:00
David Wu
202c8d80c8
Minor fxml adjustments.
2017-09-13 12:57:35 +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
fjc40
ab96884dc6
Javadoc.
2017-09-13 12:10:36 +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
2a6085c9e8
Test fix.
2017-09-13 00:52:35 +12:00
fjc40
a1684a410c
Javadoc.
2017-09-13 00:43:38 +12:00
fjc40
9fa1b9ee67
Re-enabled source id allocator check.
...
Re-enabled rotation of map at startup.
Changed race.xml schema so that yacht elements aren't required inside the participants element.
#story[1185]
2017-09-13 00:41:23 +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
Fan-Wu Yang
3a6070a645
Fixed Merge and added back some merge changes #story[1196]
2017-09-12 22:10:13 +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
David Wu
fjc40
Joseph Gardner
hba56
Fan-Wu Yang