68 Commits (970f0d0116f799bf456859339cc99736c92bef12)

Author	SHA1	Message	Date
Erika Savell	970f0d0116	Fixed race scaling ... - Races were completed far too quickly because a set SLEEPTIME was used as the time elapsed, instead of the actual break time #story[16]	9 years ago
Erika Savell	fb409af23b	Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2	9 years ago
Erika Savell	495158a621	Amended and added tests to cope with marker change ... #test #story[20]	9 years ago
Fan-Wu Yang	6ffe3d02a3	Fixed and merged heading-visualisation ... - Fixed the boats not appearing at the starting line. - Merged with master #story[24]	9 years ago
Fan-Wu Yang	edd9c2a48d	Merge remote-tracking branch 'origin/heading-visualisation' ... # Conflicts: # src/main/java/seng302/Controllers/RaceController.java # src/main/java/seng302/Model/Boat.java # src/main/java/seng302/Model/Race.java # src/main/java/seng302/Model/ResizableRaceCanvas.java # src/main/resources/scenes/racepane.fxml	9 years ago
cbt24	1524ed5a0e	Merged annotation toggle and DNF features with heading visualisation.	9 years ago
cbt24	98be99a975	Merge remote-tracking branch 'origin/master'	9 years ago
Erika Savell	eb4c02557d	Changing xml reader to take both coordinates of a marker ... - Have commented out tests for now because a lot of rearranging and fixing needed #story[20]	9 years ago
cbt24	99cb4bd526	Implemented DNF with random chance in Race ... #story [17]	9 years ago
David Wu	d2de426f58	Fixed so the animation timer will exit when all boats finish the race ... -Moved listeners for annotation to initialize -Fixed compass arrow not rescaling properly with canvas -Fixed scaling issue with race clock	9 years ago
Erika Savell	d1d46f2cf5	Created Marker class ... - Holds the start and end coordinate of a gate or marker, and has a method to calculate the middle point - Each leg will hold a start Marker and end Marker #story[20]	9 years ago
Erika Savell	45fcd22cc5	Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2	9 years ago
David Wu	33b94cdf5b	Changed implementation for Anno(annotations) ... -drawRaceMap is now called for annotation to update map #story[23]	9 years ago
Erika Savell	2d2f4692a9	Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2	9 years ago
Erika Savell	bb6b881392	Adding end coords to get test running gain ... #story[20]	9 years ago
Erika Savell	176b644aaf	Created boat initialise method to run through boats setting correct start position ... - Running funny, try pulling changes from master #story[20]	9 years ago
Erika Savell	d15cd2b881	Wrote method to calculate spread positions across start line ... - Also began work to make sure it is called. Requires refactoring - WIP, this porgramme shouldn't run atm #story[20]	9 years ago
David Wu	24dec0bb2f	Fixed participating boats not outputting correctly ... -toString method in Boat class now uses getValue	9 years ago
David Wu	073bcaa4a3	Added checkbox to change visibility of annotation to GUI ... -Checkbox is used to toggle the text displayed beside boats -Race Clock is now scaled using the scale factor #story [23]	9 years ago
David Wu	f8dff6359d	Merge branch 'story9' ... # Conflicts: # src/main/java/seng302/Controllers/RaceController.java # src/main/java/seng302/Model/Race.java # src/main/java/seng302/Model/ResizableRaceCanvas.java # src/main/resources/scenes/racepane.fxml	9 years ago
Erika Savell	306e98172b	Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into heading-visualisation	9 years ago
Erika Savell	bd86690e85	Filled in javadoc, optimised imports, rearranged code ... #refactor #story[16]	9 years ago
Erika Savell	f5ba7c95c8	Fixing merge and resulting failing tests ... #fix #story[16]	9 years ago
Erika Savell	e923fe671b	Changed race clock to display negative time before race ... #story[16] #implement	9 years ago
Erika Savell	d23a80841a	Tests for race clock being scaled correctly added ... #story[16] #test	9 years ago
David Wu	f8147be4df	Merge remote-tracking branch 'origin/story9' into story9 ... # Conflicts: # src/main/java/seng302/Constants.java # src/main/java/seng302/Model/Race.java # src/main/java/seng302/Model/ResizableRaceCanvas.java	9 years ago
David Wu	af45be1147	Implemented Animation Timer, FPS counter and modified display boat names and speed ... -Race now uses Animation Timer to simulate the race in Race class -FPS counter displayed in bottom left corner. TODO: Toggle fps view -Boat names and speed will now reposition so it is not blocked by the border of the canvas #story [18, 20]	9 years ago
Erika Savell	944da81946	Test that boat velocities are being scaled correctly added ... #story[16] #implement	9 years ago
Erika Savell	4c7295998b	Added scaler variable to mulitply the race clock and the boats' velocities by ... - Races take roughly 15 mins realtime with a slowest boat of ~20 knots. Therefore scale by 3 for a 5 min race, and 15 for a 1 min race #story[16] #implement	9 years ago
Erika Savell	4c82a4594e	Added a small test for the timer function ... -More needed once scaling is in effect #test #story[16]	9 years ago
Erika Savell	1c6bed7f37	Tests for the Race class added ... -Mostly to do with checking positions and updating correctly #test #story 9	9 years ago
Erika Savell	74a9b1499c	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
Erika Savell	0387bdc597	Tests for genreating new coordinate added ... #test #story[9]	9 years ago
Connor Taylor-Brown	26f7b94e13	Fixed finish order ... - Added test to check order is determined by velocity - Modified Race class to allow for unit testing #story[15]	9 years ago
cbt24	c8fcada427	Fixed sort order for boats in race ... - Sort boats by leg number (preserves order when boats enter shared leg) #story [19]	9 years ago
Fan-Wu Yang	419fa8e9fe	Fixed merge conflicts ... - Fixed Merge conflicts with boats #merge	9 years ago
David Wu	b5496b07de	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
David Wu	98c5c46569	Implemented displayText to display boat name and speed with mark ... -method takes in boat name, boat speed and coordinates #story [18, 19]	9 years ago
Erika Savell	7778e7d2b1	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
Erika Savell	a9601eb760	Switched latitude/longitude around ... We were using latitude on the x plane and longitude on the y plane #story[9] #fix	9 years ago
Fan-Wu Yang	15fd24203d	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
Fan-Wu Yang	d97802e06c	Refactored the refreshTable into propeties that listen. ... - Added currentLegName as a String Property - Refactored Name of the Boat as a StringProperty #story[15]	9 years ago
David Wu	c33ce60e71	Changed labels for timer ... -preRace countdown now has text saying "Time until race starts:" -Timer during race now says "Race clock:" #story [16]	9 years ago
David Wu	1842b8f0b2	Merge remote-tracking branch 'origin/story9' into story9 ... # Conflicts: # src/main/java/seng302/Model/Race.java	9 years ago
David Wu	946b9d0a72	Implement countdown clock ... -Added method countdownTimer() that countdowns from the current time to an selected time -Method is called in run (in Race) before the simulatedRace -Private integer PRERACE_TIME is used to set time before the race begins #story [16]	9 years ago
Fan-Wu Yang	12a9205ded	Implemented Table Refresh Function ... - Made refreshTable() in RaceController that refresh the boatInfoTable - Made checkPosition() in Race call controller.refreshTable() - Result is that the table now updates #story [15]	9 years ago
Erika Savell	3afa13d24b	Merge branch 'story9' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story9	9 years ago
Erika Savell	66445a91a1	Loaded official AC35 competitors ... - Competitors pulled from americascup.com - Added to a list of boats in Constants class, and this list is read by RaceController #story[9] #implement	9 years ago
David Wu	e04fdc79c9	Merge remote-tracking branch 'origin/story9' into story9 ... # Conflicts: # .idea/compiler.xml # .idea/misc.xml	9 years ago
David Wu	ca966e6c7b	Implement race clock ... -Added label to fxml racepane.fxml -Added calcTime method to calculate time elapsed -Added updateTime method in Race to update label text -Added setTimer in RaceController to update label text #story [16] #pair [fwy13, zwu18]	9 years ago