fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
168 Commits 1 Branch 0 Tags
680c6fb9917cca4770132b53d59287e3d89d6181
Commit Graph
168 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
cbt24 680c6fb991 Increased minimum opacity so actual track from start is visible. 
- No longer removes points from track
#story[25]
 2017-04-07 15:18:57 +12:00
cbt24 375202e7a0 Fades boat opacity every frame during and after race. 
- Added TrackPoint with time added and expiry to calculate opacity each frame
- Modified drawTrackPoint to compute colour from TrackPoint alpha
- Removed getTrackPoint from BoatInRace
#pait[jjg64, cbt24]
 2017-04-07 14:20:20 +12:00
Joseph Gardner 63591ad1ec Added fixed opacity points of fading and modified race time to keep updating when the race is finished. Pair [jjg64, cbt24] Story [758] 2017-04-07 13:06:52 +12:00
cbt24 4eef872a60 Decoupled drawing and adding track points, added combobox selector for visible boats. 2017-04-07 12:26:43 +12:00
Joseph Gardner 101dadc003 Gave BoatInRace a track property that stores the coordinates of the track. Added a method in ResizableRaceCanvas that draws the points on the track every time the canvas updates. [Story 25] 2017-04-06 17:11:24 +12:00
Erika Savell 6866f65adf Ignoring failing test to check CI is working. 
- Test will be fixed as part of another stoy
 2017-04-06 13:53:21 +12:00
Erika Savell 94444e6662 Negligible change to check CI runner is working 2017-04-06 13:41:04 +12:00
Connor Taylor-Brown 8e70dfa2d5 Fixed boat position calculation 
- Decoupled 'place' column data from position in table
- Set position in race after first mark passed

#story[15]
 2017-04-06 13:19:31 +12:00
Fan-Wu Yang 795b411f08 Added some doc strings 
- Added doc strings to RaceXML
- Added a few minor changes to bermuda_AC35.xml
- Changes to the RaceXMLReader Unit Test
 2017-03-31 00:51:08 +13:00
Fan-Wu Yang c105c2d01e Fixed file paths so they work when it becomes an executable 
- Changed file paths for the FXML files
 2017-03-31 00:00:53 +13:00
Erika Savell ee72d85f6a removed print messages 
#story[20]
 2017-03-30 14:33:28 +13:00
Erika Savell ec9574fd9d Refactoring 
#story[24]
 2017-03-29 23:58:00 +13:00
Erika Savell e2f9a710aa Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 23:07:57 +13:00
Erika Savell fc1121b5b7 Removed extra < char from .mailmap 2017-03-29 23:07:42 +13:00
Erika Savell 6344e12d8f Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 23:06:24 +13:00
Erika Savell 9808c57ca7 GOat boats spread out at startline working 
#story[20]
 2017-03-29 23:06:16 +13:00
Erika Savell 9f71c99ecf Updated .mailmap 2017-03-29 23:05:36 +13:00
Erika Savell 0e7d210cea Amended wake tests to handle markers instead of direct coordinates 
#test
 2017-03-29 22:02:24 +13:00
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]
 2017-03-29 21:51:03 +13:00
Erika Savell fb409af23b Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 19:54:53 +13:00
Erika Savell 495158a621 Amended and added tests to cope with marker change 
#test #story[20]
 2017-03-29 19:47:49 +13:00
Fan-Wu Yang 305326881f Merged Boundaries branch 
- Merged Boundaries branch.
#story[22]
 2017-03-29 17:13:52 +13:00
Fan-Wu Yang 461d894ac8 Merge branch 'boundaries' 
# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
#	src/main/java/seng302/Model/ResizableRaceCanvas.java
#	src/main/resources/scenes/racepane.fxml
 2017-03-29 16:53:28 +13:00
Fan-Wu Yang 6ffe3d02a3 Fixed and merged heading-visualisation 
- Fixed the boats not appearing at the starting line.
- Merged with master
#story[24]
 2017-03-29 16:46:23 +13:00
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
 2017-03-29 14:36:24 +13:00
Fan-Wu Yang eb97bd6aef Implemented resizable map and boundary scaling. 
- Map can now be downsized
- The boundaries are auto margined and fit in the center of the canvas.
#implement
 2017-03-29 13:29:53 +13:00
cbt24 1524ed5a0e Merged annotation toggle and DNF features with heading visualisation. 2017-03-29 13:27:41 +13:00
David Wu 9960317732 Removed tooltip 2017-03-29 13:19:34 +13:00
David Wu 68fccc3216 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 2017-03-29 13:14:27 +13:00
David Wu 4ee6624ff6 Changed abbreviations for teams 
-Updated the team abbreviations to official ones
-Change methods that were public to private
 2017-03-29 13:14:19 +13:00
Erika Savell 40a6801477 Marker tests added 
#story[20]
 2017-03-29 12:37:53 +13:00
cbt24 98be99a975 Merge remote-tracking branch 'origin/master' 2017-03-29 12:13:20 +13:00
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]
 2017-03-29 12:08:40 +13:00
David Wu b943b38d61 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/seng302/Model/Boat.java
 2017-03-29 11:19:15 +13:00
cbt24 99cb4bd526 Implemented DNF with random chance in Race 
#story [17]
 2017-03-29 11:18:04 +13:00
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
 2017-03-29 11:16:57 +13:00
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]
 2017-03-29 11:16:37 +13:00
cbt24 6fe80ad52c Fixed speed displayed in table view 
#story [17]
 2017-03-29 10:46:18 +13:00
Erika Savell 45fcd22cc5 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-29 10:46:06 +13:00
David Wu f7477adb36 Added javadoc for new methods used for annotation and fps 
#story[23]
 2017-03-29 10:15:31 +13:00
David Wu 33b94cdf5b Changed implementation for Anno(annotations) 
-drawRaceMap is now called for annotation to update map

#story[23]
 2017-03-29 10:13:51 +13:00
Fan-Wu Yang 224c16a713 Implemented Map Boundaries in XML 
- RaceXMLReader will calculate the top left latitude and longitude and the bottom right latitude and longitude, and make the layout the map accordingly.
- The Boundaries are draw on the Race Canvas in Aqua.
#story[22]
 2017-03-29 03:18:47 +13:00
Erika Savell 2d2f4692a9 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into changeStartingPositions2 2017-03-28 14:42:22 +13:00
Erika Savell bb6b881392 Adding end coords to get test running gain 
#story[20]
 2017-03-28 14:38:08 +13:00
Connor Taylor-Brown cfbb27513d Fixed wake scale for realistic speeds. 
#story[21]
 2017-03-27 20:59:51 +13:00
Connor Taylor-Brown 3aaee1291d Implemented heading visualisation 
- Boats are represented as isosceles triangles
- Boats are rotated toward heading while in race
- As heading is only available in race, RaceController draws boats on start line and in race separately
#story [24]
 2017-03-27 20:51:20 +13:00
Fan-Wu Yang 879de9869b Implemented XML Reader 
-XMLReader class for generic XML Reading Created
- RaceXML Reader class made specifically for reading races
- RaceController COnstants now replced with XML file
#implement
 2017-03-27 02:09:59 +13:00
Erika Savell 176b644aaf Created boat initialise method to run through boats setting correct start position 
- Running funny, try pulling changes from master

#story[20]
 2017-03-26 20:56:26 +13:00
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]
 2017-03-26 20:28:20 +13:00
David Wu 24dec0bb2f Fixed participating boats not outputting correctly 
-toString method in Boat class now uses getValue
 2017-03-26 19:12:58 +13:00