217 Commits (63fbffdbc14e2823234561d05e6bc9bc2f08e81a)

Author SHA1 Message Date
Jessica Syder 14aaf26b73 Merge branch 'story40-zoom' into 'master'
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
hba56 5e516b0508 re added the standard race
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
Connor Taylor-Brown 0c9e55093c Set lobby anchor pane to invisible to allow races to start
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
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
hba56 d3ddff8bf1 host game start button added margins
8 years ago
zwu18 64ed1f9aa6 Improved map layout image. #story[1193]
8 years ago
Connor Taylor-Brown 54baf4f884 Added scroll-wheel zooming
8 years ago
Jessica Syder a2b3ba44c0 RaceController scene separating
8 years ago
Jessica Syder 9f3cc53a63 Finished Arrow, Title and StartController scene splitting
8 years ago
David Wu 55cfda33d0 Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76
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 e82c59a8a4 New css for the host game window
8 years ago
hba56 cbfcd3aa0d Images
8 years ago
Fan-Wu Yang 7024cac426 Rotated image of arrow direction #story[1187]
8 years ago
hba56 0886a60911 arrow Flip
8 years ago
hba56 4ec2a50d20 Image Scales
8 years ago
hba56 4eac3ea8b5 Updated the HostGame now has images for the maps and the map can be picked
8 years ago
hba56 9560486248 Merge branch 'Story_76' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into Story_76
8 years ago
David Wu b22c5c5cd6 Created xml for new course layout. Marks and such are all added. Need to set up boundary when I have time. #story[1193]
8 years ago
David Wu 8b5a5506e7 Boat collisions now play a sound when user collides and a quieter sound when others collide. #story[1195]
8 years ago
hba56 8287fbf6ba Updated the HostGame window to support maps
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
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 8c76d6c26e Added boats.xml schema.
8 years ago
fjc40 298fcd03dc Added regatta schema.
8 years ago
fjc40 ec58f0c847 Participants can now join during the warning period as well.
8 years ago
hba56 66699a4660 Added a draft for a new Course layout
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 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
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
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
David Wu 86f1a608e4 Created xml for tutorial that contains start and finish line. TODO: Add gate/mark. #story[1189]
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
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 c63403d1de Created new lobby menu. Working on animated background for menu.
8 years ago
fjc40 666c7b029f Disabled map rotation - temp fix for the demo.
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
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
Joseph Gardner 4cf8846cda Map wind rotation works with multiplayer xml. #story[1092]
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
zwu18 8759ac070e Merge remote-tracking branch 'origin/splashScreen' into issue#20fix
8 years ago
fjc40 114c18763b Reduced track point period to 1000ms.
8 years ago
hba56 fdd0b30a51 Added the ability to hide and show info table with a key press
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
fjc40 3a0bd10a57 Merge remote-tracking branch 'origin/master' into story_61
8 years ago
Jessica Syder 0558629dc6 Added luffing sails image.
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
Fan-Wu Yang 70d5447e88 Moving stuff from school pc to home
8 years ago
Fan-Wu Yang 8999cddf8b Pre merge commit
8 years ago
zwu18 a31eb078a6 Created a splash screen for application.
8 years ago
hba56 62e37489ee starboard rounding update
8 years ago
hba56 499a409d4f Merge branch 'master' into story68
8 years ago
fjc40 19984772c0 Merge branch 'master' into story_61
8 years ago
hba56 4da3734804 added the ability to toggle the race guide line on and off
8 years ago
Joseph Gardner 1302769a50 Merge branch 'Development' into story_64_sails
8 years ago
Joseph 41d09f587e Merge branch 'master' into story_64_sails
8 years ago
hba56 747c31b948 Merge remote-tracking branch 'remotes/origin/story68' into Development
8 years ago
Jessica Syder 7c5670f8c2 Sails are displayed on first boat in a race. Optimised imports.
8 years ago
hba56 950a801d16 rounding fix for the xml
8 years ago
fjc40 e4999a3c93 Added a light variant of the arrow image.
8 years ago
Fan-Wu Yang 4e8d4f2433 Created Schema for Race xml's and generated classes for reading xml with xjc, made the RaceXMLReader read Corner classes in as well as making a corner class #story[1092]
8 years ago
fjc40 9889a474ee Added ArrowController. This is the controller for arrow.fxml.
8 years ago
Jessica Syder 402df18b71 Merge remote-tracking branch 'remotes/origin/master' into css
9 years ago
hba56 92b8b7b77f moved the tm symbol
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 85347c169d You can now resize all windows other than the title screen
9 years ago
Joseph Gardner 6492ba89ab Merging main features into story 6. App now sends and receives key strokes. #story[1007, 1089]
9 years ago
hba56 59058da09c textfields now show better colour that contrasts more
9 years ago
hba56 7fafddcf50 updated text to be easily read on daymode
9 years ago
hba56 64b4aa539a added and option to swap between css files in the title pane
9 years ago
zwu18 243c450790 Merged with multi visualiser branch so now multiple visualisers can connect to the same host.
9 years ago
zwu18 88604df66d Merge branch 'cbt-multi-controller' into css
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 578f04c74f Merge branch 'css' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into css
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
Connor Taylor-Brown 7e3e865563 Host starts with button in ConnectionController
9 years ago
hba56 684611a52c added a background to the water so it is not just white
9 years ago
Jessica McAuslin 4ba9c6b774 Added a pretty title screen to the application.
9 years ago
hba56 9d9321522d Linked the first fxml id tags from the fxml files for the new start up screens
9 years ago
hba56 eda7d062ec merged in the changes from the master branch so that latter mergers can run smoothly
9 years ago
hba56 956ad1f59b merged in the changes from the sprint5_refactor branch
9 years ago
fjc40 4bcfc01ceb shared.dataInput:
9 years ago
fjc40 7d3cf6ee80 I had accidentally broken the raceXML construction - fixed it.
9 years ago
fjc40 abbbf70146 Refactored Race, MockRace, and VisualiserRace to use RaceClock instead of keeping their own timers.
9 years ago
fjc40 8d36d89570 Refactored and moved RaceXMLReader to shared/dataInput.
9 years ago