Jessica Syder
625eb62af2
Wrapped the tutorial text on the title fxml.
...
#story[1261]
2017-09-12 16:41:54 +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
Jessica Syder
a5050b8ea8
Adding back lost changes and finishing splitting last controllers.
...
- renamed fxml and their controllers to match
- removed old controllers
- finished lobby and lobbyhost controllers
#story[1261]
2017-09-08 18:08:58 +12:00
David Wu
c63403d1de
Created new lobby menu. Working on animated background for menu.
2017-08-29 15:11:09 +12:00
Jessica Syder
7c5670f8c2
Sails are displayed on first boat in a race. Optimised imports.
...
- Implemented drawSails method
- Sail position is displayed and updated using a boat's heading
- Sails conform to 'Points of sail'
- Javadoc'd new method and tidied up existing
- Sped up track point frequency (visualiserBoat class)
- Optimised imports (any other classes changed)
- A lot of canvas drawing and sail rotating issues were discovered and eventually overcome along the way. Using a sail image to draw and rotate on the existing canvas rather than a JavaFX shape on a new canvas was the final decision.
#story[1098]
2017-08-07 12:20:52 +12:00
hba56
9d9321522d
Linked the first fxml id tags from the fxml files for the new start up screens
...
#story[1087]
2017-07-24 12:36:45 +12:00
hba56
eda7d062ec
merged in the changes from the master branch so that latter mergers can run smoothly
...
#story[1087]
2017-07-24 12:12:12 +12:00
Jessica Syder
Jessica Syder
David Wu
hba56