fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
668 Commits 1 Branch 0 Tags
992b6c91fc5d7786722a2d5abbd97e35b0d15cfc
Commit Graph
206 Commits
Author SHA1 Message Date
hba56andErika Savell 6888d0bddc fixed all java doc errors 
#story[782]
 2017-05-04 16:29:41 +12:00
hba56 e409c8752c Fix for now - Need to change 2017-05-04 14:56:54 +12:00
cbt24 89ba0f278d Fixed StartController countdown 
- Removed obsolete timer related code
- Consistently use RaceClock throughout StartController

#story[782]
 2017-05-04 14:16:14 +12:00
cbt24 17afd9f775 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 
# Conflicts:
#	visualiser/src/main/java/seng302/Controllers/StartController.java
 2017-05-04 14:15:21 +12:00
cbt24 336a15d1a2 Fixed StartController countdown 
- Removed obsolete timer related code
- Consistently use RaceClock throughout StartController

#story[782]
 2017-05-04 14:11:00 +12:00
hba56 1f8941e37c Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-04 13:41:14 +12:00
hba56 ccd90b91d7 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-04 13:40:45 +12:00
hba56 62ecd40967 fixed all java doc errors 
#story[782]
 2017-05-04 13:40:37 +12:00
David Wu 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]
 2017-05-04 13:36:39 +12:00
cbt24 e345f08ad8 Fixed AC35 stream crashing before status sent. 
#story[782]
 2017-05-04 13:19:39 +12:00
hba56 aa1d38ca9f removed import * lines 
#story[782]
 2017-05-04 13:17:07 +12:00
David Wu a07a90dfea Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 13:14:35 +12:00
David Wu 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]
 2017-05-04 13:14:29 +12:00
cbt24 099995c41b Fixed start controller visibility issues. 
#story[782]
 2017-05-04 13:13:44 +12:00
hba56 15179a1cdf Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-04 13:11:58 +12:00
hba56 810c3837c1 adding java doc tags 
#story[782]
 2017-05-04 13:11:14 +12:00
Fan-Wu Yang 43fb0df5be Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 13:07:13 +12:00
Fan-Wu Yang 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]
 2017-05-04 13:07:05 +12:00
David Wu 34ef1172ce Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 12:48:24 +12:00
David Wu 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]
 2017-05-04 12:48:17 +12:00
hba56 db43acf935 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 12:46:46 +12:00
hba56 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]
 2017-05-04 12:46:27 +12:00
David Wu b60b4b257f Remove start button from StartController. 
#story[778]
 2017-05-04 12:41:14 +12:00
cbt24 cd55052654 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-04 12:38:26 +12:00
cbt24 c1fa760dde Streamlined clock handling. 
- Set starting time from network
- Update RaceClock instance to current time from network

#story[782]
 2017-05-04 12:38:21 +12:00
Erika Savell 98723b88d4 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 12:26:04 +12:00
Erika Savell 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]
 2017-05-04 12:25:50 +12:00
Joseph Gardner 618073d04e Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-04 12:11:47 +12:00
Joseph Gardner 94ad164a45 Boat table and positions now update. #story[782] 2017-05-04 12:11:36 +12:00
Joseph Gardner e43353c322 Boat table and positions now update. #story[782] 2017-05-04 12:10:13 +12:00
Erika Savell d38baa9fc4 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 11:58:46 +12:00
cbt24 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]
 2017-05-04 11:49:16 +12:00
Erika Savell 23dfc6a6bf Fixed annotation toggles displaying behind course 
#story[782]
 2017-05-04 10:34:25 +12:00
Erika Savell eb58581e83 Fixed velocity issues with mock data 
-Was accidentally sending scaled velocity

#story[778]
 2017-05-04 10:16:10 +12:00
Connor Taylor-Brown 8886b5db05 Fixed RegattaXMLTest. 
#story[782]
 2017-05-04 01:40:12 +12:00
Connor Taylor-Brown 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]
 2017-05-04 01:32:28 +12:00
Connor Taylor-Brown 1723d0c27f Fixed scaling of wakes (note issues with velocity data) 
- Official stream provides speeds of 0 kn
- Mock provides speeds that do not correlate with motion

#story[782]
 2017-05-04 00:32:06 +12:00
Connor Taylor-Brown 0e1bf64177 Fixed boat track rendering (points were added before boat position set) 
#story[782]
 2017-05-03 22:31:34 +12:00
Connor Taylor-Brown e7008ab6db Fixed race playback issue, removed obsolete detail from UI. 
- Removed race scaling options
- Refactored start screen timer formatting for clarity
- Removed incomplete countdownTimer override in Streamed Race

#story[782]
 2017-05-03 22:04:08 +12:00
Connor Taylor-Brown 5a92dd68f5 Fixed build and interface problems. 
- Ignore online host test (fails on CI)
- Disable connect button on startup to prevent bad socket

#story[782]
 2017-05-03 19:31:00 +12:00
Connor Taylor-Brown ac4fbda848 Added connection screen to allow users to select available hosts from a preconfigured list. 
- Added ConnectionController for initial client setup
- Added RaceConnection class for socket data and checking
- Configures StartController with a socket drawn from a host table

#story[782]
 2017-05-03 03:40:36 +12:00
cbt24 ad58407021 Began work on ConnectionController for selecting active hosts on startup via GUI. 
#story[782]
 2017-05-03 00:35:46 +12:00
cbt24 577dea2a56 Fixed time zone label on RaceController. 
#story[782]
 2017-05-02 22:41:51 +12:00
Erika Savell 08f203a0f8 Added race statuses for before the race has started. 3 min -> 1 min is warning, 1 min -> 0 min is preparatory. 
-Boat locations (spread across start line) are also broad casted

#story[778]
 2017-05-02 20:13:39 +12:00
Erika Savell 42ad1f78fc Added heading to boatlocation messages 
#story[778]
 2017-05-02 19:21:43 +12:00
Erika Savell f2e0eec212 Fixed date time parsing problem 
#story[778]
 2017-05-02 16:50:09 +12:00
Erika Savell 7d1f4209e4 Got mock data being used by visualiser. 
- Issue with zonedTimeDate not parsing
- Fixed race crashing once one boat finished

#story[778]
 2017-05-01 20:56:46 +12:00
Fan-Wu Yang 84bb4fdb8f Fixed merge issue 
- Strange Issue where there was a null pointer from convertGPS however it has resolved itself may crop in the future htough.
#story[782]
 2017-05-01 20:23:52 +12:00
Fan-Wu Yang 5444b872bd Fixed GPs Coordinates as well as got Boats to display 
- Fixed GPS conversion number being wrong (extra 1)
- Fixed Boats displaying as the boat = null (cough Joseph) was stopping it from working as well as track is broken.
#story[782]
 2017-05-01 20:13:16 +12:00
Fan-Wu Yang 04366c2e4c Fixed small Merge issue 
- Deleted a unfinished statement that caused hte build to fail
#story[782]
 2017-05-01 19:24:59 +12:00