61ecdc2269
Merge branch 'submission' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into submission
...
# Conflicts:
# visualiser/src/main/java/seng302/Controllers/MainController.java
# visualiser/src/main/java/seng302/Controllers/StartController.java
# visualiser/src/main/java/seng302/Model/Race.java
9 years ago
61afe8d608
Created finish view to see when a race finishes.
...
-Implemented FinishController
-Fixed mock not sending Finish race status.
#Story[782]
9 years ago
c038010bd2
Draws track for racing boats only to reduce information clutter.
...
- Add track point only when boat status is "Racing"
#story[782]
9 years ago
cc824aa89a
Removed unnecessary countdownTimer from Race in visualiser module
...
- Run method now calls simulateRace directly
#story[782]
9 years ago
a6adfb4960
Refactored RaceClock to act as central source of time and duration information throughout visualiser.
...
- StartController and RaceController use same RaceClock instance
- RaceClock updates automatically as Runnable for consistent operation
- Duration between starting and current time is now an observable property of RaceClock
#story[782]
9 years ago
12e457824d
fix for issue #5 gate lines
...
-removed drawing of lines between the marks as only the start and finish line should have a line drawn
#story[782]
9 years ago
d52b09e74a
Visualiser Closes All threads on exit now.
...
- Added override for exiting the Visualiser which closes all threads: such as the TCP connection.
#story[782]
9 years ago
a20dafea11
Annotations go on top and boundaries now update
...
- Fixed FPS and other annotations being hidden under the map
- Fixed boundaries not updating with the visualiser.
#story[782]
9 years ago
982b47943a
Fixed blocking issue
...
- Fixed byte stream error where it would reinitilise every run
#story[782]
9 years ago
b7f010a2fa
Fixed Network While loops
...
- Removed while blocking loops and replaced them with return statements
#story[782]
9 years ago
565b7adaa2
Merge remote-tracking branch 'origin/race-timer-fixes' into layeredCanvas
...
# Conflicts:
# visualiser/src/main/java/seng302/Controllers/StartController.java
9 years ago
862391d7ef
Canvas Layer Created
...
- Canvas is created via layering.
- Resizable canvas is now a seperate abstract class
#story[782]
9 years ago
349bd50094
Everything works, don't ask questions
...
#story[782]
9 years ago
62db7f333c
Frantically cherry-picking commit by commit
...
#story[778]
9 years ago
6888d0bddc
fixed all java doc errors
...
#story[782]
9 years ago
e409c8752c
Fix for now - Need to change
9 years ago
89ba0f278d
Fixed StartController countdown
...
- Removed obsolete timer related code
- Consistently use RaceClock throughout StartController
#story[782]
9 years ago
17afd9f775
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
...
# Conflicts:
# visualiser/src/main/java/seng302/Controllers/StartController.java
9 years ago
336a15d1a2
Fixed StartController countdown
...
- Removed obsolete timer related code
- Consistently use RaceClock throughout StartController
#story[782]
9 years ago
1f8941e37c
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
ccd90b91d7
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
62ecd40967
fixed all java doc errors
...
#story[782]
9 years ago
545ef7aa7f
Fix lobby not entering race when race status is "started".
...
-Race was previously stuck in lobby screen when race status was not 2.
#Story[782]
9 years ago
e345f08ad8
Fixed AC35 stream crashing before status sent.
...
#story[782]
9 years ago
aa1d38ca9f
removed import * lines
...
#story[782]
9 years ago
a07a90dfea
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
88bb568ec7
Set it so the lobby view switches to race view depending on the race status passed in by the mock.
...
-Removed start button in lobby as it should be automatic.
-TODO: Synchronize the times across the whole race as they do not matching.
#Story[782]
9 years ago
099995c41b
Fixed start controller visibility issues.
...
#story[782]
9 years ago
15179a1cdf
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
810c3837c1
adding java doc tags
...
#story[782]
9 years ago
43fb0df5be
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
874953f763
Fixed issue win ResizableRaceCanvas
...
- Issue where the boat position may mess up if it is called before the server has sent us information about hte location.
#story[782]
9 years ago
34ef1172ce
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
bf12f77796
Set it so the lobby view switches to race view depending on the race status passed in by the mock.
...
-Removed start button in lobby as it should be automatic.
-TODO: Synchronize the times across the whole race as they do not matching.
#Story[782]
9 years ago
db43acf935
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
86db16c83d
updated the connection scene to let a user add their own connection
...
-added textfields to the fxml
-added scaling to the connection scene(in mainController)
-added a newConnection method and a method for getting the wrapper anchor pane
#story[782]
9 years ago
b60b4b257f
Remove start button from StartController.
...
#story[778]
9 years ago
cd55052654
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
c1fa760dde
Streamlined clock handling.
...
- Set starting time from network
- Update RaceClock instance to current time from network
#story[782]
9 years ago
98723b88d4
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
cfa6ba1c3f
Fixed speed notbeing displayed from AC35 live data
...
- Turns out the AC35 stream gives the speed in the SOG (speed over ground) section, not the boat speed section
#story[782]
9 years ago
618073d04e
Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules
9 years ago
94ad164a45
Boat table and positions now update. #story[782]
9 years ago
e43353c322
Boat table and positions now update. #story[782]
9 years ago
d38baa9fc4
Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules
9 years ago
09483fff2c
Added blocking loop to wait
...
- waits for the InputStream to be populated for at least 15 bytes of size before reading in case of header size error potentially crashing the program.
#story[782]
9 years ago
23dfc6a6bf
Fixed annotation toggles displaying behind course
...
#story[782]
9 years ago
eb58581e83
Fixed velocity issues with mock data
...
-Was accidentally sending scaled velocity
#story[778]
9 years ago
8886b5db05
Fixed RegattaXMLTest.
...
#story[782]
9 years ago
7d81fc810c
Display name of race in lobby.
...
- Moved Regatta properties and accessors to RegattaXMLReader
- StartController update now tolerates any permutation of types of XML messages
#story[782]
9 years ago
David Wu
cbt24
hba56
Fan-Wu Yang
Erika Savell
Joseph Gardner