fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
886 Commits 1 Branch 0 Tags
847cd1251eb9563a1170a83370c16a0dfcb019ee
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
hba56 1bdf80417d javadoc 
#story[1087]
 2017-08-14 12:14:55 +12:00
hba56 0ff4e9871d Merge remote-tracking branch 'remotes/origin/master' into story68 2017-08-14 12:13:24 +12:00
hba56 dc9317fe2e remove system.out statments 
#story[1101]
 2017-08-13 19:33:46 +12:00
hba56 67bb7b81dc Merge remote-tracking branch 'origin/story68' into story68 2017-08-13 19:10:31 +12:00
hba56 0d786f381b fix for boats finishing the race 
#story[1101]
 2017-08-13 19:10:16 +12:00
hba56 2acc36225e Fix for placement of invis gates and checks that boats pass through these gates 
-see wiki on rounding
#story[1101]
 2017-08-13 18:11:53 +12:00
hba56 f90648e4ce Fixing a silly mistake where starboard side rounding checks for a port side rounding (Thank goodness for documenting manual tests) 
#story[1101]
 2017-08-12 23:40:28 +12:00
hba56 a05ffd023d Fixing a silly mistake where starboard side rounding checks for a port side rounding (Thank goodness for documenting manual tests) 
#story[1101]
 2017-08-12 22:55:25 +12:00
hba56 f386a4b989 added checks for gates and moved second rounding check to be in line with the next mark to move towards 
#story[1101]
 2017-08-12 22:27:27 +12:00
hba56 fe91264aec fix for the tests 
#story[1101]
 2017-08-12 21:10:31 +12:00
hba56 62e37489ee starboard rounding update 
#story[1101]
 2017-08-12 03:41:50 +12:00
hba56 d70a711a3d Merge branch 'master' into story68 
-updated port and starboard boat checks
-added gps method to check if on correct side of a line
-updated pos check method to make boats round marks with the new tech

# 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
 2017-08-12 03:26:28 +12:00
hba56 499a409d4f Merge branch 'master' into story68 
-updated port and starboard boat checks
-added gps method to check if on correct side of a line
-updated pos check method to make boats round marks with the new tech

# 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
 2017-08-12 03:24:20 +12:00
hba56 4da3734804 added the ability to toggle the race guide line on and off 
#story[1087]
 2017-08-10 12:17:19 +12:00
hba56 74f04a13f8 Merge remote-tracking branch 'origin/Development' into Development 2017-08-09 23:27:04 +12:00
hba56 e53d72f24b compound marks now can give the mark they have that needs to be rounded this is used to draw the line around the correct mark 
#story[1101]
 2017-08-09 23:25:42 +12:00
hba56 e2605c3c7c Merge remote-tracking branch 'remotes/origin/story68' into Development 2017-08-08 23:29:57 +12:00
hba56 bb75806781 Cleaned up line to be in a shippable shape 
#story[1101]
 2017-08-08 23:23:46 +12:00
hba56 22722286ef all paths now join up 
#story[1087]
 2017-08-08 14:47:11 +12:00
hba56 ef3f468b19 arrows displayed for each leg 
#story[1101]
 2017-08-08 00:02:07 +12:00
hba56 62752c142a building blocks for drawing the race line around the course 
#story[1087]
 2017-08-07 12:47:55 +12:00
hba56 747c31b948 Merge remote-tracking branch 'remotes/origin/story68' into Development 2017-08-07 12:29:56 +12:00
hba56 4195d41814 removed outdated comments 
#story[1087]
 2017-08-07 12:28:44 +12:00
hba56 950a801d16 rounding fix for the xml 
#story[1087]
 2017-08-07 12:16:37 +12:00
hba56 0b74acadff rounding checks are now done by port or starboard side depending on what the compound marks type is 
#story[1101]
 2017-08-04 22:19:07 +12:00
hba56 db1efab225 rounding checks are now done by port or starboard side depending on what the compound marks type is 
#story[1101]
 2017-08-04 22:17:17 +12:00
hba56 be8b0e672d Updated the xml reader to pull in the rounding type of the compound marks and set each mark with that value 
#story[1101]
 2017-08-04 22:01:21 +12:00
hba56 f212414bd9 Added in a new basis for boats to round marks, gave mockboats a status to say how far through a rounding they are and made a method in GPScoordinate public so it can be used to calculate intersections. 
This branch will not run the game any more as boats can't move on to the next leg until they can be controlled by the user.

#story[1087]
 2017-08-03 13:27:00 +12:00
hba56 b7af4e19cf new method to check if a boat is between gates as well as updated the gps values to fit better with real life values 
#story[1101]
 2017-08-02 18:09:12 +12:00
hba56 13922bc284 updated javadoc 
#story[1101]
 2017-08-02 17:06:52 +12:00
hba56 c633de21f5 added new methods to the mock boats to let them check which side a mark is on to them 
#story[1101]
 2017-08-02 16:33:03 +12:00
hba56 92b8b7b77f moved the tm symbol 
#story[1087]
 2017-07-27 13:34:03 +12:00
hba56 f4eb03e79e Merge remote-tracking branch 'origin/css' into css 2017-07-27 13:06:07 +12:00
hba56 85347c169d You can now resize all windows other than the title screen 
#story[1087]
 2017-07-27 13:05:56 +12:00
hba56 59058da09c textfields now show better colour that contrasts more 
#story[1087]
 2017-07-27 12:23:21 +12:00
hba56 7fafddcf50 updated text to be easily read on daymode 
#pair[zwu18, hba56]
#story[1087]
 2017-07-27 12:09:33 +12:00
hba56 64b4aa539a added and option to swap between css files in the title pane 
#pair[zwu18, hba56]
#story[1087]
 2017-07-27 12:04:17 +12:00
hba56 684611a52c added a background to the water so it is not just white 
#story[1087]
 2017-07-25 15:31:35 +12:00
hba56 913946265d Merge branch 'css' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into css 2017-07-25 14:14:49 +12:00
hba56 afadabfecc small fix for the sparkline so that it goes from 1 to 6 rather than 0 to 7 for a 6 boat race 
#story[1087]
 2017-07-25 14:14:36 +12:00
hba56 9d9321522d Linked the first fxml id tags from the fxml files for the new start up screens 
#story[1087]
 2017-07-24 12:36:45 +12:00
hba56 eda7d062ec merged in the changes from the master branch so that latter mergers can run smoothly 
#story[1087]
 2017-07-24 12:12:12 +12:00
hba56 595e1a8727 Merge remote-tracking branch 'remotes/origin/master' into css 2017-07-24 12:06:56 +12:00
hba56 1ebbb8d4c7 merged in the changes from the master branch so that latter mergers can run smoothly 
#story[1087]
 2017-07-24 12:05:00 +12:00
hba56 738a765a0a Merge remote-tracking branch 'remotes/origin/master' into Game_Controller 2017-07-24 11:58:01 +12:00
Hamish Ball 86851c6181 Merge branch 'sprint5_refactor' into 'master' 
Sprint5 refactor

This branch refactors most of the codebase and merges everything into a single module (racevisionGame).
This has feature parity with the master branch from what I can tell, and fixes a few bugs/issues.
However, the sparkline y axis labelling isn't exactly the same. Instead of being labelled 1, 2, 3, 4, 5, 6, it's labelled (1, 7).

Acceptance criteria:
1. Feature parity with master branch. (There's an app class in each of the mock and visualiser packages.
2. Tests all pass.
3. Code is actually tidier and easier to reason about, and documented.

See merge request !16
 2017-07-24 11:48:54 +12:00
hba56 a140e532e8 Merge remote-tracking branch 'origin/css' into css 2017-07-24 11:31:24 +12:00
hba56 956ad1f59b merged in the changes from the sprint5_refactor branch 
# Conflicts:
#	visualiser/src/main/java/seng302/Model/ResizableRaceMap.java
#story[1087]
 2017-07-21 10:58:02 +12:00
hba56 0d5bede349 java doc fixes to fix the ci build problems 
#story[1003]
 2017-07-21 10:25:36 +12:00
hba56 08f74f608f trying to see if ci works while logged in to the ienabler when ssh 
#story[1003]
 2017-07-21 09:32:04 +12:00
hba56 db42b3f1bb changed css to be day and night 
#story[1003]
 2017-07-18 23:19:00 +12:00
hba56 a0a7db9f0f update the css to include a black on black option and update the colour of the water to better fit with the other colours 
#story[1003]
 2017-07-17 10:36:23 +12:00
hba56 01625a7bb8 added an icon for the window and basic red black and white style sheet 
#story[1003]
 2017-07-15 23:24:29 +12:00
hba56 fb37831ec0 added an icon for the window and basic red black and white style sheet 
#story[1003]
 2017-07-15 23:14:00 +12:00
hba56 054816c15a fix for the pom files 
#story[1006]
 2017-07-14 17:07:10 +12:00
hba56 b7e2427528 fix for the pom files 
#story[1006]
 2017-07-14 16:48:28 +12:00
hba56 fef8540b10 fix for the pom files 
#story[1006]
 2017-07-12 12:09:34 +12:00
hba56 83ac3e4e33 updated the game controller to use the visualiser as the scene 
#story[1006]
 2017-07-12 11:59:59 +12:00
hba56 6ae23f039b Added basic structure for the controller module of the game application 
#story[1006]
 2017-07-11 00:36:49 +12:00
Hamish Ball 992b6c91fc Merge branch 'fix_time_since_last_marker' into 'sprint4_master' 
Fix time since last marker

Visualiser:
Fixed the issue where a boat's time since last mark started counting from when the race screen loaded.
It now starts counting when the race actually starts.


See merge request !13
 2017-05-25 17:13:27 +12:00
Hamish Ball adbb8f0a64 Merge branch 'story36' into 'sprint4_master' 
Story36



See merge request !9
 2017-05-24 18:05:04 +12:00
hba56 dc7aa359d7 boat time now saves 
#story[878]
 2017-05-24 17:59:02 +12:00
hba56 2ac932b4f3 fix to keep boats in the bounds 
#story[#874, 873]
 2017-05-23 15:17:19 +12:00
hba56 db3f4a5b2b fix to keep boats in the bounds 
#story[#874, 873]
 2017-05-23 14:56:07 +12:00
hba56 6a74b5fe36 Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36 
# Conflicts:
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#story[878]
 2017-05-23 13:19:48 +12:00
hba56 2a7f264444 Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36 
# Conflicts:
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#story[878]
 2017-05-23 13:19:11 +12:00
hba56 7c9b9c6426 Merge commit message was wrong, i wasn't watching the start up time 
-small fix to java doc
#story[878]
 2017-05-22 17:56:47 +12:00
hba56 139d7b41fb re added story36 racefxml changes after merge 
#story[878]
 2017-05-22 17:46:51 +12:00
hba56 748a516d16 Boats not moving working on fix 
Merge remote-tracking branch 'remotes/origin/sprint4_master' into story36

# Conflicts:
#	mock/src/main/java/seng302/DataInput/XMLReader.java
#	visualiser/src/main/java/seng302/Controllers/RaceController.java
#	visualiser/src/main/java/seng302/Mock/StreamedRace.java
#	visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
#	visualiser/src/main/resources/scenes/race.fxml

#story[878]
 2017-05-22 17:45:45 +12:00
hba56 abcaca719c Javadoc fix 
#story[878]
 2017-05-22 11:05:36 +12:00
hba56 4b2e90f54b can now toggle the boats time on and off 
#story[878]
 2017-05-20 21:04:03 +12:00
hba56 a24dda2fd8 boats have an annotation beside them that shows time since last mark passed 
#story[878]
 2017-05-20 20:40:08 +12:00
hba56 9eb4e3daea boats now calculate the time since last mark 
-the raceclock is passed around so that the time can be tracked
-time from start to mark 1 is wrong
 #story[878]
 2017-05-20 17:22:52 +12:00
hba56 12b6f49f2e boats now bounce on the boundry 
#pair[hba56, cbt24, jjg64]
 #story[873]
 2017-05-15 15:21:45 +12:00
hba56 3895172631 updated the race class to set heading for windward legs 
#story[873]
 2017-05-14 17:25:44 +12:00
hba56 d4be901b1a Merge remote-tracking branch 'origin/story31.2' into story31.2 2017-05-14 15:16:18 +12:00
hba56 dd1308808a updated the race class to set heading based on the vmg not just the end of a leg 
-race class now stores the boundary
-updatePositions now checks if the boat is with the course
-update positions now sets heading and speed based on the vmg
-updated azimuth to now accept a start and finish gps rather that finding it itself
-added a calculatebearingtodestination method that finds the azimuth to the dest from the boat
-updated boat tests to use the new azimuth method
 #story[873]
 2017-05-12 12:49:02 +12:00
hba56 4f8d6b14d4 updated app class to read the polar csv and pass it off to its parser 
#story[900]
 2017-05-10 15:46:01 +12:00
hba56 245914a69e added the polars csv 
#story[900]
 2017-05-10 15:26:43 +12:00
hba56 e67f8fae4b parser updated for the hashmap polars 
#pair[hba56, fjc40]
 #story[900]
 2017-05-10 15:24:46 +12:00
hba56 f518c52c7b changed the way we store polars 
-removed polar class
-added in new hasmap polars class
-updated boat class to the changes
 #story[900]
 2017-05-10 15:10:03 +12:00
hba56 1f554648ef changed all polar values to doubles and added a empty constructor 
#story[900]
 2017-05-10 14:41:05 +12:00
hba56 a4480f3ccf removed the get best heading method as it was incorrect and not related to this story 
#story[900]
 2017-05-10 14:25:06 +12:00
hba56 d7294f73a1 boats now have polars stored in the 
-added getter and setter for a boats polars

 #story[900]
 2017-05-10 14:23:26 +12:00
hba56 5b010cad49 added the polar class for storing polars 
#story[900]
 2017-05-10 13:45:09 +12:00
hba56 187acc6960 added an empty polarparser class to push a new branch 
#story[900]
 2017-05-10 12:30:46 +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
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
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
hba56 aa1d38ca9f removed import * lines 
#story[782]
 2017-05-04 13:17:07 +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
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
hba56 8bbea28cab refactored the boat message to not use boats 
#story[778]
 2017-05-01 17:35:30 +12:00
hba56 7cb4b2228d Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules 2017-05-01 16:08:28 +12:00
hba56 a271952e0c fixed boat parser for the mock 
#story[778]
 2017-05-01 16:08:23 +12:00