hba56
e2605c3c7c
Merge remote-tracking branch 'remotes/origin/story68' into Development
8 years ago
hba56
bb75806781
Cleaned up line to be in a shippable shape
...
#story[1101]
8 years ago
hba56
22722286ef
all paths now join up
...
#story[1087]
8 years ago
zwu18
53c9192130
Merge branch 'CommandFactory' into Development
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
8 years ago
hba56
ef3f468b19
arrows displayed for each leg
...
#story[1101]
8 years ago
cbt24
2920b6cf23
Removed build-breaking code from MockRace
...
#story[1096]
8 years ago
Connor Taylor-Brown
8ee4e84236
Merge remote-tracking branch 'remotes/origin/story63' into Development
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/MockBoat.java
# racevisionGame/src/main/java/mock/model/MockRace.java
8 years ago
Connor Taylor-Brown
dad4fa57c6
Fixed WindCommand not updating downwind command when moving upwind.
...
#story[1096]
8 years ago
Connor Taylor-Brown
55798447ab
Cherry-picked CommandFactory connection between ControllerServer and RaceLogic.
...
#story[1096]
8 years ago
Connor Taylor-Brown
e76de1cbf9
Added test for WindCommand
...
#story[1096]
8 years ago
hba56
62752c142a
building blocks for drawing the race line around the course
...
#story[1087]
8 years ago
hba56
747c31b948
Merge remote-tracking branch 'remotes/origin/story68' into Development
8 years ago
hba56
4195d41814
removed outdated comments
...
#story[1087]
8 years ago
hba56
950a801d16
rounding fix for the xml
...
#story[1087]
8 years ago
Joseph Gardner
0bf2c6106b
Boat updating speed after key press has been fixed. #fix #story[1094]
8 years ago
zwu18
ddaa2623ca
Added tests for TackGybeCommand class.
...
#Story[1097]
8 years ago
zwu18
a388989827
Reworked TackGybeCommand. Current boat in race will now tack and gybe when control is pressed.
...
#Story[1097]
8 years ago
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]
8 years ago
zwu18
dab0f2b402
Merge branch 'story63' into CommandFactory
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
8 years ago
zwu18
074e2e590b
VMGCommand now toggles autoVMG on and off. Linked up observer and observable so the current boat can now be controlled.
...
#Story[1097]
8 years ago
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
8 years ago
Connor Taylor-Brown
554f8a2a0f
Added WindCommand and multiple command execution to RaceLogic
...
- Dispatch commands with CompositeCommand
- Single WindCommand handles upwind and downwind logic
- Changed key bindings as Mac lacks PgUp PgDn
- ControllerServer is observable, RaceLogic updates CompositeCommand as observer
8 years ago
hba56
0b74acadff
rounding checks are now done by port or starboard side depending on what the compound marks type is
...
#story[1101]
8 years ago
hba56
db1efab225
rounding checks are now done by port or starboard side depending on what the compound marks type is
...
#story[1101]
8 years ago
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]
8 years ago
zwu18
14ce5fcaff
Made changes to TackGybeCommand and VMGCommand classes to fit pattern layout.
...
#Story[1097]
8 years ago
zwu18
6e699f7037
Merge branch 'RaceFactory' into CommandFactory
8 years ago
Connor Taylor-Brown
851bbb4fde
Merged branch "RaceFactory" with master
8 years ago
fjc40
148108a658
CommandFactory uses BoatActionEnum instead of raw ints.
...
#story[1094]
8 years ago
Connor Taylor-Brown
c83442761c
Implemented Factory for Command objects and fixed Command Pattern implementation.
...
- Commands now have standard 0-parameter execute method
- Commands are created by CommandFactory
#story[1094]
8 years ago
Joseph Gardner
40a3ed1bb0
Boats now store whether autoVMG is on or off, boat speed scales off their bearing relative to the TWA. #story[1094]
8 years ago
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]
8 years ago
fjc40
2a5d0938ff
Merge branch 'story48' into Development
8 years ago
Connor Taylor-Brown
c8621a7be5
Merge branch 'RaceFactory' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into RaceFactory
8 years ago
zwu18
d9679c1497
Build failing due to junit even though junit passes all tests. Commented out VMGCommand and TackGybeCommand content.
8 years ago
Connor Taylor-Brown
2672c2b13b
Separated RaceLogic from MockRace
...
- MockRace satisfies refactor requirement for RaceState
- VisualiserRace directly implements Runnable to remove method from MockRace
#story[1094]
8 years ago
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
8 years ago
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]
8 years ago
Connor Taylor-Brown
0466292bd0
Partially removed VMG optimisation, separated server-specific functionality
...
from MockRace into RaceServer.
#story[1094]
8 years ago
zwu18
7fc1347377
Created class TackGybeCommand which implements the CommandFactory interface.
...
#story[1097]
8 years ago
fjc40
e1905e9e36
javadoc fix.
8 years ago
fjc40
9889a474ee
Added ArrowController. This is the controller for arrow.fxml.
...
Removed arrow control stuff from ResizableRaceCanvas.
Added a wind speed label to arrow.fxml. Also created an outer GridPane to lay things out.
#story[1093]
8 years ago
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]
8 years ago
hba56
13922bc284
updated javadoc
...
#story[1101]
8 years ago
hba56
c633de21f5
added new methods to the mock boats to let them check which side a mark is on to them
...
#story[1101]
8 years ago
Joseph Gardner
27cf0e1539
Started splitting MockRace into RaceLogic and RaceState. #refactor #story[1094]
8 years ago
Joseph Gardner
b258e94a54
Merged wind generator into this branch. #story[1094]
8 years ago
Joseph Gardner
fba256113a
Merged wind generator into this branch. #story[1094]
8 years ago
Joseph Gardner
51bbdf9a50
Merge branch 'issue_26_wind' into RaceFactory
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/MockRace.java
# racevisionGame/src/main/java/shared/model/Race.java
# racevisionGame/src/main/java/visualiser/model/VisualiserRace.java
8 years ago
fjc40
ed12ff659d
mock:
...
Moved wind generation logic and state into the WindGenerator class.
MockRace initialises this, and calls it to update wind.
8 years ago