647 Commits (49c08f5687f5678f6479c8371aab565a3c392567)

Author	SHA1	Message	Date
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 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/MainController.java	8 years ago
hba56	4780354452	Errors in this commit: mock threads get interrupted ... #story[#1188]	8 years ago
Connor Taylor-Brown	b034a452b6	Fixed problem with race pane registering non-control keys ... #story[1190]	8 years ago
Joseph Gardner	2868f921e2	Only one angular command can be active at a time. Only one velocity command can be active at a time. #story[1196]	8 years ago
Connor Taylor-Brown	68f434b6b6	Bound zooming action to zoom keys ... - View3D subject selection is no longer enabled by default - Added documentation #story[1190]	8 years ago
Joseph Gardner	df624a8437	Angular movement when auto vmg is pressed is smoothed. #story[1196]	8 years ago
Connor Taylor-Brown	1efec06bdc	View3D can untrack objects and zoom in different modes ... - updateDistance zooms between 0 and infinity - Camera switches from third person to bird's eye when reaching a set distance - Only one subject can be tracked at a time #story[1190]	8 years ago
Joseph Gardner	d2c8ccd98e	Course image for a type M2 course has been made. #story[1193]	8 years ago
fjc40	ec82e65ae7	Fixed javadocs in xml creation classes.	8 years ago
hba56	63e2cc1fd0	Merge remote-tracking branch 'remotes/origin/story77_lobby' into story77 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/HostController.java	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 ... #story[1190]	8 years ago
Connor Taylor-Brown	b59eca1a8b	Added Subject3D selection to View3D ... - Changed how View3D is added to canvasBase to allow events to get through #story[1190]	8 years ago
hba56	a494eb4a6d	games are now added on the correct port ... #story[1188]	8 years ago
hba56	d3ddff8bf1	host game start button added margins ... #story[1193]	8 years ago
zwu18	64ed1f9aa6	Improved map layout image. #story[1193]	8 years ago
Connor Taylor-Brown	54baf4f884	Added scroll-wheel zooming ... - Race pane listens to scroll delta and sets View3D distance accordingly - GPSConverter has more applicable property names for infinite 3D #story[1190]	8 years ago
Jessica Syder	a2b3ba44c0	RaceController scene separating ... - removed a lot of unecessary parameters - simplified set up functions - racecontroller works on its own now - made all the scenes visible by default #story[1261]	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 ... - scenes do not load in at the same time - scenes do not rely upon previous abstract controller class - scenes are not a part of previous main controller class - unecessary functions and code removed #story[1261]	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
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
hba56	e82c59a8a4	New css for the host game window ... #story[1193]	8 years ago
hba56	cbfcd3aa0d	Images ... #story[1193]	8 years ago
cbt24	8c7345a30d	Documented command classes ... #story[1196]	8 years ago
cbt24	a6db06a82c	Boats now reverse smoothly when colliding ... - Collision objects specify which boat is colliding - RaceLogic sets up an observable CollisionCommand when collision bubbles up - Boats now selectively identify observers of collision #story[1196]	8 years ago
cbt24	9cba3934ea	Sails command now applies acceleration to boat ... - Race only has control over speed while Sails command is not in action - This is governed by a default velocity property on the boat - Sails command returns control when sails are out and boat is up to speed - Speed never falls below 0 - Speed never goes above VMG velocity to prevent exploitation #story[1196]	8 years ago
cbt24	eba70ab2d4	Sails command now listens to race to check if goal velocity is met ... #story[1196]	8 years ago
cbt24	b62344261a	Merge remote-tracking branch 'remotes/origin/master' into storyB-)	8 years ago
cbt24	844b48a81a	Resolved issue #42 - "putting sails out changes boat bearing to face target gate" ... #story[1196]	8 years ago
Connor Taylor-Brown	e3e61e5b28	Merge remote-tracking branch 'remotes/origin/master' into storyD-3D	8 years ago
hba56	dfd3cb96f3	removed System.out.println	8 years ago
Fan-Wu Yang	ae1526c457	Merge branch 'master' into vmg_fix ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/MainController.java	8 years ago
Fan-Wu Yang	7024cac426	Rotated image of arrow direction #story[1187]	8 years ago
Fan-Wu Yang	8eee282977	Merge branch 'wind_(story53)' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into wind_(story53)	8 years ago
hba56	0886a60911	arrow Flip	8 years ago
hba56	86f495a551	javaDoc	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
Joseph Gardner	00cedf4d4d	TackGybeCommand now smooths the rotation of the boat. #story[1196]	8 years ago
hba56	4ec2a50d20	Image Scales ... #story[1193]	8 years ago
Connor Taylor-Brown	d89186d8bf	Finished playable 3D race with first person camera ... - Camera pivot must be manually updated - GPS coordinates are scaled by an arbitrary amount to make movement visible - Model has to be flipped 180 degrees to move forward #story[1261]	8 years ago
hba56	4eac3ea8b5	Updated the HostGame now has images for the maps and the map can be picked ... #story[1193]	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
hba56	6b9c041c6b	Merge remote-tracking branch 'remotes/origin/master' into wind_(story53) ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/MockRace.java	8 years ago
hba56	dbd4703e74	javadoc fix	8 years ago
Fan-Wu Yang	06517b7b47	Tidied up code ... - Removed prints from tests - Added Javadocs in necessary places - Reenabled boat status message to send - Added boat average angle - pulled out modulateAngle function - Commented harder to read loops - Disabled toggled VMG #story[1182]	8 years ago
Fan-Wu Yang	d602c1ec6f	VMG is now working and fixed, however, it feels a bit odd #story[1182]	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
Fan-Wu Yang	7331ad1a20	VMG now works however some little bug in the interpolation in some quadrant that is making the speed all the same in the quadrant #story[1182]	8 years ago
cbt24	19f4d0fc06	Added marks back to the race view ... #story[1261]	8 years ago
cbt24	05a0614246	Boats now rotate correctly in position rather than about the origin ... #story[1261]	8 years ago
cbt24	3ecf203cba	Recovered stable rotation of the player's boat ... - Uses AnimationTimer rather than listeners - Reduced pre-start time to speed up testing #story[1261]	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
Fan-Wu Yang	7aaa880f40	VMG now works with some edge cases issues #story[1182]	8 years ago
Joseph	f4cb1a3ac4	Made ObserverCommands and made racestate an observable. ObserverCommands observes the race passes in the params. #story[1196]	8 years ago
Connor Taylor-Brown	c74cc26bf1	Merged with master and changed View3D default background ... - Removed sparkline from RaceController #story[1261]	8 years ago
Connor Taylor-Brown	b8c99be201	Merge branch 'master' into storyD-3D ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/RaceController.java	8 years ago
Jessica Syder	4a0d04d7ab	Created new abstract Controller class with load methods. ... - loadScene method to load into current stage - loadPopupScene method to load into a new window - icon added to popup windows - load methods return Controller of the new scee - KeyBindingsController extends new Controller class and works correctly #story[1261]	8 years ago
cbt24	971a061499	View3D within RaceController now tracks boat heading ... - Race leaves lobby on Warning status for development - Latest subject added is used as camera pivot #story[1261]	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 ... #story[1193]	8 years ago
Fan-Wu Yang	71dcc8ee6c	Added POlar Linear Interpolation #story[1186]	8 years ago
David Wu	8c1eded926	Boat collision packets are now sent. Command class created for boat collision. Currently prints out message depending on if user crashed or someone else crashed. #story[1195]	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! ... - trying to solve jar file reading issue - learnt a lot about jars including their lack of file structure - changed location of keybindings settings to outside of jar - added new folder/file that is generated on first run #story[1197]	8 years ago
fjc40	361856ea1d	Updated timescale.	8 years ago
fjc40	dd1cb89b66	Merge remote-tracking branch 'origin/master' into 77_racexml_updates	8 years ago
Joseph	f1c07bca46	Linked table to show games from received packets. #story[1188]	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. ... - Updated View3D to use Subject3D wrappers instead of Shape3D - Fixed HostController for the new architecture - Made position and heading observable in VisualiserBoat - Attached listeners to each VisualiserBoat in RaceController #story[1261]	8 years ago
Connor Taylor-Brown	368bb8ddb3	Changed reporting plugin settings and specified central repository	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 ... - Works on windows computers - KeyFactory processes its own XML saving/loading - Does not work with Jar yet - Changed keyFactory to static temporarily to work with existing FXML loading architecture #story[1197]	8 years ago
fjc40	e3cbb6d482	Start game button actually starts the game.	8 years ago
fjc40	ac891fa91c	Fixed tests.	8 years ago
fjc40	16bf57e333	javadoc fixes.	8 years ago
fjc40	8c76d6c26e	Added boats.xml schema. ... RaceServer now creates an XMLMessage when the race's BoatDataSource changes. #story[1188]	8 years ago
fjc40	298fcd03dc	Added regatta schema. ... RaceServer now creates an XMLMessage when the race's RegattaDataSource changes. #story[1188]	8 years ago
fjc40	ec58f0c847	Participants can now join during the warning period as well. ... Added RaceDataSourceToXML. RaceServer now create an XMLMessage when the race's RaceDataSource changes. #story[1188]	8 years ago
Fan-Wu Yang	34cfe48df0	Got VMG quad detection working, however, the speeds are completley wrong. #story[1186]	8 years ago
David Wu	abf325e5ea	Passing a mark will now play a sound. Currently using placeholder sound so will ned to change. #story[1195]	8 years ago
hba56	66699a4660	Added a draft for a new Course layout ... #story[1193]	8 years ago
Jessica Syder	3fdfbd83e0	User can save, reset or cancel. ... - Created a notification popups for errors - Added functionality to save, cancel and reset buttons - Key bindings are only saved if they're valid - Added window close event - Can not exit without saving correctly - CSS to cancel, save and reset buttons to differentiate between key buttons - Javadocd #story[1197]	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
hba56	ec5bc9c6aa	Wind now will occasionally back and veer (in some games, takes ~20min for full 180 degree rotation) ... #story[1188]	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
hba56	5676d435b0	hosts now send info then wait rather than wait then send ... #story[1188]	8 years ago
fjc40	9156bde8af	Moved XML message creation to RaceServer instead of ConnectionAcceptor. ... RaceServer does not currently generate new XMLMessages - NYI. Added a sequence number to RaceDataSource - this is used to indicate that the data source has been modified. #story[1188]	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. ... RaceLogic now calls MockRace.initialiseBoats() after the prestart period has finished. MockRace create a VisualiserBoat when a source ID is allocated. MockOutput now sends updated XML messages during the race, instead of only at the start. #story[1188]	8 years ago
Jessica Syder	716a99aac7	Reset to default button is now functional. ... - keybindings are reset to built in default - the table is cleared and reloaded #story[1197]	8 years ago
Jessica Syder	3e720a9e16	Modified key bindings can be saved to use in a race. ... - new key bindings replace old new bindings on save - javadoc save method and small updates #story[1197]	8 years ago
Jessica Syder	278fb65852	Pressing ESC cancels the selected command's key from being replaced ... - focus is shifted away on esc - focus is shifted away after successful change #story[1197]	8 years ago
Jessica Syder	ce47b0d813	When a new key is bound other commands bound to this key are removed ... - On binding new key existing keys are searched - If key is in use the old one is removed - ControlKey is updated with a placeholder key value #story[1197]	8 years ago
Jessica Syder	2188ddc3a3	Fixed errors in making the keybinding replaceable. ... - Changed KeyFactory to not be a singleton - Simplified keyBindings initializer - Modified and simplified keyListener - Added method to copy existing keyState - Changed button events - Changed to newer lambda functions - Modified updateKey method - Left option for multiple keys bound to one command - Updated and wrote new JavaDoc #story[1197]	8 years ago
fjc40	3176e76c8c	MockRace: ... Now uses RaceState as its base class, rather than Race. This aligns it with VisualiserRace. RaceState contains the shared race state between the client and server, and stores most of its data in RaceDataSource etc..., instead of maintaining its own copy. Moved collider registry member to MockRace. XMLUtilities: Added documentation to two important functions, and updated them to use generics instead of Objects. #story[1188]	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
hba56	d1c0797db7	hosting a game now continues to send out the info of the race ... #story[1188]	8 years ago
Jessica Syder	8250226bde	Key bindings can be updated with any key. ... - Changed key press from FXML key event to a listener - UP, DOWN, ENTER keys now work - Keys no longer change cells or press buttons - Added placeholder buttons Cancel, Reset and Save - Added some JavaDoc #story[1197]	8 years ago
hba56	9161f69547	updating match table to store ip and port of clients and hosts ... #story[1188]	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 ... #story[1196]	8 years ago
Connor Taylor-Brown	fb7bf572d8	Changed View3D add-remove interface to an ObservableList ... #story[1196]	8 years ago
Connor Taylor-Brown	b6e56d815c	ResizableRaceCanvas no longer depends on VisualiserRaceEvent ... #story[1196]	8 years ago
Jessica Syder	ad0e26e882	Created scene to view/update current key bindings. ... - Current key bindings are shown on buttons - Added button action events to store the clicked button - Added key press event to entire pane - Button text is updated to display its key - Added functionality to keyFactory to update key bindings - CSS styling for some components #story[1197]	8 years ago
Connor Taylor-Brown	c2fd5c9bae	Changed box to boat mesh ... - Mesh needs to be rotated -90 degrees on X - STL file has been added to assets #story[1196]	8 years ago
hba56	960b1213fb	fix so that test pass ... #story[1188]	8 years ago
hba56	83f756d7d8	packets can now be sent from client to match server ... #story[1188]	8 years ago
Connor Taylor-Brown	cc66d63096	Removed unused shapes list from View3D ... #story[1196]	8 years ago
Connor Taylor-Brown	bb7eb7cb44	Added adapter interface for PerspectiveCamera frustum and transformations in View3D. ... - Tested interface while initialising HostController #story[1196]	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 ... #story[1196]	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
hba56	b2bd4fdc1c	network interface	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 ... # Conflicts: # racevisionGame/src/main/resources/visualiser/scenes/hostlobby.fxml	8 years ago
David Wu	d65ce1a897	Merge branch 'story77' 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. ... #story[1196]	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
hba56	ca0a3f2a8b	encoders and decoders for the hosted games request message with datatype and test ... #story[1188]	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
hba56	cb8e81a7b2	encoders and decoders for the host game message with datatype and test ... #story[1188]	8 years ago
cbt24	1b1b0a4591	Added floating test cube in title screen initialiser ... #story[1191]	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. ... Added a dedicatedServer module. Removed Visualiser module. Removed mock module. Removed network module. Fixed weird exception non-handling that appeared for some reason.	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. ... Set race to use 3 boat race.xml file.	8 years ago
David Wu	37095bfc6c	Merged master into branch.	8 years ago
David Wu	5234cdea66	Merge branch 'master' into new_issue#19 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/TitleController.java	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 ... # Conflicts: # racevisionGame/src/main/java/visualiser/Controllers/RaceController.java # racevisionGame/src/main/java/visualiser/app/App.java	8 years ago
Joseph Gardner	d41e52766b	Merge branch 'master' into story_64_sails ... # Conflicts: # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java # racevisionGame/src/main/java/visualiser/model/VisualiserBoat.java	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' ... Issue 18 track alpha This should resolve #18. Track point system is now a line, and updated more frequently. Line fades over time. The boat wake is also longer, and has a black dot at the end. See merge request !28	8 years ago
Joseph Gardner	610aa96241	Merge branch 'MapWindRotation' into 'master' ... Map wind rotation Note: we'd like to generate a realistic course layout, that can vary from race to race (but not within a race, for now.) The generated layout must be sent through the API in the format given by the race.xml section of the AC35 Streaming Data Interface Specification. The AC35 Protocol (sections 31.4 and 31.5) specifies the requirements for a course: * First leg of the course (from start line to first mark) must be a reaching leg * Next legs are windward/leeward, and boats complete either two or three laps of this section * Final leg to finish line may be a reaching leg * A boat should take around 25 minutes to complete the course in the wind conditions at the start of the race (AC35 protocol, section 31.5) You should assume that the windward/leeward marks and start/finish lines are always compounds of two marks. Acceptance criteria: * The layout must be sent over the API in a race.xml message, plus boat location messages for the marks as required, before any other boat location messages are sent. * Each mark must be defined using boat "SourceID"s (see definition of race.xml) so their positions can be adjusted later. * The course must meet the requirements given in the AC35 Protocol. * The course limits should be set to clear all marks by at least several boat-lengths. * The entire race area within the limits must be on the water. See merge request !22	8 years ago
Hamish Ball	2edb6b5249	Merge branch 'issue#40' into 'master' ... Issue#40 See merge request !30	8 years ago
David Wu	c08bafa566	Fixed most of issue #19 with new master?	8 years ago
fjc40	2656efcb4d	Marks are a bit darker. ... Wake no longer has circle at end.	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 ... # Conflicts: # racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java	8 years ago
Fan-Wu Yang	7546c65893	Merge branch 'master' into MapWindRotation ... # Conflicts: # racevisionGame/src/main/java/shared/model/CompoundMark.java # racevisionGame/src/main/java/shared/model/Mark.java	8 years ago
Joseph Gardner	20c9870fea	Merge branch 'master' into story_64_sails ... # Conflicts: # racevisionGame/src/main/java/shared/model/Boat.java # racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatLocationCommand.java	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 ... #story[1100]	8 years ago
Joseph Gardner	1e7ba8cd51	Merge branch 'master' into MapWindRotation ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java # racevisionGame/src/main/java/shared/dataInput/RaceXMLReader.java # racevisionGame/src/main/java/shared/model/CompoundMark.java # racevisionGame/src/main/java/shared/model/Mark.java # racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/app/VisualiserInput.java # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java # racevisionGame/src/main/java/visualiser/model/VisualiserRace.java	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 ... # Conflicts: # racevisionGame/src/main/java/mock/app/MockOutput.java # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java # racevisionGame/src/main/java/network/MessageDecoders/BoatActionDecoder.java # racevisionGame/src/main/java/network/MessageDecoders/BoatLocationDecoder.java # racevisionGame/src/main/java/visualiser/app/VisualiserInput.java # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java # racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java # racevisionGame/src/main/java/visualiser/model/VisualiserRace.java # racevisionGame/src/main/resources/visualiser/scenes/connect.fxml # racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml # racevisionGame/src/test/java/mock/model/MockRaceTest.java # racevisionGame/src/test/java/network/Utils/AC35UnitConverterTest.java # racevisionGame/src/test/java/network/XMLMessageEncoderTest.java	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 ... - Updated Encoder and Decoder factories for the new message type - Added an enum for handling yacht event types #story[1100]	8 years ago
hba56	ee0cc4b704	Merge branch 'issue#40' into Development	8 years ago
fjc40	114c18763b	Reduced track point period to 1000ms. ... issue #18	8 years ago
fjc40	20055b1883	Removed redunant calls in VisualiserRaceState.initialiseBoats(). ... Slightly refactored ResizableRaceCanvas - removed a redundant drawPoint() function, functions which alter the gc stroke call save/restore. Text is drawn black, at 20pts. The drawBoats() function: instead of drawing everything for each boat, one boat at a time, it draws the track points for all boats, then wake for all boats, etc..., to have better layering. issue #18	8 years ago
cbt24	f7d0e9d466	Boats bounce during collision if pointing into collision ... #story[1100]	8 years ago
cbt24	eaa0d2e82b	Boats bounce away from marks. ... - Changed onCollisionEnter signature to pass boat info #story[1100]	8 years ago
cbt24	8113867576	Bubbles collision events to RaceLogic ... - ColliderRegistry collects and forwards all Collision events - RaceLogic observes the ColliderRegistry of its single Race instance #story[1100]	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 ... - Boat is now collider - Collider subclasses specify their own collision ray and collision handler #story[1100]	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 ... #story[1100]	8 years ago
cbt24	ce14e93404	Removed CI-breaking docstring	8 years ago
cbt24	f0d750cae1	Merge remote-tracking branch 'remotes/origin/master' into story66-collision ... # Conflicts: # racevisionGame/src/main/java/mock/model/MockBoat.java # racevisionGame/src/main/java/mock/model/RaceLogic.java # racevisionGame/src/main/java/shared/model/CompoundMark.java # racevisionGame/src/main/java/shared/model/Race.java # racevisionGame/src/test/java/mock/model/MockBoatTest.java	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 ... -the wind arrow also scales with the new size of the screen	8 years ago
fjc40	85e703cba5	RaceController/info table now makes a copy of the boat list, to avoid race conditions. ... #story[1095]	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. ... #story[1095]	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). ... issue #32	8 years ago
fjc40	9ab12a9c58	MockBoat: Removed redundant isAutoVMG() function. ... TackGybeCommand now disables autoVMG. Removed print statements from VMGCommand.	8 years ago
fjc40	dc4610d6eb	Fixed sparkline not updating. ... #story[1095]	8 years ago
fjc40	5ae8393126	Fixed null pointer exception when a boat finishes the race. ... Boats now default to have position (0, 0). Added mark rounding data to single player race.xml	8 years ago
fjc40	3a0bd10a57	Merge remote-tracking branch 'origin/master' into story_61 ... # Conflicts: # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java # racevisionGame/src/main/java/visualiser/gameController/ControllerClient.java # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java # racevisionGame/src/main/resources/visualiser/scenes/race.fxml	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. ... #story[1100]	8 years ago
cbt24	7d64a43350	Allow collision checking to provide collision parameters to ray casting method ... - Added tests for MockBoat collision direction and distance #story[1100]	8 years ago
cbt24	2fbb96afd7	Created ray casting methods for MockBoat and CompoundMark ... - Added ColliderRegistry to Race - Added collision triggering to RaceLogic - Created basic collision handlers 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 ... # Conflicts: # racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java # racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java	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. ... issue #18	8 years ago
Joseph Gardner	7d4f1cd925	Fixed first key press not working. #story[1098]	8 years ago
hba56	1bdf80417d	javadoc ... #story[1087]	8 years ago
Jessica Syder	0558629dc6	Added luffing sails image. ... - Created transparent gif of luffing sail - Displayed image when sail is luffing - Repositioned luffing sail #story[1098]	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 ... # Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/mock/model/MockRace.java # racevisionGame/src/main/java/visualiser/app/VisualiserInput.java # racevisionGame/src/main/java/visualiser/model/VisualiserRace.java	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. ... #story[1092]	8 years ago
fjc40	175fb11178	Javadoc fixes. ... #story[1095]	8 years ago
fjc40	7366aba5ec	Added empty data sources, to be used by VisualiserRace. ... Created FrameRateTracker which can be used to track framerate. Updated RequestToJoinEnum and JoinAcceptanceEnum to match the agreed connection API. Added AssignPlayerBoat message, which is used internally on the client to assign the player a source ID once they have connected. Fixed some race conditions in the MessageRouter. Updated ConnectionAcceptor.CheckClientConnection to wait slightly longer before removing connection (there was a slight race condition before). Race no longer has a reference to LatestMessages. LatestMessages no longer has specific messages types in it. Created RaceState class, which contains the state that is shared between VisualiserRaceState and MockRaceState (currently only used on visualiser). Split VisualiserRace into VisualiserRaceState and VisualiserRaceService. Added the VisualiserRace commands (BoatLocatonCommand, RaceStatusCommand, etc...). Slightly increased the preferred width of race.fxml table columns. issues #27 #37 #35 #story[1095]	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 ... #story[1101]	8 years ago
hba56	67bb7b81dc	Merge remote-tracking branch 'origin/story68' into story68	8 years ago
hba56	0d786f381b	fix for boats finishing the race ... #story[1101]	8 years ago
hba56	2acc36225e	Fix for placement of invis gates and checks that boats pass through these gates ... -see wiki on rounding #story[1101]	8 years ago
Jessica Syder	8b1561cdc7	Fixed nullpointer when boat passes finish line. ... - Added a condition in calculateBearingToNextMethod to avoid nullpointer	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) ... #story[1101]	8 years ago
Fan-Wu Yang	7c6f0931ba	Transferring files from my laptop to desktop to work on, may be broken.	8 years ago