fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
223 Commits 1 Branch 0 Tags
149c312080a432ee6ad224d79c7f6b2f2472e530
Commit Graph
223 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
fjc40 149c312080 Merge branch 'isolatingMock' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into isolatingMock 2017-04-21 13:38:01 +12:00
fjc40 9e1b3365bf Added helper functions to BoatLocationMessage which convert between the datatypes used by the message and datatypes used by our model. (Converts boat heading, wind angle, gps coordinate). 
#story[778]
 2017-04-21 13:19:49 +12:00
Erika Savell 33e3b3713c Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 13:10:45 +12:00
Erika Savell 97c5c9662b Wrapped race in an event which sends out starting xml files 
#story[778]
 2017-04-21 13:10:30 +12:00
fjc40 ef53dee7fe Changed device type constants to bytes. 
#fix #story[778]
 2017-04-21 12:56:00 +12:00
fjc40 421663c145 Added device type enumerations as static ints for BoatLocationMessage. 
#story[778]
 2017-04-21 12:54:48 +12:00
fjc40 1a085e881d Merge branch 'isolatingMock' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into isolatingMock 2017-04-21 12:26:34 +12:00
fjc40 8da67d1dbc Added class to encapsulate a BoatLocationMessage. 
#story[778]
 2017-04-21 12:25:57 +12:00
Erika Savell 231a1824d1 Condensed Race and ConstantVelocityRace into one class 
#story[778]
 2017-04-21 12:17:17 +12:00
Erika Savell 34c0aec0b9 Mock race runs without an fx component 
#story[778]
 2017-04-21 10:47:15 +12:00
Erika Savell 3326da4f5d Started removing fx component from mock module. 
- Stuck on animation timer not running

#story[778]
 2017-04-20 15:09:55 +12:00
Erika Savell a584400e24 Actually added sub modules this time 
#story[778]
 2017-04-20 11:16:19 +12:00
Erika Savell 669718d406 Cloned the main project into two submodules, mock and visualiser 
#story[778]
 2017-04-19 18:57:59 +12:00
cbt24 d12f70c8f8 Merge remote-tracking branch 'origin/story_30' into story_30 2017-04-19 18:08:35 +12:00
cbt24 0f22cf81ef Moved implementational details of generated races to ConstantVelocityRace. 
- Boat headings are now treated as a property, not a calculation
#story[758]
 2017-04-19 18:08:27 +12:00
Joseph Gardner 3321727999 Tests for RegattaXMLReader #Story[782] 2017-04-19 17:41:53 +12:00
Joseph Gardner b825790acd Moved package to correct spot 2017-04-19 17:24:00 +12:00
Joseph Gardner c40967f972 Added Regatta class and Regatta xml reader. This will be needed for the mock #Story[30] 2017-04-19 17:15:08 +12:00
Connor Taylor-Brown 316c0dda76 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
 2017-04-19 16:59:29 +12:00
Connor Taylor-Brown 764eb9089f Added race data source interface to abstract sources of race data. 
- Refactored controllers to send data source to consumers (Race, ResizeableRaceCanvas)

#story[782]
 2017-04-19 16:53:31 +12:00
David Wu 668758f6f8 Fixed boat path not being toggled when annotation is toggled. 
#story[759]
 2017-04-19 16:32:24 +12:00
Erika Savell 028cb33509 Fixing fxml problems 
#story[760]
 2017-04-19 13:52:00 +12:00
Erika Savell 374b31f5c0 Disabled scale buttons once one has been clicked 
#story[760]
 2017-04-19 13:41:33 +12:00
Erika Savell b1e55f8c7d Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story28 2017-04-19 13:40:40 +12:00
Erika Savell dc32868227 Created countdown clock on start screen. 
#story[760]
 2017-04-19 13:35:02 +12:00
Joseph Gardner fc15c3d151 Added annotation to toggle all boat paths on and off #Pair[jjg64, zwu18] #Story[759] 2017-04-19 13:09:45 +12:00
hba56 f5472bf595 Merge remote-tracking branch 'remotes/origin/master' into story28 
-anchors now fills stage
-added time label

# Conflicts:
#	pom.xml
#	src/main/java/seng302/Controllers/RaceController.java
#	src/main/resources/scenes/racepane.fxml

#pair[fwy13, hba56]
#story[761]
 2017-04-19 13:08:06 +12:00
hba56 edabe58b03 Merge remote-tracking branch 'remotes/origin/master' into story28 
-anchors now fills stage
-added time label

# Conflicts:
#	pom.xml
#	src/main/java/seng302/Controllers/RaceController.java
#	src/main/resources/scenes/racepane.fxml

#pair[fwy13, hba56]
#story[761]
 2017-04-19 12:48:03 +12:00
Joseph Gardner eb9fce1f22 Track scales with time scale #Pair[jjg64, zwu18] #Story[758] 2017-04-19 12:46:26 +12:00
cbt24 71535be143 Merge branch 'story_25' 2017-04-19 12:42:39 +12:00
cbt24 caf1e61391 Documented methods added for track handling. 
#story[758]
 2017-04-19 12:39:23 +12:00
Joseph Gardner af9d6769e5 Story 25 merged #Story[758] 2017-04-19 12:22:52 +12:00
Joseph Gardner b07e881edc Merge branch 'story_25' 
# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
#	src/main/java/seng302/Model/ResizableRaceCanvas.java
#	src/main/resources/scenes/racepane.fxml
 2017-04-19 12:12:12 +12:00
Joseph Gardner 2945c8446e Points now last whole race with a lower opacity #Story[25] 2017-04-19 11:59:09 +12:00
hba56 a00b066f8d Quick fix to zoneId to make it set correctly 
- removed local zoneId
#story[761]
#pair[fwy13, hba56]
 2017-04-19 11:55:11 +12:00
Fan-Wu Yang e501102bc5 Refactored the raceClock 
- created a class that hosts the raceClock
- refactored the raceController to use a raceClock.
#story[761]
 2017-04-19 02:45:08 +12:00
Joseph 56d51ceaa9 Track point is now removed after its expiry and fades after the boat has stopped Story [758] 2017-04-18 09:07:02 +12:00
Erika Savell 4e78ae2ae7 Fixed testing problem where race tests would sometimes fail because a boat did not finish 
- Added an option to set the dnf chance, then set it to 0 is all tests

#story[760]
 2017-04-17 15:41:23 +12:00
Erika Savell f25e2bac32 Changed countdown length to two minutes 2017-04-17 15:25:54 +12:00
Erika Savell 62d220f1fb Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story27 2017-04-17 15:08:04 +12:00
cbt24 2d74cdc5dc Fixed DNF position handling 
- DNF position is now "-"
- If boat DNFs during leg, other boats' rankings are updated to remain accurate
#story[15]
 2017-04-07 16:26:24 +12:00
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
zwu18 c31ea51068 Temporarily removed test for countdown timer as countdown timer now uses animation timer. 2017-04-07 03:42:16 +12:00
zwu18 57d30a7a02 Fixed countdown timer not scaling. 
-Countdown timer now also uses an animation timer
-Added scaling factor to countdown timer
 2017-04-06 20:48:17 +12:00
Jessica McAuslin 2bf264c6bb Populated starting boat table 
- boat names shown in first column
- boat abbrevs. shown in second column

#story[760]
 2017-04-06 19:29:57 +12:00
Erika Savell 8112918c13 Attempted to load details in, but ran into problems with the string property/vs string distinction 
#pair[jam330] #story[760]
 2017-04-06 17:17:06 +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