fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,022 Commits 1 Branch 0 Tags
88782182d7b7b373a188e13e26e732b81ae5d7dc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Wu 88782182d7 Player panes and spectator list now call method on click. Will later be used for players to choose whether they want to play or spectate. #story[1188] 2017-08-30 11:39:41 +12:00
David Wu 7df181c759 Minor changes to new lobby fxml. #story[1188] 2017-08-29 19:08:22 +12:00
David Wu 892320db5f Added javadoc and extra files to push 2017-08-29 19:03:34 +12:00
David Wu 0621e1bdb1 Finished up lobby menu. Set split pane to not change size on resize. Disabled divider on split pane. Added quit button and start button (start only prints to terminal for now). Panes are now wrapped in an anchor pane to fix resizing issues. TODO: Will be working on making a nicer background animation. 2017-08-29 19:02:02 +12:00
David Wu c63403d1de Created new lobby menu. Working on animated background for menu. 2017-08-29 15:11:09 +12:00
David Wu 37095bfc6c Merged master into branch. 2017-08-17 17:02:24 +12:00
David Wu 5234cdea66 Merge branch 'master' into new_issue#19 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/TitleController.java
 2017-08-17 17:00:39 +12:00
David Wu 598275591f Updated javadoc. 2017-08-17 16:50:51 +12:00
David Wu 79add59375 Unresizable control screen. 2017-08-17 16:37:31 +12:00
David Wu f1ef75fb81 Merge branch 'master' into new_issue#19 2017-08-17 16:34:19 +12:00
David Wu 03dd937713 Change fxml stuff. Added back to menu buttons. 2017-08-17 16:33:52 +12:00
David Wu 9f813ab7aa Merged in development. 2017-08-17 16:14:09 +12:00
David Wu 288979be3b Merge branch 'Development' into new_issue#19 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
#	racevisionGame/src/main/java/visualiser/app/App.java
 2017-08-17 16:05:59 +12:00
David Wu 09eaf6d968 Merged master. 2017-08-17 13:55:49 +12:00
David Wu 5a188f0582 Merge branch 'master' into new_issue#19 2017-08-17 13:52:04 +12:00
David Wu c08bafa566 Fixed most of issue #19 with new master? 2017-08-17 13:49:43 +12:00
David Wu fa5992bfb2 added App app to app. 2017-08-17 12:58:05 +12:00
David Wu 6bc81f566e Issue 19 changes. 2017-08-17 12:50:41 +12:00
zwu18 109b291973 Merged issue #20 fix and splash screen into development. 2017-08-17 01:36:55 +12:00
zwu18 317582aae8 Merge branch 'issue#20fix' into Development 2017-08-17 01:35:33 +12:00
zwu18 4e8b7d3b5a Merge remote-tracking branch 'origin/master' into issue#20fix 2017-08-17 01:30:43 +12:00
zwu18 8759ac070e Merge remote-tracking branch 'origin/splashScreen' into issue#20fix 2017-08-17 01:30:38 +12:00
zwu18 5e0bcd2af5 Added control menu to title screen. Pressing control button will open a pop-up window showing game controls. 2017-08-15 21:26:23 +12:00
zwu18 a31eb078a6 Created a splash screen for application. 2017-08-12 16:27:12 +12:00
zwu18 848edfc6a4 Removed commented out code. Merged master in. 
#story[1097]
 2017-08-12 03:20:21 +12:00
zwu18 c3ea62dfee Merge branch 'master' into CommandFactory 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/ConnectionAcceptor.java
#	racevisionGame/src/main/java/mock/app/Event.java
#	racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
#	racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
#	racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
 2017-08-12 03:18:24 +12:00
zwu18 9c902dab46 Added javadoc to classes. 
#story[1097]
 2017-08-12 02:11:23 +12:00
zwu18 e4b72fdfeb Update appearance on client arrow. 
#story[1095]
 2017-08-11 20:38:54 +12:00
zwu18 03713d3699 Added checkPosition into MockRace which was removed. Boat now updates legs again. 
#Story[1097]
 2017-08-09 16:37:29 +12:00
David Wu 568458aca4 Merge branch 'story48' into 'master' 
Story48 & issue 26

This is the merge request for story 48 (http://agilefant.cosc.canterbury.ac.nz:8080/agilefant302/editProject.action?projectId=61#fi.hut.soberit.agilefant.model.Story_1093) ( #29 ) and issue #26.

A.C:
- Wind speed and direction must follow that provided by the Race Status message or messages.
- Arrow aligned with the current wind direction shown on the live race view.
- Arrow orientation adjusts within 1s when changes in the wind direction are received.
- Arrow length is proportional to wind speed.
- Wind speed in m/s (or as defined in story 17) should be easily estimated from the wind arrow.

The wind speed (TWS) should be shown as both a number and in the length of the wind arrow. The arrow length should be always long enough for TWA (wind direction) to be clear; the length should never drop below some minimum value.  

This includes issue #26 as story 48 was slightly dependent on that.

Both #29 and issue #26 should be closed once this has been merged.

See merge request !20
 2017-08-08 20:50:41 +12:00
zwu18 53c9192130 Merge branch 'CommandFactory' into Development 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
 2017-08-08 02:52:29 +12:00
zwu18 ddaa2623ca Added tests for TackGybeCommand class. 
#Story[1097]
 2017-08-07 02:56:24 +12:00
zwu18 a388989827 Reworked TackGybeCommand. Current boat in race will now tack and gybe when control is pressed. 
#Story[1097]
 2017-08-06 16:38:44 +12:00
zwu18 18f14c7542 VMGCommand now toggles autoVMG on and off. Linked up observer and observable so the current boat can now be controlled. Fixed autoVMG not working. 
#Story[1097]
 2017-08-06 16:12:53 +12:00
zwu18 dab0f2b402 Merge branch 'story63' into CommandFactory 
# Conflicts:
#	racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
 2017-08-06 14:54:21 +12:00
zwu18 074e2e590b VMGCommand now toggles autoVMG on and off. Linked up observer and observable so the current boat can now be controlled. 
#Story[1097]
 2017-08-06 14:48:46 +12:00
zwu18 3d417c3a40 Merge branch 'story63' into CommandFactory 
# Conflicts:
#	racevisionGame/src/main/java/mock/model/MockRace.java
#	racevisionGame/src/main/java/mock/model/RaceLogic.java
#	racevisionGame/src/main/java/mock/model/RaceState.java
#	racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
#	racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
#	racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
 2017-08-06 13:48:41 +12:00
zwu18 14ce5fcaff Made changes to TackGybeCommand and VMGCommand classes to fit pattern layout. 
#Story[1097]
 2017-08-04 03:56:55 +12:00
zwu18 6e699f7037 Merge branch 'RaceFactory' into CommandFactory 2017-08-04 03:00:31 +12:00
zwu18 d9679c1497 Build failing due to junit even though junit passes all tests. Commented out VMGCommand and TackGybeCommand content. 2017-08-03 01:31:05 +12:00
zwu18 b581b01a44 Merge branch 'RaceFactory' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into RaceFactory 
# Conflicts:
#	racevisionGame/src/main/java/mock/model/MockRace.java
 2017-08-03 00:28:44 +12:00
zwu18 ad61dc6bce Implemented runCommand method in VMGCommand and TackGybeCommand classes. Both classes currently rely on the MockRace class so changes will be required when MockRace is refactored. 
#story[1097]
 2017-08-03 00:22:46 +12:00
zwu18 7fc1347377 Created class TackGybeCommand which implements the CommandFactory interface. 
#story[1097]
 2017-08-02 22:28:47 +12:00
David Wu f2932e8bae New branch created for development. 2017-08-01 12:29:05 +12:00
David Wu 2b8b334486 Updated host to show the hosted address and port. Fixed css issue with lobby text field. 
#story[1087]
 2017-07-27 13:12:39 +12:00
David Wu 28e6709890 Merge remote-tracking branch 'origin/css' into css 
# Conflicts:
#	racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
 2017-07-27 12:42:13 +12:00
David Wu 90f9ec2b98 Changed host menu. Will update soon. 
#story[1087]
 2017-07-27 12:41:46 +12:00
zwu18 8bb66bc5e4 Commented out test failure. Test was failing due to refactor. 
#story[1087]
 2017-07-26 22:06:42 +12:00
zwu18 53a01402e1 Check method moved to new class called ping so that refresh will be called on new thread. 
#story[1087]
 2017-07-26 21:59:43 +12:00
zwu18 243c450790 Merged with multi visualiser branch so now multiple visualisers can connect to the same host. 
#story[1087]
 2017-07-26 21:08:13 +12:00
zwu18 88604df66d Merge branch 'cbt-multi-controller' into css 
# Conflicts:
#	racevisionGame/src/main/java/mock/app/App.java
#	racevisionGame/src/main/java/visualiser/Controllers/ConnectionController.java
#	racevisionGame/src/main/java/visualiser/app/App.java
#	racevisionGame/src/main/java/visualiser/model/RaceConnection.java
#	racevisionGame/src/main/resources/visualiser/scenes/connect.fxml
 2017-07-26 20:54:07 +12:00
zwu18 9c9b98f882 Added functionality to host game and join a game in lobby. Host name and game name are not implemented yet. 
#story[1087]
 2017-07-26 20:42:36 +12:00
David Wu 578f04c74f Merge branch 'css' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into css 2017-07-25 16:15:42 +12:00
David Wu 9159e16a21 Set up controller classes for lobby and host. Made changes to TitleController and MainController. Title screen can now enter lobby and host. 
#story[1087]
 2017-07-25 16:15:32 +12:00
David Wu 8514c98805 Created FXML files for new start up U-I. #story[1087] 2017-07-23 19:32:57 +12:00
David Wu 9076606030 Fixed show all annotation not toggling annotations. 
-Problem found with if statement to fix annotation toggling.
-Sparkline graph x-axis also increased slightly.

#story[878]
 2017-05-23 17:49:00 +12:00
zwu18 b9d696ef12 Sparkline has a set x-axis now to prevent sparkline constantly re-adjusting axis. 
#story[876]
 2017-05-21 23:06:51 +12:00
zwu18 74d3996f6c Merge remote-tracking branch 'origin/story34_v2' into story34_v2 
# Conflicts:
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Mock/StreamedRace.java
 2017-05-17 20:08:31 +12:00
zwu18 f19a543b68 Changed line appearance and colour. 
-Line displayed will no longer plot a point every update.
-Line colours are based on the colours displayed in the race.
-Race colours defined in ResizableRaceCanvas have been used for the lines.
-As boats change colour depending on placement (unintended), the lines will also do this.

#story[876]
 2017-05-17 20:04:03 +12:00
zwu18 2929019689 Temporary ignored offlineConnectionStatusOffline due to CI issue. 
#story[882]
 2017-05-17 18:23:20 +12:00
zwu18 7d27a098ac Fixed wind direction code missing due to past merges (?) 
#story[882]
 2017-05-17 18:13:20 +12:00
David Wu f999967cd5 Implemented functionality for sparkline to update throughout race. 
-Sparkline reads in initial boats in race.
-Sparkline updates throughout the race.
-Sparkline updates are displayed on GUI.

#story[876]
 2017-05-16 17:13:52 +12:00
zwu18 0291726589 Added test for changing wind direction. 
#story[882]
 2017-05-15 02:10:44 +12:00
zwu18 a91bc459f7 Implemented functionality for mock to parse marker boats throughout race. 
-Added getter to CompoundMark to get the Mark value.

#story[881]
 2017-05-12 02:10:17 +12:00
zwu18 ce5a726153 Adjusted wind direction changing angles to a smaller angle. 
#story[882]
 2017-05-10 22:20:00 +12:00
zwu18 8390b19299 Created methods to initialise and change wind direction throughout race. 
-Method initialiseWinDir assigns an unsigned short value to wind direction.
-Method changeWindDir randomly changes the wind direction throughout race.
-Issue found regarding showing wind direction.

#story[882]
 2017-05-10 21:37:18 +12:00
David Wu 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
 2017-05-06 20:23:01 +12:00
David Wu 61afe8d608 Created finish view to see when a race finishes. 
-Implemented FinishController
-Fixed mock not sending Finish race status.

#Story[782]
 2017-05-06 20:14:10 +12:00
David Wu a95a0c2543 Added documentation for multiple classes. 
#Story[782]
 2017-05-06 16:39:15 +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
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
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
David Wu b60b4b257f Remove start button from StartController. 
#story[778]
 2017-05-04 12:41:14 +12:00
David Wu 4811b7f4ea Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 
# Conflicts:
#	mock/src/test/java/seng302/Model/RaceTest.java
 2017-05-01 16:39:26 +12:00
David Wu 0bfc9a5a39 Added test for race dnf in Race class. 
-Unable to test animation timer.

#story[778]
 2017-05-01 16:37:55 +12:00
David Wu d14446a12e Added extra constructor in Race. 
-Constructor is used for junit testing for Race class.

#story[778]
 2017-04-25 12:24:39 +12:00
David Wu c2183a68a0 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-25 12:00:52 +12:00
David Wu 0fd4de7ec7 Fixed previously broken tests due to refactoring app. 
-ConstantVelocityRace doesn't exist anymore so tests had to be change to compensate for this.
-Boat in race had to be change due to the addition of the sourceID for each boat.

#story[778]
 2017-04-25 12:00:44 +12:00
David Wu d995d5df45 Fixed RegattaDataSource missing. 
-RegattaDataSource failed to push from before. It is now created and working.

#story[778]
 2017-04-25 11:28:28 +12:00
zwu18 c5df90d276 Created RegattaDataSource and regattaTest.xml. 
-Event regattaData will now get data from the XML instead of having static data.

#story[778]
 2017-04-23 19:59:07 +12:00
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]
 2017-04-21 16:58:22 +12:00
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]
 2017-04-21 16:22:23 +12:00
David Wu ec716058c6 Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 14:20:20 +12:00
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]
 2017-04-21 14:19:49 +12:00
David Wu be59bb853c Merge branch 'isolatingMock' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into isolatingMock 2017-04-21 13:10:56 +12:00
David Wu 265bece9ed Added a heartbeat value to the race. 
-Heartbeat will display and update every 5 seconds.

#story[778]
 2017-04-21 13:10:46 +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
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
David Wu ee65e7eba5 Changed where the saved annotation set is declared. 
-Annotation set is now initialized along with annotations.

#story[26]
 2017-04-06 16:44:22 +12:00
David Wu d08a1c325f Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 2017-04-06 16:37:09 +12:00
David Wu 5c89c1aeb7 Implemented functionality to select which annotations to display. Selected annotations can be temporarily saved and then displayed on a button press. 
-Added checkboxes to display name, abbreviation, and speed in annotation.
-Changed single titlepane to an accordion.
-Moved all annotation controls to separate titlepane in accordion.
-Added buttons to save and load saved annotation settings.

#story[26]
 2017-04-06 16:37:00 +12:00
David Wu 9960317732 Removed tooltip 2017-03-29 13:19:34 +13:00
David Wu 68fccc3216 Merge branch 'master' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 2017-03-29 13:14:27 +13:00
David Wu 4ee6624ff6 Changed abbreviations for teams 
-Updated the team abbreviations to official ones
-Change methods that were public to private
 2017-03-29 13:14:19 +13:00
David Wu b943b38d61 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/seng302/Model/Boat.java
 2017-03-29 11:19:15 +13:00
David Wu d2de426f58 Fixed so the animation timer will exit when all boats finish the race 
-Moved listeners  for annotation to initialize
-Fixed compass arrow not rescaling properly with canvas
-Fixed scaling issue with race clock
 2017-03-29 11:16:57 +13:00
David Wu f7477adb36 Added javadoc for new methods used for annotation and fps 
#story[23]
 2017-03-29 10:15:31 +13:00