235 Commits (28ec4b92465c66ef78fe91e41abe9cb4c14fa599)

Author SHA1 Message Date
David Wu 28ec4b9246 Merge branch 'master' into story70
8 years ago
Connor Taylor-Brown 93883ee8b7 Added more descriptive documentation to new classes and functionality
8 years ago
Connor Taylor-Brown b034a452b6 Fixed problem with race pane registering non-control keys
8 years ago
Connor Taylor-Brown 68f434b6b6 Bound zooming action to zoom keys
8 years ago
Connor Taylor-Brown 1efec06bdc View3D can untrack objects and zoom in different modes
8 years ago
Connor Taylor-Brown 23eabed3ff View3D tracks selected boat at fixed distance, pitch, and relative yaw
8 years ago
Connor Taylor-Brown b59eca1a8b Added Subject3D selection to View3D
8 years ago
Connor Taylor-Brown 54baf4f884 Added scroll-wheel zooming
8 years ago
Fan-Wu Yang 7bad0e53ff The boat is now viewable in top down view (60 degrees for isometric) and the race is playable #story[1261]
8 years ago
Fan-Wu Yang 18a689b110 Changed a constant to be using the one in the constants file (prepartory start time) and temporarily made it so that the race can start in 3 seconds. #story[1261]
8 years ago
Connor Taylor-Brown e3e61e5b28 Merge remote-tracking branch 'remotes/origin/master' into storyD-3D
8 years ago
Fan-Wu Yang 5bb8ba44b8 Fixed Javadoc and also made some variables private #story[1187]
8 years ago
Fan-Wu Yang 2382585c15 Fixed Javadoc and also made some variables private #story[1187]
8 years ago
Connor Taylor-Brown d89186d8bf Finished playable 3D race with first person camera
8 years ago
hba56 6b9c041c6b Merge remote-tracking branch 'remotes/origin/master' into wind_(story53)
8 years ago
hba56 dbd4703e74 javadoc fix
8 years ago
cbt24 19f4d0fc06 Added marks back to the race view
8 years ago
cbt24 05a0614246 Boats now rotate correctly in position rather than about the origin
8 years ago
cbt24 3ecf203cba Recovered stable rotation of the player's boat
8 years ago
Connor Taylor-Brown c74cc26bf1 Merged with master and changed View3D default background
8 years ago
Connor Taylor-Brown b8c99be201 Merge branch 'master' into storyD-3D
8 years ago
cbt24 971a061499 View3D within RaceController now tracks boat heading
8 years ago
Jessica Syder 35c595adf8 Merge branches 'master' and 'storyD-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into storyD-3D
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
fjc40 dd1cb89b66 Merge remote-tracking branch 'origin/master' into 77_racexml_updates
8 years ago
Connor Taylor-Brown 0ee448e17d Created wrapper for controlling the position and heading of rendered 3D models.
8 years ago
Jessica Syder cfa6fc37e0 User modified keybindings are persistently saved
8 years ago
fjc40 e3cbb6d482 Start game button actually starts the game.
8 years ago
Jessica Syder 3fdfbd83e0 User can save, reset or cancel.
8 years ago
David Wu 086206a623 Controls button in title screen now opens the key mapping menu. #story[1197]
8 years ago
David Wu 65b960f725 Background of title now changes colour depending on day mode and night mode. Sun image also changes. This is so that the tutorial label is more visible during night mode. #story[1189]
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
fjc40 9156bde8af Moved XML message creation to RaceServer instead of ConnectionAcceptor.
8 years ago
Jessica Syder 716a99aac7 Reset to default button is now functional.
8 years ago
Jessica Syder 3e720a9e16 Modified key bindings can be saved to use in a race.
8 years ago
Jessica Syder 278fb65852 Pressing ESC cancels the selected command's key from being replaced
8 years ago
Jessica Syder ce47b0d813 When a new key is bound other commands bound to this key are removed
8 years ago
Jessica Syder 2188ddc3a3 Fixed errors in making the keybinding replaceable.
8 years ago
zwu18 c7af4f2eb7 Made changes to tutorial xmls. Linked button in title menu to start up a race on mouse click. Will need to make it so it starts the tutorial on click. #story[1189]
8 years ago
Jessica Syder 8250226bde Key bindings can be updated with any key.
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 b6e56d815c ResizableRaceCanvas no longer depends on VisualiserRaceEvent
8 years ago
Jessica Syder ad0e26e882 Created scene to view/update current key bindings.
8 years ago
Connor Taylor-Brown c2fd5c9bae Changed box to boat mesh
8 years ago
Connor Taylor-Brown cc66d63096 Removed unused shapes list from View3D
8 years ago
Connor Taylor-Brown bb7eb7cb44 Added adapter interface for PerspectiveCamera frustum and transformations in View3D.
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
Connor Taylor-Brown e7164d8a78 View3D perspective camera is now operational
8 years ago