236 Commits (2e9c6fe5936fa7b3bda120366136b56435470ebb)

Author SHA1 Message Date
David Wu 9159e16a21 Set up controller classes for lobby and host. Made changes to TitleController and MainController. Title screen can now enter lobby and host.
9 years ago
Connor Taylor-Brown 7e3e865563 Host starts with button in ConnectionController
9 years ago
hba56 684611a52c added a background to the water so it is not just white
9 years ago
Connor Taylor-Brown a27c16d413 Merge remote-tracking branch 'remotes/origin/Game_Controller' into cbt-multi-controller
9 years ago
hba56 913946265d Merge branch 'css' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into css
9 years ago
hba56 afadabfecc small fix for the sparkline so that it goes from 1 to 6 rather than 0 to 7 for a 6 boat race
9 years ago
Fan-Wu Yang eec0cb3493 Added fairness to mockOuput list so the index will correspond to the player in order that they entered the hosted game, #story[1010]
9 years ago
Jessica McAuslin 4ba9c6b774 Added a pretty title screen to the application.
9 years ago
Fan-Wu Yang cfd858194e Removed Unecessary Print Messages
9 years ago
Fan-Wu Yang 9f99e21232 Added functionality for more than one visualiser to connect to the mock.
9 years ago
hba56 9d9321522d Linked the first fxml id tags from the fxml files for the new start up screens
9 years ago
hba56 eda7d062ec merged in the changes from the master branch so that latter mergers can run smoothly
9 years ago
hba56 595e1a8727 Merge remote-tracking branch 'remotes/origin/master' into css
9 years ago
hba56 1ebbb8d4c7 merged in the changes from the master branch so that latter mergers can run smoothly
9 years ago
hba56 738a765a0a Merge remote-tracking branch 'remotes/origin/master' into Game_Controller
9 years ago
fjc40 0598724117 Added two more missing javadocs.
9 years ago
hba56 956ad1f59b merged in the changes from the sprint5_refactor branch
9 years ago
hba56 0d5bede349 java doc fixes to fix the ci build problems
9 years ago
hba56 08f74f608f trying to see if ci works while logged in to the ienabler when ssh
9 years ago
fjc40 38f3fe16a0 Revert "Added travis_wait to test CI build order."
9 years ago
fjc40 350ec41beb Added travis_wait to test CI build order.
9 years ago
fjc40 5cddaaed8e mock.app.App now tells mock.app.Event that the xml file strings are XMLFileType.Contents.
9 years ago
fjc40 4bcfc01ceb shared.dataInput:
9 years ago
fjc40 10e80bca05 Moved mock.app.App#readFile(...) to shared.dataInput.XMLReader#readXMLFileToString(...).
9 years ago
fjc40 d0c6b5f716 Moved mock.model and mock.dataInput tests into the racevisionGame.tests.mock package.
9 years ago
fjc40 3a85fad211 Currently, mock/pom.xml and visualiser/pom.xml build racevisionGame mock and visualiser.
9 years ago
fjc40 cab9bf9574 RaceClock no has run(), or is runnable, as it wasn't needed.
9 years ago
fjc40 7d3cf6ee80 I had accidentally broken the raceXML construction - fixed it.
9 years ago
fjc40 abbbf70146 Refactored Race, MockRace, and VisualiserRace to use RaceClock instead of keeping their own timers.
9 years ago
fjc40 f057ad58b7 LatestMessages can hold MarkRounding messages. It also holds XMLMessage for each message type.
9 years ago
fjc40 8e18ad62ca Added LatestMessages to network.Messages. This is an object that encapsulates the latest up to date set of race messages.
9 years ago
fjc40 3a0b81834f Refactored mock.Event to work with MockRace.
9 years ago
fjc40 8d36d89570 Refactored and moved RaceXMLReader to shared/dataInput.
9 years ago
fjc40 7f027c8cc5 Refactored and moved XMLReader, RaceDataSource, BoatXMLReader, BoatDataSource, RegattaXMLReader to shared/dataInput.
9 years ago
fjc40 d0d63ca236 Copied remaining files into appropriate package. These need to be refactored and put into the shared package.
9 years ago
fjc40 bbbb1f2eb0 Renamed sharedModel module to racevisionGame - this is intended to be our single module program.
9 years ago