Erika Savell
|
5304f7df7d
|
removed problematic import
#story[778]
|
9 years ago |
|
Erika Savell
|
3ff2a07680
|
Temporarily ignored some tests in mock
#story[778]
|
9 years ago |
|
Erika Savell
|
a7913a16f9
|
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
|
9 years ago |
|
Erika Savell
|
9764f448eb
|
Added participants field to xml generator
#story[778]
|
9 years ago |
|
Erika Savell
|
c365d5a344
|
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
|
9 years ago |
David Wu
|
1d9b098f2b
|
Create XML Object for regatta data.
-Regatta data XML is generated in class Event.
-Regatta data is static as there isn't any information regarding it.
#story[778]
|
9 years ago |
|
Erika Savell
|
fdba50f9d2
|
Added course limit, course and marker seq field to xml fiule of race info
#story[778]
|
9 years ago |
|
David Wu
|
5397d14d3c
|
Added sourceID to boats in race.
-All boats in race will now have a sourceID.
-SourceID will be used in XML object for boat.
#story[778]
|
9 years ago |
|
Erika Savell
|
737755def6
|
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
|
9 years ago |
|
Erika Savell
|
94ba18cf0c
|
Began xml creator for race info message
#story[778]
|
9 years ago |
|
David Wu
|
ec716058c6
|
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
|
9 years ago |
|
David Wu
|
687ffb41e6
|
Create XML object of boat data.
-XML object currently displaying out in terminal.
-Reads in data from RaceDataSource.
-TODO: Add sourceID to boats.
#story[778]
|
9 years ago |
fjc40
|
149c312080
|
Merge branch 'isolatingMock' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into isolatingMock
|
9 years ago |
|
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]
|
9 years ago |
|
David Wu
|
be59bb853c
|
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
|
9 years ago |
|
David Wu
|
265bece9ed
|
Added a heartbeat value to the race.
-Heartbeat will display and update every 5 seconds.
#story[778]
|
9 years ago |
|
Erika Savell
|
33e3b3713c
|
Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock
|
9 years ago |
|
Erika Savell
|
97c5c9662b
|
Wrapped race in an event which sends out starting xml files
#story[778]
|
9 years ago |
|
fjc40
|
ef53dee7fe
|
Changed device type constants to bytes.
#fix #story[778]
|
9 years ago |
|
fjc40
|
421663c145
|
Added device type enumerations as static ints for BoatLocationMessage.
#story[778]
|
9 years ago |
|
fjc40
|
1a085e881d
|
Merge branch 'isolatingMock' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into isolatingMock
|
9 years ago |
|
fjc40
|
8da67d1dbc
|
Added class to encapsulate a BoatLocationMessage.
#story[778]
|
9 years ago |
|
Erika Savell
|
231a1824d1
|
Condensed Race and ConstantVelocityRace into one class
#story[778]
|
9 years ago |
|
Erika Savell
|
34c0aec0b9
|
Mock race runs without an fx component
#story[778]
|
9 years ago |
|
Erika Savell
|
3326da4f5d
|
Started removing fx component from mock module.
- Stuck on animation timer not running
#story[778]
|
9 years ago |
|
Erika Savell
|
a584400e24
|
Actually added sub modules this time
#story[778]
|
9 years ago |
|
Erika Savell
|
669718d406
|
Cloned the main project into two submodules, mock and visualiser
#story[778]
|
9 years ago |
cbt24
|
d12f70c8f8
|
Merge remote-tracking branch 'origin/story_30' into story_30
|
9 years ago |
|
cbt24
|
0f22cf81ef
|
Moved implementational details of generated races to ConstantVelocityRace.
- Boat headings are now treated as a property, not a calculation
#story[758]
|
9 years ago |
Joseph Gardner
|
3321727999
|
Tests for RegattaXMLReader #Story[782]
|
9 years ago |
|
Joseph Gardner
|
b825790acd
|
Moved package to correct spot
|
9 years ago |
|
Joseph Gardner
|
c40967f972
|
Added Regatta class and Regatta xml reader. This will be needed for the mock #Story[30]
|
9 years ago |
|
Connor Taylor-Brown
|
316c0dda76
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/seng302/Controllers/RaceController.java
|
9 years ago |
|
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]
|
9 years ago |
|
David Wu
|
668758f6f8
|
Fixed boat path not being toggled when annotation is toggled.
#story[759]
|
9 years ago |
|
Erika Savell
|
028cb33509
|
Fixing fxml problems
#story[760]
|
9 years ago |
|
Erika Savell
|
374b31f5c0
|
Disabled scale buttons once one has been clicked
#story[760]
|
9 years ago |
|
Erika Savell
|
b1e55f8c7d
|
Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story28
|
9 years ago |
|
Erika Savell
|
dc32868227
|
Created countdown clock on start screen.
#story[760]
|
9 years ago |
|
Joseph Gardner
|
fc15c3d151
|
Added annotation to toggle all boat paths on and off #Pair[jjg64, zwu18] #Story[759]
|
9 years ago |
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]
|
9 years ago |
|
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]
|
9 years ago |
|
Joseph Gardner
|
eb9fce1f22
|
Track scales with time scale #Pair[jjg64, zwu18] #Story[758]
|
9 years ago |
|
cbt24
|
71535be143
|
Merge branch 'story_25'
|
9 years ago |
|
cbt24
|
caf1e61391
|
Documented methods added for track handling.
#story[758]
|
9 years ago |
|
Joseph Gardner
|
af9d6769e5
|
Story 25 merged #Story[758]
|
9 years ago |
|
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
|
9 years ago |
|
Joseph Gardner
|
2945c8446e
|
Points now last whole race with a lower opacity #Story[25]
|
9 years ago |
|
hba56
|
a00b066f8d
|
Quick fix to zoneId to make it set correctly
- removed local zoneId
#story[761]
#pair[fwy13, hba56]
|
9 years ago |
Fan-Wu Yang
|
e501102bc5
|
Refactored the raceClock
- created a class that hosts the raceClock
- refactored the raceController to use a raceClock.
#story[761]
|
9 years ago |
