hba56
|
c17900a461
|
Merge remote-tracking branch 'remotes/origin/master' into scoreTable
|
8 years ago |
Fan-Wu Yang
|
2383915c78
|
Merged #story[1195]
|
8 years ago |
Joseph Gardner
|
7bea2fee73
|
Merge branch 'storyA_sounds' 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 |
|
hba56
|
083eb5a4bc
|
updated race view that does not use a split pane
|
8 years ago |
|
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
|
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 |
