244 Commits (963c8a43ada1f130b40f16eff6bbd1bd948d5292)

Author SHA1 Message Date
Connor Taylor-Brown 963c8a43ad Boats and marks are sized realistically in 3rd person
8 years ago
Joseph Gardner bcc827b554 Added lights and managed to get the orientation of one of the skybox walls correct. #story[1261]
8 years ago
Joseph 7a8ea7fea7 Made seasurface overlay to enable skybox to be smaller. #story[1261]
8 years ago
Joseph 49cd19e1a8 Made and textured a skybox, still needs to be fixed on two sides. #story[1261]
8 years ago
Joseph Gardner 0da6931f8f Have structure for skybox, still need to play around with it a bit more to make it fit. #story[1261]
8 years ago
Fan-Wu Yang ae75bb86d3 Resized models to a similar size of the collision detectors. #story[1261]
8 years ago
Fan-Wu Yang 08ca42f786 Wrote some missing java docs #story[1261]
8 years ago
Fan-Wu Yang 9ac9c25923 Made sea surface look like a sea surface which is randomly generated each time, size may need to be altered a bit else it will cause the program to slow #story[1261]
8 years ago
Fan-Wu Yang a7eefca13a Work in progress, the perlin noise is now generated, however, a good colour should be selected as well as using a subject3d instead of a imageview #story[1261]
8 years ago
Fan-Wu Yang e2b868d815 Added boundaries to the map, which are drawn by the race #story[1261]
8 years ago
cbt24 70f4a00d12 Scaled down marks and boats to make 3rd person view more realistic
8 years ago
cbt24 2508b847b8 Merge branch 'master' into storyD-3D
8 years ago
cbt24 643f145407 Added mark radius 3D annotation to improve bird's eye visibility
8 years ago
Connor Taylor-Brown 93883ee8b7 Added more descriptive documentation to new classes and functionality
8 years ago
Fan-Wu Yang e149255240 Tried to get multiple boats working but.... it's not #story[1196]
8 years ago
Fan-Wu Yang 5bc382304b Created and linked up bouy to race, and added keybindings to git ignore #story[1196]
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
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