fjc40
|
5c58ca11ff
|
Boats use their assigned color.
Boat name is displayed in lobby instead of source ID.
|
8 years ago |
hba56
|
c17900a461
|
Merge remote-tracking branch 'remotes/origin/master' into scoreTable
|
8 years ago |
Joseph Gardner
|
c42e25df86
|
Merge branch 'master' into storyD-3D
|
8 years ago |
|
Joseph Gardner
|
14b5f4bdf1
|
Merge branch 'master' into storyD-3D
# Conflicts:
# .gitignore
# racevisionGame/src/main/java/mock/model/RaceServer.java
# racevisionGame/src/main/java/mock/model/collider/Collider.java
# racevisionGame/src/main/java/mock/xml/RaceXMLCreator.java
# racevisionGame/src/main/java/shared/model/Boat.java
# racevisionGame/src/main/java/shared/model/Mark.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/java/visualiser/Controllers/RaceViewController.java
# racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
# racevisionGame/src/main/java/visualiser/layout/Plane3D.java
# racevisionGame/src/main/java/visualiser/layout/SeaSurface.java
# racevisionGame/src/main/java/visualiser/layout/View3D.java
# racevisionGame/src/main/java/visualiser/utils/PerlinNoiseGenerator.java
# racevisionGame/src/main/resources/visualiser/scenes/title.fxml
|
8 years ago |
David Wu
|
550180f286
|
Removed countdown pane.
|
8 years ago |
|
hba56
|
083eb5a4bc
|
updated race view that does not use a split pane
|
8 years ago |
Fan-Wu Yang
|
1b946b6807
|
Removed/commented out unecessary print messages #story[1188]
|
8 years ago |
|
hba56
|
4c52673fc1
|
javadoc fixes
#story[1188]
|
8 years ago |
|
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
|
8 years ago |
|
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
|
8 years ago |
|
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
|
8 years ago |
|
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]
|
8 years ago |
|
David Wu
|
06bd637460
|
Added documentation. #story[1188]
|
8 years ago |
|
David Wu
|
490aab3f8d
|
Changes made to pre-race countdown. #story[1188]
|
8 years ago |
|
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
|
8 years ago |
|
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
|
8 years ago |
|
David Wu
|
89ce8a7cc0
|
Pre-race countdown implementation.
|
8 years ago |
|
hba56
|
4dcff5c009
|
SeaSurface files have been added to display the surface in the lobby. Surface is now drawn in the lobby
|
8 years ago |
|
Fan-Wu Yang
|
3301798411
|
Fixed boats not rotating in lobby #story[1188]
|
8 years ago |
|
Fan-Wu Yang
|
2cda5ea70d
|
Lobby no longer glitches out when a person disconnects and reconnects without restarting the program #story[1188]
|
8 years ago |
|
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]
|
8 years ago |
|
Fan-Wu Yang
|
df04cdf87c
|
Boats are now visualy removed when they leave the lobby.
|
8 years ago |
|
hba56
|
ddc3a6ae47
|
boxes in lobby are now boats
|
8 years ago |
|
hba56
|
4780354452
|
Errors in this commit: mock threads get interrupted
#story[#1188]
|
8 years ago |
|
hba56
|
63e2cc1fd0
|
Merge remote-tracking branch 'remotes/origin/story77_lobby' into story77
# Conflicts:
# racevisionGame/src/main/java/visualiser/Controllers/HostController.java
|
8 years ago |
