447 Commits (55402136ede134cb8a9f6d1a38e6ae7d7b562667)

Author SHA1 Message Date
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
hba56 ec5bc9c6aa Wind now will occasionally back and veer (in some games, takes ~20min for full 180 degree rotation)
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
fjc40 d0eebcdb2f SourceIdAllocator now allocates from the BoatDataSource and RaceDataSource exposed by MockRace, instead of having its own source IDs. Can only allocate ids during PRESTART period.
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
fjc40 3176e76c8c MockRace:
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
Fan-Wu Yang 9a5d20bdf2 Added new polar function, currently it does not distinguish between up wind and downwind and doesn't find it in the correct quadrant #story[1186]
8 years ago
Jessica Syder 8250226bde Key bindings can be updated with any key.
8 years ago
Joseph 0de7780020 Changed wind speed to be non-linear. #story[1187]
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 e04f199fc7 Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D
8 years ago
Connor Taylor-Brown e7164d8a78 View3D perspective camera is now operational
8 years ago
Fan-Wu Yang 4910d2712c Changed STL Importers Version #story[1191]
8 years ago
David Wu 23d58dc809 Created UI option in the start menu to play a practice game. #story[1189]
8 years ago
Fan-Wu Yang 921e0999b8 Testing if dependency for stl works this time #story[1191]
8 years ago
Fan-Wu Yang 0927e62ea3 Changed dependency to see if it will pass the CI runner #story[1191]
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
Fan-Wu Yang 43ec179d79 Merge branch 'story86-3D' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story86-3D
8 years ago
Fan-Wu Yang ea41c64c34 Added dependency for stl converter #story[1191]
8 years ago
David Wu 7df181c759 Minor changes to new lobby fxml. #story[1188]
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
Joseph Gardner b0f7c5e734 Wind speed changes depending on where the wind direction is. #story[1187]
8 years ago
David Wu c63403d1de Created new lobby menu. Working on animated background for menu.
8 years ago
Joseph Gardner d0ba7b93e0 Wind oscillates, replaces random wind with shifting wind. #story[1187]
8 years ago
cbt24 1b1b0a4591 Added floating test cube in title screen initialiser
8 years ago
Joseph Gardner 0be5b731c3 Merge branch 'master' into wind_(story53)
8 years ago
Joseph Gardner 12e2ae9c01 Started implementing wind oscillation. #story[1187]
8 years ago
Joseph Gardner 64e96a1b8b Class for shifting wind. #story[1187]
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
fjc40 0d2be85d17 Brought over long/latitude fix from "rounding_line_visible_hack" branch.
8 years ago
hba56 b886cb426f guide line last leg fix
8 years ago
fjc40 666c7b029f Disabled map rotation - temp fix for the demo.
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
Joseph Gardner 5ba6f52669 fixed autovmg.
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
Joseph Gardner dcd1df2999 Merged master.
8 years ago
Joseph Gardner 014b78f166 Merge branch 'master' into story_64_sails
8 years ago
Fan-Wu Yang 83b0c0a6b4 Fixed issue using File from java.io.File which did not like maven
8 years ago
David Wu 9f813ab7aa Merged in development.
8 years ago
Joseph Gardner e26fb73627 Merged master.
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 09eaf6d968 Merged master.
8 years ago
Joseph Gardner 37fe7389ff Rounding marks works.
8 years ago
David Wu 5a188f0582 Merge branch 'master' into new_issue#19
8 years ago
Hamish Ball d2f9bfedcb Merge branch 'issue_18_track_alpha' into 'master'
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
fjc40 2656efcb4d Marks are a bit darker.
8 years ago
Fan-Wu Yang 2e9c6fe593 Merged most recent master in, #story[1092]
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
Joseph Gardner a50d460222 Merged master.
8 years ago
fjc40 0f58270c10 Merge branch 'master' into issue_18_track_alpha
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 fa5992bfb2 added App app to app.
8 years ago
fjc40 62f400b924 Trackpoint line color fades out.
8 years ago
David Wu 6bc81f566e Issue 19 changes.
8 years ago
Joseph Gardner a3fe57ed5a Removed print statement. #story[1092]
8 years ago
fjc40 fa26abe10c Minor tidy.
8 years ago
Joseph Gardner 4cf8846cda Map wind rotation works with multiplayer xml. #story[1092]
8 years ago
hwball 86d94ef27e javadoc fix
8 years ago
hwball df2b674b94 update scale for table displaying
8 years ago
Connor Taylor-Brown 4b3cc8e126 Created ack number generator for use by multiple services
8 years ago
Joseph Gardner 1e7ba8cd51 Merge branch 'master' into MapWindRotation
8 years ago
Joseph d7e0bfa86c Trackpoints are only shown for the player's boat. #story[1098]
8 years ago
Joseph 47fc55245c Merged master.
8 years ago
Joseph f60809bdd4 Merge branch 'master' into story_64_sails
8 years ago
zwu18 109b291973 Merged issue #20 fix and splash screen into development.
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
zwu18 8759ac070e Merge remote-tracking branch 'origin/splashScreen' into issue#20fix
8 years ago
Connor Taylor-Brown f8150ef449 Added YachtEvent message with encoder and decoder
8 years ago
hba56 ee0cc4b704 Merge branch 'issue#40' into Development
8 years ago
fjc40 114c18763b Reduced track point period to 1000ms.
8 years ago
fjc40 20055b1883 Removed redunant calls in VisualiserRaceState.initialiseBoats().
8 years ago
cbt24 f7d0e9d466 Boats bounce during collision if pointing into collision
8 years ago
cbt24 eaa0d2e82b Boats bounce away from marks.
8 years ago
cbt24 8113867576 Bubbles collision events to RaceLogic
8 years ago
fjc40 f1e41d5d8f Merge branch 'master' into issue_18_trackpoint
8 years ago
cbt24 79f3c41d45 Moved generic ray casting to Collider abstract class
8 years ago
cbt24 8498701091 Removed commented-out file from master
8 years ago
cbt24 f44929f376 Spun off Locatable interface to make collision code more reusable
8 years ago
cbt24 ce14e93404 Removed CI-breaking docstring
8 years ago
cbt24 f0d750cae1 Merge remote-tracking branch 'remotes/origin/master' into story66-collision
8 years ago
cbt24 d63641c1e2 Cherry-picked multiple changes from master
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
Fan-Wu Yang 9f7c5d8c0c Fixed other javadocs that were causing the build to fail #story[1092]
8 years ago
Fan-Wu Yang 8d87da6206 fixed java doc issues on my side #story[1092]
8 years ago
fjc40 bcb6b79f8d Fixed player boat not being highlighted.
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 a4755ed88b Maybe fixed updating boat list on FX thread.
8 years ago
Fan-Wu Yang a4e1dfb3d7 Fixed import that was messing up the build #story[1092]
8 years ago
fjc40 0483859c40 Fixed sparkline y axis labelling. Reverted it to how it previously worked (negative data values instead of negative scale).
8 years ago
fjc40 9ab12a9c58 MockBoat: Removed redundant isAutoVMG() function.
8 years ago
fjc40 dc4610d6eb Fixed sparkline not updating.
8 years ago
fjc40 5ae8393126 Fixed null pointer exception when a boat finishes the race.
8 years ago
fjc40 3a0bd10a57 Merge remote-tracking branch 'origin/master' into story_61
8 years ago
fjc40 c9875f3987 RaceLogic no longer uses AnimationTimer for its main loop (since that ran in javafx thread).
8 years ago
cbt24 9ca50aa66c Ray casting now only supports distance specification.
8 years ago
cbt24 7d64a43350 Allow collision checking to provide collision parameters to ray casting method
8 years ago
cbt24 2fbb96afd7 Created ray casting methods for MockBoat and CompoundMark
8 years ago
cbt24 da52082d70 Deleted duplicate method (again -.-)
8 years ago
Connor Taylor-Brown 847cd1251e Merge remote-tracking branch 'remotes/origin/master' into CommandFactory
8 years ago
Connor Taylor-Brown b97bfe62a6 Fixed documentation bugs not relevant to story.
8 years ago
fjc40 5a03d97713 Added comment.
8 years ago
fjc40 b07c30704a The trackpoint line is now a line (poly-line) instead of a sequence of circles. A point along the poly-line is added every 250ms.
8 years ago
Joseph Gardner 7d4f1cd925 Fixed first key press not working. #story[1098]
8 years ago
hba56 1bdf80417d javadoc
8 years ago
Jessica Syder 0558629dc6 Added luffing sails image.
8 years ago
Fan-Wu Yang a5b21799d3 Fixed java doc issue #story[1092]
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 175fb11178 Javadoc fixes.
8 years ago
fjc40 7366aba5ec Added empty data sources, to be used by VisualiserRace.
8 years ago
Fan-Wu Yang 70d5447e88 Moving stuff from school pc to home
8 years ago
Fan-Wu Yang 8999cddf8b Pre merge commit
8 years ago
hba56 dc9317fe2e remove system.out statments
8 years ago
hba56 67bb7b81dc Merge remote-tracking branch 'origin/story68' into story68
8 years ago
hba56 0d786f381b fix for boats finishing the race
8 years ago
hba56 2acc36225e Fix for placement of invis gates and checks that boats pass through these gates
8 years ago
Jessica Syder 8b1561cdc7 Fixed nullpointer when boat passes finish line.
8 years ago
Fan-Wu Yang 820898d92c pushed work from school computer to do at home
8 years ago
hba56 f90648e4ce Fixing a silly mistake where starboard side rounding checks for a port side rounding (Thank goodness for documenting manual tests)
8 years ago
Fan-Wu Yang 7c6f0931ba Transferring files from my laptop to desktop to work on, may be broken.
8 years ago