270 Commits (246d6bcc71c2febc630578e40ec0c2e96cd12f15)

Author SHA1 Message Date
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
David Wu c6594a0e20 Tutorial text now displays on screen when in tutorial. #story[1189]
8 years ago
David Wu 9a96131a33 Fixed issue where wind arrow, accordion, time, etc. were not being displayed. Fixed issue where zooming would crash when done outside of tutorial. #story[1189]
8 years ago
David Wu bad6422ca9 Implemented tutorial for zooming as it was left out from the last commit. Refactored updating tutorial state. #story[1189]
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
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
David Wu 28ec4b9246 Merge branch 'master' into story70
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
hba56 ddc3a6ae47 boxes in lobby are now boats
8 years ago
hba56 e5d8a4028d Merge remote-tracking branch 'remotes/origin/master' into story77
8 years ago
hba56 ea1594a839 Merge remote-tracking branch 'remotes/origin/master' into Story_76
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
Jessica Syder 1ed7ccf146 Minor changes preparing to merge in 3D
8 years ago
Connor Taylor-Brown 93883ee8b7 Added more descriptive documentation to new classes and functionality
8 years ago
Jessica Syder 0dff85006a Changes to code to use new controller structure.
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
Jessica Syder a5050b8ea8 Adding back lost changes and finishing splitting last controllers.
8 years ago
hba56 4c2ab9cc9a Merge branch 'master' into story77
8 years ago
Jessica Syder a5d3434a70 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
hba56 4780354452 Errors in this commit: mock threads get interrupted
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
Joseph Gardner d2c8ccd98e Course image for a type M2 course has been made. #story[1193]
8 years ago
hba56 63e2cc1fd0 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story77
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
Connor Taylor-Brown b59eca1a8b Added Subject3D selection to View3D
8 years ago
hba56 a494eb4a6d games are now added on the correct port
8 years ago
Connor Taylor-Brown 54baf4f884 Added scroll-wheel zooming
8 years ago
Jessica Syder a2b3ba44c0 RaceController scene separating
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
Jessica Syder 9f3cc53a63 Finished Arrow, Title and StartController scene splitting
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
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
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 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
Jessica Syder 4a0d04d7ab Created new abstract Controller class with load methods.
8 years ago
cbt24 971a061499 View3D within RaceController now tracks boat heading
8 years ago
Jessica Syder 1073113589 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into controllerSplit
8 years ago
hba56 8287fbf6ba Updated the HostGame window to support maps
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
fjc40 dd1cb89b66 Merge remote-tracking branch 'origin/master' into 77_racexml_updates
8 years ago
Joseph f8e1a539c2 Linked table to show games from received packets. #story[1188]
8 years ago
Connor Taylor-Brown 0ee448e17d Created wrapper for controlling the position and heading of rendered 3D models.
8 years ago
zwu18 cd685ae467 Added sound effect files for button clicks and mark rounding and linked them up to application. Collision audio is added too but not linked up. #story[1195]
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 c3be9665ac Added button press sounds for hosting a game, entering lobby list and entering host menu. #story[1195]
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
hba56 d1c0797db7 hosting a game now continues to send out the info of the race
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
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
David Wu 23d58dc809 Created UI option in the start menu to play a practice game. #story[1189]
8 years ago
David Wu 028428da2c Fixed fxml issues due to merge. Added pane centering for panes. #story[1188]
8 years ago
David Wu d2f0c1105a Merged 3d branch. Added 3d item to one of the player pane. #story[1188]
8 years ago
David Wu b724a814b1 Merge branch 'story86-3D' into story77_lobby
8 years ago
David Wu 88782182d7 Player panes and spectator list now call method on click. Will later be used for players to choose whether they want to play or spectate. #story[1188]
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
Connor Taylor-Brown d630788a14 Merge remote-tracking branch 'remotes/origin/story77_lobby' into story86-3D
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
cbt24 1b1b0a4591 Added floating test cube in title screen initialiser
8 years ago
fjc40 eb980c436e Wind arrow now points in the direction the wind is blowing, as per P.O feedback (again....).
8 years ago
fjc40 a9fde95b39 Updated maven version to 2.0.
8 years ago
David Wu 37095bfc6c Merged master into branch.
8 years ago
David Wu 5234cdea66 Merge branch 'master' into new_issue#19
8 years ago
David Wu 598275591f Updated javadoc.
8 years ago
David Wu 79add59375 Unresizable control screen.
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
David Wu 9f813ab7aa Merged in development.
8 years ago
David Wu 288979be3b Merge branch 'Development' into new_issue#19
8 years ago
Joseph Gardner d41e52766b Merge branch 'master' into story_64_sails
8 years ago
David Wu 5a188f0582 Merge branch 'master' into new_issue#19
8 years ago
Joseph Gardner 610aa96241 Merge branch 'MapWindRotation' into 'master'
8 years ago
Hamish Ball 2edb6b5249 Merge branch 'issue#40' into 'master'
8 years ago
David Wu c08bafa566 Fixed most of issue #19 with new master?
8 years ago
hba56 02ab0e8a00 added javadoc
8 years ago
hba56 3cf50c56f8 added a refresh for the info table so no new values are shown when the game is in full screen
8 years ago
Fan-Wu Yang 7546c65893 Merge branch 'master' into MapWindRotation
8 years ago
Joseph Gardner 20c9870fea Merge branch 'master' into story_64_sails
8 years ago
David Wu 6bc81f566e Issue 19 changes.
8 years ago
hwball df2b674b94 update scale for table displaying
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
zwu18 317582aae8 Merge branch 'issue#20fix' into Development
8 years ago
zwu18 4e8b7d3b5a Merge remote-tracking branch 'origin/master' into issue#20fix
8 years ago
hba56 ee0cc4b704 Merge branch 'issue#40' into Development
8 years ago
cbt24 f44929f376 Spun off Locatable interface to make collision code more reusable
8 years ago
hba56 fdd0b30a51 Added the ability to hide and show info table with a key press
8 years ago
fjc40 85e703cba5 RaceController/info table now makes a copy of the boat list, to avoid race conditions.
8 years ago
zwu18 5e0bcd2af5 Added control menu to title screen. Pressing control button will open a pop-up window showing game controls.
8 years ago
fjc40 5ae8393126 Fixed null pointer exception when a boat finishes the race.
8 years ago
Joseph Gardner 7d4f1cd925 Fixed first key press not working. #story[1098]
8 years ago
Fan-Wu Yang ac42c07c69 Merge branch 'master' into MapWindRotation
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 7366aba5ec Added empty data sources, to be used by VisualiserRace.
8 years ago
fjc40 89b0aa8b77 Implemented MessageRouter.
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
fjc40 e1905e9e36 javadoc fix.
8 years ago
fjc40 9889a474ee Added ArrowController. This is the controller for arrow.fxml.
8 years ago
Fan-Wu Yang 442920f9f6 DOD, and added javadocs/fixed javadocs #story[1087]
9 years ago
Jessica Syder 9eaf24e699 Fixed title screen having whitespace on different screen resolutions.
9 years ago
Jessica Syder 402df18b71 Merge remote-tracking branch 'remotes/origin/master' into css
9 years ago
fjc40 1b5926007c Visualiser ConnectionController:
9 years ago
fjc40 f91f7055de Visualiser RaceController:
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
hba56 f4eb03e79e Merge remote-tracking branch 'origin/css' into css
9 years ago
hba56 85347c169d You can now resize all windows other than the title screen
9 years ago
David Wu 28e6709890 Merge remote-tracking branch 'origin/css' into css
9 years ago
David Wu 90f9ec2b98 Changed host menu. Will update soon.
9 years ago
hba56 64b4aa539a added and option to swap between css files in the title pane
9 years ago
Connor Taylor-Brown e670ded66d ControllerClient can retrieve valid protocol code from each key press
9 years ago
Connor Taylor-Brown 86e8cb7560 Refactored KeyFactory to ensure single instance of each key state handler.
9 years ago
Connor Taylor-Brown cc264f318e Added ControllerClient and ControllerServer
9 years ago