53 Commits (31bb2897237f1250985bd49aad88308fb07d7cfc)

Author SHA1 Message Date
Fan-Wu Yang 2389aa361c Boats sails can luff and are now two piece. #story[1297]
8 years ago
hba56 fd120edaf9 Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
hba56 00780e17e9 Merge remote-tracking branch 'remotes/origin/temp77' into story77
8 years ago
hba56 aafc0dc9db Merge remote-tracking branch 'remotes/origin/temp77' into story77
8 years ago
hba56 70ccb4cf1c Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
Jessica Syder 9bc36ba544 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Jessica Syder c30391ef23 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
Jessica Syder 669a303e9b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
David Wu 28ec4b9246 Merge branch 'master' into story70
8 years ago
Jessica Syder 0dff85006a Changes to code to use new controller structure.
8 years ago
Jessica Syder a5050b8ea8 Adding back lost changes and finishing splitting last controllers.
8 years ago
Jessica Syder 9f3cc53a63 Finished Arrow, Title and StartController scene splitting
8 years ago
Jessica Syder addaaf0de3 Merge remote-tracking branch 'remotes/origin/master' into C_keybindings
8 years ago
Jessica Syder 85eb66d508 Keybindings can be saved and loaded, and work when Jar'd!
8 years ago
Jessica Syder cfa6fc37e0 User modified keybindings are persistently saved
8 years ago
David Wu 086206a623 Controls button in title screen now opens the key mapping menu. #story[1197]
8 years ago
Jessica Syder 2188ddc3a3 Fixed errors in making the keybinding replaceable.
8 years ago
Jessica Syder ad0e26e882 Created scene to view/update current key bindings.
8 years ago
David Wu 86f1a608e4 Created xml for tutorial that contains start and finish line. TODO: Add gate/mark. #story[1189]
8 years ago
David Wu 0621e1bdb1 Finished up lobby menu. Set split pane to not change size on resize. Disabled divider on split pane. Added quit button and start button (start only prints to terminal for now). Panes are now wrapped in an anchor pane to fix resizing issues. TODO: Will be working on making a nicer background animation.
8 years ago
David Wu 598275591f Updated javadoc.
8 years ago
David Wu 9f813ab7aa Merged in development.
8 years ago
David Wu 288979be3b Merge branch 'Development' into new_issue#19
8 years ago
David Wu 09eaf6d968 Merged master.
8 years ago
David Wu c08bafa566 Fixed most of issue #19 with new master?
8 years ago
David Wu fa5992bfb2 added App app to app.
8 years ago
David Wu 6bc81f566e Issue 19 changes.
8 years ago
zwu18 109b291973 Merged issue #20 fix and splash screen into development.
8 years ago
zwu18 4e8b7d3b5a Merge remote-tracking branch 'origin/master' into issue#20fix
8 years ago
fjc40 89b0aa8b77 Implemented MessageRouter.
8 years ago
zwu18 a31eb078a6 Created a splash screen for application.
8 years ago
fjc40 19984772c0 Merge branch 'master' into story_61
8 years ago
fjc40 7cc39abe57 WIP. Probably need to cherry pick stuff out of here.
8 years ago
fjc40 8ef906472b Renamed Heartbeat to HeartBeat.
8 years ago
David Wu f2932e8bae New branch created for development.
9 years ago
hba56 85347c169d You can now resize all windows other than the title screen
9 years ago
hba56 59058da09c textfields now show better colour that contrasts more
9 years ago
hba56 64b4aa539a added and option to swap between css files in the title pane
9 years ago
zwu18 243c450790 Merged with multi visualiser branch so now multiple visualisers can connect to the same host.
9 years ago
zwu18 88604df66d Merge branch 'cbt-multi-controller' into css
9 years ago
zwu18 9c9b98f882 Added functionality to host game and join a game in lobby. Host name and game name are not implemented yet.
9 years ago
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 a27c16d413 Merge remote-tracking branch 'remotes/origin/Game_Controller' into cbt-multi-controller
9 years ago
Jessica McAuslin 4ba9c6b774 Added a pretty title screen to the application.
9 years ago
Fan-Wu Yang 9f99e21232 Added functionality for more than one visualiser to connect to the mock.
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
hba56 956ad1f59b merged in the changes from the sprint5_refactor branch
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