48 Commits (33017984115299d642efa43534d761f094d04062)

Author SHA1 Message Date
hba56 e3ddb272c0 Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
David Wu b976186c7d Merged current master in. Made changes to classes so tutorial again due to merge. #story[1189]
8 years ago
David Wu c97706d86e Merge branch 'master' into story70
8 years ago
David Wu d2d5ae62eb Tutorial states implemented and working. Game currently prints to terminal the "tutorial text". Next step is to create display on application for these text. Game ends when tutorial ends. Fixed game not loading xml issue. #story[1189]
8 years ago
David Wu 28ec4b9246 Merge branch 'master' into story70
8 years ago
hba56 4780354452 Errors in this commit: mock threads get interrupted
8 years ago
Joseph Gardner d2c8ccd98e Course image for a type M2 course has been made. #story[1193]
8 years ago
Joseph Gardner 3157ac88b5 Course layout for a type M2 course has been made. #story[1193]
8 years ago
Connor Taylor-Brown 23eabed3ff View3D tracks selected boat at fixed distance, pitch, and relative yaw
8 years ago
David Wu 002cccd5a0 Reworked iMapLayout as race would either take too long or too short. Added temporary image for iMapLayout. Will be reworked when I have time. #story[1193]
8 years ago
hba56 4ec2a50d20 Image Scales
8 years ago
Connor Taylor-Brown d89186d8bf Finished playable 3D race with first person camera
8 years ago
hba56 4eac3ea8b5 Updated the HostGame now has images for the maps and the map can be picked
8 years ago
hba56 8287fbf6ba Updated the HostGame window to support maps
8 years ago
Connor Taylor-Brown 0ee448e17d Created wrapper for controlling the position and heading of rendered 3D models.
8 years ago
fjc40 e3cbb6d482 Start game button actually starts the game.
8 years ago
David Wu ea029baf22 Tutorial option in title screen will now created a game with tutorial xmls. Host game will now created a game with the race xml instead of tutorial xml as well. Made changes to tutorial label in title. #story[1189]
8 years ago
hba56 d1c0797db7 hosting a game now continues to send out the info of the race
8 years ago
Connor Taylor-Brown 3cc806dc45 Returned rotation to boat in lobby
8 years ago
Connor Taylor-Brown fb7bf572d8 Changed View3D add-remove interface to an ObservableList
8 years ago
Connor Taylor-Brown c2fd5c9bae Changed box to boat mesh
8 years ago
hba56 83f756d7d8 packets can now be sent from client to match server
8 years ago
Connor Taylor-Brown bb7eb7cb44 Added adapter interface for PerspectiveCamera frustum and transformations in View3D.
8 years ago
Connor Taylor-Brown e7164d8a78 View3D perspective camera is now operational
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 892320db5f Added javadoc and extra files to push
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 c63403d1de Created new lobby menu. Working on animated background for menu.
8 years ago
fjc40 a9fde95b39 Updated maven version to 2.0.
8 years ago
David Wu 5234cdea66 Merge branch 'master' into new_issue#19
8 years ago
David Wu f1ef75fb81 Merge branch 'master' into new_issue#19
8 years ago
David Wu 03dd937713 Change fxml stuff. Added back to menu buttons.
8 years ago
Joseph Gardner d41e52766b Merge branch 'master' into story_64_sails
8 years ago
David Wu c08bafa566 Fixed most of issue #19 with new master?
8 years ago
David Wu 6bc81f566e Issue 19 changes.
8 years ago
Joseph Gardner 1e7ba8cd51 Merge branch 'master' into MapWindRotation
8 years ago
Joseph f60809bdd4 Merge branch 'master' into story_64_sails
8 years ago
fjc40 5ae8393126 Fixed null pointer exception when a boat finishes the race.
8 years ago
Fan-Wu Yang b5e414f97a Made all the model classes extend off the schema xml classes for race, and made xml builder, validator and reader utility class.
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
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
David Wu 90f9ec2b98 Changed host menu. Will update soon.
9 years ago
zwu18 243c450790 Merged with multi visualiser branch so now multiple visualisers can connect to the same host.
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