17 Commits (9bc36ba544113c0731414108d5bdc92ee2c5343c)

Author SHA1 Message Date
Jessica Syder 9bc36ba544 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
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
Connor Taylor-Brown cf838f2072 Added View3D control for rendering 3D shapes under a PerspectiveCamera, which is not currently working.
8 years ago
David Wu 5234cdea66 Merge branch 'master' into new_issue#19
8 years ago
David Wu 03dd937713 Change fxml stuff. Added back to menu buttons.
8 years ago
David Wu c08bafa566 Fixed most of issue #19 with new master?
8 years ago
Joseph f60809bdd4 Merge branch 'master' into story_64_sails
8 years ago
fjc40 19984772c0 Merge branch 'master' into story_61
8 years ago
Jessica Syder 7c5670f8c2 Sails are displayed on first boat in a race. Optimised imports.
8 years ago
Fan-Wu Yang 442920f9f6 DOD, and added javadocs/fixed javadocs #story[1087]
9 years ago
David Wu 2b8b334486 Updated host to show the hosted address and port. Fixed css issue with lobby text field.
9 years ago
zwu18 53a01402e1 Check method moved to new class called ping so that refresh will be called on new thread.
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