0558629dc6
Added luffing sails image.
...
- Created transparent gif of luffing sail
- Displayed image when sail is luffing
- Repositioned luffing sail
#story[1098]
8 years ago
d8628b4289
Boats now start the race with sails out. #story[1098]
8 years ago
20302496f0
Made SailsInCommand and SailsOutCommand one class. #story[1098]
8 years ago
321dcde72f
Implemented luffing sail without image (yet).
...
- Added sailsLuff image property
- Displayed luffing sail in correct position and angle
#story[1098]
8 years ago
1a7152f54e
Boats stop when the sails are out. Merged dev. #story[1098]
8 years ago
1302769a50
Merge branch 'Development' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/commandFactory/CommandFactory.java
# racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
# racevisionGame/src/test/java/mock/model/MockBoatTest.java
8 years ago
e23f20753d
Merged master. Added commands for sails in and out. Added logic to stop boat from moving when sails are out. Testing if the boat stops with sails out is blocked until command factory is merged. #story[1098]
8 years ago
41d09f587e
Merge branch 'master' into story_64_sails
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/gameController/Keys/ControlKey.java
# racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java
# racevisionGame/src/main/java/visualiser/gameController/Keys/VMGKey.java
# racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
8 years ago
74f04a13f8
Merge remote-tracking branch 'origin/Development' into Development
8 years ago
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]
8 years ago
da9915174c
Merge branch 'master' into Development
8 years ago
638413da1a
Merge remote-tracking branch 'remotes/origin/story63' into Development
8 years ago
ce973fecfe
Sails are displayed correctly for all wind and active boat directions.
...
- Figured out the different situations that can occur using accurate points of sail
- Mathed out the rotation angle for each situation
- Manual testing carried out by running simulations
- Manual testing carried out using pen and paper
#story[1098]
8 years ago
e021dd328d
Changed CompositeCommand stack to queue
...
#story[1096]
8 years ago
e2605c3c7c
Merge remote-tracking branch 'remotes/origin/story68' into Development
8 years ago
bb75806781
Cleaned up line to be in a shippable shape
...
#story[1101]
8 years ago
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
8 years ago
22722286ef
all paths now join up
...
#story[1087]
8 years ago
53c9192130
Merge branch 'CommandFactory' into Development
...
# Conflicts:
# racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
8 years ago
ef3f468b19
arrows displayed for each leg
...
#story[1101]
8 years ago
ace1252c1d
Fixed sails so they behave correctly
...
- Changed sail angle calculations back
- Luffing currently displays no sail as a temporary representation of sails in
#story[1098]
8 years ago
2920b6cf23
Removed build-breaking code from MockRace
...
#story[1096]
8 years ago
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
f6cdf66bfe
Sails can be toggled on the visualiser and the rotate sails button rotates the sail visually. #story[1098]
8 years ago
dad4fa57c6
Fixed WindCommand not updating downwind command when moving upwind.
...
#story[1096]
8 years ago
55798447ab
Cherry-picked CommandFactory connection between ControllerServer and RaceLogic.
...
#story[1096]
8 years ago
e76de1cbf9
Added test for WindCommand
...
#story[1096]
8 years ago
62752c142a
building blocks for drawing the race line around the course
...
#story[1087]
8 years ago
747c31b948
Merge remote-tracking branch 'remotes/origin/story68' into Development
8 years ago
4195d41814
removed outdated comments
...
#story[1087]
8 years ago
7c5670f8c2
Sails are displayed on first boat in a race. Optimised imports.
...
- Implemented drawSails method
- Sail position is displayed and updated using a boat's heading
- Sails conform to 'Points of sail'
- Javadoc'd new method and tidied up existing
- Sped up track point frequency (visualiserBoat class)
- Optimised imports (any other classes changed)
- A lot of canvas drawing and sail rotating issues were discovered and eventually overcome along the way. Using a sail image to draw and rotate on the existing canvas rather than a JavaFX shape on a new canvas was the final decision.
#story[1098]
8 years ago
950a801d16
rounding fix for the xml
...
#story[1087]
8 years ago
0bf2c6106b
Boat updating speed after key press has been fixed. #fix #story[1094]
8 years ago
ddaa2623ca
Added tests for TackGybeCommand class.
...
#Story[1097]
8 years ago
a388989827
Reworked TackGybeCommand. Current boat in race will now tack and gybe when control is pressed.
...
#Story[1097]
8 years ago
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
dab0f2b402
Merge branch 'story63' into CommandFactory
...
# Conflicts:
# racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
8 years ago
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
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
7feddeb49f
Merge branch 'master' into story48
8 years ago
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
0b74acadff
rounding checks are now done by port or starboard side depending on what the compound marks type is
...
#story[1101]
8 years ago
db1efab225
rounding checks are now done by port or starboard side depending on what the compound marks type is
...
#story[1101]
8 years ago
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
425cc7f91f
Changed ControlKey to use BoatActionEnum instead of magic numbers.
8 years ago
14ce5fcaff
Made changes to TackGybeCommand and VMGCommand classes to fit pattern layout.
...
#Story[1097]
8 years ago
6e699f7037
Merge branch 'RaceFactory' into CommandFactory
8 years ago
851bbb4fde
Merged branch "RaceFactory" with master
8 years ago
148108a658
CommandFactory uses BoatActionEnum instead of raw ints.
...
#story[1094]
8 years ago
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
Jessica Syder
Joseph Gardner
hba56
Connor Taylor-Brown
David Wu
fjc40