David Wu 5234cdea66 Merge branch 'master' into new_issue#19 ...

# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java

2017-08-17 17:00:39 +12:00

..

arrow.fxml

Sails are displayed on first boat in a race. Optimised imports.

2017-08-07 12:20:52 +12:00

connect.fxml

Merge branch 'master' into story_61

2017-08-10 23:49:21 +12:00

controls.fxml

Added control menu to title screen. Pressing control button will open a pop-up window showing game controls.

2017-08-15 21:26:23 +12:00

finish.fxml

I had accidentally broken the raceXML construction - fixed it.

2017-07-10 08:35:43 +12:00

hostgame.fxml

Merge branch 'master' into new_issue#19

2017-08-17 17:00:39 +12:00

lobby.fxml

Change fxml stuff. Added back to menu buttons.

2017-08-17 16:33:52 +12:00

main.fxml

Sails are displayed on first boat in a race. Optimised imports.

2017-08-07 12:20:52 +12:00

race.fxml

Added the ability to hide and show info table with a key press

2017-08-16 02:04:07 +12:00

start.fxml

I had accidentally broken the raceXML construction - fixed it.

2017-07-10 08:35:43 +12:00

title.fxml

Sails are displayed on first boat in a race. Optimised imports.

2017-08-07 12:20:52 +12:00

titleScreen.fxml

Merge branch 'master' into new_issue#19

2017-08-17 17:00:39 +12:00