fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
987 Commits 1 Branch 0 Tags
014b78f166b5c1645e435f8cf4371458347bee55
Commit Graph
987 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
cbt24 cc824aa89a Removed unnecessary countdownTimer from Race in visualiser module 
- Run method now calls simulateRace directly

#story[782]
 2017-05-06 18:20:41 +12:00
cbt24 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]
 2017-05-06 18:02:48 +12:00
Fan-Wu Yang bdf215d0f1 TCP connection at the front menu will no longer bug out if the socket is bugged. 
- Timeout set on connection socket so that the socket will return false after 5 seconds.
#story[782]
 2017-05-06 16:55:12 +12:00
David Wu a95a0c2543 Added documentation for multiple classes. 
#Story[782]
 2017-05-06 16:39:15 +12:00
hba56 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]
 2017-05-06 16:31:40 +12:00
Fan-Wu Yang 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]
 2017-05-06 15:58:12 +12:00
Fan-Wu Yang 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]
 2017-05-06 15:46:38 +12:00
Fan-Wu Yang 982b47943a Fixed blocking issue 
- Fixed byte stream error where it would reinitilise every run
#story[782]
 2017-05-06 15:27:21 +12:00
Fan-Wu Yang b7f010a2fa Fixed Network While loops 
- Removed while blocking loops and replaced them with return statements
#story[782]
 2017-05-06 14:36:37 +12:00
Fan-Wu Yang 565b7adaa2 Merge remote-tracking branch 'origin/race-timer-fixes' into layeredCanvas 
# Conflicts:
#	visualiser/src/main/java/seng302/Controllers/StartController.java
 2017-05-04 16:55:01 +12:00
Fan-Wu Yang 862391d7ef Canvas Layer Created 
- Canvas is created via layering.
- Resizable canvas is now a seperate abstract class
#story[782]
 2017-05-04 16:54:06 +12:00
cbt24 349bd50094 Everything works, don't ask questions 
#story[782]
 2017-05-04 16:52:33 +12:00
Erika Savell 62db7f333c Frantically cherry-picking commit by commit 
#story[778]
 2017-05-04 16:33:07 +12:00
Erika Savell 8ed0ca5b4f Quick way of adding extra leg to mock data 
- To be redundant when the mock feed pulls from a proper xml instead of having two parsers

#story[778]
 2017-05-04 16:31:40 +12:00
Fan-Wu YangandErika Savell 284eb6d951 Added Test for AC35UnitConverter 
- Added tests to make sure it was working properly
#story[782]
 2017-05-04 16:30:42 +12:00
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
Erika Savell 288699b7c7 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 13:44:56 +12:00
Erika Savell 2dab427092 Quick way of adding extra leg to mock data 
- To be redundant when the mock feed pulls from a proper xml instead of having two parsers

#story[778]
 2017-05-04 13:44:44 +12:00
Fan-Wu Yang 037c09b059 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 13:42:28 +12:00
hba56 1f8941e37c Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-04 13:41:14 +12:00
Fan-Wu Yang 6bbc2ac4be Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 13:40:48 +12:00
hba56 ccd90b91d7 Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-04 13:40:45 +12:00
Fan-Wu Yang bb57685faf Added Test for AC35UnitConverter 
- Added tests to make sure it was working properly
#story[782]
 2017-05-04 13:40:43 +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
Erika Savell 5ebd4251e2 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 12:50:42 +12:00
Erika Savell c3ee3ec9e2 Added new lines to the other two xml creators 
#story[778]
 2017-05-04 12:50:30 +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
Erika Savell 6e10f86a90 Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules 2017-05-04 12:39:58 +12:00
Erika Savell 311cd99457 Added newlines to xml created by mock 
#story[778]
 2017-05-04 12:39:46 +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